You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ra...@apache.org on 2016/04/21 19:42:46 UTC
olingo-odata4 git commit: OLINGO-939: correcting the content-type in
the error response
Repository: olingo-odata4
Updated Branches:
refs/heads/master deadae1f7 -> e4f95706a
OLINGO-939: correcting the content-type in the error response
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/e4f95706
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/e4f95706
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/e4f95706
Branch: refs/heads/master
Commit: e4f95706a908efae0ec19ef5feda106d523ffa0f
Parents: deadae1
Author: Ramesh Reddy <ra...@jboss.org>
Authored: Thu Apr 21 12:42:25 2016 -0500
Committer: Ramesh Reddy <ra...@jboss.org>
Committed: Thu Apr 21 12:42:25 2016 -0500
----------------------------------------------------------------------
.../apache/olingo/server/core/responses/ErrorResponse.java | 2 +-
.../apache/olingo/server/example/TripPinServiceTest.java | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e4f95706/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ErrorResponse.java
----------------------------------------------------------------------
diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ErrorResponse.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ErrorResponse.java
index 2e1fbd6..b2e2f6e 100644
--- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ErrorResponse.java
+++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ErrorResponse.java
@@ -49,7 +49,7 @@ public class ErrorResponse extends ServiceResponse {
public void writeError(ODataServerError error) {
try {
- writeHeader(HttpHeader.CONTENT_TYPE, this.contentType.getType());
+ writeHeader(HttpHeader.CONTENT_TYPE, this.contentType.toContentTypeString());
writeContent(this.serializer.error(error).getContent(), error.getStatusCode(), true);
} catch (SerializerException e) {
writeServerError(true);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e4f95706/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinServiceTest.java
----------------------------------------------------------------------
diff --git a/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinServiceTest.java b/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinServiceTest.java
index c537edd..1299f68 100644
--- a/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinServiceTest.java
+++ b/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinServiceTest.java
@@ -163,6 +163,15 @@ public class TripPinServiceTest {
}
@Test
+ public void testErrorResponse() throws Exception {
+ HttpResponse response = httpGET(baseURL + "/Airlines(1)", 400);
+ Header[] headers = response.getHeaders("Content-Type");
+ assertEquals("application/json; odata.metadata=minimal", headers[0].getValue());
+ assertEquals("{\"error\":{\"code\":null,\"message\":\"The key value '' is invalid.\"}}",
+ IOUtils.toString(response.getEntity().getContent()));
+ }
+
+ @Test
public void testReadEntityWithNonExistingKey() throws Exception {
HttpResponse response = httpGET(baseURL + "/Airlines('OO')", 404);
EntityUtils.consumeQuietly(response.getEntity());