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/07/07 15:46:07 UTC
olingo-odata4 git commit: [OLINGO-659] Delete pretty printer from
service document json
Repository: olingo-odata4
Updated Branches:
refs/heads/master 4e405938e -> d18cbccee
[OLINGO-659] Delete pretty printer from service document json
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/d18cbcce
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/d18cbcce
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/d18cbcce
Branch: refs/heads/master
Commit: d18cbcceeb64edd5cfbb54b2b8e90b8eebbba6e5
Parents: 4e40593
Author: Christian Amend <ch...@sap.com>
Authored: Tue Jul 7 15:41:58 2015 +0200
Committer: Christian Amend <ch...@sap.com>
Committed: Tue Jul 7 15:42:39 2015 +0200
----------------------------------------------------------------------
.../olingo/server/core/serializer/json/ODataJsonSerializer.java | 3 +--
.../java/org/apache/olingo/server/core/ODataHandlerTest.java | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d18cbcce/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
index a3b7805..c1292de 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
@@ -91,8 +91,7 @@ public class ODataJsonSerializer implements ODataSerializer {
try {
buffer = new CircleStreamBuffer();
- gen = new JsonFactory().createGenerator(buffer.getOutputStream())
- .setPrettyPrinter(new DefaultPrettyPrinter());
+ gen = new JsonFactory().createGenerator(buffer.getOutputStream());
new ServiceDocumentJsonSerializer(metadata, serviceRoot, isODataMetadataNone).writeServiceDocument(gen);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d18cbcce/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java
index a3f75eb..236c1b7 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java
@@ -112,8 +112,8 @@ public class ODataHandlerTest {
assertNotNull(response.getContent());
String doc = IOUtils.toString(response.getContent());
- assertThat(doc, containsString("\"@odata.context\" : \"$metadata\""));
- assertThat(doc, containsString("\"value\" :"));
+ assertThat(doc, containsString("\"@odata.context\":\"$metadata\""));
+ assertThat(doc, containsString("\"value\":"));
}
@Test