olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chr...@apache.org
Subject olingo-odata4 git commit: [OLINGO-718] ETag removed from json reference payload
Date Tue, 30 Jun 2015 06:55:41 GMT
Repository: olingo-odata4
Updated Branches:
  refs/heads/master b3dcaa25b -> aeb258b5a


[OLINGO-718] ETag removed from json reference payload


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/aeb258b5
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/aeb258b5
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/aeb258b5

Branch: refs/heads/master
Commit: aeb258b5abbd3b871c375d8d850decd3db4c8ddf
Parents: b3dcaa2
Author: Christian Holzer <c.holzer@sap.com>
Authored: Tue Jun 30 08:55:20 2015 +0200
Committer: Christian Holzer <c.holzer@sap.com>
Committed: Tue Jun 30 08:55:20 2015 +0200

----------------------------------------------------------------------
 .../olingo/server/core/serializer/json/ODataJsonSerializer.java  | 2 --
 .../server/core/serializer/json/ODataJsonSerializerTest.java     | 4 ----
 2 files changed, 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aeb258b5/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 e9d4858..a3b7805 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
@@ -656,7 +656,6 @@ public class ODataJsonSerializer implements ODataSerializer {
 
       json.writeStartObject();
       writeContextURL(contextURL, json);
-      writeMetadataETag(metadata, json);
       json.writeStringField(Constants.JSON_ID, uriHelper.buildCanonicalURL(edmEntitySet,
entity));
       json.writeEndObject();
 
@@ -681,7 +680,6 @@ public class ODataJsonSerializer implements ODataSerializer {
       json.writeStartObject();
 
       writeContextURL(contextURL, json);
-      writeMetadataETag(metadata, json);
       if (options != null && options.getCount() != null && options.getCount().getValue())
{
         writeCount(entityCollection, json);
       }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aeb258b5/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java
b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java
index 0b398f4..3856339 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java
@@ -793,7 +793,6 @@ public class ODataJsonSerializerTest {
     final String resultString = IOUtils.toString(serializerResult.getContent());
 
     Assert.assertEquals("{\"@odata.context\":\"$metadata#$ref\","
-        + "\"@odata.metadataEtag\":\"W/\\\"metadataETag\\\"\","
         + "\"@odata.id\":\"ESAllPrim(32767)\"}",
         resultString);
   }
@@ -822,7 +821,6 @@ public class ODataJsonSerializerTest {
     final String resultString = IOUtils.toString(serializerResult.getContent());
 
     Assert.assertEquals("{\"@odata.context\":\"$metadata#Collection($ref)\","
-        + "\"@odata.metadataEtag\":\"W/\\\"metadataETag\\\"\","
         + "\"value\":[{\"@odata.id\":\"ESAllPrim(32767)\"},"
         + "{\"@odata.id\":\"ESAllPrim(-32768)\"},"
         + "{\"@odata.id\":\"ESAllPrim(0)\"}]}",
@@ -843,7 +841,6 @@ public class ODataJsonSerializerTest {
     final String resultString = IOUtils.toString(serializerResult.getContent());
 
     Assert.assertEquals("{\"@odata.context\":\"$metadata#Collection($ref)\","
-        + "\"@odata.metadataEtag\":\"W/\\\"metadataETag\\\"\","
         + "\"value\":[]}", resultString);
   }
 
@@ -1046,7 +1043,6 @@ public class ODataJsonSerializerTest {
 
     Assert.assertThat(resultString, CoreMatchers.startsWith("{"
         + "\"@odata.context\":\"$metadata#Collection($ref)\","
-        + "\"@odata.metadataEtag\":\"W/\\\"metadataETag\\\"\","
         + "\"@odata.count\":\"3\",\"value\":["));
     Assert.assertThat(resultString, CoreMatchers.endsWith("],"
         + "\"@odata.nextLink\":\"/next\"}"));


Mime
View raw message