You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ra...@apache.org on 2019/09/13 07:18:43 UTC
[olingo-odata4] branch master updated: [OLINGO-1155]Discrepency in
Next Link shown in delta request and normal request
This is an automated email from the ASF dual-hosted git repository.
ramyav 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 8f4d031 [OLINGO-1155]Discrepency in Next Link shown in delta request and normal request
8f4d031 is described below
commit 8f4d03195786968830111e8cf41614c05d02c99b
Author: ramya vasanth <ra...@sap.com>
AuthorDate: Fri Sep 13 12:48:26 2019 +0530
[OLINGO-1155]Discrepency in Next Link shown in delta request and normal request
---
.../src/main/java/org/apache/olingo/commons/api/Constants.java | 1 +
.../core/serializer/json/JsonDeltaSerializerWithNavigations.java | 2 +-
.../core/serializer/json/JsonDeltaSerializerWithNavigationsTest.java | 4 ++--
3 files changed, 4 insertions(+), 3 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 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 @@ public interface Constants {
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 @@ public class JsonDeltaSerializerWithNavigations implements EdmDeltaSerializer {
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 @@ public class JsonDeltaSerializerWithNavigationsTest {
+ "\"@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 @@ public class JsonDeltaSerializerWithNavigationsTest {
+ "\"@context\":\"#ESDelta/$link\",\"source\":\"ESDelta(100)\","
+ "\"relationship\":\"NavPropertyETAllPrimOne\","
+ "\"target\":\"ESAllPrim(0)\"}],"
- + "\"@odata.nextLink\":\"23042017\""
+ + "\"@nextLink\":\"23042017\""
+ "}";
Assert.assertNotNull(jsonString);
Assert.assertEquals(expectedResult, jsonString);