Return-Path: X-Original-To: apmail-olingo-commits-archive@minotaur.apache.org Delivered-To: apmail-olingo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 88D3D180B5 for ; Fri, 14 Aug 2015 11:45:12 +0000 (UTC) Received: (qmail 1123 invoked by uid 500); 14 Aug 2015 11:45:12 -0000 Delivered-To: apmail-olingo-commits-archive@olingo.apache.org Received: (qmail 1103 invoked by uid 500); 14 Aug 2015 11:45:12 -0000 Mailing-List: contact commits-help@olingo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@olingo.apache.org Delivered-To: mailing list commits@olingo.apache.org Received: (qmail 1094 invoked by uid 99); 14 Aug 2015 11:45:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Aug 2015 11:45:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 42063E0435; Fri, 14 Aug 2015 11:45:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chrisam@apache.org To: commits@olingo.apache.org Message-Id: <6e8800b3765243dd9ddd95cbfd479c95@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: olingo-odata4 git commit: [Olingo-731] finalize debug supprt Date: Fri, 14 Aug 2015 11:45:12 +0000 (UTC) Repository: olingo-odata4 Updated Branches: refs/heads/master 4a8140924 -> 179c46396 [Olingo-731] finalize debug supprt Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/179c4639 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/179c4639 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/179c4639 Branch: refs/heads/master Commit: 179c46396e41bb13897400ccf3a34cd14dfcf2b3 Parents: 4a81409 Author: Christian Amend Authored: Fri Aug 14 13:25:36 2015 +0200 Committer: Christian Amend Committed: Fri Aug 14 13:26:03 2015 +0200 ---------------------------------------------------------------------- .../olingo/commons/api/http/HttpHeaders.java | 4 +-- .../olingo/server/api/uri/UriInfoResource.java | 1 + .../server/api/uri/queryoption/ExpandItem.java | 1 + .../core/debug/DebugResponseHelperImpl.java | 1 - .../olingo/server/core/debug/DebugTabBody.java | 32 ++++++++------------ 5 files changed, 17 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/179c4639/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpHeaders.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpHeaders.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpHeaders.java index 54d0e30..59c07c2 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpHeaders.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpHeaders.java @@ -21,14 +21,14 @@ package org.apache.olingo.commons.api.http; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.LinkedHashMap; import java.util.Map; -import java.util.TreeMap; /** * HttpHeader container */ public class HttpHeaders { - private final Map headers = new TreeMap(); + private final Map headers = new LinkedHashMap(); /** * Add a header with given name and value. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/179c4639/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.java index 20d4880..3ea1058 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.java @@ -75,6 +75,7 @@ public interface UriInfoResource { OrderByOption getOrderByOption(); /** + * CURRENTLY NOT SUPPORTED. WILL ALWAYS RETURN NULL * @return Object containing information of the $search option */ SearchOption getSearchOption(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/179c4639/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandItem.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandItem.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandItem.java index fccf844..a16c137 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandItem.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandItem.java @@ -38,6 +38,7 @@ public interface ExpandItem { FilterOption getFilterOption(); /** + * CURRENTLY NOT SUPPORTED. WILL ALWAYS RETURN NULL * @return Information of the option $search when used within $expand */ SearchOption getSearchOption(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/179c4639/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugResponseHelperImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugResponseHelperImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugResponseHelperImpl.java index 3a1c2e0..222bd0a 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugResponseHelperImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugResponseHelperImpl.java @@ -138,7 +138,6 @@ public class DebugResponseHelperImpl implements DebugResponseHelper { gen.writeStartObject(); DebugTab requestInfo = parts.get(0); - // TODO: Should we really translate to lower case here? gen.writeFieldName(requestInfo.getName().toLowerCase(Locale.ROOT)); requestInfo.appendJson(gen); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/179c4639/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabBody.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabBody.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabBody.java index e0330b8..317f376 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabBody.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabBody.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.Writer; import java.util.regex.Pattern; +import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.IOUtils; import org.apache.olingo.commons.api.http.HttpHeader; import org.apache.olingo.server.api.ODataResponse; @@ -43,31 +44,27 @@ public class DebugTabBody implements DebugTab { private final String serviceRoot; -// private final boolean isXml; -// private final boolean isJson; -// private final boolean isText; -// private final boolean isImage; - public DebugTabBody(final ODataResponse response, final String serviceRoot) { this.response = response; this.serviceRoot = serviceRoot == null ? "/" : serviceRoot; if (response != null) { - final String contentType = response.getHeader(HttpHeader.CONTENT_TYPE); - // TODO: Differentiate better - if (contentType != null) { - responseContent = ResponseContent.JSON; + final String contentTypeString = response.getHeader(HttpHeader.CONTENT_TYPE); + if (contentTypeString != null) { + if (contentTypeString.startsWith("application/json")) { + responseContent = ResponseContent.JSON; + } else if (contentTypeString.startsWith("image/")) { + responseContent = ResponseContent.IMAGE; + } else if (contentTypeString.contains("xml")) { + responseContent = ResponseContent.XML; + } else { + responseContent = ResponseContent.TEXT; + } } else { responseContent = ResponseContent.TEXT; } } else { responseContent = ResponseContent.TEXT; } -// isXml = contentType.contains("xml"); -// isJson = !isXml && contentType.startsWith(HttpContentType.APPLICATION_JSON); -// isText = isXml || isJson || contentType.startsWith("text/") -// || contentType.startsWith(HttpContentType.APPLICATION_HTTP) -// || contentType.startsWith(HttpContentType.MULTIPART_MIXED); -// isImage = !isText && contentType.startsWith("image/"); } @Override @@ -90,14 +87,12 @@ public class DebugTabBody implements DebugTab { String contentString; switch (responseContent) { case IMAGE: - // TODO: DecodeString as base 64 - contentString = "Currently not supported"; + contentString = Base64.encodeBase64String(IOUtils.toString(response.getContent()).getBytes()); break; case JSON: case XML: case TEXT: default: - // TODO: Remove IOUtils from core dependency contentString = IOUtils.toString(response.getContent(), "UTF-8"); break; } @@ -124,7 +119,6 @@ public class DebugTabBody implements DebugTab { writer.append("\n"); break; case IMAGE: - // Make header query case insensitive writer.append("\n");