http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0043bd9c/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 1c0d049..e8257dd 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 @@ -253,9 +253,8 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor } else { final ExpandOption expand = uriInfo.getExpandOption(); final SelectOption select = uriInfo.getSelectOption(); - final ODataFormat format = ODataFormat.fromContentType(contentType); final SerializerResult result = serializeProperty(entity, edmEntitySet, path, property, edmProperty, - type, returnType, representationType, format, expand, select); + type, returnType, representationType, contentType, expand, select); response.setContent(result.getContent()); } } @@ -295,7 +294,7 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor deserializer.primitiveValue(request.getBody(), edmProperty); dataProvider.updatePropertyValue(property, value); } else { - final Property changedProperty = odata.createDeserializer(ODataFormat.fromContentType(requestFormat)) + final Property changedProperty = odata.createDeserializer(requestFormat) .property(request.getBody(), edmProperty).getProperty(); if (changedProperty.isNull() && !edmProperty.isNullable()) { throw new ODataApplicationException("Not nullable.", HttpStatusCode.BAD_REQUEST.getStatusCode(), Locale.ROOT); @@ -310,9 +309,8 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor response.setContent( serializePrimitiveValue(property, edmProperty, (EdmPrimitiveType) edmProperty.getType(), null)); } else { - final ODataFormat format = ODataFormat.fromContentType(responseFormat); final SerializerResult result = serializeProperty(entity, edmEntitySet, path, property, edmProperty, - edmProperty.getType(), null, representationType, format, null, null); + edmProperty.getType(), null, representationType, responseFormat, null, null); response.setContent(result.getContent()); } response.setHeader(HttpHeader.CONTENT_TYPE, responseFormat.toContentTypeString()); @@ -395,10 +393,10 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor private SerializerResult serializeProperty(final Entity entity, final EdmEntitySet edmEntitySet, final List<String> path, final Property property, final EdmProperty edmProperty, final EdmType type, final EdmReturnType returnType, - final RepresentationType representationType, final ODataFormat format, + final RepresentationType representationType, final ContentType responseFormat, final ExpandOption expand, final SelectOption select) throws ODataLibraryException { - ODataSerializer serializer = odata.createSerializer(format); - final ContextURL contextURL = format == ODataFormat.JSON_NO_METADATA ? null : + ODataSerializer serializer = odata.createSerializer(responseFormat); + final ContextURL contextURL = ODataFormat.fromContentType(responseFormat) == ODataFormat.JSON_NO_METADATA ? null : getContextUrl(edmEntitySet, entity, path, type, representationType, expand, select); SerializerResult result = null; switch (representationType) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0043bd9c/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/AbstractODataDeserializerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/AbstractODataDeserializerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/AbstractODataDeserializerTest.java index 89b7318..e03b32c 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/AbstractODataDeserializerTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/AbstractODataDeserializerTest.java @@ -23,12 +23,14 @@ import java.io.InputStream; import java.util.Collections; import org.apache.olingo.commons.api.edm.Edm; +import org.apache.olingo.commons.api.format.ContentType; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.tecsvc.provider.EdmTechProvider; public class AbstractODataDeserializerTest { - + protected static final ContentType CONTENT_TYPE_JSON = ODataFormat.JSON.getContentType(); protected static final Edm edm = OData.newInstance().createServiceMetadata( new EdmTechProvider(), Collections.<EdmxReference> emptyList()).getEdm(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0043bd9c/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 010ec06..7bae022 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 @@ -30,18 +30,16 @@ import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.Link; import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.deserializer.DeserializerException; import org.junit.Test; public class ODataDeserializerDeepInsertTest extends AbstractODataDeserializerTest { - @Test 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).getEntity(); + Entity entity = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entity(stream, edmEntityType).getEntity(); Link navigationLink = entity.getNavigationLink("NavPropertyETTwoPrimOne"); assertNotNull(navigationLink); @@ -55,14 +53,14 @@ public class ODataDeserializerDeepInsertTest extends AbstractODataDeserializerTe public void esAllPrimExpandedToOneWithODataAnnotations() throws Exception { EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); InputStream stream = getFileAsStream("EntityESAllPrimExpandedNavPropertyETTwoPrimOneWithODataAnnotations.json"); - OData.newInstance().createDeserializer(ODataFormat.JSON).entity(stream, edmEntityType); + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entity(stream, edmEntityType); } @Test 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).getEntity(); + Entity entity = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entity(stream, edmEntityType).getEntity(); Link navigationLink = entity.getNavigationLink("NavPropertyETTwoPrimMany"); assertNotNull(navigationLink); @@ -78,7 +76,7 @@ public class ODataDeserializerDeepInsertTest extends AbstractODataDeserializerTe public void esAllPrimExpandedToManyWithODataAnnotations() throws Exception { EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); InputStream stream = getFileAsStream("EntityESAllPrimExpandedNavPropertyETTwoPrimManyWithODataAnnotations.json"); - OData.newInstance().createDeserializer(ODataFormat.JSON).entity(stream, edmEntityType); + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entity(stream, edmEntityType); } @Test(expected = DeserializerException.class) @@ -86,7 +84,7 @@ public class ODataDeserializerDeepInsertTest extends AbstractODataDeserializerTe EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); InputStream stream = getFileAsStream("EntityESAllPrimExpandedNavPropertyETTwoPrimOneWithCustomAnnotations.json"); try { - OData.newInstance().createDeserializer(ODataFormat.JSON).entity(stream, edmEntityType); + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entity(stream, edmEntityType); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.NOT_IMPLEMENTED, e.getMessageKey()); throw e; @@ -98,7 +96,7 @@ public class ODataDeserializerDeepInsertTest extends AbstractODataDeserializerTe EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); InputStream stream = getFileAsStream("EntityESAllPrimExpandedNavPropertyETTwoPrimManyWithCustomAnnotations.json"); try { - OData.newInstance().createDeserializer(ODataFormat.JSON).entity(stream, edmEntityType); + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entity(stream, edmEntityType); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.NOT_IMPLEMENTED, e.getMessageKey()); throw e; @@ -114,7 +112,7 @@ public class ODataDeserializerDeepInsertTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); try { - OData.newInstance().createDeserializer(ODataFormat.JSON).entity(stream, edmEntityType); + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entity(stream, edmEntityType); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.INVALID_NULL_PROPERTY, e.getMessageKey()); throw e; @@ -129,7 +127,7 @@ 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(CONTENT_TYPE_JSON).entity(stream, edmEntityType) .getEntity(); assertEquals(1, entity.getNavigationLinks().size()); @@ -149,7 +147,7 @@ public class ODataDeserializerDeepInsertTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); try { - OData.newInstance().createDeserializer(ODataFormat.JSON).entity(stream, edmEntityType); + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entity(stream, edmEntityType); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.INVALID_VALUE_FOR_NAVIGATION_PROPERTY, e.getMessageKey()); throw e; @@ -165,7 +163,7 @@ public class ODataDeserializerDeepInsertTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); try { - OData.newInstance().createDeserializer(ODataFormat.JSON).entity(stream, edmEntityType); + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entity(stream, edmEntityType); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.INVALID_NULL_PROPERTY, e.getMessageKey()); throw e; @@ -181,7 +179,7 @@ public class ODataDeserializerDeepInsertTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); try { - OData.newInstance().createDeserializer(ODataFormat.JSON).entity(stream, edmEntityType); + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entity(stream, edmEntityType); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.INVALID_VALUE_FOR_NAVIGATION_PROPERTY, e.getMessageKey()); throw e; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0043bd9c/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 c2294dd..375fafb 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 @@ -32,7 +32,6 @@ import org.apache.olingo.commons.api.data.EntityCollection; import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.deserializer.DeserializerException; import org.junit.Test; @@ -44,7 +43,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); InputStream stream = getFileAsStream("ESAllPrim.json"); EntityCollection entitySet = - OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType) + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entityCollection(stream, edmEntityType) .getEntityCollection(); assertNotNull(entitySet); @@ -79,7 +78,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETCompCollComp")); InputStream stream = getFileAsStream("ESCompCollComp.json"); EntityCollection entitySet = - OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType) + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entityCollection(stream, edmEntityType) .getEntityCollection(); assertNotNull(entitySet); @@ -92,7 +91,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial public void esAllPrimODataAnnotationsAreIgnored() throws Exception { EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); InputStream stream = getFileAsStream("ESAllPrimWithODataAnnotations.json"); - OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType); + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entityCollection(stream, edmEntityType); } @Test @@ -101,7 +100,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial InputStream stream = new ByteArrayInputStream(entityCollectionString.getBytes()); EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); EntityCollection entityCollection = - OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType) + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entityCollection(stream, edmEntityType) .getEntityCollection(); assertNotNull(entityCollection.getEntities()); assertTrue(entityCollection.getEntities().isEmpty()); @@ -112,7 +111,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); InputStream stream = getFileAsStream("ESAllPrimWithCustomAnnotations.json"); try { - OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType); + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entityCollection(stream, edmEntityType); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.NOT_IMPLEMENTED, e.getMessageKey()); throw e; @@ -124,7 +123,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); InputStream stream = getFileAsStream("ESAllPrimWithDoubleKey.json"); try { - OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType); + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entityCollection(stream, edmEntityType); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.DUPLICATE_JSON_PROPERTY, e.getMessageKey()); throw e; @@ -137,7 +136,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial InputStream stream = new ByteArrayInputStream(entityCollectionString.getBytes()); EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); try { - OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType); + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entityCollection(stream, edmEntityType); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.VALUE_TAG_MUST_BE_AN_ARRAY, e.getMessageKey()); throw e; @@ -150,7 +149,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial InputStream stream = new ByteArrayInputStream(entityCollectionString.getBytes()); EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); try { - OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType); + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entityCollection(stream, edmEntityType); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.VALUE_TAG_MUST_BE_AN_ARRAY, e.getMessageKey()); throw e; @@ -163,7 +162,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial InputStream stream = new ByteArrayInputStream(entityCollectionString.getBytes()); EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); try { - OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType); + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entityCollection(stream, edmEntityType); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.VALUE_TAG_MUST_BE_AN_ARRAY, e.getMessageKey()); throw e; @@ -176,7 +175,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial InputStream stream = new ByteArrayInputStream(entityCollectionString.getBytes()); EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); try { - OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType); + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entityCollection(stream, edmEntityType); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.VALUE_ARRAY_NOT_PRESENT, e.getMessageKey()); throw e; @@ -189,7 +188,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial InputStream stream = new ByteArrayInputStream(entityCollectionString.getBytes()); EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); try { - OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType); + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entityCollection(stream, edmEntityType); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.INVALID_ENTITY, e.getMessageKey()); throw e; @@ -202,7 +201,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial InputStream stream = new ByteArrayInputStream(entityCollectionString.getBytes()); EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); try { - OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType); + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entityCollection(stream, edmEntityType); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.INVALID_ENTITY, e.getMessageKey()); throw e; @@ -215,7 +214,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial InputStream stream = new ByteArrayInputStream(entityCollectionString.getBytes()); EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); try { - OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType); + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entityCollection(stream, edmEntityType); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.JSON_SYNTAX_EXCEPTION, e.getMessageKey()); throw e; @@ -230,7 +229,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial InputStream stream = new ByteArrayInputStream(entityCollectionString.getBytes()); EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); try { - OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType); + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entityCollection(stream, edmEntityType); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.UNKNOWN_CONTENT, e.getMessageKey()); throw e; @@ -245,7 +244,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial InputStream stream = new ByteArrayInputStream(entityCollectionString.getBytes()); EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); try { - OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType); + OData.newInstance().createDeserializer(CONTENT_TYPE_JSON).entityCollection(stream, edmEntityType); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.NOT_IMPLEMENTED, e.getMessageKey()); throw e; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0043bd9c/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 00918db..b3568f5 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 @@ -28,7 +28,6 @@ import java.util.Map; import org.apache.olingo.commons.api.data.Parameter; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.deserializer.DeserializerException; import org.junit.Test; @@ -112,14 +111,14 @@ public class ODataJsonDeserializerActionParametersTest extends AbstractODataDese } private Map<String, Parameter> deserialize(final String input, final String actionName) throws DeserializerException { - return OData.newInstance().createDeserializer(ODataFormat.JSON) + return OData.newInstance().createDeserializer(CONTENT_TYPE_JSON) .actionParameters(new ByteArrayInputStream(input.getBytes()), edm.getUnboundAction(new FullQualifiedName("Namespace1_Alias", actionName))).getActionParameters(); } private Map<String, Parameter> deserialize(final String input, final String actionName, final String typeName) throws DeserializerException { - return OData.newInstance().createDeserializer(ODataFormat.JSON) + return OData.newInstance().createDeserializer(CONTENT_TYPE_JSON) .actionParameters(new ByteArrayInputStream(input.getBytes()), edm.getBoundAction(new FullQualifiedName("Namespace1_Alias", actionName), new FullQualifiedName("Namespace1_Alias", typeName), false)).getActionParameters(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0043bd9c/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 d4739be..01ec4b5 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 @@ -45,12 +45,10 @@ import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.provider.CsdlMapping; -import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.core.edm.primitivetype.EdmDate; import org.apache.olingo.commons.core.edm.primitivetype.EdmDateTimeOffset; import org.apache.olingo.server.api.OData; 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.edmx.EdmxReference; import org.apache.olingo.server.tecsvc.provider.EdmTechProvider; @@ -63,7 +61,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe public void emptyEntity() throws Exception { String entityString = "{}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) .getEntity(); @@ -93,7 +91,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe "\"PropertyGuid\":\"01234567-89ab-cdef-0123-456789abcdef\"," + "\"PropertyTimeOfDay\":\"03:26:05\"}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) .getEntity(); @@ -140,7 +138,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe "\"PropertyGuid\":\"01234567-89ab-cdef-0123-456789abcdef\"," + "\"PropertyTimeOfDay\":\"03:26:05\"}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) .getEntity(); @@ -161,7 +159,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe "\"PropertyString\":\"First Resource - positive values\"" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) .getEntity(); @@ -191,7 +189,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe "\"PropertyGuid\":\"01234567-89ab-cdef-0123-456789abcdef\"," + "\"PropertyTimeOfDay\":\"03:26:05\"}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) .getEntity(); @@ -226,7 +224,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe "\"PropertySByte\":127," + "\"PropertyTimeOfDay\":\"01:00:01\"}}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETCompAllPrim"))) .getEntity(); @@ -268,7 +266,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"CollPropertyTimeOfDay\":[\"04:14:13\",\"23:59:59\",\"01:12:33\"]" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETCollAllPrim"))) .getEntity(); @@ -306,7 +304,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "{\"PropertyInt16\":789,\"PropertyString\":\"TEST 3\"}]}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))) .getEntity(); @@ -339,7 +337,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "{\"PropertyInt16\":789}]}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))) .getEntity(); @@ -388,7 +386,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe "\"PropertyGuid\":\"01234567-89ab-cdef-0123-456789abcdef\"," + "\"PropertyTimeOfDay\":\"03:26:05\"}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) .getEntity(); @@ -406,7 +404,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"PropertyString\":\"First Resource - positive values\"" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); } @@ -425,7 +423,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "{\"PropertyInt16\":789,\"PropertyString\":\"TEST 3\"}]}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))); } @@ -446,7 +444,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"PropertyString\":\"First Resource - positive values\"" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) .getEntity(); @@ -465,7 +463,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"[email protected]\":[\"ESTwoPrim(2)\",\"ESTwoPrim(3)\"]" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) .getEntity(); @@ -499,7 +497,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"[email protected]\":[]" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) .getEntity(); @@ -511,7 +509,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe @Test public void eTMixEnumDefCollCompTest() throws Exception { InputStream stream = getFileAsStream("EntityETMixEnumDefCollComp.json"); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity entity = deserializer.entity(stream, edm .getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp"))) @@ -558,7 +556,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"CollPropertyTimeOfDay\":[\"04:14:13\",\"23:59:59\",\"01:12:33\"]" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity e = deserializer.entity(stream, edm.getEntityType( new FullQualifiedName("Namespace1_Alias", "ETCollAllPrim"))).getEntity(); @@ -573,7 +571,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"PropertyComp\":null" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))).getEntity(); @@ -587,7 +585,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "null," + "{\"PropertyInt16\":789,\"PropertyString\":\"TEST 3\"}]}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity entity = deserializer.entity(stream, edm.getEntityType( new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))).getEntity(); @@ -604,7 +602,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"PropertyComp\":{\"PropertyString\":\"TEST A\",\"PropertyInt16\":null}" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity entity = deserializer.entity(stream, edm.getEntityType( new FullQualifiedName("Namespace1_Alias", "ETCompAllPrim"))).getEntity(); @@ -621,7 +619,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "}}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity e = deserializer.entity(stream, edm.getEntityType( new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp"))).getEntity(); @@ -637,7 +635,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity e = deserializer.entity(stream, edm.getEntityType( new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp"))).getEntity(); @@ -673,7 +671,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe "{\"PropertyDate\":\"2012-12-03\"," + "\"PropertyDateTimeOffset\":\"2012-12-03T07:16:23Z\"}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); Entity entity = deserializer.entity(stream, entityType).getEntity(); assertNotNull(entity); @@ -710,7 +708,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe "\"PropertyTimeOfDay\":\"03:26:05\"}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); try { - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.INVALID_NULL_PROPERTY, e.getMessageKey()); @@ -725,7 +723,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); try { - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETTwoPrim"))); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.DUPLICATE_PROPERTY, e.getMessageKey()); @@ -748,7 +746,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); try { - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.DUPLICATE_PROPERTY, e.getMessageKey()); @@ -775,7 +773,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); try { - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.DUPLICATE_PROPERTY, e.getMessageKey()); @@ -799,7 +797,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); try { - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.DUPLICATE_PROPERTY, e.getMessageKey()); @@ -822,7 +820,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); try { - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.NOT_IMPLEMENTED, e.getMessageKey()); @@ -845,7 +843,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); try { - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.NOT_IMPLEMENTED, e.getMessageKey()); @@ -867,7 +865,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); try { - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.NOT_IMPLEMENTED, e.getMessageKey()); @@ -890,7 +888,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); try { - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.UNKNOWN_CONTENT, e.getMessageKey()); @@ -912,7 +910,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); try { - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.UNKNOWN_CONTENT, e.getMessageKey()); @@ -934,7 +932,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe InputStream stream = new ByteArrayInputStream(entityString.getBytes()); try { - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))); } catch (DeserializerException e) { assertEquals(DeserializerException.MessageKeys.UNKNOWN_CONTENT, e.getMessageKey()); @@ -1046,7 +1044,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"[email protected]\":[\"ESTwoPrim(2)\"]" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); } catch (DeserializerException e) { @@ -1063,7 +1061,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"[email protected]\":\"ESTwoPrim(2)\"" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); } catch (DeserializerException e) { @@ -1080,7 +1078,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"[email protected]\":[123,456]" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); } catch (DeserializerException e) { @@ -1097,7 +1095,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"@odata.bind\":\"ESTwoPrim(2)\"" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); } catch (DeserializerException e) { @@ -1114,7 +1112,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"[email protected]\":null" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); } catch (DeserializerException e) { @@ -1131,7 +1129,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"[email protected]\":null" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); } catch (DeserializerException e) { @@ -1148,7 +1146,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"[email protected]\":[null]" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); } catch (DeserializerException e) { @@ -1162,7 +1160,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe String entityString = "{\"PropertyInt16\":32767,}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); } catch (DeserializerException e) { @@ -1176,7 +1174,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe String entityString = "{\"PropertyInt16\":[]}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); } catch (DeserializerException e) { @@ -1190,7 +1188,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe String entityString = "{\"PropertyInt16\":{}}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); } catch (DeserializerException e) { @@ -1206,7 +1204,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "{\"[email protected]\":1234}" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))); } catch (DeserializerException e) { @@ -1221,7 +1219,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"PropertyComp\":\"InvalidString\"" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))); } catch (DeserializerException e) { @@ -1236,7 +1234,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"PropertyComp\":null" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETTwoKeyNav"))); } catch (DeserializerException e) { @@ -1253,7 +1251,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"PropertyComp\": {\"PropertyString\":\"StringValue\"}}" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETTwoKeyNav"))); } catch (DeserializerException e) { @@ -1269,7 +1267,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"PropertyCompTwoPrim\":{\"PropertyInt16\": null, \"PropertyString\":\"StringValue\"}" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETKeyNav"))); } catch (DeserializerException e) { @@ -1285,7 +1283,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "null," + "\"StringValue_1\",\"TEST 3\"]}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETCollAllPrim"))); } catch (DeserializerException e) { @@ -1300,7 +1298,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"CollPropertyInt16\":[123,\"null\",4711]" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETCollAllPrim"))); } catch (DeserializerException e) { @@ -1315,7 +1313,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "\"PropertyInt16\":32767000000000000000000000000000000000000" + "}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))); } catch (DeserializerException e) { @@ -1333,7 +1331,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "}}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType( new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp"))); @@ -1352,7 +1350,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "}}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp"))); } catch (DeserializerException e) { @@ -1370,7 +1368,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "}}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp"))); } catch (DeserializerException e) { @@ -1388,7 +1386,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "}}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp"))); } catch (DeserializerException e) { @@ -1406,7 +1404,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe + "}}"; InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp"))); } catch (DeserializerException e) { @@ -1418,7 +1416,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe @Test @Ignore public void ieee754Compatible() throws Exception { - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); String entityString = "{\"PropertyInt16\":32767," + "\"PropertyString\":\"First Resource - positive values\"," + @@ -1447,7 +1445,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe private void checkPropertyJsonType(final String entityString) throws DeserializerException { InputStream stream = new ByteArrayInputStream(entityString.getBytes()); - ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); + ODataDeserializer deserializer = OData.newInstance().createDeserializer(CONTENT_TYPE_JSON); try { deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))); fail("Expected an exception but was not thrown: " + this.getClass().getName()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0043bd9c/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 2f91777..a2a1b37 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 @@ -36,6 +36,11 @@ import org.apache.olingo.commons.api.edm.EdmEntitySet; import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmProperty; +<<<<<<< HEAD +======= +import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.commons.api.format.ContentType; +>>>>>>> [OLINGO-690] ODataSerializer and ODataDeserializer are created by contentType instead of ODataFormat import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.server.api.ServiceMetadata; import org.apache.olingo.server.api.edmx.EdmxReference; @@ -70,7 +75,9 @@ public class ODataJsonSerializerTest { new EdmTechProvider(), Collections.<EdmxReference> emptyList(), new MetadataETagSupport("W/\"metadataETag\"")); private static final EdmEntityContainer entityContainer = metadata.getEdm().getEntityContainer(); private final DataProvider data = new DataProvider(); - private final ODataSerializer serializer = new ODataJsonSerializer(ODataFormat.JSON); + private final ODataSerializer serializer = new ODataJsonSerializer(ODataFormat.JSON.getContentType()); + private final ODataSerializer serializerIEEECompatible = + new ODataJsonSerializer(ContentType.parse("application/json;odata.metadata=minimal;IEEE754Compatible=true")); private final UriHelper helper = new UriHelperImpl(); @Test @@ -304,8 +311,8 @@ public class ODataJsonSerializerTest { public void entityTwoPrimNoMetadata() throws Exception { 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).getContent(); + InputStream result = new ODataJsonSerializer(ODataFormat.JSON_NO_METADATA.getContentType()) + .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); @@ -315,10 +322,10 @@ public class ODataJsonSerializerTest { public void entitySetTwoPrimNoMetadata() throws Exception { final EdmEntitySet edmEntitySet = entityContainer.getEntitySet("ESTwoPrim"); final EntityCollection entitySet = data.readAll(edmEntitySet); - InputStream result = new ODataJsonSerializer(ODataFormat.JSON_NO_METADATA) - .entityCollection(metadata, edmEntitySet.getEntityType(), entitySet, - EntityCollectionSerializerOptions.with() - .contextURL(ContextURL.with().entitySet(edmEntitySet).build()).build()).getContent(); + InputStream result = new ODataJsonSerializer(ODataFormat.JSON_NO_METADATA.getContentType()) + .entityCollection(metadata, edmEntitySet.getEntityType(), entitySet, + EntityCollectionSerializerOptions.with() + .contextURL(ContextURL.with().entitySet(edmEntitySet).build()).build()).getContent(); final String resultString = IOUtils.toString(result); final String expectedResult = "{\"value\":[" + "{\"PropertyInt16\":32766,\"PropertyString\":\"Test String1\"}," @@ -761,7 +768,7 @@ public class ODataJsonSerializerTest { entityCollection, ReferenceCollectionSerializerOptions.with() .contextURL(ContextURL.with().asCollection().suffix(Suffix.REFERENCE).build()) - .setIEEE754Compatible(false).build()); + .build()); final String resultString = IOUtils.toString(serializerResult.getContent()); @@ -782,7 +789,7 @@ public class ODataJsonSerializerTest { edmEntitySet, entityCollection, ReferenceCollectionSerializerOptions.with() .contextURL(ContextURL.with().asCollection().suffix(Suffix.REFERENCE).build()) - .setIEEE754Compatible(false).build()); + .build()); final String resultString = IOUtils.toString(serializerResult.getContent()); @@ -795,10 +802,9 @@ public class ODataJsonSerializerTest { public void entityIEE754Compatible() throws Exception { final EdmEntitySet edmEntitySet = entityContainer.getEntitySet("ESAllPrim"); final Entity entity = data.readAll(edmEntitySet).getEntities().get(0); - InputStream result = serializer.entity(metadata, edmEntitySet.getEntityType(), entity, + InputStream result = serializerIEEECompatible.entity(metadata, edmEntitySet.getEntityType(), entity, EntitySerializerOptions.with() .contextURL(ContextURL.with().entitySet(edmEntitySet).suffix(Suffix.ENTITY).build()) - .setIEEE754Compatible(true) .build()).getContent(); final String resultString = IOUtils.toString(result); final String expectedResult = "{" @@ -827,11 +833,10 @@ public class ODataJsonSerializerTest { public void entityCollAllPrimIEEE754Compatible() throws Exception { final EdmEntitySet edmEntitySet = entityContainer.getEntitySet("ESCollAllPrim"); final Entity entity = data.readAll(edmEntitySet).getEntities().get(0); - InputStream result = serializer.entity(metadata, edmEntitySet.getEntityType(), entity, + InputStream result = serializerIEEECompatible.entity(metadata, edmEntitySet.getEntityType(), entity, EntitySerializerOptions.with() .contextURL(ContextURL.with().serviceRoot(URI.create("http://host/service/";)) .entitySet(edmEntitySet).suffix(Suffix.ENTITY).build()) - .setIEEE754Compatible(true) .build()).getContent(); final String resultString = IOUtils.toString(result); final String expectedResult = "{" @@ -866,12 +871,11 @@ public class ODataJsonSerializerTest { final EdmProperty edmProperty = (EdmProperty) edmEntitySet.getEntityType().getProperty("CollPropertyInt64"); final Property property = data.readAll(edmEntitySet).getEntities().get(0).getProperty(edmProperty.getName()); - final String resultString = IOUtils.toString(serializer + final String resultString = IOUtils.toString(serializerIEEECompatible .primitiveCollection((EdmPrimitiveType) edmProperty.getType(), property, PrimitiveSerializerOptions.with() .contextURL(ContextURL.with() .entitySet(edmEntitySet).keyPath("1").navOrPropertyPath(edmProperty.getName()).build()) - .setIEEE754Compatible(true) .build()).getContent()); Assert.assertEquals("{" + "\"@odata.context\":\"$metadata#ESCollAllPrim(1)/CollPropertyInt64\"," @@ -885,12 +889,11 @@ public class ODataJsonSerializerTest { final EdmProperty edmProperty = (EdmProperty) edmEntitySet.getEntityType().getProperty("CollPropertyDecimal"); final Property property = data.readAll(edmEntitySet).getEntities().get(0).getProperty(edmProperty.getName()); - final String resultString = IOUtils.toString(serializer + final String resultString = IOUtils.toString(serializerIEEECompatible .primitiveCollection((EdmPrimitiveType) edmProperty.getType(), property, PrimitiveSerializerOptions.with() .contextURL(ContextURL.with() .entitySet(edmEntitySet).keyPath("1").navOrPropertyPath(edmProperty.getName()).build()) - .setIEEE754Compatible(true) .build()).getContent()); Assert.assertEquals("{" + "\"@odata.context\":\"$metadata#ESCollAllPrim(1)/CollPropertyDecimal\"," @@ -903,12 +906,11 @@ public class ODataJsonSerializerTest { final EdmEntitySet edmEntitySet = entityContainer.getEntitySet("ESAllPrim"); final EdmProperty edmProperty = (EdmProperty) edmEntitySet.getEntityType().getProperty("PropertyInt64"); final Property property = data.readAll(edmEntitySet).getEntities().get(0).getProperty(edmProperty.getName()); - final String resultString = IOUtils.toString(serializer + final String resultString = IOUtils.toString(serializerIEEECompatible .primitive((EdmPrimitiveType) edmProperty.getType(), property, PrimitiveSerializerOptions.with() .contextURL(ContextURL.with() .entitySet(edmEntitySet).keyPath("32767").navOrPropertyPath(edmProperty.getName()).build()) - .setIEEE754Compatible(true) .build()).getContent()); Assert.assertEquals("{" + "\"@odata.context\":\"$metadata#ESAllPrim(32767)/PropertyInt64\"," @@ -921,12 +923,11 @@ public class ODataJsonSerializerTest { final EdmEntitySet edmEntitySet = entityContainer.getEntitySet("ESAllPrim"); final EdmProperty edmProperty = (EdmProperty) edmEntitySet.getEntityType().getProperty("PropertyDecimal"); final Property property = data.readAll(edmEntitySet).getEntities().get(0).getProperty(edmProperty.getName()); - final String resultString = IOUtils.toString(serializer + final String resultString = IOUtils.toString(serializerIEEECompatible .primitive((EdmPrimitiveType) edmProperty.getType(), property, PrimitiveSerializerOptions.with() .contextURL(ContextURL.with() .entitySet(edmEntitySet).keyPath("32767").navOrPropertyPath(edmProperty.getName()).build()) - .setIEEE754Compatible(true) .build()).getContent()); Assert.assertEquals("{" + "\"@odata.context\":\"$metadata#ESAllPrim(32767)/PropertyDecimal\"," @@ -942,9 +943,8 @@ public class ODataJsonSerializerTest { entitySet.setNext(URI.create("/next")); CountOption countOption = Mockito.mock(CountOption.class); Mockito.when(countOption.getValue()).thenReturn(true); - InputStream result = serializer.entityCollection(metadata, edmEntitySet.getEntityType(), entitySet, + InputStream result = serializerIEEECompatible.entityCollection(metadata, edmEntitySet.getEntityType(), entitySet, EntityCollectionSerializerOptions.with() - .setIEEE754Compatible(true) .contextURL(ContextURL.with().entitySet(edmEntitySet).build()) .count(countOption) .build()).getContent(); @@ -972,9 +972,8 @@ public class ODataJsonSerializerTest { entitySet.setNext(URI.create("/next")); CountOption countOption = Mockito.mock(CountOption.class); Mockito.when(countOption.getValue()).thenReturn(true); - InputStream result = serializer.referenceCollection(metadata, edmEntitySet, entitySet, + InputStream result = serializerIEEECompatible.referenceCollection(metadata, edmEntitySet, entitySet, ReferenceCollectionSerializerOptions.with() - .setIEEE754Compatible(true) .contextURL(ContextURL.with().asCollection().suffix(Suffix.REFERENCE).build()) .count(countOption) .build()).getContent(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0043bd9c/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 ae9e314..44607d8 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 @@ -47,10 +47,10 @@ public class ServiceDocumentTest { OData server = OData.newInstance(); assertNotNull(server); - ODataSerializer serializer = server.createSerializer(ODataFormat.JSON); + ODataSerializer serializer = server.createSerializer(ODataFormat.JSON.getContentType()); assertNotNull(serializer); - InputStream result = serializer.serviceDocument(metadata, serviceRoot).getContent(); + InputStream result = serializer.serviceDocument(metadata.getEdm(), serviceRoot).getContent(); assertNotNull(result); final String jsonString = IOUtils.toString(result); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0043bd9c/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 a8619b3..f69ee60 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).getContent()); + odata.createSerializer(ODataFormat.XML.getContentType()).metadataDocument(serviceMetadata).getContent()); assertNotNull(metadata); assertThat(metadata, containsString("<edmx:Reference Uri=\"" + CORE_VOCABULARY + "\">" http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0043bd9c/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 caffcd5..27e77f6 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 @@ -103,7 +103,7 @@ public class CarsProcessor implements EntityCollectionProcessor, EntityProcessor // Next we create a serializer based on the requested format. This could also be a custom format but we do not // support them in this example final ODataFormat format = ODataFormat.fromContentType(requestedContentType); - ODataSerializer serializer = odata.createSerializer(format); + ODataSerializer serializer = odata.createSerializer(requestedContentType); // Now the content is serialized using the serializer. final ExpandOption expand = uriInfo.getExpandOption(); @@ -143,7 +143,7 @@ public class CarsProcessor implements EntityCollectionProcessor, EntityProcessor } else { // If an entity was found we proceed by serializing it and sending it to the client. final ODataFormat format = ODataFormat.fromContentType(requestedContentType); - ODataSerializer serializer = odata.createSerializer(format); + ODataSerializer serializer = odata.createSerializer(requestedContentType); final ExpandOption expand = uriInfo.getExpandOption(); final SelectOption select = uriInfo.getSelectOption(); InputStream serializedContent = serializer.entity(edm, edmEntitySet.getEntityType(), entity, @@ -255,7 +255,7 @@ public class CarsProcessor implements EntityCollectionProcessor, EntityProcessor response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode()); } else { final ODataFormat format = ODataFormat.fromContentType(contentType); - ODataSerializer serializer = odata.createSerializer(format); + ODataSerializer serializer = odata.createSerializer(contentType); final ContextURL contextURL = format == ODataFormat.JSON_NO_METADATA ? null : getContextUrl(edmEntitySet, true, null, null, edmProperty.getName()); InputStream serializerContent = complex ?
