Repository: olingo-odata4 Updated Branches: refs/heads/master e4f95706a -> 01e27bb6e
OLINGO-939: Avoiding to use contentType.getType method, instead use contentType.toContentTypeString for string form of the content-type Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/01e27bb6 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/01e27bb6 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/01e27bb6 Branch: refs/heads/master Commit: 01e27bb6eedf66534b07d6613a11089efaa5694e Parents: e4f9570 Author: Ramesh Reddy <[email protected]> Authored: Thu Apr 21 15:26:15 2016 -0500 Committer: Ramesh Reddy <[email protected]> Committed: Thu Apr 21 15:26:15 2016 -0500 ---------------------------------------------------------------------- .../apache/olingo/server/core/responses/EntityResponse.java | 9 +++------ .../olingo/server/core/responses/EntitySetResponse.java | 2 +- .../olingo/server/core/responses/MetadataResponse.java | 2 +- .../olingo/server/core/responses/PropertyResponse.java | 2 +- .../server/core/responses/ServiceDocumentResponse.java | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/01e27bb6/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntityResponse.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntityResponse.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntityResponse.java index 5f54a24..9637623 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntityResponse.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntityResponse.java @@ -114,13 +114,10 @@ public class EntityResponse extends ServiceResponse { // Note that if media written just like Stream, but on entity URL // 8.2.8.7 - if (this.returnRepresentation == ReturnRepresentation.MINIMAL || - this.returnRepresentation == ReturnRepresentation.NONE) { + if (this.returnRepresentation == ReturnRepresentation.MINIMAL) { writeNoContent(false); writeHeader(HttpHeader.LOCATION, locationHeader); - if (this.returnRepresentation == ReturnRepresentation.MINIMAL) { - writeHeader("Preference-Applied", "return=minimal"); //$NON-NLS-1$ //$NON-NLS-2$ - } + writeHeader("Preference-Applied", "return=minimal"); //$NON-NLS-1$ //$NON-NLS-2$ // 8.3.3 writeHeader("OData-EntityId", entity.getId().toASCIIString()); //$NON-NLS-1$ close(); @@ -162,7 +159,7 @@ public class EntityResponse extends ServiceResponse { public void writeError(ODataServerError error) { try { - writeHeader(HttpHeader.CONTENT_TYPE, this.responseContentType.getType()); + writeHeader(HttpHeader.CONTENT_TYPE, this.responseContentType.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/01e27bb6/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntitySetResponse.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntitySetResponse.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntitySetResponse.java index 09a48c1..622c95d 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntitySetResponse.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntitySetResponse.java @@ -85,7 +85,7 @@ public class EntitySetResponse extends ServiceResponse { public void writeError(ODataServerError error) { try { - writeHeader(HttpHeader.CONTENT_TYPE, this.responseContentType.getType()); + writeHeader(HttpHeader.CONTENT_TYPE, this.responseContentType.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/01e27bb6/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/MetadataResponse.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/MetadataResponse.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/MetadataResponse.java index c030336..73d5487 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/MetadataResponse.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/MetadataResponse.java @@ -64,7 +64,7 @@ public class MetadataResponse extends ServiceResponse { public void writeError(ODataServerError error) { try { - writeHeader(HttpHeader.CONTENT_TYPE, this.responseContentType.getType()); + writeHeader(HttpHeader.CONTENT_TYPE, this.responseContentType.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/01e27bb6/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/PropertyResponse.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/PropertyResponse.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/PropertyResponse.java index 7bb2c24..9dac341 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/PropertyResponse.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/PropertyResponse.java @@ -160,7 +160,7 @@ public class PropertyResponse extends ServiceResponse { public void writeError(ODataServerError error) { try { - writeHeader(HttpHeader.CONTENT_TYPE, this.responseContentType.getType()); + writeHeader(HttpHeader.CONTENT_TYPE, this.responseContentType.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/01e27bb6/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ServiceDocumentResponse.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ServiceDocumentResponse.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ServiceDocumentResponse.java index a4192e7..8a0cd96 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ServiceDocumentResponse.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ServiceDocumentResponse.java @@ -65,7 +65,7 @@ public class ServiceDocumentResponse extends ServiceResponse { public void writeError(ODataServerError error) { try { - writeHeader(HttpHeader.CONTENT_TYPE, this.responseContentType.getType()); + writeHeader(HttpHeader.CONTENT_TYPE, this.responseContentType.toContentTypeString()); writeContent(this.serializer.error(error).getContent(), error.getStatusCode(), true); } catch (SerializerException e) { writeServerError(true);
