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 a3122216b..6c5fc3942 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; } 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 bca290a37..44e1dae27 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); 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 9cefff699..51ad37ba1 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());