http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/BatchResponseSerializerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/BatchResponseSerializerTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/BatchResponseSerializerTest.java index 85a30ac..e9e5868 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/BatchResponseSerializerTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/BatchResponseSerializerTest.java @@ -35,7 +35,6 @@ import org.apache.olingo.server.api.ODataResponse; import org.apache.olingo.server.api.deserializer.batch.ODataResponsePart; import org.apache.olingo.server.core.deserializer.batch.BatchParserCommon; import org.apache.olingo.server.core.deserializer.batch.BufferedReaderIncludingLineEndings; -import org.apache.olingo.server.core.serializer.BatchResponseSerializer; import org.junit.Test; public class BatchResponseSerializerTest { @@ -68,7 +67,7 @@ public class BatchResponseSerializerTest { new BufferedReaderIncludingLineEndings(new InputStreamReader(content)); final List<String> body = reader.toList(); reader.close(); - + int line = 0; assertEquals(24, body.size()); assertTrue(body.get(line++).contains("--batch_")); @@ -123,7 +122,7 @@ public class BatchResponseSerializerTest { new BufferedReaderIncludingLineEndings(new InputStreamReader(content)); final List<String> body = reader.toList(); reader.close(); - + int line = 0; assertEquals(23, body.size()); assertTrue(body.get(line++).contains("--batch_")); @@ -150,7 +149,7 @@ public class BatchResponseSerializerTest { assertTrue(body.get(line++).contains("--changeset_")); assertTrue(body.get(line++).contains("--batch_")); } - + @Test public void testResponse() throws Exception { List<ODataResponsePart> parts = new ArrayList<ODataResponsePart>(); @@ -165,13 +164,13 @@ public class BatchResponseSerializerTest { final BatchResponseSerializer serializer = new BatchResponseSerializer(); final InputStream content = serializer.serialize(parts, BOUNDARY); - + assertNotNull(content); final BufferedReaderIncludingLineEndings reader = new BufferedReaderIncludingLineEndings(new InputStreamReader(content)); final List<String> body = reader.toList(); reader.close(); - + int line = 0; assertEquals(10, body.size()); assertTrue(body.get(line++).contains("--batch_")); @@ -199,14 +198,14 @@ public class BatchResponseSerializerTest { BatchResponseSerializer serializer = new BatchResponseSerializer(); final InputStream content = serializer.serialize(parts, BOUNDARY); - + assertNotNull(content); final BufferedReaderIncludingLineEndings reader = new BufferedReaderIncludingLineEndings(new InputStreamReader(content)); final List<String> body = reader.toList(); reader.close(); - + int line = 0; assertEquals(14, body.size()); assertTrue(body.get(line++).contains("--batch_"));
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/FixedFormatSerializerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/FixedFormatSerializerTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/FixedFormatSerializerTest.java index ce319fc..500d6bb 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/FixedFormatSerializerTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/FixedFormatSerializerTest.java @@ -40,7 +40,7 @@ public class FixedFormatSerializerTest { @Test public void binary() throws Exception { - assertEquals("ABC", IOUtils.toString(serializer.binary(new byte [] { 0x41, 0x42, 0x43 }))); + assertEquals("ABC", IOUtils.toString(serializer.binary(new byte[] { 0x41, 0x42, 0x43 }))); } @Test http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ClientErrorSerializerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ClientErrorSerializerTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ClientErrorSerializerTest.java index 7c72e45..bc89289 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ClientErrorSerializerTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ClientErrorSerializerTest.java @@ -28,8 +28,8 @@ import java.util.List; import org.apache.commons.io.IOUtils; import org.apache.olingo.commons.api.ODataErrorDetail; import org.apache.olingo.commons.api.format.ODataFormat; -import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ClientServerError; +import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.serializer.ODataSerializer; import org.apache.olingo.server.api.serializer.SerializerException; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java index c7ae99d..08aed13 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java @@ -43,7 +43,7 @@ public class ODataJsonSerializerTest { col.add(getValues(1)); col.add(getValues(2)); final Property complexCollection = new Property(null, "ComplexCol", ValueType.COLLECTION_COMPLEX, col); - + final ODataJsonSerializer serializer = new ODataJsonSerializer(ODataFormat.APPLICATION_JSON); final ComplexSerializerOptions options = ComplexSerializerOptions.with() .contextURL(ContextURL.with().selectList("ComplexCollection").build()).build(); @@ -63,7 +63,7 @@ public class ODataJsonSerializerTest { } - private ComplexValue getValues(int i) { + private ComplexValue getValues(final int i) { ComplexValue value = new ComplexValue(); value.getValue().add(new Property(null, "prop1", ValueType.PRIMITIVE, "test" + i)); value.getValue().add(new Property(null, "prop2", ValueType.PRIMITIVE, "test" + i + i)); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/utils/ContextURLBuilderTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/utils/ContextURLBuilderTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/utils/ContextURLBuilderTest.java index df4ed77..6cf2048 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/utils/ContextURLBuilderTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/utils/ContextURLBuilderTest.java @@ -37,9 +37,9 @@ import org.apache.olingo.commons.api.edm.provider.CsdlComplexType; import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider; import org.apache.olingo.commons.api.edm.provider.CsdlNavigationProperty; import org.apache.olingo.commons.api.edm.provider.CsdlProperty; -import org.apache.olingo.commons.core.edm.primitivetype.EdmString; import org.apache.olingo.commons.core.edm.EdmComplexTypeImpl; import org.apache.olingo.commons.core.edm.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.primitivetype.EdmString; import org.junit.Test; import org.mockito.Mockito; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java index 560685b..7eeeb35 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java @@ -411,7 +411,7 @@ public class MetadataDocumentXmlSerializerTest { @Override public CsdlFunctionImport getFunctionImport(final FullQualifiedName entityContainer, - final String functionImportName) + final String functionImportName) throws ODataException { if (entityContainer.equals(nameContainer)) { if (functionImportName.equals("FINRTInt16")) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/Encoder.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/Encoder.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/Encoder.java index 82bb775..33956b5 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/Encoder.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/Encoder.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -25,12 +25,12 @@ import java.io.UnsupportedEncodingException; * percent-encoded UTF-8 representation according to * <a href="http://www.ietf.org/rfc/rfc3986.txt";>RFC 3986</a> * (with consideration of its predecessor RFC 2396). - * + * */ public class Encoder { - //TODO: Should we really copy this class? - + // TODO: Should we really copy this class? + /** * Encodes a Java String (in its internal UTF-16 encoding) into its * percent-encoded UTF-8 representation according to http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java index 4137db0..25c86c7 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -49,7 +49,7 @@ public class TechnicalServlet extends HttpServlet { @Override protected void service(final HttpServletRequest req, final HttpServletResponse resp) - throws ServletException, IOException { + throws ServletException, IOException { try { OData odata = OData.newInstance(); EdmxReference reference = new EdmxReference(URI.create("../v4.0/cs02/vocabularies/Org.OData.Core.V1.xml")); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/ActionData.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/ActionData.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/ActionData.java index 17561a8..85bfd45 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/ActionData.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/ActionData.java @@ -39,7 +39,7 @@ import org.apache.olingo.server.tecsvc.data.DataProvider.DataProviderException; public class ActionData { - protected static Property primitiveAction(String name, Map<String, Parameter> parameters) + protected static Property primitiveAction(final String name, final Map<String, Parameter> parameters) throws DataProviderException { if ("UARTString".equals(name)) { return DataCreator.createPrimitive(null, "UARTString string value"); @@ -47,7 +47,7 @@ public class ActionData { throw new DataProviderException("Action " + name + " is not yet implemented."); } - protected static Property primitiveCollectionAction(String name, Map<String, Parameter> parameters) + protected static Property primitiveCollectionAction(final String name, final Map<String, Parameter> parameters) throws DataProviderException { if ("UARTCollStringTwoParam".equals(name)) { Parameter paramInt16 = parameters.get("ParameterInt16"); @@ -75,7 +75,8 @@ public class ActionData { throw new DataProviderException("Action " + name + " is not yet implemented."); } - protected static Property complexAction(String name, Map<String, Parameter> parameters) throws DataProviderException { + protected static Property complexAction(final String name, final Map<String, Parameter> parameters) + throws DataProviderException { if ("UARTCTTwoPrimParam".equals(name)) { Parameter paramInt16 = parameters.get("ParameterInt16"); Short number; @@ -90,7 +91,7 @@ public class ActionData { throw new DataProviderException("Action " + name + " is not yet implemented."); } - private static Property createCTTwoPrimComplexProperty(Short number, String text) { + private static Property createCTTwoPrimComplexProperty(final Short number, final String text) { ComplexValue compValue = new ComplexValue(); Property propInt = new Property(); propInt.setName("PropertyInt16"); @@ -106,7 +107,7 @@ public class ActionData { return complexProp; } - protected static Property complexCollectionAction(String name, Map<String, Parameter> parameters) + protected static Property complexCollectionAction(final String name, final Map<String, Parameter> parameters) throws DataProviderException { if ("UARTCollCTTwoPrimParam".equals(name)) { List<ComplexValue> complexCollection = new ArrayList<ComplexValue>(); @@ -131,7 +132,7 @@ public class ActionData { throw new DataProviderException("Action " + name + " is not yet implemented."); } - protected static EntityActionResult entityAction(String name, Map<String, Parameter> parameters) + protected static EntityActionResult entityAction(final String name, final Map<String, Parameter> parameters) throws DataProviderException { if ("UARTETTwoKeyTwoPrimParam".equals(name)) { Parameter parameter = parameters.get("ParameterInt16"); @@ -177,7 +178,7 @@ public class ActionData { throw new DataProviderException("Action " + name + " is not yet implemented."); } - private static Entity createAllPrimEntity(Short key, String val, Calendar date) { + private static Entity createAllPrimEntity(final Short key, final String val, final Calendar date) { return new Entity().addProperty(DataCreator.createPrimitive("PropertyInt16", key)) .addProperty(DataCreator.createPrimitive("PropertyString", val)) .addProperty(DataCreator.createPrimitive("PropertyBoolean", false)) @@ -196,7 +197,7 @@ public class ActionData { .addProperty(DataCreator.createPrimitive("PropertyTimeOfDay", null)); } - protected static EntityCollection entityCollectionAction(String name, Map<String, Parameter> parameters) + protected static EntityCollection entityCollectionAction(final String name, final Map<String, Parameter> parameters) throws DataProviderException { if ("UARTCollETKeyNavParam".equals(name)) { Parameter paramInt16 = parameters.get("ParameterInt16"); @@ -229,7 +230,7 @@ public class ActionData { } @SuppressWarnings("unchecked") - private static Entity createETKeyNavEntity(Short number) { + private static Entity createETKeyNavEntity(final Short number) { return new Entity() .addProperty(DataCreator.createPrimitive("PropertyInt16", number)) .addProperty(DataCreator.createPrimitive("PropertyString", "UARTCollETKeyNavParam int16 value: " + number)) http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java index db0b7ac..81db468 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java @@ -91,7 +91,7 @@ public class DataCreator { return entitySet; } - private Entity createETTwoKeyTwoPrimEntity(short propertyInt16, String propertyString) { + private Entity createETTwoKeyTwoPrimEntity(final short propertyInt16, final String propertyString) { return new Entity().addProperty(createPrimitive("PropertyInt16", propertyInt16)) .addProperty(createPrimitive("PropertyString", propertyString)); } @@ -118,7 +118,7 @@ public class DataCreator { } @SuppressWarnings("unchecked") - private Entity createETKeyNavEntity(int propertyInt16, String propertyString) { + private Entity createETKeyNavEntity(final int propertyInt16, final String propertyString) { return new Entity().addProperty(createPrimitive("PropertyInt16", propertyInt16)) .addProperty(createPrimitive("PropertyString", propertyString)) .addProperty(createComplex("PropertyCompNav", createPrimitive("PropertyInt16", 1))) @@ -148,7 +148,7 @@ public class DataCreator { } @SuppressWarnings("unchecked") - private Entity createESTwoKeyNavEntity(int propertyInt16, String propertyString) { + private Entity createESTwoKeyNavEntity(final int propertyInt16, final String propertyString) { return new Entity() .addProperty(createPrimitive("PropertyInt16", propertyInt16)) .addProperty(createPrimitive("PropertyString", propertyString)) @@ -490,7 +490,7 @@ public class DataCreator { + " <circle cx=\"50\" cy=\"50\" r=\"42\"/>\n" + " </g>\n" + "</svg>\n").getBytes(Charset.forName("UTF-8")); } - private void linkESTwoPrim(Map<String, EntityCollection> data) { + private void linkESTwoPrim(final Map<String, EntityCollection> data) { final EntityCollection entitySet = data.get("ESTwoPrim"); final List<Entity> targetEntities = data.get("ESAllPrim").getEntities(); @@ -499,7 +499,7 @@ public class DataCreator { setLink(entitySet.getEntities().get(3), "NavPropertyETAllPrimOne", targetEntities.get(0)); } - private void linkESAllPrim(Map<String, EntityCollection> data) { + private void linkESAllPrim(final Map<String, EntityCollection> data) { final EntityCollection entitySet = data.get("ESAllPrim"); final List<Entity> targetEntities = data.get("ESTwoPrim").getEntities(); @@ -510,7 +510,7 @@ public class DataCreator { targetEntities.get(3)); } - private void linkESKeyNav(Map<String, EntityCollection> data) { + private void linkESKeyNav(final Map<String, EntityCollection> data) { final EntityCollection entitySet = data.get("ESKeyNav"); final List<Entity> esKeyNavTargets = data.get("ESKeyNav").getEntities(); final List<Entity> esTwoKeyNavTargets = data.get("ESTwoKeyNav").getEntities(); @@ -546,7 +546,7 @@ public class DataCreator { setLinks(entitySet.getEntities().get(2), "NavPropertyETMediaMany", esMediaTargets.get(0), esMediaTargets.get(1)); } - private void linkESTwoKeyNav(Map<String, EntityCollection> data) { + private void linkESTwoKeyNav(final Map<String, EntityCollection> data) { final EntityCollection entitySet = data.get("ESTwoKeyNav"); final List<Entity> esKeyNavTargets = data.get("ESKeyNav").getEntities(); final List<Entity> esTwoKeyNavTargets = data.get("ESTwoKeyNav").getEntities(); @@ -624,7 +624,7 @@ public class DataCreator { return timestamp; } - protected static void setLink(Entity entity, final String navigationPropertyName, final Entity target) { + protected static void setLink(final Entity entity, final String navigationPropertyName, final Entity target) { Link link = entity.getNavigationLink(navigationPropertyName); if (link == null) { link = new Link(); @@ -635,7 +635,7 @@ public class DataCreator { link.setInlineEntity(target); } - protected static void setLinks(Entity entity, final String navigationPropertyName, final Entity... targets) { + protected static void setLinks(final Entity entity, final String navigationPropertyName, final Entity... targets) { Link link = entity.getNavigationLink(navigationPropertyName); if (link == null) { link = new Link(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java index 676b6ce..f682cfb 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java @@ -192,7 +192,7 @@ public class DataProvider { return true; } - private void createProperties(final EdmStructuredType type, List<Property> properties) + private void createProperties(final EdmStructuredType type, final List<Property> properties) throws DataProviderException { final List<String> keyNames = type instanceof EdmEntityType ? ((EdmEntityType) type).getKeyPredicateNames() : Collections.<String> emptyList(); @@ -226,7 +226,7 @@ public class DataProvider { return newProperty; } - public void update(final String rawBaseUri, final EdmEntitySet edmEntitySet, Entity entity, + public void update(final String rawBaseUri, final EdmEntitySet edmEntitySet, final Entity entity, final Entity changedEntity, final boolean patch, final boolean isInsert) throws DataProviderException { final EdmEntityType entityType = edmEntitySet.getEntityType(); @@ -258,7 +258,8 @@ public class DataProvider { } } - private void handleDeleteSingleNavigationProperties(EdmEntitySet edmEntitySet, Entity entity, Entity changedEntity) + private void handleDeleteSingleNavigationProperties(final EdmEntitySet edmEntitySet, final Entity entity, + final Entity changedEntity) throws DataProviderException { final EdmEntityType entityType = edmEntitySet.getEntityType(); final List<String> navigationPropertyNames = entityType.getNavigationPropertyNames(); @@ -343,7 +344,7 @@ public class DataProvider { } } - private void removeLink(EdmNavigationProperty navigationProperty, Entity entity) { + private void removeLink(final EdmNavigationProperty navigationProperty, final Entity entity) { final Link link = entity.getNavigationLink(navigationProperty.getName()); if (link != null) { entity.getNavigationLinks().remove(link); @@ -380,7 +381,8 @@ public class DataProvider { } } - private void setLink(final EdmNavigationProperty navigationProperty, Entity srcEntity, final Entity targetEntity) { + private void + setLink(final EdmNavigationProperty navigationProperty, final Entity srcEntity, final Entity targetEntity) { if (navigationProperty.isCollection()) { DataCreator.setLinks(srcEntity, navigationProperty.getName(), targetEntity); } else { @@ -389,7 +391,7 @@ public class DataProvider { } @SuppressWarnings({ "unchecked" }) - public void updateProperty(final EdmProperty edmProperty, Property property, final Property newProperty, + public void updateProperty(final EdmProperty edmProperty, final Property property, final Property newProperty, final boolean patch) throws DataProviderException { if (edmProperty.isPrimitive()) { if (newProperty != null || !patch) { @@ -469,7 +471,7 @@ public class DataProvider { return (byte[]) entity.getProperty(MEDIA_PROPERTY_NAME).asPrimitive(); } - public void setMedia(Entity entity, byte[] media, String type) { + public void setMedia(final Entity entity, final byte[] media, final String type) { entity.getProperties().remove(entity.getProperty(MEDIA_PROPERTY_NAME)); entity.addProperty(DataCreator.createPrimitive(MEDIA_PROPERTY_NAME, media)); entity.setMediaContentType(type); @@ -490,33 +492,34 @@ public class DataProvider { return FunctionData.primitiveComplexFunction(function.getName(), parameters, data); } - public Property processActionPrimitive(String name, Map<String, Parameter> actionParameters) + public Property processActionPrimitive(final String name, final Map<String, Parameter> actionParameters) throws DataProviderException { return ActionData.primitiveAction(name, actionParameters); } - public Property processActionComplex(String name, Map<String, Parameter> actionParameters) + public Property processActionComplex(final String name, final Map<String, Parameter> actionParameters) throws DataProviderException { return ActionData.complexAction(name, actionParameters); } - public Property processActionComplexCollection(String name, Map<String, Parameter> actionParameters) + public Property processActionComplexCollection(final String name, final Map<String, Parameter> actionParameters) throws DataProviderException { return ActionData.complexCollectionAction(name, actionParameters); } - public Property processActionPrimitiveCollection(String name, Map<String, Parameter> actionParameters) + public Property processActionPrimitiveCollection(final String name, final Map<String, Parameter> actionParameters) throws DataProviderException { return ActionData.primitiveCollectionAction(name, actionParameters); } - public EntityActionResult processActionEntity(String name, Map<String, Parameter> actionParameters) + public EntityActionResult processActionEntity(final String name, final Map<String, Parameter> actionParameters) throws DataProviderException { return ActionData.entityAction(name, actionParameters); } - public EntityCollection processActionEntityCollection(String name, Map<String, Parameter> actionParameters) - throws DataProviderException { + public EntityCollection + processActionEntityCollection(final String name, final Map<String, Parameter> actionParameters) + throws DataProviderException { return ActionData.entityCollectionAction(name, actionParameters); } @@ -539,7 +542,7 @@ public class DataProvider { super(message, HttpStatusCode.INTERNAL_SERVER_ERROR.getStatusCode(), Locale.ROOT); } - public DataProviderException(final String message, HttpStatusCode statusCode) { + public DataProviderException(final String message, final HttpStatusCode statusCode) { super(message, statusCode.getStatusCode(), Locale.ROOT); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/EntityActionResult.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/EntityActionResult.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/EntityActionResult.java index 8611cf7..2c60f8a 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/EntityActionResult.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/EntityActionResult.java @@ -23,21 +23,23 @@ import org.apache.olingo.commons.api.data.Entity; public class EntityActionResult { private Entity entity; private boolean created = false; - + public Entity getEntity() { return entity; } - public EntityActionResult setEntity(Entity entity) { + + public EntityActionResult setEntity(final Entity entity) { this.entity = entity; return this; } + public boolean isCreated() { return created; } - public EntityActionResult setCreated(boolean created) { + + public EntityActionResult setCreated(final boolean created) { this.created = created; return this; } - - + } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/RequestValidator.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/RequestValidator.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/RequestValidator.java index 92bb5ce..e6849d0 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/RequestValidator.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/RequestValidator.java @@ -52,52 +52,52 @@ public class RequestValidator { public RequestValidator(final DataProvider provider, final UriHelper uriHelper, final Edm edm, final String rawServiceRoot) { this.provider = provider; - this.isInsert = true; + isInsert = true; this.uriHelper = uriHelper; this.edm = edm; this.rawServiceRoot = rawServiceRoot; } - public RequestValidator(final DataProvider provider, final boolean isUpdate, final boolean isPatch, + public RequestValidator(final DataProvider provider, final boolean isUpdate, final boolean isPatch, final UriHelper uriHelper, final Edm edm, final String rawServiceRoot) { this.provider = provider; - this.isInsert = !isUpdate; + isInsert = !isUpdate; this.isPatch = isPatch; this.uriHelper = uriHelper; this.edm = edm; this.rawServiceRoot = rawServiceRoot; } - - public void validate(final EdmBindingTarget edmBindingTarget, final Entity entity) + + public void validate(final EdmBindingTarget edmBindingTarget, final Entity entity) throws DataProviderException { final List<String> path = new ArrayList<String>(); - + validateEntitySetProperties(entity.getProperties(), edmBindingTarget, edmBindingTarget.getEntityType(), path); - validateNavigationProperties(entity, edmBindingTarget, edmBindingTarget.getEntityType(), path); + validateNavigationProperties(entity, edmBindingTarget, edmBindingTarget.getEntityType(), path); } - - private void validateNavigationProperties(final Linked entity, final EdmBindingTarget edmBindingTarget, + + private void validateNavigationProperties(final Linked entity, final EdmBindingTarget edmBindingTarget, final EdmStructuredType edmType, final List<String> path) throws DataProviderException { for (final String navPropertyName : edmType.getNavigationPropertyNames()) { final EdmNavigationProperty edmProperty = edmType.getNavigationProperty(navPropertyName); - if(entity == null && !edmProperty.isNullable()) { + if (entity == null && !edmProperty.isNullable()) { throw new DataProviderException("Navigation property " + navPropertyName + " must not be null", HttpStatusCode.BAD_REQUEST); - } else if(entity != null) { + } else if (entity != null) { final Link navigationBinding = entity.getNavigationBinding(navPropertyName); final Link navigationLink = entity.getNavigationLink(navPropertyName); final List<String> newPath = new ArrayList<String>(path); newPath.add(edmProperty.getName()); final EdmBindingTarget target = edmBindingTarget.getRelatedBindingTarget(buildPath(newPath)); - + final ValidatioResult bindingResult = validateBinding(navigationBinding, edmProperty, target); - final ValidatioResult linkResult = validateNavigationLink(navigationLink, - edmProperty, - target); - - if (( isInsert && !edmProperty.isNullable() - && (bindingResult != ValidatioResult.FOUND - && linkResult != ValidatioResult.FOUND)) + final ValidatioResult linkResult = validateNavigationLink(navigationLink, + edmProperty, + target); + + if ((isInsert && !edmProperty.isNullable() + && (bindingResult != ValidatioResult.FOUND + && linkResult != ValidatioResult.FOUND)) || (!(isInsert && isPatch) && !edmProperty.isNullable() && linkResult == ValidatioResult.EMPTY)) { throw new DataProviderException("Navigation property " + navPropertyName + " must not be null", HttpStatusCode.BAD_REQUEST); @@ -105,78 +105,78 @@ public class RequestValidator { } } } - + private String buildPath(final List<String> path) { final StringBuilder builder = new StringBuilder(); - - for(final String segment : path) { - if(builder.length() > 0) { + + for (final String segment : path) { + if (builder.length() > 0) { builder.append("/"); } - + builder.append(segment); } - + return builder.toString(); } - private ValidatioResult validateBinding(final Link navigationBindung, final EdmNavigationProperty edmProperty, + private ValidatioResult validateBinding(final Link navigationBindung, final EdmNavigationProperty edmProperty, final EdmBindingTarget edmBindingTarget) throws DataProviderException { - if(navigationBindung == null) { + if (navigationBindung == null) { return ValidatioResult.NOT_FOUND; } - + if (edmProperty.isCollection()) { - if(navigationBindung.getBindingLinks().size() == 0) { + if (navigationBindung.getBindingLinks().size() == 0) { return ValidatioResult.EMPTY; } - + for (final String bindingLink : navigationBindung.getBindingLinks()) { validateLink(bindingLink, edmBindingTarget); } } else { - if(navigationBindung.getBindingLink() == null) { + if (navigationBindung.getBindingLink() == null) { return ValidatioResult.EMPTY; } - + validateLink(navigationBindung.getBindingLink(), edmBindingTarget); } - + return ValidatioResult.FOUND; } - - private ValidatioResult validateNavigationLink(final Link navigationLink, final EdmNavigationProperty edmProperty, + + private ValidatioResult validateNavigationLink(final Link navigationLink, final EdmNavigationProperty edmProperty, final EdmBindingTarget edmBindingTarget) throws DataProviderException { - if(navigationLink == null) { + if (navigationLink == null) { return ValidatioResult.NOT_FOUND; } - - if(edmProperty.isCollection()) { + + if (edmProperty.isCollection()) { final EntityCollection inlineEntitySet = navigationLink.getInlineEntitySet(); - if(!isInsert && inlineEntitySet.getEntities().size() > 0) { + if (!isInsert && inlineEntitySet.getEntities().size() > 0) { throw new DataProvider.DataProviderException("Deep update is not allowed", HttpStatusCode.BAD_REQUEST); } else { - for(final Entity entity : navigationLink.getInlineEntitySet().getEntities()) { + for (final Entity entity : navigationLink.getInlineEntitySet().getEntities()) { validate(edmBindingTarget, entity); } } } else { final Entity inlineEntity = navigationLink.getInlineEntity(); - if(!isInsert && inlineEntity != null) { + if (!isInsert && inlineEntity != null) { throw new DataProvider.DataProviderException("Deep update is not allowed", HttpStatusCode.BAD_REQUEST); - } else if(inlineEntity != null) { + } else if (inlineEntity != null) { validate(edmBindingTarget, navigationLink.getInlineEntity()); } } - + return ValidatioResult.FOUND; } - - private void validateLink(final String bindingLink, final EdmBindingTarget edmBindungTarget) + + private void validateLink(final String bindingLink, final EdmBindingTarget edmBindungTarget) throws DataProviderException { try { final List<UriParameter> keys = uriHelper.getKeyPredicatesFromEntityLink(edm, bindingLink, rawServiceRoot); - final Entity entity = provider.read((EdmEntitySet)edmBindungTarget, keys); + final Entity entity = provider.read((EdmEntitySet) edmBindungTarget, keys); if (entity == null) { throw new DataProviderException("Entity not found", HttpStatusCode.NOT_FOUND); @@ -186,62 +186,62 @@ public class RequestValidator { } } - private void validateEntitySetProperties(final List<Property> properties, final EdmBindingTarget edmBindingTarget, + private void validateEntitySetProperties(final List<Property> properties, final EdmBindingTarget edmBindingTarget, final EdmEntityType edmType, final List<String> path) throws DataProviderException { validateProperties(properties, edmBindingTarget, edmType, edmType.getKeyPredicateNames(), path); } - - private void validateProperties(final List<Property> properties, final EdmBindingTarget edmBingingTarget, - final EdmStructuredType edmType, final List<String> keyPredicateNames, final List<String> path) - throws DataProviderException { - - for(final String propertyName : edmType.getPropertyNames()) { + + private void validateProperties(final List<Property> properties, final EdmBindingTarget edmBingingTarget, + final EdmStructuredType edmType, final List<String> keyPredicateNames, final List<String> path) + throws DataProviderException { + + for (final String propertyName : edmType.getPropertyNames()) { final EdmProperty edmProperty = (EdmProperty) edmType.getProperty(propertyName); - + // Ignore key properties, they are set automatically - if(!keyPredicateNames.contains(propertyName)) { + if (!keyPredicateNames.contains(propertyName)) { final Property property = getProperty(properties, propertyName); - + // Check if all "not nullable" properties are set - if(!edmProperty.isNullable()) { - if((property != null && property.isNull()) // Update,insert; Property is explicit set to null - || (isInsert && property == null) // Insert; Property not provided - || (!isInsert && !isPatch && property == null)) { // Insert(Put); Property not provided - throw new DataProviderException("Property " + propertyName + " must not be null", + if (!edmProperty.isNullable()) { + if ((property != null && property.isNull()) // Update,insert; Property is explicit set to null + || (isInsert && property == null) // Insert; Property not provided + || (!isInsert && !isPatch && property == null)) { // Insert(Put); Property not provided + throw new DataProviderException("Property " + propertyName + " must not be null", HttpStatusCode.BAD_REQUEST); } } - + // Validate property value validatePropertyValue(property, edmProperty, edmBingingTarget, path); } } } - - private void validatePropertyValue(final Property property, final EdmProperty edmProperty, + + private void validatePropertyValue(final Property property, final EdmProperty edmProperty, final EdmBindingTarget edmBindingTarget, final List<String> path) throws DataProviderException { - + final ArrayList<String> newPath = new ArrayList<String>(path); newPath.add(edmProperty.getName()); if (edmProperty.isCollection()) { if (edmProperty.getType() instanceof EdmComplexType && property != null) { for (final Object value : property.asCollection()) { - validateComplexValue((ComplexValue) value, - edmBindingTarget, - (EdmComplexType) edmProperty.getType(), - newPath); + validateComplexValue((ComplexValue) value, + edmBindingTarget, + (EdmComplexType) edmProperty.getType(), + newPath); } } } else if (edmProperty.getType() instanceof EdmComplexType) { - validateComplexValue((property == null) ? null : property.asComplex(), - edmBindingTarget, - (EdmComplexType) edmProperty.getType(), - newPath); + validateComplexValue((property == null) ? null : property.asComplex(), + edmBindingTarget, + (EdmComplexType) edmProperty.getType(), + newPath); } } - private void validateComplexValue(final ComplexValue value, final EdmBindingTarget edmBindingTarget, + private void validateComplexValue(final ComplexValue value, final EdmBindingTarget edmBindingTarget, final EdmComplexType edmType, final List<String> path) throws DataProviderException { // The whole complex property can be nullable but nested primitive, navigation properties can be not nullable final List<Property> properties = (value == null) ? new ArrayList<Property>() : value.getValue(); @@ -251,15 +251,15 @@ public class RequestValidator { } private Property getProperty(final List<Property> properties, final String name) { - for(final Property property : properties) { - if(property.getName().equals(name)) { + for (final Property property : properties) { + if (property.getName().equals(name)) { return property; } } - + return null; } - + private static enum ValidatioResult { FOUND, NOT_FOUND, http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalBatchProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalBatchProcessor.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalBatchProcessor.java index d2c4286..83e9525 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalBatchProcessor.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalBatchProcessor.java @@ -40,19 +40,19 @@ import org.apache.olingo.server.tecsvc.data.DataProvider; public class TechnicalBatchProcessor extends TechnicalProcessor implements BatchProcessor { private static final String PREFERENCE_CONTINUE_ON_ERROR = "odata.continue-on-error"; - public TechnicalBatchProcessor(DataProvider dataProvider) { + public TechnicalBatchProcessor(final DataProvider dataProvider) { super(dataProvider); } @Override - public void processBatch(BatchFacade facade, ODataRequest request, ODataResponse response) + public void processBatch(final BatchFacade facade, final ODataRequest request, final ODataResponse response) throws BatchSerializerException, BatchDeserializerException { boolean continueOnError = isContinueOnError(request); final String boundary = facade.extractBoundaryFromContentType(request.getHeader(HttpHeader.CONTENT_TYPE)); final BatchOptions options = BatchOptions.with() - .rawBaseUri(request.getRawBaseUri()) - .rawServiceResolutionUri(request.getRawServiceResolutionUri()).build(); + .rawBaseUri(request.getRawBaseUri()) + .rawServiceResolutionUri(request.getRawServiceResolutionUri()).build(); final List<BatchRequestPart> parts = odata.createFixedFormatDeserializer().parseBatchRequest(request.getBody(), boundary, options); final List<ODataResponsePart> responseParts = new ArrayList<ODataResponsePart>(); @@ -79,7 +79,7 @@ public class TechnicalBatchProcessor extends TechnicalProcessor implements Batch response.setStatusCode(HttpStatusCode.ACCEPTED.getStatusCode()); } - private boolean isContinueOnError(ODataRequest request) { + private boolean isContinueOnError(final ODataRequest request) { final List<String> preferValues = request.getHeaders(HttpHeader.PREFER); if (preferValues != null) { @@ -93,8 +93,8 @@ public class TechnicalBatchProcessor extends TechnicalProcessor implements Batch } @Override - public ODataResponsePart processChangeSet(BatchFacade facade, List<ODataRequest> requests) - throws BatchDeserializerException { + public ODataResponsePart processChangeSet(final BatchFacade facade, final List<ODataRequest> requests) + throws BatchDeserializerException { List<ODataResponse> responses = new ArrayList<ODataResponse>(); for (ODataRequest request : requests) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/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 024628c..9eb9800 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 @@ -78,12 +78,12 @@ public class TechnicalEntityProcessor extends TechnicalProcessor EntityProcessor, ActionEntityProcessor, MediaEntityProcessor, ActionVoidProcessor { - public TechnicalEntityProcessor(final DataProvider dataProvider, ServiceMetadata serviceMetadata) { + public TechnicalEntityProcessor(final DataProvider dataProvider, final ServiceMetadata serviceMetadata) { super(dataProvider, serviceMetadata); } @Override - public void readEntityCollection(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, + public void readEntityCollection(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType requestedContentType) throws ODataApplicationException, SerializerException { validateOptions(uriInfo.asUriInfoResource()); @@ -131,7 +131,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor // Serialize response.setContent(serializer.entityCollection( - this.serviceMetadata, + serviceMetadata, edmEntityType, entitySetSerialization, EntityCollectionSerializerOptions.with() @@ -178,7 +178,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor } @Override - public void countEntityCollection(final ODataRequest request, ODataResponse response, final UriInfo uriInfo) + public void countEntityCollection(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo) throws ODataApplicationException, SerializerException { validateOptions(uriInfo.asUriInfoResource()); getEdmEntitySet(uriInfo); // including checks @@ -194,7 +194,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor } @Override - public void readEntity(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, + public void readEntity(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType requestedContentType) throws ODataApplicationException, SerializerException { validateOptions(uriInfo.asUriInfoResource()); final EdmEntitySet edmEntitySet = getEdmEntitySet(uriInfo); @@ -215,7 +215,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor expandHandler.applyExpandQueryOptions(entitySerialization, edmEntitySet, expand); response.setContent(serializer.entity( - this.serviceMetadata, + serviceMetadata, edmEntitySet.getEntityType(), entitySerialization, EntitySerializerOptions.with() @@ -228,7 +228,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor } @Override - public void readMediaEntity(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, + public void readMediaEntity(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType responseFormat) throws ODataApplicationException, SerializerException { getEdmEntitySet(uriInfo); // including checks final Entity entity = readEntity(uriInfo); @@ -238,14 +238,14 @@ public class TechnicalEntityProcessor extends TechnicalProcessor } @Override - public void createMediaEntity(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, + public void createMediaEntity(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat) throws ODataApplicationException, DeserializerException, SerializerException { createEntity(request, response, uriInfo, requestFormat, responseFormat); } @Override - public void createEntity(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, + public void createEntity(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat) throws ODataApplicationException, DeserializerException, SerializerException { if (uriInfo.asUriInfoResource().getUriResourceParts().size() > 1) { @@ -279,7 +279,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor final ODataFormat format = ODataFormat.fromContentType(responseFormat); ODataSerializer serializer = odata.createSerializer(format); - response.setContent(serializer.entity(this.serviceMetadata, edmEntityType, entity, + response.setContent(serializer.entity(serviceMetadata, edmEntityType, entity, EntitySerializerOptions.with() .contextURL(format == ODataFormat.JSON_NO_METADATA ? null : getContextUrl(edmEntitySet, edmEntityType, true, null, null)) @@ -326,7 +326,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor } @Override - public void updateMediaEntity(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, + public void updateMediaEntity(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat) throws ODataApplicationException, DeserializerException, SerializerException { getEdmEntitySet(uriInfo); // including checks @@ -338,7 +338,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor } @Override - public void deleteEntity(final ODataRequest request, ODataResponse response, final UriInfo uriInfo) + public void deleteEntity(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo) throws ODataApplicationException { final EdmEntitySet edmEntitySet = getEdmEntitySet(uriInfo); final Entity entity = readEntity(uriInfo); @@ -347,7 +347,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor } @Override - public void processActionEntity(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, + public void processActionEntity(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat) throws ODataApplicationException, DeserializerException, SerializerException { EdmAction action = checkBoundAndExtractAction(uriInfo); @@ -372,9 +372,9 @@ public class TechnicalEntityProcessor extends TechnicalProcessor SerializerResult result = odata.createSerializer(ODataFormat.fromContentType(responseFormat)) .entity(serviceMetadata, type, entityResult.getEntity(), options); - if(entityResult.isCreated()){ + if (entityResult.isCreated()) { response.setStatusCode(HttpStatusCode.CREATED.getStatusCode()); - }else{ + } else { response.setStatusCode(HttpStatusCode.OK.getStatusCode()); } response.setContent(result.getContent()); @@ -383,7 +383,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor } @Override - public void processActionVoid(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, + public void processActionVoid(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat) throws ODataApplicationException, DeserializerException { final UriResourceAction resource = ((UriResourceAction) uriInfo.getUriResourceParts().get(uriInfo.getUriResourceParts().size() - 1)); @@ -396,7 +396,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode()); } - private void setCount(EntityCollection entitySet) { + private void setCount(final EntityCollection entitySet) { if (entitySet.getCount() == null) { entitySet.setCount(entitySet.getEntities().size()); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/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 d847b32..0d911f0 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 @@ -85,18 +85,18 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor ComplexCollectionProcessor, ActionComplexCollectionProcessor { public TechnicalPrimitiveComplexProcessor(final DataProvider dataProvider, - ServiceMetadata serviceMetadata) { + final ServiceMetadata serviceMetadata) { super(dataProvider, serviceMetadata); } @Override - public void readPrimitive(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, + public void readPrimitive(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType contentType) throws ODataApplicationException, SerializerException { readProperty(response, uriInfo, contentType, RepresentationType.PRIMITIVE); } @Override - public void updatePrimitive(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, + public void updatePrimitive(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat) throws ODataApplicationException, DeserializerException, SerializerException { throw new ODataApplicationException("Not supported yet.", @@ -104,7 +104,7 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor } @Override - public void deletePrimitive(final ODataRequest request, ODataResponse response, final UriInfo uriInfo) + public void deletePrimitive(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo) throws ODataApplicationException { deleteProperty(response, uriInfo); } @@ -141,7 +141,7 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor } @Override - public void readPrimitiveCollection(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, + public void readPrimitiveCollection(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType contentType) throws ODataApplicationException, SerializerException { readProperty(response, uriInfo, contentType, RepresentationType.COLLECTION_PRIMITIVE); } @@ -155,8 +155,9 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor } @Override - public void deletePrimitiveCollection(final ODataRequest request, ODataResponse response, final UriInfo uriInfo) - throws ODataApplicationException { + public void + deletePrimitiveCollection(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo) + throws ODataApplicationException { deleteProperty(response, uriInfo); } @@ -193,7 +194,7 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor } @Override - public void readComplex(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, + public void readComplex(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType contentType) throws ODataApplicationException, SerializerException { readProperty(response, uriInfo, contentType, RepresentationType.COMPLEX); } @@ -207,8 +208,8 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor } @Override - public void processActionComplex(ODataRequest request, ODataResponse response, UriInfo uriInfo, - ContentType requestFormat, ContentType responseFormat) + public void processActionComplex(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, + final ContentType requestFormat, final ContentType responseFormat) throws ODataApplicationException, DeserializerException, SerializerException { EdmAction action = checkBoundAndExtractAction(uriInfo); DeserializerResult deserializerResult = @@ -245,7 +246,7 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor } @Override - public void readComplexCollection(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, + public void readComplexCollection(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType contentType) throws ODataApplicationException, SerializerException { readProperty(response, uriInfo, contentType, RepresentationType.COLLECTION_COMPLEX); } @@ -259,8 +260,8 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor } @Override - public void processActionComplexCollection(ODataRequest request, ODataResponse response, - UriInfo uriInfo, ContentType requestFormat, ContentType responseFormat) + public void processActionComplexCollection(final ODataRequest request, final ODataResponse response, + final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat) throws ODataApplicationException, DeserializerException, SerializerException { EdmAction action = checkBoundAndExtractAction(uriInfo); DeserializerResult deserializerResult = @@ -291,7 +292,7 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor } @Override - public void deleteComplexCollection(final ODataRequest request, ODataResponse response, final UriInfo uriInfo) + public void deleteComplexCollection(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo) throws ODataApplicationException { deleteProperty(response, uriInfo); } @@ -345,7 +346,7 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor .build()).getContent()); break; case COMPLEX: - response.setContent(serializer.complex(this.serviceMetadata, (EdmComplexType) type, property, + response.setContent(serializer.complex(serviceMetadata, (EdmComplexType) type, property, ComplexSerializerOptions.with().contextURL(contextURL) .expand(expand).select(select) .build()).getContent()); @@ -361,7 +362,7 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor .build()).getContent()); break; case COLLECTION_COMPLEX: - response.setContent(serializer.complexCollection(this.serviceMetadata, (EdmComplexType) type, property, + response.setContent(serializer.complexCollection(serviceMetadata, (EdmComplexType) type, property, ComplexSerializerOptions.with().contextURL(contextURL) .expand(expand).select(select) .build()).getContent()); @@ -454,7 +455,7 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor } @Override - public void readPrimitiveValue(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, + public void readPrimitiveValue(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType contentType) throws ODataApplicationException, SerializerException { final UriInfoResource resource = uriInfo.asUriInfoResource(); validateOptions(resource); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java index f2a1f23..ef0d7bc 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java @@ -57,8 +57,8 @@ public abstract class TechnicalProcessor implements Processor { protected TechnicalProcessor(final DataProvider dataProvider) { this.dataProvider = dataProvider; } - - protected TechnicalProcessor(final DataProvider dataProvider, ServiceMetadata serviceMetadata) { + + protected TechnicalProcessor(final DataProvider dataProvider, final ServiceMetadata serviceMetadata) { this.dataProvider = dataProvider; this.serviceMetadata = serviceMetadata; } @@ -67,8 +67,8 @@ public abstract class TechnicalProcessor implements Processor { public void init(final OData odata, final ServiceMetadata serviceMetadata) { this.odata = odata; this.serviceMetadata = serviceMetadata; - this.dataProvider.setOData(odata); - this.dataProvider.setEdm(serviceMetadata.getEdm()); + dataProvider.setOData(odata); + dataProvider.setEdm(serviceMetadata.getEdm()); } protected EdmEntitySet getEdmEntitySet(final UriInfoResource uriInfo) throws ODataApplicationException { @@ -215,7 +215,7 @@ public abstract class TechnicalProcessor implements Processor { HttpStatusCode.NOT_IMPLEMENTED.getStatusCode(), Locale.ROOT); } } - + protected EdmAction checkBoundAndExtractAction(final UriInfo uriInfo) throws ODataApplicationException { final UriInfoResource resource = uriInfo.asUriInfoResource(); List<UriResource> uriResourceParts = resource.getUriResourceParts(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/ExpandSystemQueryOptionHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/ExpandSystemQueryOptionHandler.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/ExpandSystemQueryOptionHandler.java index f68af3b..f9ac6e7 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/ExpandSystemQueryOptionHandler.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/ExpandSystemQueryOptionHandler.java @@ -59,7 +59,8 @@ public class ExpandSystemQueryOptionHandler { } } - public void applyExpandQueryOptions(Entity entity, EdmEntitySet edmEntitySet, ExpandOption expandOption) + public void applyExpandQueryOptions(final Entity entity, final EdmEntitySet edmEntitySet, + final ExpandOption expandOption) throws ODataApplicationException { if (expandOption == null) { return; @@ -128,7 +129,7 @@ public class ExpandSystemQueryOptionHandler { return newEntitySet; } - public Entity transformEntityGraphToTree(final Entity entity, EdmBindingTarget edmEntitySet, + public Entity transformEntityGraphToTree(final Entity entity, final EdmBindingTarget edmEntitySet, final ExpandOption expand) throws ODataApplicationException { final Entity newEntity = newEntity(entity); if (hasExpandItems(expand)) { @@ -190,7 +191,7 @@ public class ExpandSystemQueryOptionHandler { return newEntity; } - private Link newLink(Link link) { + private Link newLink(final Link link) { final Link newLink = new Link(); newLink.setMediaETag(link.getMediaETag()); newLink.setTitle(link.getTitle()); @@ -200,11 +201,11 @@ public class ExpandSystemQueryOptionHandler { return newLink; } - private boolean hasExpandItems(ExpandOption expand) { + private boolean hasExpandItems(final ExpandOption expand) { return expand != null && expand.getExpandItems() != null && !expand.getExpandItems().isEmpty(); } - private boolean expandAll(ExpandOption expand) { + private boolean expandAll(final ExpandOption expand) { for (final ExpandItem item : expand.getExpandItems()) { if (item.isStar()) { return true; @@ -213,7 +214,7 @@ public class ExpandSystemQueryOptionHandler { return false; } - private Set<String> getExpandedPropertyNames(List<ExpandItem> expandItems) throws ODataApplicationException { + private Set<String> getExpandedPropertyNames(final List<ExpandItem> expandItems) throws ODataApplicationException { Set<String> expanded = new HashSet<String>(); for (final ExpandItem item : expandItems) { final List<UriResource> resourceParts = item.getResourcePath().getUriResourceParts(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/ExpressionVisitorImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/ExpressionVisitorImpl.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/ExpressionVisitorImpl.java index 9c035a8..69ab34a 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/ExpressionVisitorImpl.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/ExpressionVisitorImpl.java @@ -48,15 +48,14 @@ import org.apache.olingo.server.tecsvc.processor.queryoptions.expression.operati public class ExpressionVisitorImpl implements ExpressionVisitor<VisitorOperand> { final private Entity entity; - final private EdmBindingTarget bindingTarget; - public ExpressionVisitorImpl(Entity entity, EdmBindingTarget bindingTarget) { + public ExpressionVisitorImpl(final Entity entity, final EdmBindingTarget bindingTarget) { this.entity = entity; - this.bindingTarget = bindingTarget; } @Override - public VisitorOperand visitBinaryOperator(BinaryOperatorKind operator, VisitorOperand left, VisitorOperand right) + public VisitorOperand visitBinaryOperator(final BinaryOperatorKind operator, final VisitorOperand left, + final VisitorOperand right) throws ExpressionVisitException, ODataApplicationException { final BinaryOperator binaryOperator = new BinaryOperator(left, right); @@ -90,7 +89,7 @@ public class ExpressionVisitorImpl implements ExpressionVisitor<VisitorOperand> } @Override - public VisitorOperand visitUnaryOperator(UnaryOperatorKind operator, VisitorOperand operand) + public VisitorOperand visitUnaryOperator(final UnaryOperatorKind operator, final VisitorOperand operand) throws ExpressionVisitException, ODataApplicationException { final UnaryOperator unaryOperator = new UnaryOperator(operand); @@ -107,7 +106,7 @@ public class ExpressionVisitorImpl implements ExpressionVisitor<VisitorOperand> } @Override - public VisitorOperand visitMethodCall(MethodKind methodCall, List<VisitorOperand> parameters) + public VisitorOperand visitMethodCall(final MethodKind methodCall, final List<VisitorOperand> parameters) throws ExpressionVisitException, ODataApplicationException { final MethodCallOperator methodCallOperation = new MethodCallOperator(parameters); @@ -160,20 +159,21 @@ public class ExpressionVisitorImpl implements ExpressionVisitor<VisitorOperand> } @Override - public VisitorOperand visitLambdaExpression(String lambdaFunction, String lambdaVariable, Expression expression) + public VisitorOperand visitLambdaExpression(final String lambdaFunction, final String lambdaVariable, + final Expression expression) throws ExpressionVisitException, ODataApplicationException { return throwNotImplemented(); } @Override - public VisitorOperand visitLiteral(String literal) throws ExpressionVisitException, ODataApplicationException { + public VisitorOperand visitLiteral(final String literal) throws ExpressionVisitException, ODataApplicationException { return new UntypedOperand(literal); } @Override - public VisitorOperand visitMember(UriInfoResource member) throws ExpressionVisitException, + public VisitorOperand visitMember(final UriInfoResource member) throws ExpressionVisitException, ODataApplicationException { final List<UriResource> uriResourceParts = member.getUriResourceParts(); @@ -203,23 +203,25 @@ public class ExpressionVisitorImpl implements ExpressionVisitor<VisitorOperand> } @Override - public VisitorOperand visitAlias(String aliasName) throws ExpressionVisitException, ODataApplicationException { + public VisitorOperand visitAlias(final String aliasName) throws ExpressionVisitException, ODataApplicationException { return throwNotImplemented(); } @Override - public VisitorOperand visitTypeLiteral(EdmType type) throws ExpressionVisitException, ODataApplicationException { + public VisitorOperand visitTypeLiteral(final EdmType type) throws ExpressionVisitException, + ODataApplicationException { return throwNotImplemented(); } @Override - public VisitorOperand visitLambdaReference(String variableName) throws ExpressionVisitException, + public VisitorOperand visitLambdaReference(final String variableName) throws ExpressionVisitException, ODataApplicationException { return throwNotImplemented(); } @Override - public VisitorOperand visitEnum(EdmEnumType type, List<String> enumValues) throws ExpressionVisitException, + public VisitorOperand visitEnum(final EdmEnumType type, final List<String> enumValues) + throws ExpressionVisitException, ODataApplicationException { return throwNotImplemented(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operand/TypedOperand.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operand/TypedOperand.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operand/TypedOperand.java index 6391390..17097c9 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operand/TypedOperand.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operand/TypedOperand.java @@ -34,13 +34,13 @@ public class TypedOperand extends VisitorOperand { final private EdmType type; final private EdmProperty edmProperty; - public TypedOperand(Object value, EdmType type) { + public TypedOperand(final Object value, final EdmType type) { super(value); this.type = type; - this.edmProperty = null; + edmProperty = null; } - public TypedOperand(Object value, EdmType type, EdmProperty edmProperty) { + public TypedOperand(final Object value, final EdmType type, final EdmProperty edmProperty) { super(value); this.type = type; this.edmProperty = edmProperty; @@ -55,7 +55,7 @@ public class TypedOperand extends VisitorOperand { } @Override - public TypedOperand asTypedOperand(EdmPrimitiveType... asTypes) throws ODataApplicationException { + public TypedOperand asTypedOperand(final EdmPrimitiveType... asTypes) throws ODataApplicationException { if (type.equals(EdmNull.getInstance())) { return this; } else if (isNull()) { @@ -90,7 +90,7 @@ public class TypedOperand extends VisitorOperand { throw new ODataApplicationException("Cast failed ", HttpStatusCode.BAD_REQUEST.getStatusCode(), Locale.ROOT); } - public TypedOperand castToCommonType(VisitorOperand otherOperand) throws ODataApplicationException { + public TypedOperand castToCommonType(final VisitorOperand otherOperand) throws ODataApplicationException { final TypedOperand other = otherOperand.asTypedOperand(); final EdmType oType = other.getType(); @@ -128,7 +128,7 @@ public class TypedOperand extends VisitorOperand { return type; } - public <T> T getTypedValue(Class<T> clazz) { + public <T> T getTypedValue(final Class<T> clazz) { return clazz.cast(value); } @@ -156,7 +156,7 @@ public class TypedOperand extends VisitorOperand { primDecimal); } - public boolean is(EdmPrimitiveType... types) { + public boolean is(final EdmPrimitiveType... types) { if (isNullLiteral()) { return true; } @@ -175,7 +175,7 @@ public class TypedOperand extends VisitorOperand { return edmProperty; } - private String getLiteral(Object value) throws EdmPrimitiveTypeException { + private String getLiteral(final Object value) throws EdmPrimitiveTypeException { final EdmProperty edmProperty = getEdmProperty(); String uriLiteral = null; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operand/VisitorOperand.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operand/VisitorOperand.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operand/VisitorOperand.java index 5c0e65a..5b2a808 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operand/VisitorOperand.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operand/VisitorOperand.java @@ -65,7 +65,7 @@ public abstract class VisitorOperand { primDecimal = oData.createPrimitiveTypeInstance(EdmPrimitiveTypeKind.Decimal); primSingle = oData.createPrimitiveTypeInstance(EdmPrimitiveTypeKind.Single); primDouble = oData.createPrimitiveTypeInstance(EdmPrimitiveTypeKind.Double); - + defaultTypeMapping.put(primByte, BigInteger.class); defaultTypeMapping.put(primSByte, BigInteger.class); defaultTypeMapping.put(primInt16, BigInteger.class); @@ -77,7 +77,7 @@ public abstract class VisitorOperand { defaultTypeMapping.put(primDecimal, BigDecimal.class); } - public VisitorOperand(Object value) { + public VisitorOperand(final Object value) { this.value = value; } @@ -91,7 +91,7 @@ public abstract class VisitorOperand { return value; } - protected Object castTo(final String value, EdmPrimitiveType type) throws EdmPrimitiveTypeException { + protected Object castTo(final String value, final EdmPrimitiveType type) throws EdmPrimitiveTypeException { final EdmProperty edmProperty = getEdmProperty(); if (edmProperty != null) { @@ -103,7 +103,7 @@ public abstract class VisitorOperand { } } - protected Class<?> getDefaultType(EdmPrimitiveType type) { + protected Class<?> getDefaultType(final EdmPrimitiveType type) { return defaultTypeMapping.get(type) != null ? defaultTypeMapping.get(type) : type.getDefaultType(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operation/BinaryOperator.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operation/BinaryOperator.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operation/BinaryOperator.java index 6d49243..7465ab8 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operation/BinaryOperator.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operation/BinaryOperator.java @@ -54,7 +54,7 @@ public class BinaryOperator { private static final int EQUALS = 0; private static final int LESS_THAN = -1; private static final int GREATER_THAN = 1; - + protected static final OData oData; protected static final EdmPrimitiveType primString; protected static final EdmPrimitiveType primBoolean; @@ -168,7 +168,7 @@ public class BinaryOperator { return new TypedOperand(result, primBoolean); } - private boolean binaryComparison(int... expect) { + private boolean binaryComparison(final int... expect) { int result; if (left.isNull() && right.isNull()) { @@ -192,7 +192,7 @@ public class BinaryOperator { return false; } - public VisitorOperand arithmeticOperator(BinaryOperatorKind operator) throws ODataApplicationException { + public VisitorOperand arithmeticOperator(final BinaryOperatorKind operator) throws ODataApplicationException { if (left.isNull() || right.isNull()) { return new TypedOperand(new Object(), EdmNull.getInstance()); } else { @@ -211,7 +211,7 @@ public class BinaryOperator { } } - private EdmType determineResultType(final Number arithmeticResult, TypedOperand leftOperand) { + private EdmType determineResultType(final Number arithmeticResult, final TypedOperand leftOperand) { // Left and right operand have the same typed, so it is enough to check the type of the left operand if (leftOperand.isDecimalType()) { final BigDecimal value = (BigDecimal) arithmeticResult; @@ -243,7 +243,7 @@ public class BinaryOperator { } } - private VisitorOperand dateArithmeticOperation(BinaryOperatorKind operator) throws ODataApplicationException { + private VisitorOperand dateArithmeticOperation(final BinaryOperatorKind operator) throws ODataApplicationException { VisitorOperand result = null; if (left.is(primDate)) { @@ -302,7 +302,7 @@ public class BinaryOperator { } } - private BigDecimal decimalArithmeticOperation(BinaryOperatorKind operator) throws ODataApplicationException { + private BigDecimal decimalArithmeticOperation(final BinaryOperatorKind operator) throws ODataApplicationException { final BigDecimal left = this.left.getTypedValue(BigDecimal.class); final BigDecimal right = this.right.getTypedValue(BigDecimal.class); @@ -321,7 +321,7 @@ public class BinaryOperator { } } - private BigInteger integerArithmeticOperation(BinaryOperatorKind operator) throws ODataApplicationException { + private BigInteger integerArithmeticOperation(final BinaryOperatorKind operator) throws ODataApplicationException { final BigInteger left = this.left.getTypedValue(BigInteger.class); final BigInteger right = this.right.getTypedValue(BigInteger.class);
