Repository: olingo-odata4 Updated Branches: refs/heads/OLINGO-573 26ec32ad5 -> f262563fa
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/502f7ced/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java index 841eabe..e105a2f 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java @@ -40,6 +40,7 @@ import org.apache.olingo.server.api.ODataRequest; import org.apache.olingo.server.api.ODataResponse; import org.apache.olingo.server.api.ServiceMetadata; import org.apache.olingo.server.api.deserializer.DeserializerException; +import org.apache.olingo.server.api.deserializer.DeserializerResult; import org.apache.olingo.server.api.deserializer.ODataDeserializer; import org.apache.olingo.server.api.processor.ActionEntityCollectionProcessor; import org.apache.olingo.server.api.processor.ActionEntityProcessor; @@ -136,7 +137,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor getContextUrl(edmEntitySet, edmEntityType, false, expand, select)) .count(uriInfo.getCountOption()) .expand(expand).select(select) - .build())); + .build()).getContent()); response.setStatusCode(HttpStatusCode.OK.getStatusCode()); response.setHeader(HttpHeader.CONTENT_TYPE, requestedContentType.toContentTypeString()); } @@ -195,7 +196,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor .contextURL(format == ODataFormat.JSON_NO_METADATA ? null : getContextUrl(edmEntitySet, edmEntityType, true, expand, select)) .expand(expand).select(select) - .build())); + .build()).getContent()); response.setStatusCode(HttpStatusCode.OK.getStatusCode()); response.setHeader(HttpHeader.CONTENT_TYPE, requestedContentType.toContentTypeString()); } @@ -231,14 +232,16 @@ public class TechnicalEntityProcessor extends TechnicalProcessor final EdmEntityType edmEntityType = edmEntitySet.getEntityType(); Entity entity = dataProvider.create(edmEntitySet); + ExpandOption expand = null; if (edmEntityType.hasStream()) { // called from createMediaEntity(...), not directly dataProvider.setMedia(entity, odata.createFixedFormatDeserializer().binary(request.getBody()), requestFormat.toContentTypeString()); } else { + final DeserializerResult deserializerResult = odata.createDeserializer(ODataFormat.fromContentType(requestFormat)) + .entity(request.getBody(), edmEntityType); dataProvider.update(request.getRawBaseUri(), edmEntitySet, entity, - odata.createDeserializer(ODataFormat.fromContentType(requestFormat)) - .entity(request.getBody(), edmEntityType), - false, true); + deserializerResult.getEntity(), false, true); + expand = deserializerResult.getExpandTree(); } final ODataFormat format = ODataFormat.fromContentType(responseFormat); @@ -247,7 +250,8 @@ public class TechnicalEntityProcessor extends TechnicalProcessor EntitySerializerOptions.with() .contextURL(format == ODataFormat.JSON_NO_METADATA ? null : getContextUrl(edmEntitySet, edmEntityType, true, null, null)) - .build())); + .expand(expand) + .build()).getContent()); response.setStatusCode(HttpStatusCode.CREATED.getStatusCode()); response.setHeader(HttpHeader.CONTENT_TYPE, responseFormat.toContentTypeString()); response.setHeader(HttpHeader.LOCATION, @@ -262,7 +266,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor Entity entity = readEntity(uriInfo); checkRequestFormat(requestFormat); ODataDeserializer deserializer = odata.createDeserializer(ODataFormat.fromContentType(requestFormat)); - final Entity changedEntity = deserializer.entity(request.getBody(), edmEntitySet.getEntityType()); + final Entity changedEntity = deserializer.entity(request.getBody(), edmEntitySet.getEntityType()).getEntity(); dataProvider.update(request.getRawBaseUri(), edmEntitySet, entity, changedEntity, request.getMethod() == HttpMethod.PATCH, false); response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/502f7ced/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalPrimitiveComplexProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalPrimitiveComplexProcessor.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalPrimitiveComplexProcessor.java index b853e48..8a9968f 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalPrimitiveComplexProcessor.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalPrimitiveComplexProcessor.java @@ -248,13 +248,13 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor .precision(edmProperty == null ? returnType.getPrecision() : edmProperty.getPrecision()) .scale(edmProperty == null ? returnType.getScale() : edmProperty.getScale()) .unicode(edmProperty == null ? null : edmProperty.isUnicode()) - .build())); + .build()).getContent()); break; case COMPLEX: response.setContent(serializer.complex(this.serviceMetadata,(EdmComplexType) type, property, ComplexSerializerOptions.with().contextURL(contextURL) .expand(expand).select(select) - .build())); + .build()).getContent()); break; case COLLECTION_PRIMITIVE: response.setContent(serializer.primitiveCollection((EdmPrimitiveType) type, property, @@ -264,13 +264,13 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor .precision(edmProperty == null ? returnType.getPrecision() : edmProperty.getPrecision()) .scale(edmProperty == null ? returnType.getScale() : edmProperty.getScale()) .unicode(edmProperty == null ? null : edmProperty.isUnicode()) - .build())); + .build()).getContent()); break; case COLLECTION_COMPLEX: response.setContent(serializer.complexCollection(this.serviceMetadata, (EdmComplexType) type, property, ComplexSerializerOptions.with().contextURL(contextURL) .expand(expand).select(select) - .build())); + .build()).getContent()); break; default: break; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/502f7ced/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerDeepInsertTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerDeepInsertTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerDeepInsertTest.java index f2a65cd..0347941 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerDeepInsertTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerDeepInsertTest.java @@ -41,8 +41,7 @@ public class ODataDeserializerDeepInsertTest extends AbstractODataDeserializerTe public void esAllPrimExpandedToOne() throws Exception { EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); InputStream stream = getFileAsStream("EntityESAllPrimExpandedNavPropertyETTwoPrimOne.json"); - Entity entity = OData.newInstance().createDeserializer(ODataFormat.JSON).entity(stream, edmEntityType); - + Entity entity = OData.newInstance().createDeserializer(ODataFormat.JSON).entity(stream, edmEntityType).getEntity(); Link navigationLink = entity.getNavigationLink("NavPropertyETTwoPrimOne"); assertNotNull(navigationLink); @@ -63,7 +62,7 @@ public class ODataDeserializerDeepInsertTest extends AbstractODataDeserializerTe public void esAllPrimExpandedToMany() throws Exception { EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); InputStream stream = getFileAsStream("EntityESAllPrimExpandedNavPropertyETTwoPrimMany.json"); - Entity entity = OData.newInstance().createDeserializer(ODataFormat.JSON).entity(stream, edmEntityType); + Entity entity = OData.newInstance().createDeserializer(ODataFormat.JSON).entity(stream, edmEntityType).getEntity(); Link navigationLink = entity.getNavigationLink("NavPropertyETTwoPrimMany"); assertNotNull(navigationLink); @@ -130,7 +129,8 @@ public class ODataDeserializerDeepInsertTest extends AbstractODataDeserializerTe + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETTwoPrim")); - final Entity entity = OData.newInstance().createDeserializer(ODataFormat.JSON).entity(stream, edmEntityType); + final Entity entity = OData.newInstance().createDeserializer(ODataFormat.JSON).entity(stream, edmEntityType) + .getEntity(); assertEquals(1, entity.getNavigationLinks().size()); final Link link = entity.getNavigationLinks().get(0); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/502f7ced/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerEntityCollectionTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerEntityCollectionTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerEntityCollectionTest.java index 3a17eae..4864d24 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerEntityCollectionTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerEntityCollectionTest.java @@ -44,7 +44,8 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); InputStream stream = getFileAsStream("ESAllPrim.json"); EntitySet entitySet = - OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType); + OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType) + .getEntityCollection(); assertNotNull(entitySet); assertEquals(3, entitySet.getEntities().size()); @@ -78,7 +79,8 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETCompCollComp")); InputStream stream = getFileAsStream("ESCompCollComp.json"); EntitySet entitySet = - OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType); + OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType) + .getEntityCollection(); assertNotNull(entitySet); assertEquals(2, entitySet.getEntities().size()); @@ -99,7 +101,8 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial InputStream stream = new ByteArrayInputStream(entityCollectionString.getBytes()); EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); EntitySet entityCollection = - OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType); + OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType) + .getEntityCollection(); assertNotNull(entityCollection.getEntities()); assertTrue(entityCollection.getEntities().isEmpty()); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/502f7ced/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerActionParametersTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerActionParametersTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerActionParametersTest.java index 58777ab..80c7c47 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerActionParametersTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerActionParametersTest.java @@ -98,7 +98,7 @@ public class ODataJsonDeserializerActionParametersTest extends AbstractODataDese private List<Parameter> deserialize(final String input, final String actionName) throws DeserializerException { return OData.newInstance().createDeserializer(ODataFormat.JSON) .actionParameters(new ByteArrayInputStream(input.getBytes()), - edm.getUnboundAction(new FullQualifiedName("Namespace1_Alias", actionName))); + edm.getUnboundAction(new FullQualifiedName("Namespace1_Alias", actionName))).getActionParameter(); } private List<Parameter> deserialize(final String input, final String actionName, final String typeName) @@ -106,6 +106,6 @@ public class ODataJsonDeserializerActionParametersTest extends AbstractODataDese return OData.newInstance().createDeserializer(ODataFormat.JSON) .actionParameters(new ByteArrayInputStream(input.getBytes()), edm.getBoundAction(new FullQualifiedName("Namespace1_Alias", actionName), - new FullQualifiedName("Namespace1_Alias", typeName), false)); + new FullQualifiedName("Namespace1_Alias", typeName), false)).getActionParameter(); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/502f7ced/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java index 870f7c3..4a433c3 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java @@ -64,7 +64,8 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = - deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); + deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) + .getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); @@ -93,7 +94,8 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = - deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); + deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) + .getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); @@ -139,7 +141,8 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = - deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); + deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) + .getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); @@ -159,7 +162,8 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = - deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); + deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) + .getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); @@ -188,7 +192,8 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = - deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); + deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) + .getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); @@ -222,7 +227,8 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = - deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETCompAllPrim"))); + deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETCompAllPrim"))) + .getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); @@ -263,7 +269,8 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = - deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETCollAllPrim"))); + deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETCollAllPrim"))) + .getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); @@ -300,7 +307,8 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = - deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))); + deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))) + .getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); @@ -332,7 +340,8 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = - deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))); + deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))) + .getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); @@ -380,7 +389,8 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = - deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); + deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) + .getEntity(); assertNotNull(entity); } @@ -437,7 +447,8 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = - deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); + deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) + .getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); @@ -455,7 +466,8 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = - deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); + deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) + .getEntity(); assertNotNull(entity); Link bindingToOne = entity.getNavigationBinding("NavPropertyETTwoPrimOne"); @@ -488,7 +500,8 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = - deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); + deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) + .getEntity(); Link bindingToMany = entity.getNavigationBinding("NavPropertyETTwoPrimMany"); assertNotNull(bindingToMany); assertTrue(bindingToMany.getBindingLinks().isEmpty()); @@ -500,7 +513,8 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = deserializer.entity(stream, edm - .getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp"))); + .getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp"))) + .getEntity(); assertEquals(6, entity.getProperties().size()); @@ -545,7 +559,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity e = deserializer.entity(stream, edm.getEntityType( - new FullQualifiedName("Namespace1_Alias", "ETCollAllPrim"))); + new FullQualifiedName("Namespace1_Alias", "ETCollAllPrim"))).getEntity(); assertTrue((Boolean) e.getProperty("CollPropertyBoolean").asCollection().get(0)); assertNull(e.getProperty("CollPropertyBoolean").asCollection().get(1)); @@ -560,7 +574,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", - "ETMixPrimCollComp"))); + "ETMixPrimCollComp"))).getEntity(); assertNull(entity.getProperty("PropertyComp").getValue()); } @@ -575,7 +589,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = deserializer.entity(stream, edm.getEntityType( - new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))); + new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))).getEntity(); List<?> collPropertyComp = entity.getProperty("CollPropertyComp").asCollection(); assertNull(collPropertyComp.get(0)); List<Property> complexPropertyProperties = ((ComplexValue) collPropertyComp.get(1)).getValue(); @@ -591,7 +605,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = deserializer.entity(stream, edm.getEntityType( - new FullQualifiedName("Namespace1_Alias", "ETCompAllPrim"))); + new FullQualifiedName("Namespace1_Alias", "ETCompAllPrim"))).getEntity(); assertEquals("TEST A", entity.getProperty("PropertyComp").asComplex().getValue().get(0).getValue()); assertNull(entity.getProperty("PropertyComp").asComplex().getValue().get(1).getValue()); @@ -608,7 +622,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity e = deserializer.entity(stream, edm.getEntityType( - new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp"))); + new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp"))).getEntity(); assertEquals((short) 2, e.getProperty("PropertyEnumString").getValue()); Property propertyCompMixedEnumDef = e.getProperty("PropertyCompMixedEnumDef"); @@ -624,7 +638,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity e = deserializer.entity(stream, edm.getEntityType( - new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp"))); + new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp"))).getEntity(); assertEquals((short) 3, e.getProperty("PropertyEnumString").getValue()); } @@ -662,7 +676,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = - deserializer.entity(stream, entityType); + deserializer.entity(stream, entityType).getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/502f7ced/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java index ee38684..f8b1dab 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java @@ -81,7 +81,7 @@ public class ODataJsonSerializerTest { InputStream result = serializer.entity(metadata, edmEntitySet.getEntityType(), entity, EntitySerializerOptions.with() .contextURL(ContextURL.with().entitySet(edmEntitySet).suffix(Suffix.ENTITY).build()) - .build()); + .build()).getContent(); final String resultString = IOUtils.toString(result); final String expectedResult = "{" + "\"@odata.context\":\"$metadata#ESAllPrim/$entity\"," @@ -114,7 +114,7 @@ public class ODataJsonSerializerTest { entity, EntitySerializerOptions.with() .contextURL(ContextURL.with().entitySet(edmEntitySet).suffix(Suffix.ENTITY).build()) - .build())); + .build()).getContent()); final String expectedResult = "{\"@odata.context\":\"$metadata#ESAllPrim/$entity\"," + "\"PropertyInt16\":32767," + "\"PropertyString\":null,\"PropertyBoolean\":null," @@ -169,7 +169,7 @@ public class ODataJsonSerializerTest { EntityCollectionSerializerOptions.with() .contextURL(ContextURL.with().entitySet(edmEntitySet).build()) .count(countOption) - .build()); + .build()).getContent(); final String resultString = IOUtils.toString(result); Assert.assertThat(resultString, CoreMatchers.startsWith("{" @@ -194,7 +194,7 @@ public class ODataJsonSerializerTest { EntitySerializerOptions.with() .contextURL(ContextURL.with().serviceRoot(URI.create("http://host/service/";)) .entitySet(edmEntitySet).suffix(Suffix.ENTITY).build()) - .build()); + .build()).getContent(); final String resultString = IOUtils.toString(result); final String expectedResult = "{" + "\"@odata.context\":\"http://host/service/$metadata#ESCollAllPrim/$entity\","; @@ -229,7 +229,7 @@ public class ODataJsonSerializerTest { InputStream result = serializer.entity(metadata, edmEntitySet.getEntityType(), entity, EntitySerializerOptions.with() .contextURL(ContextURL.with().entitySet(edmEntitySet).suffix(Suffix.ENTITY).build()) - .build()); + .build()).getContent(); final String resultString = IOUtils.toString(result); final String expectedResult = "{" + "\"@odata.context\":\"$metadata#ESCompAllPrim/$entity\"," @@ -262,7 +262,7 @@ public class ODataJsonSerializerTest { InputStream result = serializer.entity(metadata, edmEntitySet.getEntityType(), entity, EntitySerializerOptions.with() .contextURL(ContextURL.with().entitySet(edmEntitySet).suffix(Suffix.ENTITY).build()) - .build()); + .build()).getContent(); final String resultString = IOUtils.toString(result); final String expectedResult = "{" + "\"@odata.context\":\"$metadata#ESMixPrimCollComp/$entity\"," @@ -285,7 +285,7 @@ public class ODataJsonSerializerTest { final String resultString = IOUtils.toString(serializer.entity(metadata, edmEntitySet.getEntityType(), entity, EntitySerializerOptions.with() .contextURL(ContextURL.with().entitySet(edmEntitySet).suffix(Suffix.ENTITY).build()) - .build())); + .build()).getContent()); final String expectedResult = "{\"@odata.context\":\"$metadata#ESMixPrimCollComp/$entity\"," + "\"PropertyInt16\":32767," + "\"CollPropertyString\":null,\"PropertyComp\":null,\"CollPropertyComp\":null}"; @@ -297,7 +297,7 @@ public class ODataJsonSerializerTest { final EdmEntitySet edmEntitySet = entityContainer.getEntitySet("ESTwoPrim"); final Entity entity = data.readAll(edmEntitySet).getEntities().get(0); InputStream result = new ODataJsonSerializer(ODataFormat.JSON_NO_METADATA) - .entity(metadata, edmEntitySet.getEntityType(), entity, null); + .entity(metadata, edmEntitySet.getEntityType(), entity, null).getContent(); final String resultString = IOUtils.toString(result); final String expectedResult = "{\"PropertyInt16\":32766,\"PropertyString\":\"Test String1\"}"; Assert.assertEquals(expectedResult, resultString); @@ -310,7 +310,7 @@ public class ODataJsonSerializerTest { InputStream result = new ODataJsonSerializer(ODataFormat.JSON_NO_METADATA) .entityCollection(metadata, edmEntitySet.getEntityType(), entitySet, EntityCollectionSerializerOptions.with() - .contextURL(ContextURL.with().entitySet(edmEntitySet).build()).build()); + .contextURL(ContextURL.with().entitySet(edmEntitySet).build()).build()).getContent(); final String resultString = IOUtils.toString(result); final String expectedResult = "{\"value\":[" + "{\"PropertyInt16\":32766,\"PropertyString\":\"Test String1\"}," @@ -329,7 +329,7 @@ public class ODataJsonSerializerTest { entity, EntitySerializerOptions.with() .contextURL(ContextURL.with().entitySet(edmEntitySet).suffix(Suffix.ENTITY).build()) - .build())); + .build()).getContent()); final String expectedResult = "{\"@odata.context\":\"$metadata#ESMedia/$entity\"," + "\"@odata.mediaEtag\":\"theMediaETag\",\"@odata.mediaContentType\":\"image/svg+xml\"," + "\"PropertyInt16\":1}"; @@ -343,7 +343,7 @@ public class ODataJsonSerializerTest { final String resultString = IOUtils.toString(serializer.entityCollection(metadata, edmEntitySet.getEntityType(), entitySet, EntityCollectionSerializerOptions.with() - .contextURL(ContextURL.with().entitySet(edmEntitySet).build()).build())); + .contextURL(ContextURL.with().entitySet(edmEntitySet).build()).build()).getContent()); final String expectedResult = "{\"@odata.context\":\"$metadata#ESMedia\",\"value\":[" + "{\"@odata.mediaContentType\":\"image/svg+xml\",\"PropertyInt16\":1}," + "{\"@odata.mediaContentType\":\"image/svg+xml\",\"PropertyInt16\":2}," @@ -368,7 +368,7 @@ public class ODataJsonSerializerTest { .selectList(helper.buildContextURLSelectList(entityType, null, select)) .suffix(Suffix.ENTITY).build()) .select(select) - .build()); + .build()).getContent(); final String resultString = IOUtils.toString(result); final String expectedResult = "{" + "\"@odata.context\":\"$metadata#ESAllPrim(PropertyBoolean,PropertyDate)/$entity\"," @@ -388,7 +388,7 @@ public class ODataJsonSerializerTest { EntitySerializerOptions.with() .contextURL(ContextURL.with().entitySet(edmEntitySet).suffix(Suffix.ENTITY).build()) .select(select) - .build()); + .build()).getContent(); final String resultString = IOUtils.toString(result); final String expectedResult = "{\"@odata.context\":\"$metadata#ESTwoPrim/$entity\"," + "\"PropertyInt16\":32766,\"PropertyString\":\"Test String1\"}"; @@ -409,7 +409,7 @@ public class ODataJsonSerializerTest { .selectList(helper.buildContextURLSelectList(entityType, null, select)) .build()) .select(select) - .build()); + .build()).getContent(); final String resultString = IOUtils.toString(result); Assert.assertEquals("{" + "\"@odata.context\":\"$metadata#ESCompComp(PropertyComp/PropertyComp/PropertyString)\"," @@ -434,7 +434,7 @@ public class ODataJsonSerializerTest { .selectList(helper.buildContextURLSelectList(entityType, null, select)) .build()) .select(select) - .build())); + .build()).getContent()); Assert.assertEquals("{" + "\"@odata.context\":\"$metadata#ESCompComp(PropertyComp/PropertyComp)\"," + "\"value\":[" @@ -453,7 +453,7 @@ public class ODataJsonSerializerTest { EntitySerializerOptions.with() .contextURL(ContextURL.with().entitySet(edmEntitySet).suffix(Suffix.ENTITY).build()) .expand(expand) - .build()); + .build()).getContent(); final String resultString = IOUtils.toString(result); Assert.assertEquals("{\"@odata.context\":\"$metadata#ESTwoPrim/$entity\"," + "\"PropertyInt16\":32767,\"PropertyString\":\"Test String4\"," @@ -494,7 +494,7 @@ public class ODataJsonSerializerTest { .selectList(helper.buildContextURLSelectList(entityType, expand, select)) .suffix(Suffix.ENTITY).build()) .expand(expand) - .build())); + .build()).getContent()); Assert.assertEquals("{" + "\"@odata.context\":\"$metadata#ESTwoPrim(NavPropertyETAllPrimOne(PropertyDate))/$entity\"," + "\"PropertyInt16\":32767,\"PropertyString\":\"Test String4\"," @@ -522,7 +522,7 @@ public class ODataJsonSerializerTest { .suffix(Suffix.ENTITY).build()) .expand(expand) .select(select) - .build())); + .build()).getContent()); Assert.assertEquals("{" + "\"@odata.context\":\"$metadata#ESAllPrim(PropertySByte)/$entity\"," + "\"PropertySByte\":127," @@ -549,7 +549,7 @@ public class ODataJsonSerializerTest { .suffix(Suffix.ENTITY).build()) .expand(expand) .select(select) - .build())); + .build()).getContent()); Assert.assertEquals("{" + "\"@odata.context\":\"$metadata#ESAllPrim(PropertyTimeOfDay)/$entity\"," + "\"PropertyTimeOfDay\":\"23:49:14\"," @@ -579,7 +579,7 @@ public class ODataJsonSerializerTest { .selectList(helper.buildContextURLSelectList(entityType, expand, select)) .suffix(Suffix.ENTITY).build()) .expand(expand) - .build())); + .build()).getContent()); Assert.assertEquals("{" + "\"@odata.context\":\"$metadata#ESTwoPrim(NavPropertyETAllPrimMany(PropertyInt32))/$entity\"," + "\"PropertyInt16\":-365,\"PropertyString\":\"Test String2\"," @@ -604,7 +604,7 @@ public class ODataJsonSerializerTest { .contextURL(ContextURL.with() .entitySet(edmEntitySet).keyPath("32767").navOrPropertyPath(edmProperty.getName()) .build()) - .build())); + .build()).getContent()); Assert.assertEquals("{" + "\"@odata.context\":\"$metadata#ESAllPrim(32767)/PropertyString\"," + "\"value\":\"First Resource - positive values\"}", @@ -636,7 +636,7 @@ public class ODataJsonSerializerTest { .contextURL(ContextURL.with() .entitySet(edmEntitySet).keyPath("1").navOrPropertyPath(edmProperty.getName()) .build()) - .build())); + .build()).getContent()); Assert.assertEquals("{" + "\"@odata.context\":\"$metadata#ESCollAllPrim(1)/CollPropertyString\"," + "\"value\":[\"[email protected]\",\"[email protected]\",\"[email protected]\"]}", @@ -655,7 +655,7 @@ public class ODataJsonSerializerTest { .contextURL(ContextURL.with() .entitySet(edmEntitySet).keyPath("32767").navOrPropertyPath(edmProperty.getName()) .build()) - .build())); + .build()).getContent()); Assert.assertEquals("{" + "\"@odata.context\":\"$metadata#ESMixPrimCollComp(32767)/PropertyComp\"," + "\"PropertyInt16\":111,\"PropertyString\":\"TEST A\"}", @@ -674,7 +674,7 @@ public class ODataJsonSerializerTest { .contextURL(ContextURL.with() .entitySet(edmEntitySet).keyPath("32767").navOrPropertyPath(edmProperty.getName()) .build()) - .build())); + .build()).getContent()); Assert.assertEquals("{" + "\"@odata.context\":\"$metadata#ESMixPrimCollComp(32767)/CollPropertyComp\"," + "\"value\":[{\"PropertyInt16\":123,\"PropertyString\":\"TEST 1\"}," http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/502f7ced/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentTest.java index de03327..08baea0 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentTest.java @@ -114,7 +114,7 @@ public class ServiceDocumentTest { ODataSerializer serializer = server.createSerializer(ODataFormat.JSON); assertNotNull(serializer); - InputStream result = serializer.serviceDocument(edm, serviceRoot); + InputStream result = serializer.serviceDocument(edm, serviceRoot).getContent(); assertNotNull(result); String jsonString = IOUtils.toString(result); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/502f7ced/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java index dce6589..df7dd79 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java @@ -48,7 +48,7 @@ public class MetadataDocumentTest { new EdmTechProvider(references), references); final String metadata = IOUtils.toString( - odata.createSerializer(ODataFormat.XML).metadataDocument(serviceMetadata)); + odata.createSerializer(ODataFormat.XML).metadataDocument(serviceMetadata).getContent()); assertNotNull(metadata); assertThat(metadata, http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/502f7ced/samples/server/src/main/java/org/apache/olingo/server/sample/processor/CarsProcessor.java ---------------------------------------------------------------------- diff --git a/samples/server/src/main/java/org/apache/olingo/server/sample/processor/CarsProcessor.java b/samples/server/src/main/java/org/apache/olingo/server/sample/processor/CarsProcessor.java index 71b827d..90df224 100644 --- a/samples/server/src/main/java/org/apache/olingo/server/sample/processor/CarsProcessor.java +++ b/samples/server/src/main/java/org/apache/olingo/server/sample/processor/CarsProcessor.java @@ -113,7 +113,7 @@ public class CarsProcessor implements EntityCollectionProcessor, EntityProcessor getContextUrl(edmEntitySet, false, expand, select, null)) .count(uriInfo.getCountOption()) .expand(expand).select(select) - .build()); + .build()).getContent(); // Finally we set the response data, headers and status code response.setContent(serializedContent); @@ -150,7 +150,7 @@ public class CarsProcessor implements EntityCollectionProcessor, EntityProcessor .contextURL(format == ODataFormat.JSON_NO_METADATA ? null : getContextUrl(edmEntitySet, true, expand, select, null)) .expand(expand).select(select) - .build()); + .build()).getContent(); response.setContent(serializedContent); response.setStatusCode(HttpStatusCode.OK.getStatusCode()); response.setHeader(HttpHeader.CONTENT_TYPE, requestedContentType.toContentTypeString()); @@ -259,7 +259,7 @@ public class CarsProcessor implements EntityCollectionProcessor, EntityProcessor getContextUrl(edmEntitySet, true, null, null, edmProperty.getName()); InputStream serializerContent = complex ? serializer.complex(edm, (EdmComplexType) edmProperty.getType(), property, - ComplexSerializerOptions.with().contextURL(contextURL).build()) : + ComplexSerializerOptions.with().contextURL(contextURL).build()).getContent() : serializer.primitive((EdmPrimitiveType) edmProperty.getType(), property, PrimitiveSerializerOptions.with() .contextURL(contextURL) @@ -267,7 +267,7 @@ public class CarsProcessor implements EntityCollectionProcessor, EntityProcessor .nullable(edmProperty.isNullable()) .precision(edmProperty.getPrecision()) .maxLength(edmProperty.getMaxLength()) - .unicode(edmProperty.isUnicode()).build()); + .unicode(edmProperty.isUnicode()).build()).getContent(); response.setContent(serializerContent); response.setStatusCode(HttpStatusCode.OK.getStatusCode()); response.setHeader(HttpHeader.CONTENT_TYPE, contentType.toContentTypeString());
