[OLINGO-1155]Discrepency in Next Link shown in delta request and normal request
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 9f29f63..0828abc 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
@@ -334,4 +334,5 @@
String ENTITY = "/$entity";
String REASON = "Reason";
String ID = "@id";
+ String NEXTLINK = "@nextLink";
}
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 52bb217..eff602b 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
@@ -687,7 +687,7 @@
boolean writeNextLink(final AbstractEntityCollection entitySet, final JsonGenerator json)
throws IOException {
if (entitySet.getNext() != null) {
- json.writeStringField(Constants.JSON_NEXT_LINK, entitySet.getNext().toASCIIString());
+ json.writeStringField(Constants.NEXTLINK, entitySet.getNext().toASCIIString());
return true;
} else {
return false;
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/JsonDeltaSerializerWithNavigationsTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/JsonDeltaSerializerWithNavigationsTest.java
index 5a7c26f..5cffa02 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/JsonDeltaSerializerWithNavigationsTest.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/JsonDeltaSerializerWithNavigationsTest.java
@@ -323,7 +323,7 @@
+ "\"@context\":\"#ESDelta/$link\",\"source\":\"ESDelta(100)\","
+ "\"relationship\":\"NavPropertyETAllPrimOne\","
+ "\"target\":\"ESAllPrim(0)\"}],"
- + "\"@odata.nextLink\":\"23042017\""
+ + "\"@nextLink\":\"23042017\""
+ "}";
Assert.assertNotNull(jsonString);
Assert.assertEquals(expectedResult, jsonString);
@@ -352,7 +352,7 @@
+ "\"@context\":\"#ESDelta/$link\",\"source\":\"ESDelta(100)\","
+ "\"relationship\":\"NavPropertyETAllPrimOne\","
+ "\"target\":\"ESAllPrim(0)\"}],"
- + "\"@odata.nextLink\":\"23042017\""
+ + "\"@nextLink\":\"23042017\""
+ "}";
Assert.assertNotNull(jsonString);
Assert.assertEquals(expectedResult, jsonString);
