You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2015/01/14 14:49:07 UTC
olingo-odata4 git commit: [OLINGO-530] Change name of method to
EntityCollection
Repository: olingo-odata4
Updated Branches:
refs/heads/master 2ac6ba18b -> 8ae469681
[OLINGO-530] Change name of method to EntityCollection
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/8ae46968
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/8ae46968
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/8ae46968
Branch: refs/heads/master
Commit: 8ae469681c3e55dea58ee3c6158141bd9d2638c1
Parents: 2ac6ba1
Author: Christian Amend <ch...@apache.org>
Authored: Wed Jan 14 14:48:34 2015 +0100
Committer: Christian Amend <ch...@apache.org>
Committed: Wed Jan 14 14:48:34 2015 +0100
----------------------------------------------------------------------
.../apache/olingo/server/api/deserializer/ODataDeserializer.java | 2 +-
.../server/core/deserializer/json/ODataJsonDeserializer.java | 2 +-
.../core/deserializer/json/ODataDeserializerEntitySetTest.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8ae46968/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java
index a312221..6c5fc39 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java
@@ -28,6 +28,6 @@ public interface ODataDeserializer {
Entity entity(InputStream stream, EdmEntityType edmEntityType) throws DeserializerException;
- EntitySet entitySet(InputStream stream, EdmEntityType edmEntityType) throws DeserializerException;
+ EntitySet entityCollection(InputStream stream, EdmEntityType edmEntityType) throws DeserializerException;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8ae46968/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
index bca290a..44e1dae 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
@@ -62,7 +62,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
public class ODataJsonDeserializer implements ODataDeserializer {
@Override
- public EntitySet entitySet(InputStream stream, EdmEntityType edmEntityType) throws DeserializerException {
+ public EntitySet entityCollection(InputStream stream, EdmEntityType edmEntityType) throws DeserializerException {
try {
JsonParser parser = new JsonFactory(new ObjectMapper()).createParser(stream);
final ObjectNode tree = parser.getCodec().readTree(parser);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8ae46968/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerEntitySetTest.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerEntitySetTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerEntitySetTest.java
index 9cefff6..51ad37b 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerEntitySetTest.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerEntitySetTest.java
@@ -40,7 +40,7 @@ public class ODataDeserializerEntitySetTest extends AbstractODataDeserializerTes
public void esAllPrim() throws Exception {
EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"));
InputStream stream = getFileAsStream("ESAllPrim.json");
- EntitySet entitySet = OData.newInstance().createDeserializer(ODataFormat.JSON).entitySet(stream, edmEntityType);
+ EntitySet entitySet = OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType);
assertNotNull(entitySet);
assertEquals(3, entitySet.getEntities().size());
@@ -73,7 +73,7 @@ public class ODataDeserializerEntitySetTest extends AbstractODataDeserializerTes
public void eSCompCollComp() throws Exception {
EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETCompCollComp"));
InputStream stream = getFileAsStream("ESCompCollComp.json");
- EntitySet entitySet = OData.newInstance().createDeserializer(ODataFormat.JSON).entitySet(stream, edmEntityType);
+ EntitySet entitySet = OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType);
assertNotNull(entitySet);
assertEquals(2, entitySet.getEntities().size());