Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-530] Change name of method to EntityCollection

This commit is contained in:
Christian Amend 2015-01-14 14:48:34 +01:00
parent 2ac6ba18bb
commit 8ae469681c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java
View File

@ -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;
}

2
lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
View File

@ -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);

4
lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerEntitySetTest.java
View File

@ -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());