You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2015/08/26 10:37:25 UTC
olingo-odata4 git commit: [OLINGO-659] Small debug output enhancement
Repository: olingo-odata4
Updated Branches:
refs/heads/master 77c0ef5cc -> cc4e710ce
[OLINGO-659] Small debug output enhancement
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/cc4e710c
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/cc4e710c
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/cc4e710c
Branch: refs/heads/master
Commit: cc4e710ceb921c031750e6f83810efe311fc166a
Parents: 77c0ef5
Author: Christian Amend <ch...@sap.com>
Authored: Wed Aug 26 10:35:34 2015 +0200
Committer: Christian Amend <ch...@sap.com>
Committed: Wed Aug 26 10:37:11 2015 +0200
----------------------------------------------------------------------
.../olingo/ext/proxy/api/NoResultException.java | 31 --------------------
.../ext/proxy/api/NonUniqueResultException.java | 31 --------------------
.../ODataClientErrorException.java | 2 +-
.../server/api/debug/DebugInformation.java | 10 +++----
.../server/core/ODataHttpHandlerImpl.java | 4 +--
.../core/debug/DebugResponseHelperImpl.java | 10 +++----
.../olingo/server/core/debug/DebugTabBody.java | 31 ++++----------------
.../server/core/debug/DebugTabResponse.java | 8 ++---
.../server/core/debug/DebugTabServer.java | 14 ++++-----
.../olingo/server/core/debug/DebugTabUri.java | 4 +--
.../server/core/debug/ServerCoreDebugger.java | 6 ++--
.../server/core/debug/DebugTabBodyTest.java | 2 +-
.../server/core/debug/DebugTabResponseTest.java | 4 +--
13 files changed, 37 insertions(+), 120 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cc4e710c/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/NoResultException.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/NoResultException.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/NoResultException.java
deleted file mode 100644
index 617b305..0000000
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/NoResultException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.ext.proxy.api;
-
-/**
- * Thrown when {@link Filter#getSingleResult()} is executed and there is no result to return.
- */
-public class NoResultException extends RuntimeException {
-
- private static final long serialVersionUID = -6643642637364303053L;
-
- public NoResultException() {
- super();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cc4e710c/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/NonUniqueResultException.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/NonUniqueResultException.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/NonUniqueResultException.java
deleted file mode 100644
index 37658c6..0000000
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/NonUniqueResultException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.ext.proxy.api;
-
-/**
- * Thrown when {@link Filter#getSingleResult()} is executed and there is more than one result.
- */
-public class NonUniqueResultException extends RuntimeException {
-
- private static final long serialVersionUID = 4444551737338550185L;
-
- public NonUniqueResultException() {
- super();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cc4e710c/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataClientErrorException.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataClientErrorException.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataClientErrorException.java
index c37e2c2..eaedc88 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataClientErrorException.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataClientErrorException.java
@@ -18,8 +18,8 @@
*/
package org.apache.olingo.client.api.communication;
-import org.apache.commons.lang3.StringUtils;
import org.apache.http.StatusLine;
+import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.commons.api.ex.ODataRuntimeException;
import org.apache.olingo.commons.api.ex.ODataError;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cc4e710c/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugInformation.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugInformation.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugInformation.java
index 9198c6b..2f4e67d 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugInformation.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugInformation.java
@@ -34,7 +34,7 @@ public class DebugInformation {
private ODataResponse applicationResponse;
private UriInfo uriInfo;
private Exception exception;
- private Map<String, String> serverEnvironmentVaribles;
+ private Map<String, String> serverEnvironmentVariables;
private List<RuntimeMeasurement> runtimeInformation;
/**
@@ -94,12 +94,12 @@ public class DebugInformation {
* might contain different information. Will never be null but might be empty.
* @return environment variables
*/
- public Map<String, String> getServerEnvironmentVaribles() {
- return serverEnvironmentVaribles;
+ public Map<String, String> getServerEnvironmentVariables() {
+ return serverEnvironmentVariables;
}
- public void setServerEnvironmentVaribles(Map<String, String> serverEnvironmentVaribles) {
- this.serverEnvironmentVaribles = serverEnvironmentVaribles;
+ public void setServerEnvironmentVariables(Map<String, String> serverEnvironmentVariables) {
+ this.serverEnvironmentVariables = serverEnvironmentVariables;
}
/**
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cc4e710c/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java
index 050f285..33b62c3 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java
@@ -89,14 +89,14 @@ public class ODataHttpHandlerImpl implements ODataHttpHandler {
debugger.stopRuntimeMeasurement(processMethodHandel);
if (debugger.isDebugMode()) {
- Map<String, String> serverEnvironmentVaribles = createEnvironmentVariablesMap(request);
+ Map<String, String> serverEnvironmentVariables = createEnvironmentVariablesMap(request);
if (exception == null) {
// This is to ensure that we have access to the thrown OData Exception
exception = handler.getLastThrownException();
}
odResponse =
debugger.createDebugResponse(request, exception, odRequest, odResponse, handler.getUriInfo(),
- serverEnvironmentVaribles);
+ serverEnvironmentVariables);
}
convertToHttp(response, odResponse);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cc4e710c/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 5510c54..88a39ca 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
@@ -107,12 +107,12 @@ public class DebugResponseHelperImpl implements DebugResponseHelper {
parts.add(new DebugTabRequest(debugInfo.getRequest()));
// response
- parts.add(new DebugTabResponse(debugInfo.getApplicationResponse(), debugInfo.getRequest().getRawBaseUri()));
+ parts.add(new DebugTabResponse(debugInfo.getApplicationResponse()));
// server
- Map<String, String> serverEnvironmentVaribles = debugInfo.getServerEnvironmentVaribles();
- if (serverEnvironmentVaribles != null && !serverEnvironmentVaribles.isEmpty()) {
- parts.add(new DebugTabServer(serverEnvironmentVaribles));
+ Map<String, String> serverEnvironmentVariables = debugInfo.getServerEnvironmentVariables();
+ if (serverEnvironmentVariables != null && !serverEnvironmentVariables.isEmpty()) {
+ parts.add(new DebugTabServer(serverEnvironmentVariables));
}
// URI
@@ -239,7 +239,7 @@ public class DebugResponseHelperImpl implements DebugResponseHelper {
.append("ul, .tree { list-style-type: none; }\n")
.append("div > ul.expr, div > .expand, .tree { padding-left: 0; }\n")
.append(".expr, .expand, .null, .numeric { padding-left: 1.5em; }\n")
- .append(".jsonCode{ white-space: pre-wrap; }")
+ .append(".json { white-space: pre-wrap; }\n")
.append("</style>\n")
.append("</head>\n")
.append("<body>\n");
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cc4e710c/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 ab489b0..8af0e43 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
@@ -20,13 +20,11 @@ package org.apache.olingo.server.core.debug;
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;
-import org.apache.olingo.server.api.debug.DebugSupport;
import com.fasterxml.jackson.core.JsonGenerator;
@@ -42,11 +40,8 @@ public class DebugTabBody implements DebugTab {
private final ODataResponse response;
private final ResponseContent responseContent;
- private final String serviceRoot;
-
- public DebugTabBody(final ODataResponse response, final String serviceRoot) {
+ public DebugTabBody(final ODataResponse response) {
this.response = response;
- this.serviceRoot = serviceRoot == null ? "/" : serviceRoot;
if (response != null) {
final String contentTypeString = response.getHeader(HttpHeader.CONTENT_TYPE);
if (contentTypeString != null) {
@@ -109,13 +104,13 @@ public class DebugTabBody implements DebugTab {
response == null || response.getContent() == null ? "ODataLibrary: No body." : getContentString();
switch (responseContent) {
case XML:
- writer.append("<pre class=\"code").append("xml").append("\">\n");
- writer.append(addLinks(DebugResponseHelperImpl.escapeHtml(body)));
+ writer.append("<pre class=\"code").append(" xml").append("\">\n");
+ writer.append(DebugResponseHelperImpl.escapeHtml(body));
writer.append("</pre>\n");
break;
case JSON:
- writer.append("<pre class=\"code").append("json").append("\">\n");
- writer.append(addLinks(DebugResponseHelperImpl.escapeHtml(body)));
+ writer.append("<pre class=\"code").append(" json").append("\">\n");
+ writer.append(DebugResponseHelperImpl.escapeHtml(body));
writer.append("</pre>\n");
break;
case IMAGE:
@@ -125,24 +120,10 @@ public class DebugTabBody implements DebugTab {
break;
case TEXT:
default:
- writer.append("<pre class=\"code").append("").append("\">\n");
+ writer.append("<pre class=\"code").append("\">\n");
writer.append(DebugResponseHelperImpl.escapeHtml(body));
writer.append("</pre>\n");
break;
}
}
-
- private String addLinks(final String source) {
- final String debugOption = DebugSupport.ODATA_DEBUG_QUERY_PARAMETER + "=" + DebugSupport.ODATA_DEBUG_HTML;
- final String urlPattern = "("
- + (responseContent == ResponseContent.XML ?
- "(?:href|src|base)=" : "\"(?:uri|media_src|edit_media|__next)\":\\p{Space}*")
- + "\")(.+?)\"";
- return (responseContent == ResponseContent.XML ?
- source.replaceAll("(xmlns(?::\\p{Alnum}+)?=\")(.+?)\"", "$1<span class=\"ns\">$2</span>\"") : source)
- .replaceAll(urlPattern, "$1<a href=\"" + serviceRoot + "$2?" + debugOption + "\">$2</a>\"")
- .replaceAll("(<a href=\"" + Pattern.quote(serviceRoot) + ')' + Pattern.quote(serviceRoot), "$1")
- .replaceAll("<a href=\"(.+?)\\?(.+?)\\?" + debugOption, "<a href=\"$1?$2&" + debugOption)
- .replaceAll("&amp;", "&");
- }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cc4e710c/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabResponse.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabResponse.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabResponse.java
index 11331a9..68cd58a 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabResponse.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabResponse.java
@@ -36,11 +36,10 @@ import com.fasterxml.jackson.core.JsonGenerator;
public class DebugTabResponse implements DebugTab {
private final ODataResponse response;
- private final String serviceRoot;
private final HttpStatusCode status;
private final Map<String, List<String>> headers;
- public DebugTabResponse(final ODataResponse applicationResponse, final String serviceRoot) {
+ public DebugTabResponse(final ODataResponse applicationResponse) {
this.response = applicationResponse;
if (response != null) {
status = HttpStatusCode.fromStatusCode(response.getStatusCode());
@@ -49,7 +48,6 @@ public class DebugTabResponse implements DebugTab {
status = HttpStatusCode.INTERNAL_SERVER_ERROR;
headers = Collections.emptyMap();
}
- this.serviceRoot = serviceRoot == null ? "/" : serviceRoot;
}
@Override
@@ -76,7 +74,7 @@ public class DebugTabResponse implements DebugTab {
gen.writeFieldName("body");
if (response != null && response.getContent() != null) {
- new DebugTabBody(response, serviceRoot).appendJson(gen);
+ new DebugTabBody(response).appendJson(gen);
} else {
gen.writeNull();
}
@@ -105,7 +103,7 @@ public class DebugTabResponse implements DebugTab {
DebugResponseHelperImpl.appendHtmlTable(writer, map(headers));
writer.append("<h2>Response Body</h2>\n");
if (response != null && response.getContent() != null) {
- new DebugTabBody(response, serviceRoot).appendHtml(writer);
+ new DebugTabBody(response).appendHtml(writer);
} else {
writer.append("<p>ODataLibrary: no response body</p>");
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cc4e710c/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabServer.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabServer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabServer.java
index 2faae3e..e8fd90f 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabServer.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabServer.java
@@ -29,10 +29,10 @@ import com.fasterxml.jackson.core.JsonGenerator;
*/
public class DebugTabServer implements DebugTab {
- private final Map<String, String> serverEnvironmentVaribles;
+ private final Map<String, String> serverEnvironmentVariables;
- public DebugTabServer(Map<String, String> serverEnvironmentVaribles) {
- this.serverEnvironmentVaribles = serverEnvironmentVaribles;
+ public DebugTabServer(Map<String, String> serverEnvironmentVariables) {
+ this.serverEnvironmentVariables = serverEnvironmentVariables;
}
@Override
@@ -42,8 +42,8 @@ public class DebugTabServer implements DebugTab {
@Override
public void appendJson(JsonGenerator gen) throws IOException {
- if (serverEnvironmentVaribles != null && !serverEnvironmentVaribles.isEmpty()) {
- DebugResponseHelperImpl.appendJsonTable(gen, serverEnvironmentVaribles);
+ if (serverEnvironmentVariables != null && !serverEnvironmentVariables.isEmpty()) {
+ DebugResponseHelperImpl.appendJsonTable(gen, serverEnvironmentVariables);
} else {
gen.writeNull();
}
@@ -56,8 +56,8 @@ public class DebugTabServer implements DebugTab {
.append("<p>").append(pack.getImplementationTitle())
.append(" Version ").append(pack.getImplementationVersion()).append("</p>\n")
.append("<h2>Server Environment</h2>\n");
- if (serverEnvironmentVaribles != null && !serverEnvironmentVaribles.isEmpty()) {
- DebugResponseHelperImpl.appendHtmlTable(writer, serverEnvironmentVaribles);
+ if (serverEnvironmentVariables != null && !serverEnvironmentVariables.isEmpty()) {
+ DebugResponseHelperImpl.appendHtmlTable(writer, serverEnvironmentVariables);
}
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cc4e710c/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabUri.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabUri.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabUri.java
index 5e1a921..fb2c5e0 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabUri.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabUri.java
@@ -79,7 +79,7 @@ public class DebugTabUri implements DebugTab {
}
if (uriInfo.getSkipTokenOption() != null) {
- gen.writeStringField("id", uriInfo.getSkipTokenOption().getValue());
+ gen.writeStringField("skiptoken", uriInfo.getSkipTokenOption().getValue());
}
appendCommonJsonObjects(gen, uriInfo.getCountOption(), uriInfo.getSkipOption(), uriInfo.getTopOption(), uriInfo
@@ -250,7 +250,7 @@ public class DebugTabUri implements DebugTab {
}
writer.append("<h2>Uri Information</h2>\n")
- .append("<ul class=\"jsonCode\"><li>");
+ .append("<ul class=\"json\"><li>");
writer.append(getJsonString());
writer.append("</li></ul>\n");
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cc4e710c/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/ServerCoreDebugger.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/ServerCoreDebugger.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/ServerCoreDebugger.java
index 8bdbe39..d52e2d4 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/ServerCoreDebugger.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/ServerCoreDebugger.java
@@ -63,7 +63,7 @@ public class ServerCoreDebugger {
public ODataResponse createDebugResponse(final HttpServletRequest request, final Exception exception,
final ODataRequest odRequest, final ODataResponse odResponse, UriInfo uriInfo,
- Map<String, String> serverEnvironmentVaribles) {
+ Map<String, String> serverEnvironmentVariables) {
//Failsafe so we do not generate unauthorized debug messages
if(!isDebugMode){
return odResponse;
@@ -71,7 +71,7 @@ public class ServerCoreDebugger {
try {
DebugInformation debugInfo =
- createDebugInformation(request, exception, odRequest, odResponse, uriInfo, serverEnvironmentVaribles);
+ createDebugInformation(request, exception, odRequest, odResponse, uriInfo, serverEnvironmentVariables);
return debugSupport.createDebugResponse(debugFormat, debugInfo);
} catch (Exception e) {
@@ -97,7 +97,7 @@ public class ServerCoreDebugger {
debugInfo.setException(exception);
- debugInfo.setServerEnvironmentVaribles(serverEnvironmentVaribles);
+ debugInfo.setServerEnvironmentVariables(serverEnvironmentVaribles);
debugInfo.setUriInfo(uriInfo);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cc4e710c/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabBodyTest.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabBodyTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabBodyTest.java
index 7d3a58e..b77679f 100644
--- a/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabBodyTest.java
+++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabBodyTest.java
@@ -26,7 +26,7 @@ public class DebugTabBodyTest extends AbstractDebugTabTest {
@Test
public void nullResponseMustNotLeadToException() throws Exception {
- DebugTabBody tab = new DebugTabBody(null, null);
+ DebugTabBody tab = new DebugTabBody(null);
String expectedHtml = "<pre class=\"code\">\n"
+ "ODataLibrary: No body.</pre>\n";
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cc4e710c/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabResponseTest.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabResponseTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabResponseTest.java
index af55a40..af109c2 100644
--- a/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabResponseTest.java
+++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabResponseTest.java
@@ -28,7 +28,7 @@ public class DebugTabResponseTest extends AbstractDebugTabTest {
@Test
public void nullResponseMustNotLeadToException() throws Exception {
- DebugTabResponse tab = new DebugTabResponse(null, null);
+ DebugTabResponse tab = new DebugTabResponse(null);
String expectedJson = "{\"status\":{\"code\":\"500\",\"info\":\"Internal Server Error\"},\"body\":null}";
String expectedHtml = "<h2>Status Code</h2>\n"
@@ -54,7 +54,7 @@ public class DebugTabResponseTest extends AbstractDebugTabTest {
response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode());
response.setHeader("headername", "headervalue");
response.setHeader("headername2", "headervalue2");
- DebugTabResponse tab = new DebugTabResponse(response, null);
+ DebugTabResponse tab = new DebugTabResponse(response);
String expectedJson = "{\"status\":{\"code\":\"204\",\"info\":\"No Content\"},"
+ "\"headers\":{\"headername\":\"headervalue\",\"headername2\":\"headervalue2\"},\"body\":null}";