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 e9d4858de..a3b7805c4 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); } 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 0b398f48a..38563391a 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\"}"));