[olingo-odata4] branch master updated: [OLINGO-1333]ODataResponse for delta client throws NPE on Asynchronous calls

[archanarai]

This is an automated email from the ASF dual-hosted git repository.

archanarai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/olingo-odata4.git


The following commit(s) were added to refs/heads/master by this push:
     new 3395683  [OLINGO-1333]ODataResponse for delta client throws NPE on 
Asynchronous calls
3395683 is described below

commit 3395683b5a68629a2bf12d3ed577a82e04909c5a
Author: Archana Rai <archana....@sap.com>
AuthorDate: Tue Mar 26 17:23:54 2019 +0530

    [OLINGO-1333]ODataResponse for delta client throws NPE on Asynchronous calls
---
 .../src/main/java/org/apache/olingo/commons/api/Constants.java    | 1 +
 .../olingo/server/core/serializer/json/JsonDeltaSerializer.java   | 2 +-
 .../core/serializer/json/JsonDeltaSerializerWithNavigations.java  | 2 +-
 .../server/core/serializer/json/JsonDeltaSerializerTest.java      | 8 ++++----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/Constants.java 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/Constants.java
index e41abd4..9f29f63 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/Constants.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/Constants.java
@@ -333,4 +333,5 @@ public interface Constants {
   String REMOVED = "removed";
   String ENTITY = "/$entity";
   String REASON = "Reason";
+  String ID = "@id";
 }
diff --git 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/JsonDeltaSerializer.java
 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/JsonDeltaSerializer.java
index 0708d5d..c6c5ac4 100644
--- 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/JsonDeltaSerializer.java
+++ 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/JsonDeltaSerializer.java
@@ -191,7 +191,7 @@ public class JsonDeltaSerializer implements 
EdmDeltaSerializer {
     }
     json.writeStartObject();
     json.writeStringField(Constants.JSON_CONTEXT, HASH + 
deletedEntity.getId().toASCIIString() + DELETEDENTITY);
-    json.writeStringField(Constants.JSON_ID, 
deletedEntity.getId().toASCIIString());
+    json.writeStringField(Constants.ATOM_ATTR_ID, 
deletedEntity.getId().toASCIIString());
     json.writeStringField(Constants.ELEM_REASON, 
deletedEntity.getReason().name());
     json.writeEndObject();
 
diff --git 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/JsonDeltaSerializerWithNavigations.java
 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/JsonDeltaSerializerWithNavigations.java
index 673a6dd..ad8635d 100644
--- 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/JsonDeltaSerializerWithNavigations.java
+++ 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/JsonDeltaSerializerWithNavigations.java
@@ -225,7 +225,7 @@ public class JsonDeltaSerializerWithNavigations implements 
EdmDeltaSerializer {
         json.writeStringField(property.getName(), 
property.getValue().toString());
       }
     }
-    json.writeStringField(Constants.AT + Constants.ATOM_ATTR_ID, 
deletedEntity.getId().toASCIIString());
+    json.writeStringField(Constants.ID,  
deletedEntity.getId().toASCIIString());
     json.writeEndObject();
 
   }
diff --git 
a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/JsonDeltaSerializerTest.java
 
b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/JsonDeltaSerializerTest.java
index 3e221d6..0ade205 100644
--- 
a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/JsonDeltaSerializerTest.java
+++ 
b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/JsonDeltaSerializerTest.java
@@ -144,9 +144,9 @@ public class JsonDeltaSerializerTest {
        final String expectedResult = "{"
            +"\"@odata.context\":\"$metadata#ESDelta/$delta\",\"value\":[{"
            + "\"@odata.context\":\"#ESDelta(100)/$deletedEntity\","
-           + "\"@odata.id\":\"ESDelta(100)\",\"reason\":\"deleted\"},{"
+           + "\"id\":\"ESDelta(100)\",\"reason\":\"deleted\"},{"
            + "\"@odata.context\":\"#ESDelta(-32768)/$deletedEntity\","
-           + "\"@odata.id\":\"ESDelta(-32768)\",\"reason\":\"changed\"}]"
+           + "\"id\":\"ESDelta(-32768)\",\"reason\":\"changed\"}]"
            + "}";
        Assert.assertNotNull(jsonString);
        Assert.assertEquals(expectedResult, jsonString);
@@ -231,8 +231,8 @@ public class JsonDeltaSerializerTest {
          + "\"@odata.id\":\"ESDelta(32767)\",\"PropertyInt16\":32767,"
          + 
"\"PropertyString\":\"Number:32767\"},{\"@odata.id\":\"ESDelta(-32768)\","
          + 
"\"PropertyString\":\"Number:-32768\"},{\"@odata.context\":\"#ESDelta(100)/$deletedEntity\","
-         + "\"@odata.id\":\"ESDelta(100)\",\"reason\":\"deleted\"},"
-         + 
"{\"@odata.context\":\"#ESDelta(-32768)/$deletedEntity\",\"@odata.id\":\"ESDelta(-32768)\","
+         + "\"id\":\"ESDelta(100)\",\"reason\":\"deleted\"},"
+         + 
"{\"@odata.context\":\"#ESDelta(-32768)/$deletedEntity\",\"id\":\"ESDelta(-32768)\","
          + 
"\"reason\":\"changed\"},{\"@odata.context\":\"#ESDelta/$link\",\"source\":\"ESDelta(100)\","
          + 
"\"relationship\":\"NavPropertyETAllPrimOne\",\"target\":\"ESAllPrim(0)\"},{\"@odata.context\":"
          + 
"\"#ESDelta/$deletedLink\",\"source\":\"ESDelta(100)\",\"relationship\":\"NavPropertyETAllPrimOne\","