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/MethodCallOperator.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operation/MethodCallOperator.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operation/MethodCallOperator.java index 5f8575b..763d458 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operation/MethodCallOperator.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operation/MethodCallOperator.java @@ -73,17 +73,17 @@ public class MethodCallOperator { primSingle = oData.createPrimitiveTypeInstance(EdmPrimitiveTypeKind.Single); primDouble = oData.createPrimitiveTypeInstance(EdmPrimitiveTypeKind.Double); } - + final private List<VisitorOperand> parameters; - public MethodCallOperator(List<VisitorOperand> parameters) { + public MethodCallOperator(final List<VisitorOperand> parameters) { this.parameters = parameters; } public VisitorOperand endsWith() throws ODataApplicationException { return stringFunction(new StringFunction() { @Override - public Object perform(List<String> params) { + public Object perform(final List<String> params) { return params.get(0).endsWith(params.get(1)); } }, primBoolean); @@ -92,7 +92,7 @@ public class MethodCallOperator { public VisitorOperand indexOf() throws ODataApplicationException { return stringFunction(new StringFunction() { @Override - public Object perform(List<String> params) { + public Object perform(final List<String> params) { // If the first string do not contain the second string, return -1. See OASIS JIRA ODATA-780 return params.get(0).indexOf(params.get(1)); } @@ -102,7 +102,7 @@ public class MethodCallOperator { public VisitorOperand startsWith() throws ODataApplicationException { return stringFunction(new StringFunction() { @Override - public Object perform(List<String> params) { + public Object perform(final List<String> params) { return params.get(0).startsWith(params.get(1)); } }, primBoolean); @@ -111,7 +111,7 @@ public class MethodCallOperator { public VisitorOperand toLower() throws ODataApplicationException { return stringFunction(new StringFunction() { @Override - public Object perform(List<String> params) { + public Object perform(final List<String> params) { return params.get(0).toLowerCase(); } }, primString); @@ -120,7 +120,7 @@ public class MethodCallOperator { public VisitorOperand toUpper() throws ODataApplicationException { return stringFunction(new StringFunction() { @Override - public Object perform(List<String> params) { + public Object perform(final List<String> params) { return params.get(0).toUpperCase(); } }, primString); @@ -129,7 +129,7 @@ public class MethodCallOperator { public VisitorOperand trim() throws ODataApplicationException { return stringFunction(new StringFunction() { @Override - public Object perform(List<String> params) { + public Object perform(final List<String> params) { return params.get(0).trim(); } }, primString); @@ -147,7 +147,7 @@ public class MethodCallOperator { final String value = valueOperand.getTypedValue(String.class); int start = Math.min(startOperand.getTypedValue(BigInteger.class).intValue(), value.length()); start = start < 0 ? 0 : start; - + int end = value.length(); if (parameters.size() == 3) { @@ -175,7 +175,7 @@ public class MethodCallOperator { public VisitorOperand contains() throws ODataApplicationException { return stringFunction(new StringFunction() { @Override - public Object perform(List<String> params) { + public Object perform(final List<String> params) { return params.get(0).contains(params.get(1)); } }, primBoolean); @@ -184,7 +184,7 @@ public class MethodCallOperator { public VisitorOperand concat() throws ODataApplicationException { return stringFunction(new StringFunction() { @Override - public Object perform(List<String> params) { + public Object perform(final List<String> params) { return params.get(0) + params.get(1); } }, primString); @@ -193,7 +193,7 @@ public class MethodCallOperator { public VisitorOperand length() throws ODataApplicationException { return stringFunction(new StringFunction() { @Override - public Object perform(List<String> params) { + public Object perform(final List<String> params) { return params.get(0).length(); } }, primInt32); @@ -202,7 +202,7 @@ public class MethodCallOperator { public VisitorOperand year() throws ODataApplicationException { return dateFunction(new DateFunction() { @Override - public Object perform(Calendar calendar, TypedOperand operand) { + public Object perform(final Calendar calendar, final TypedOperand operand) { return calendar.get(Calendar.YEAR); } }, primInt32, primDateTimeOffset, primDate); @@ -211,7 +211,7 @@ public class MethodCallOperator { public VisitorOperand month() throws ODataApplicationException { return dateFunction(new DateFunction() { @Override - public Object perform(Calendar calendar, TypedOperand operand) { + public Object perform(final Calendar calendar, final TypedOperand operand) { // Month is 0-based! return calendar.get(Calendar.MONTH) + 1; } @@ -221,7 +221,7 @@ public class MethodCallOperator { public VisitorOperand day() throws ODataApplicationException { return dateFunction(new DateFunction() { @Override - public Object perform(Calendar calendar, TypedOperand operand) { + public Object perform(final Calendar calendar, final TypedOperand operand) { return calendar.get(Calendar.DAY_OF_MONTH); } }, primInt32, primDateTimeOffset, primDate); @@ -230,7 +230,7 @@ public class MethodCallOperator { public VisitorOperand hour() throws ODataApplicationException { return dateFunction(new DateFunction() { @Override - public Object perform(Calendar calendar, TypedOperand operand) { + public Object perform(final Calendar calendar, final TypedOperand operand) { return calendar.get(Calendar.HOUR_OF_DAY); } }, primInt32, primDateTimeOffset, primTimeOfDay); @@ -239,7 +239,7 @@ public class MethodCallOperator { public VisitorOperand minute() throws ODataApplicationException { return dateFunction(new DateFunction() { @Override - public Object perform(Calendar calendar, TypedOperand operand) { + public Object perform(final Calendar calendar, final TypedOperand operand) { return calendar.get(Calendar.MINUTE); } }, primInt32, primDateTimeOffset, primTimeOfDay); @@ -248,7 +248,7 @@ public class MethodCallOperator { public VisitorOperand second() throws ODataApplicationException { return dateFunction(new DateFunction() { @Override - public Object perform(Calendar calendar, TypedOperand operand) { + public Object perform(final Calendar calendar, final TypedOperand operand) { return calendar.get(Calendar.SECOND); } }, primInt32, primDateTimeOffset, primTimeOfDay); @@ -257,7 +257,7 @@ public class MethodCallOperator { public VisitorOperand fractionalseconds() throws ODataApplicationException { return dateFunction(new DateFunction() { @Override - public Object perform(Calendar calendar, TypedOperand operand) { + public Object perform(final Calendar calendar, final TypedOperand operand) { if (operand.getValue() instanceof Timestamp) { return new BigDecimal(operand.getTypedValue(Timestamp.class).getNanos()).divide(BigDecimal .valueOf(1000 * 1000 * 1000)); @@ -312,7 +312,8 @@ public class MethodCallOperator { Object perform(Calendar calendar, TypedOperand operand); } - private VisitorOperand dateFunction(DateFunction f, EdmType returnType, EdmPrimitiveType... expectedTypes) + private VisitorOperand dateFunction(final DateFunction f, final EdmType returnType, + final EdmPrimitiveType... expectedTypes) throws ODataApplicationException { final TypedOperand operand = parameters.get(0).asTypedOperand(); @@ -340,7 +341,8 @@ public class MethodCallOperator { } } - private VisitorOperand stringFunction(StringFunction f, EdmType returnValue) throws ODataApplicationException { + private VisitorOperand stringFunction(final StringFunction f, final EdmType returnValue) + throws ODataApplicationException { List<String> stringParameters = getParametersAsString(); if (stringParameters.contains(null)) { return new TypedOperand(null, returnValue);
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/UnaryOperator.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operation/UnaryOperator.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operation/UnaryOperator.java index 5e0c2bc..95b2fbc 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operation/UnaryOperator.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operation/UnaryOperator.java @@ -1,24 +1,23 @@ -/* +/* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * regarding copyright ownership. The ASF licenses this file * 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 - * + * 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 - * KIND, either express or implied. See the License for the + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ package org.apache.olingo.server.tecsvc.processor.queryoptions.expression.operation; - import java.math.BigDecimal; import java.math.BigInteger; import java.util.Locale; @@ -32,7 +31,7 @@ import org.apache.olingo.server.tecsvc.processor.queryoptions.expression.operand import org.apache.olingo.server.tecsvc.processor.queryoptions.expression.operand.VisitorOperand; public class UnaryOperator { - + protected static final OData oData; protected static final EdmPrimitiveType primBoolean; protected static final EdmPrimitiveType primDuration; @@ -42,10 +41,10 @@ public class UnaryOperator { primBoolean = oData.createPrimitiveTypeInstance(EdmPrimitiveTypeKind.Boolean); primDuration = oData.createPrimitiveTypeInstance(EdmPrimitiveTypeKind.Duration); } - + final private TypedOperand operand; - public UnaryOperator(VisitorOperand operand) throws ODataApplicationException { + public UnaryOperator(final VisitorOperand operand) throws ODataApplicationException { this.operand = operand.asTypedOperand(); } 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/primitive/EdmNull.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/primitive/EdmNull.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/primitive/EdmNull.java index 156e2cb..ae0f514 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/primitive/EdmNull.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/primitive/EdmNull.java @@ -1,18 +1,18 @@ -/* +/* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * regarding copyright ownership. The ASF licenses this file * 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 - * + * 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 - * KIND, either express or implied. See the License for the + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ @@ -23,20 +23,19 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; - public final class EdmNull implements EdmPrimitiveType { - + private static final EdmNull instance = new EdmNull(); - + public static EdmNull getInstance() { return instance; } - + @Override public Class<?> getDefaultType() { return Object.class; } - + protected String uriPrefix = ""; protected String uriSuffix = ""; @@ -118,8 +117,9 @@ public final class EdmNull implements EdmPrimitiveType { return new FullQualifiedName(getNamespace(), getName()).getFullQualifiedNameAsString(); } - protected <T> T internalValueOfString(String value, Boolean isNullable, Integer maxLength, Integer precision, - Integer scale, Boolean isUnicode, Class<T> returnType) throws EdmPrimitiveTypeException { + protected <T> T internalValueOfString(final String value, final Boolean isNullable, final Integer maxLength, + final Integer precision, + final Integer scale, final Boolean isUnicode, final Class<T> returnType) throws EdmPrimitiveTypeException { if (!value.equals("null")) { throw new EdmPrimitiveTypeException("The literal '" + value + "' has illegal content."); } @@ -131,8 +131,9 @@ public final class EdmNull implements EdmPrimitiveType { } } - protected <T> String internalValueToString(T value, Boolean isNullable, Integer maxLength, Integer precision, - Integer scale, Boolean isUnicode) throws EdmPrimitiveTypeException { + protected <T> String internalValueToString(final T value, final Boolean isNullable, final Integer maxLength, + final Integer precision, + final Integer scale, final Boolean isUnicode) throws EdmPrimitiveTypeException { return "null"; } @@ -160,5 +161,5 @@ public final class EdmNull implements EdmPrimitiveType { public EdmTypeKind getKind() { return EdmTypeKind.PRIMITIVE; } - + } 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/options/CountHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/CountHandler.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/CountHandler.java index cfe79ec..f82ec0d 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/CountHandler.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/CountHandler.java @@ -23,7 +23,7 @@ import org.apache.olingo.server.api.uri.queryoption.CountOption; public class CountHandler { public static void applyCountSystemQueryOption(final CountOption countOption, final EntityCollection entitySet) { - if(countOption != null && countOption.getValue()) { + if (countOption != null && countOption.getValue()) { 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/queryoptions/options/FilterHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/FilterHandler.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/FilterHandler.java index 3db6b98..eb809af 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/FilterHandler.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/FilterHandler.java @@ -36,17 +36,17 @@ import org.apache.olingo.server.tecsvc.processor.queryoptions.expression.operand import org.apache.olingo.server.tecsvc.processor.queryoptions.expression.operand.VisitorOperand; public class FilterHandler { - + protected static final OData oData; protected static final EdmPrimitiveType primBoolean; - + static { oData = OData.newInstance(); primBoolean = oData.createPrimitiveTypeInstance(EdmPrimitiveTypeKind.Boolean); } - public static void applyFilterSystemQuery(FilterOption filterOption, EntityCollection entitySet, - EdmBindingTarget edmEntitySet) throws ODataApplicationException { + public static void applyFilterSystemQuery(final FilterOption filterOption, final EntityCollection entitySet, + final EdmBindingTarget edmEntitySet) throws ODataApplicationException { if (filterOption == null) { return; 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/options/ServerSidePagingHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/ServerSidePagingHandler.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/ServerSidePagingHandler.java index 0871a33..9c6b688 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/ServerSidePagingHandler.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/ServerSidePagingHandler.java @@ -86,7 +86,7 @@ public class ServerSidePagingHandler { } } - private static int getPage(SkipTokenOption skipTokenOption) throws ODataApplicationException { + private static int getPage(final SkipTokenOption skipTokenOption) throws ODataApplicationException { if (skipTokenOption != null) { try { return Integer.parseInt(skipTokenOption.getValue()); 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/options/SkipHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/SkipHandler.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/SkipHandler.java index 835657b..73bf4b7 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/SkipHandler.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/SkipHandler.java @@ -30,7 +30,7 @@ import org.apache.olingo.server.api.uri.queryoption.SkipOption; public class SkipHandler { public static void applySkipSystemQueryHandler(final SkipOption skipOption, final EntityCollection entitySet) throws ODataApplicationException { - + if (skipOption != null) { if (skipOption.getValue() >= 0) { popAtMost(entitySet, skipOption.getValue()); 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/options/SystemQueryOptionsRuntimeException.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/SystemQueryOptionsRuntimeException.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/SystemQueryOptionsRuntimeException.java index c682795..57bb204 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/SystemQueryOptionsRuntimeException.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/SystemQueryOptionsRuntimeException.java @@ -24,7 +24,7 @@ public class SystemQueryOptionsRuntimeException extends ODataRuntimeException { private static final long serialVersionUID = 1L; - public SystemQueryOptionsRuntimeException(Exception cause) { + public SystemQueryOptionsRuntimeException(final Exception cause) { super(cause); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ActionProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ActionProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ActionProvider.java index a7ecb9f..1365a45 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ActionProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ActionProvider.java @@ -39,7 +39,7 @@ public class ActionProvider { public static final FullQualifiedName nameBAESTwoKeyNavRTESKeyNav = new FullQualifiedName(SchemaProvider.NAMESPACE, "BAESTwoKeyNavRTESKeyNav"); - + public static final FullQualifiedName nameBAETBaseTwoKeyNavRTETBaseTwoKeyNav = new FullQualifiedName(SchemaProvider.NAMESPACE, "BAETBaseTwoKeyNavRTETBaseTwoKeyNav"); @@ -48,18 +48,18 @@ public class ActionProvider { public static final FullQualifiedName nameBAETTwoKeyNavRTETTwoKeyNav = new FullQualifiedName(SchemaProvider.NAMESPACE, "BAETTwoKeyNavRTETTwoKeyNav"); - - public static final FullQualifiedName nameBAESAllPrimRT = + + public static final FullQualifiedName nameBAESAllPrimRT = new FullQualifiedName(SchemaProvider.NAMESPACE, "BAESAllPrimRT"); - - public static final FullQualifiedName nameBAETAllPrimRT = + + public static final FullQualifiedName nameBAETAllPrimRT = new FullQualifiedName(SchemaProvider.NAMESPACE, "BAETAllPrimRT"); - + // Unbound Actions public static final FullQualifiedName nameUARTString = new FullQualifiedName(SchemaProvider.NAMESPACE, - "UARTString"); + "UARTString"); public static final FullQualifiedName nameUARTCollStringTwoParam = new FullQualifiedName(SchemaProvider.NAMESPACE, - "UARTCollStringTwoParam"); + "UARTCollStringTwoParam"); public static final FullQualifiedName nameUARTCollCTTwoPrimParam = new FullQualifiedName(SchemaProvider.NAMESPACE, "UARTCollCTTwoPrimParam"); public static final FullQualifiedName nameUARTCTTwoPrimParam = new FullQualifiedName(SchemaProvider.NAMESPACE, @@ -67,9 +67,9 @@ public class ActionProvider { public static final FullQualifiedName nameUARTETTwoKeyTwoPrimParam = new FullQualifiedName(SchemaProvider.NAMESPACE, "UARTETTwoKeyTwoPrimParam"); public static final FullQualifiedName nameUARTCollETKeyNavParam = - new FullQualifiedName(SchemaProvider.NAMESPACE, "UARTCollETKeyNavParam"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "UARTCollETKeyNavParam"); public static final FullQualifiedName nameUARTETAllPrimParam = - new FullQualifiedName(SchemaProvider.NAMESPACE, "UARTETAllPrimParam"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "UARTETAllPrimParam"); public static final FullQualifiedName nameUARTCollETAllPrimParam = new FullQualifiedName(SchemaProvider.NAMESPACE, "UARTCollETAllPrimParam"); public static final FullQualifiedName nameUART = new FullQualifiedName(SchemaProvider.NAMESPACE, "UART"); @@ -78,7 +78,6 @@ public class ActionProvider { public static final FullQualifiedName nameUARTTwoParam = new FullQualifiedName(SchemaProvider.NAMESPACE, "UARTTwoParam"); - public List<CsdlAction> getActions(final FullQualifiedName actionName) throws ODataException { if (actionName.equals(nameUARTString)) { return Collections.singletonList( @@ -86,12 +85,12 @@ public class ActionProvider { .setReturnType(new CsdlReturnType().setType(PropertyProvider.nameString))); } else if (actionName.equals(nameUARTCollStringTwoParam)) { - return Collections.singletonList( - new CsdlAction().setName(nameUARTCollStringTwoParam.getName()) - .setParameters(Arrays.asList( - new CsdlParameter().setName("ParameterInt16").setType(PropertyProvider.nameInt16), - new CsdlParameter().setName("ParameterDuration").setType(PropertyProvider.nameDuration))) - .setReturnType(new CsdlReturnType().setType(PropertyProvider.nameString).setCollection(true))); + return Collections.singletonList( + new CsdlAction().setName(nameUARTCollStringTwoParam.getName()) + .setParameters(Arrays.asList( + new CsdlParameter().setName("ParameterInt16").setType(PropertyProvider.nameInt16), + new CsdlParameter().setName("ParameterDuration").setType(PropertyProvider.nameDuration))) + .setReturnType(new CsdlReturnType().setType(PropertyProvider.nameString).setCollection(true))); } else if (actionName.equals(nameUARTCTTwoPrimParam)) { return Collections.singletonList( @@ -101,7 +100,7 @@ public class ActionProvider { .setNullable(false))) .setReturnType( new CsdlReturnType().setType(ComplexTypeProvider.nameCTTwoPrim).setNullable(false))); - + } else if (actionName.equals(nameUARTCollCTTwoPrimParam)) { return Collections.singletonList( new CsdlAction().setName(nameUARTCollCTTwoPrimParam.getName()) @@ -199,19 +198,19 @@ public class ActionProvider { .setBound(true) .setReturnType( new CsdlReturnType().setType(EntityTypeProvider.nameETTwoKeyNav).setCollection(true))); - - } else if(actionName.equals(nameBAESTwoKeyNavRTESKeyNav)) { + + } else if (actionName.equals(nameBAESTwoKeyNavRTESKeyNav)) { return Arrays.asList( new CsdlAction().setName("BAESTwoKeyNavRTESKeyNav") - .setBound(true) - .setEntitySetPath("BindingParam/NavPropertyETKeyNavMany") - .setParameters(Arrays.asList( - new CsdlParameter().setName("ParameterETTwoKeyNav") - .setType(EntityTypeProvider.nameETTwoKeyNav) - .setCollection(true) - .setNullable(false))) - .setReturnType( - new CsdlReturnType().setType(EntityTypeProvider.nameETKeyNav).setCollection(true))); + .setBound(true) + .setEntitySetPath("BindingParam/NavPropertyETKeyNavMany") + .setParameters(Arrays.asList( + new CsdlParameter().setName("ParameterETTwoKeyNav") + .setType(EntityTypeProvider.nameETTwoKeyNav) + .setCollection(true) + .setNullable(false))) + .setReturnType( + new CsdlReturnType().setType(EntityTypeProvider.nameETKeyNav).setCollection(true))); } else if (actionName.equals(nameBAETBaseTwoKeyNavRTETBaseTwoKeyNav)) { return Arrays.asList( @@ -234,7 +233,7 @@ public class ActionProvider { .setReturnType( new CsdlReturnType().setType(EntityTypeProvider.nameETBaseTwoKeyNav))); - } else if(actionName.equals(nameBAETAllPrimRT)) { + } else if (actionName.equals(nameBAETAllPrimRT)) { return Arrays.asList( new CsdlAction().setName("BAETAllPrimRT") .setBound(true) @@ -243,17 +242,17 @@ public class ActionProvider { .setNullable(false) .setType(EntityTypeProvider.nameETAllPrim) ))); - } else if(actionName.equals(nameBAESAllPrimRT)) { + } else if (actionName.equals(nameBAESAllPrimRT)) { return Arrays.asList( new CsdlAction().setName("BAESAllPrimRT") - .setBound(true) - .setParameters(Arrays.asList( - new CsdlParameter().setName("ParameterETAllPrim") - .setNullable(false) - .setCollection(true) - .setType(EntityTypeProvider.nameETAllPrim) - )) - ); + .setBound(true) + .setParameters(Arrays.asList( + new CsdlParameter().setName("ParameterETAllPrim") + .setNullable(false) + .setCollection(true) + .setType(EntityTypeProvider.nameETAllPrim) + )) + ); } return null; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EdmTechProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EdmTechProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EdmTechProvider.java index afb23d6..37951a3 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EdmTechProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EdmTechProvider.java @@ -56,10 +56,10 @@ public class EdmTechProvider extends CsdlAbstractEdmProvider { private final TypeDefinitionProvider typeDefinitionProvider; public EdmTechProvider() { - this(Collections.<EdmxReference>emptyList()); + this(Collections.<EdmxReference> emptyList()); } - public EdmTechProvider(List<EdmxReference> references) { + public EdmTechProvider(final List<EdmxReference> references) { containerProvider = new ContainerProvider(this); entityTypeProvider = new EntityTypeProvider(); complexTypeProvider = new ComplexTypeProvider(); @@ -148,7 +148,7 @@ public class EdmTechProvider extends CsdlAbstractEdmProvider { @Override public CsdlEntityContainerInfo getEntityContainerInfo(final FullQualifiedName entityContainerName) - throws ODataException { + throws ODataException { return containerProvider.getEntityContainerInfo(entityContainerName); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EntityTypeProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EntityTypeProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EntityTypeProvider.java index 50a8004..b9a8221 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EntityTypeProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EntityTypeProvider.java @@ -18,6 +18,8 @@ */ package org.apache.olingo.server.tecsvc.provider; +import java.util.Arrays; + import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.provider.CsdlEntityType; @@ -26,8 +28,6 @@ import org.apache.olingo.commons.api.edm.provider.CsdlProperty; import org.apache.olingo.commons.api.edm.provider.CsdlPropertyRef; import org.apache.olingo.commons.api.edm.provider.CsdlReferentialConstraint; -import java.util.Arrays; - public class EntityTypeProvider { public static final FullQualifiedName nameETAllKey = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETAllKey"); @@ -55,7 +55,7 @@ public class EntityTypeProvider { public static final FullQualifiedName nameETKeyNav = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETKeyNav"); public static final FullQualifiedName nameETKeyPrimNav = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETKeyPrimNav"); - public static final FullQualifiedName nameETKeyNavCont = new FullQualifiedName(SchemaProvider.NAMESPACE, + public static final FullQualifiedName nameETKeyNavCont = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETKeyNavCont"); public static final FullQualifiedName nameETKeyTwoKeyComp = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETKeyTwoKeyComp"); @@ -331,17 +331,17 @@ public class EntityTypeProvider { .setNavigationProperties( Arrays.asList( PropertyProvider.navPropertyETKeyPrimNavOne_ETKeyPrimNav)); - } else if(entityTypeName.equals(nameETKeyNavCont)) { + } else if (entityTypeName.equals(nameETKeyNavCont)) { return new CsdlEntityType() - .setName("ETKeyNavCont") - .setKey(Arrays.asList(new CsdlPropertyRef().setName("PropertyInt16"))) - .setProperties(Arrays.asList( - PropertyProvider.propertyInt16_NotNullable, PropertyProvider.propertyString_NotNullable, - PropertyProvider.propertyCompNavCont)) - .setNavigationProperties(Arrays.asList( - PropertyProvider.navPropertyETTwoKeyNavContOneCT_ETTwoKeyNav, - PropertyProvider.collectionNavPropertyETTwoKeyNavContMany_CT_ETTwoKeyNav - )); + .setName("ETKeyNavCont") + .setKey(Arrays.asList(new CsdlPropertyRef().setName("PropertyInt16"))) + .setProperties(Arrays.asList( + PropertyProvider.propertyInt16_NotNullable, PropertyProvider.propertyString_NotNullable, + PropertyProvider.propertyCompNavCont)) + .setNavigationProperties(Arrays.asList( + PropertyProvider.navPropertyETTwoKeyNavContOneCT_ETTwoKeyNav, + PropertyProvider.collectionNavPropertyETTwoKeyNavContMany_CT_ETTwoKeyNav + )); } else if (entityTypeName.equals(nameETTwoKeyNav)) { return new CsdlEntityType() @@ -409,8 +409,8 @@ public class EntityTypeProvider { new CsdlPropertyRef().setName("PropertyComp/PropertyString").setAlias("KeyAlias2"), new CsdlPropertyRef().setName("PropertyCompComp/PropertyComp/PropertyString").setAlias("KeyAlias3"))) .setProperties( - Arrays.asList(PropertyProvider.propertyInt16_NotNullable, - PropertyProvider.propertyComp_CTTwoPrim_NotNullable, + Arrays.asList(PropertyProvider.propertyInt16_NotNullable, + PropertyProvider.propertyComp_CTTwoPrim_NotNullable, PropertyProvider.propertyCompComp_CTCompComp_NotNullable)); } else if (entityTypeName.equals(nameETCompMixPrimCollComp)) { return new CsdlEntityType() http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EnumTypeProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EnumTypeProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EnumTypeProvider.java index b9eb069..bc382cf 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EnumTypeProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EnumTypeProvider.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.server.tecsvc.provider; +import java.util.Arrays; + import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.provider.CsdlEnumMember; import org.apache.olingo.commons.api.edm.provider.CsdlEnumType; -import java.util.Arrays; - public class EnumTypeProvider { public static final FullQualifiedName nameENString = new FullQualifiedName(SchemaProvider.NAMESPACE, "ENString"); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/FunctionProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/FunctionProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/FunctionProvider.java index 960c7f7..63dfec1 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/FunctionProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/FunctionProvider.java @@ -18,17 +18,17 @@ */ package org.apache.olingo.server.tecsvc.provider; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.provider.CsdlFunction; import org.apache.olingo.commons.api.edm.provider.CsdlParameter; import org.apache.olingo.commons.api.edm.provider.CsdlReturnType; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - public class FunctionProvider { // Bound Functions @@ -526,18 +526,18 @@ public class FunctionProvider { .setReturnType( new CsdlReturnType().setType(EntityTypeProvider.nameETTwoKeyNav).setCollection(true) .setNullable(false)) - // new Function() -// .setName("BFCESTwoKeyNavRTESTwoKeyNav") -// .setBound(true) -// .setParameters( -// Arrays.asList(new Parameter().setName("BindingParam").setType(EntityTypeProvider.nameETKeyNav) -// .setCollection(true).setNullable(false), -// new Parameter().setName("ParameterString").setType(PropertyProvider.nameString) -// .setCollection(false).setNullable(false))) -// .setComposable(true) -// .setReturnType( -// new ReturnType().setType(EntityTypeProvider.nameETTwoKeyNav).setCollection(true) -// .setNullable(false)) + // new Function() + // .setName("BFCESTwoKeyNavRTESTwoKeyNav") + // .setBound(true) + // .setParameters( + // Arrays.asList(new Parameter().setName("BindingParam").setType(EntityTypeProvider.nameETKeyNav) + // .setCollection(true).setNullable(false), + // new Parameter().setName("ParameterString").setType(PropertyProvider.nameString) + // .setCollection(false).setNullable(false))) + // .setComposable(true) + // .setReturnType( + // new ReturnType().setType(EntityTypeProvider.nameETTwoKeyNav).setCollection(true) + // .setNullable(false)) ); } else if (functionName.equals(nameBFCStringRTESTwoKeyNav)) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/PropertyProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/PropertyProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/PropertyProvider.java index c18ed9d..6efad33 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/PropertyProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/PropertyProvider.java @@ -665,27 +665,27 @@ public class PropertyProvider { .setPartner("NavPropertyETKeyNavOne"); public static final CsdlNavigationProperty collectionNavPropertyETTwoKeyNavMany_ETTwoKeyNav = - new CsdlNavigationProperty() - .setName("NavPropertyETTwoKeyNavMany") - .setType(EntityTypeProvider.nameETTwoKeyNav) - .setCollection(true); + new CsdlNavigationProperty() + .setName("NavPropertyETTwoKeyNavMany") + .setType(EntityTypeProvider.nameETTwoKeyNav) + .setCollection(true); public static final CsdlNavigationProperty collectionNavPropertyETTwoKeyNavOne_ETTwoKeyNav = - new CsdlNavigationProperty() - .setName("NavPropertyETTwoKeyNavOne") - .setType(EntityTypeProvider.nameETTwoKeyNav); + new CsdlNavigationProperty() + .setName("NavPropertyETTwoKeyNavOne") + .setType(EntityTypeProvider.nameETTwoKeyNav); public static final CsdlNavigationProperty collectionNavPropertyETTwoPrimMany_ETTwoPrim = - new CsdlNavigationProperty() - .setName("NavPropertyETTwoPrimMany") - .setType(EntityTypeProvider.nameETTwoPrim) - .setCollection(true); + new CsdlNavigationProperty() + .setName("NavPropertyETTwoPrimMany") + .setType(EntityTypeProvider.nameETTwoPrim) + .setCollection(true); public static final CsdlNavigationProperty collectionNavPropertyETAllPrimMany_ETAllPrim = - new CsdlNavigationProperty() - .setName("NavPropertyETAllPrimMany") - .setType(EntityTypeProvider.nameETAllPrim) - .setCollection(true); + new CsdlNavigationProperty() + .setName("NavPropertyETAllPrimMany") + .setType(EntityTypeProvider.nameETAllPrim) + .setCollection(true); public static final CsdlNavigationProperty collectionNavPropertySINav = new CsdlNavigationProperty() .setName("NavPropertySINav") @@ -693,11 +693,11 @@ public class PropertyProvider { .setType(EntityTypeProvider.nameETTwoKeyNav); public static final CsdlNavigationProperty collectionNavPropertyETKeyNavContMany_CT_ETKeyNav = - new CsdlNavigationProperty() - .setName("NavPropertyETKeyNavContMany") - .setCollection(true) - .setContainsTarget(true) - .setType(EntityTypeProvider.nameETKeyNav); + new CsdlNavigationProperty() + .setName("NavPropertyETKeyNavContMany") + .setCollection(true) + .setContainsTarget(true) + .setType(EntityTypeProvider.nameETKeyNav); public static final CsdlNavigationProperty collectionNavPropertyETTwoKeyNavContMany_CT_ETKeyNav = new CsdlNavigationProperty() @@ -719,10 +719,10 @@ public class PropertyProvider { .setType(EntityTypeProvider.nameETKeyPrimNav); public static final CsdlNavigationProperty navPropertyETTwoKeyNavOne_ETTwoKeyNav_NotNullable = - new CsdlNavigationProperty() - .setName("NavPropertyETTwoKeyNavOne") - .setType(EntityTypeProvider.nameETTwoKeyNav) - .setNullable(false); + new CsdlNavigationProperty() + .setName("NavPropertyETTwoKeyNavOne") + .setType(EntityTypeProvider.nameETTwoKeyNav) + .setNullable(false); public static final CsdlNavigationProperty navPropertyETTwoKeyNavOne_ETTwoKeyNav = new CsdlNavigationProperty() .setName("NavPropertyETTwoKeyNavOne") http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/SchemaProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/SchemaProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/SchemaProvider.java index 7500a5a..c8d299d 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/SchemaProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/SchemaProvider.java @@ -18,6 +18,9 @@ */ package org.apache.olingo.server.tecsvc.provider; +import java.util.ArrayList; +import java.util.List; + import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.provider.CsdlAction; import org.apache.olingo.commons.api.edm.provider.CsdlComplexType; @@ -27,9 +30,6 @@ import org.apache.olingo.commons.api.edm.provider.CsdlFunction; import org.apache.olingo.commons.api.edm.provider.CsdlSchema; import org.apache.olingo.commons.api.edm.provider.CsdlTypeDefinition; -import java.util.ArrayList; -import java.util.List; - public class SchemaProvider { private EdmTechProvider prov; @@ -46,7 +46,7 @@ public class SchemaProvider { schema.setNamespace(NAMESPACE); schema.setAlias("Namespace1_Alias"); schemas.add(schema); - + // EnumTypes List<CsdlEnumType> enumTypes = new ArrayList<CsdlEnumType>(); schema.setEnumTypes(enumTypes); @@ -56,7 +56,7 @@ public class SchemaProvider { schema.setTypeDefinitions(typeDefinitions); typeDefinitions.add(prov.getTypeDefinition(TypeDefinitionProvider.nameTDString)); enumTypes.add(prov.getEnumType(EnumTypeProvider.nameENString)); - + // EntityTypes List<CsdlEntityType> entityTypes = new ArrayList<CsdlEntityType>(); schema.setEntityTypes(entityTypes); @@ -87,8 +87,7 @@ public class SchemaProvider { entityTypes.add(prov.getEntityType(EntityTypeProvider.nameETKeyPrimNav)); entityTypes.add(prov.getEntityType(EntityTypeProvider.nameETAbstract)); entityTypes.add(prov.getEntityType(EntityTypeProvider.nameETAbstractBase)); - - + // ComplexTypes List<CsdlComplexType> complexType = new ArrayList<CsdlComplexType>(); schema.setComplexTypes(complexType); @@ -108,8 +107,7 @@ public class SchemaProvider { complexType.add(prov.getComplexType(ComplexTypeProvider.nameCTTwoBasePrimCompNav)); complexType.add(prov.getComplexType(ComplexTypeProvider.nameCTCompNav)); complexType.add(prov.getComplexType(ComplexTypeProvider.nameCTNavCont)); - - + // Actions List<CsdlAction> actions = new ArrayList<CsdlAction>(); schema.setActions(actions); @@ -159,7 +157,7 @@ public class SchemaProvider { functions.addAll(prov.getFunctions(FunctionProvider.nameUFCRTCollETMixPrimCollCompTwoParam)); functions.addAll(prov.getFunctions(FunctionProvider.nameUFNRTCollCTNavFiveProp)); functions.addAll(prov.getFunctions(FunctionProvider.nameUFCRTCollETKeyNavContParam)); - + functions.addAll(prov.getFunctions(FunctionProvider.nameBFCESTwoKeyNavRTESTwoKeyNav)); functions.addAll(prov.getFunctions(FunctionProvider.nameBFCStringRTESTwoKeyNav)); functions.addAll(prov.getFunctions(FunctionProvider.nameBFCETBaseTwoKeyNavRTETTwoKeyNav)); @@ -183,7 +181,7 @@ public class SchemaProvider { functions.addAll(prov.getFunctions(FunctionProvider.nameBFESTwoKeyNavRTESTwoKeyNav)); functions.addAll(prov.getFunctions(FunctionProvider.nameBFCETTwoKeyNavRTETTwoKeyNav)); functions.addAll(prov.getFunctions(FunctionProvider.nameBFCETTwoKeyNavRTCTTwoPrim)); - //functions.addAll(prov.getFunctions(FunctionProvider.nameUFCRTESMixPrimCollCompTwoParam)); + // functions.addAll(prov.getFunctions(FunctionProvider.nameUFCRTESMixPrimCollCompTwoParam)); functions.addAll(prov.getFunctions(FunctionProvider.nameBFCESTwoKeyNavRTCTNavFiveProp)); functions.addAll(prov.getFunctions(FunctionProvider.nameBFCESTwoKeyNavRTCollCTNavFiveProp)); functions.addAll(prov.getFunctions(FunctionProvider.nameBFCESTwoKeyNavRTStringParam)); @@ -191,9 +189,8 @@ public class SchemaProvider { functions.addAll(prov.getFunctions(FunctionProvider.nameBFCCTPrimCompRTETTwoKeyNavParam)); functions.addAll(prov.getFunctions(FunctionProvider.nameBFCESKeyNavRTESTwoKeyNav)); - // functions.addAll(prov.getFunctions(FunctionProvider.nameBFCCTPrimCompRTESTwoKeyNavParam)); - + // EntityContainer schema.setEntityContainer(prov.getEntityContainer()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java b/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java index c9a8e65..f3bfc4f 100644 --- a/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java +++ b/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java index 2a51b8d..a6f6c36 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.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 @@ -47,11 +47,11 @@ import org.apache.olingo.commons.api.http.HttpContentType; import org.apache.olingo.commons.api.http.HttpHeader; import org.apache.olingo.commons.api.http.HttpMethod; import org.apache.olingo.commons.api.http.HttpStatusCode; +import org.apache.olingo.server.api.ClientServerError; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.ODataRequest; import org.apache.olingo.server.api.ODataResponse; -import org.apache.olingo.server.api.ClientServerError; import org.apache.olingo.server.api.ServiceMetadata; import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.processor.ActionComplexCollectionProcessor; @@ -224,6 +224,7 @@ public class ODataHandlerTest { final OData odata = OData.newInstance(); final ServiceMetadata serviceMetadata = odata.createServiceMetadata( new CsdlAbstractEdmProvider() { + @Override public CsdlEntitySet getEntitySet(final FullQualifiedName entityContainer, final String entitySetName) throws ODataException { throw new ODataException("msg"); @@ -692,7 +693,8 @@ public class ODataHandlerTest { ErrorProcessor errorProcessor = mock(ErrorProcessor.class); dispatch(HttpMethod.POST, "ESAllPrim", "", HttpHeader.CONTENT_TYPE, "some/unsupported", errorProcessor); verifyZeroInteractions(processor); - verify(errorProcessor).processError(any(ODataRequest.class), any(ODataResponse.class), any(ClientServerError.class), + verify(errorProcessor).processError(any(ODataRequest.class), any(ODataResponse.class), + any(ClientServerError.class), any(ContentType.class)); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/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 185d869..89b7318 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 @@ -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 @@ -28,10 +28,10 @@ import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.tecsvc.provider.EdmTechProvider; public class AbstractODataDeserializerTest { - + protected static final Edm edm = OData.newInstance().createServiceMetadata( new EdmTechProvider(), Collections.<EdmxReference> emptyList()).getEdm(); - + protected InputStream getFileAsStream(final String filename) throws IOException { InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(filename); if (in == null) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/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 bcacb3a..010ec06 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 @@ -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 @@ -120,7 +120,7 @@ public class ODataDeserializerDeepInsertTest extends AbstractODataDeserializerTe throw e; } } - + @Test public void expandedToOneValidNullValue() throws Exception { String entityString = @@ -130,16 +130,16 @@ 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) - .getEntity(); - + .getEntity(); + assertEquals(1, entity.getNavigationLinks().size()); final Link link = entity.getNavigationLinks().get(0); - + assertEquals("NavPropertyETAllPrimOne", link.getTitle()); assertNull(link.getInlineEntity()); assertNull(link.getInlineEntitySet()); } - + @Test(expected = DeserializerException.class) public void expandedToOneInvalidStringValue() throws Exception { String entityString = @@ -155,7 +155,7 @@ public class ODataDeserializerDeepInsertTest extends AbstractODataDeserializerTe throw e; } } - + @Test(expected = DeserializerException.class) public void expandedToManyInvalidNullValue() throws Exception { String entityString = http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/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 0a593dc..609db35 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 @@ -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 @@ -45,7 +45,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial InputStream stream = getFileAsStream("ESAllPrim.json"); EntityCollection entitySet = OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType) - .getEntityCollection(); + .getEntityCollection(); assertNotNull(entitySet); assertEquals(3, entitySet.getEntities().size()); @@ -80,7 +80,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial InputStream stream = getFileAsStream("ESCompCollComp.json"); EntityCollection entitySet = OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType) - .getEntityCollection(); + .getEntityCollection(); assertNotNull(entitySet); assertEquals(2, entitySet.getEntities().size()); @@ -102,7 +102,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); EntityCollection entityCollection = OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType) - .getEntityCollection(); + .getEntityCollection(); assertNotNull(entityCollection.getEntities()); assertTrue(entityCollection.getEntities().isEmpty()); } @@ -236,7 +236,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial throw e; } } - + @Test(expected = DeserializerException.class) public void customAnnotationNotSupportedYet() throws Exception { String entityCollectionString = "{\"value\" : []," http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/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 9df2b34..00918db 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 @@ -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 @@ -69,7 +69,7 @@ public class ODataJsonDeserializerActionParametersTest extends AbstractODataDese public void ignoreODataAnnotations() throws Exception { final String input = "{\"[email protected]\":\"Edm.Duration\"," - + "\"ParameterDuration\":\"P42DT11H22M33S\",\"ParameterInt16\":42}"; + + "\"ParameterDuration\":\"P42DT11H22M33S\",\"ParameterInt16\":42}"; final Map<String, Parameter> parameters = deserialize(input, "UARTTwoParam"); assertNotNull(parameters); assertEquals(2, parameters.size()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/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 cd3c710..35e9faa 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 @@ -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 @@ -41,7 +41,6 @@ import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.Link; import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.data.ValueType; -import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.edm.FullQualifiedName; @@ -65,7 +64,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) - .getEntity(); + .getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); @@ -95,7 +94,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) - .getEntity(); + .getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); @@ -142,7 +141,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) - .getEntity(); + .getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); @@ -163,7 +162,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) - .getEntity(); + .getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); @@ -193,7 +192,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) - .getEntity(); + .getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); @@ -228,7 +227,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETCompAllPrim"))) - .getEntity(); + .getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); @@ -270,7 +269,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETCollAllPrim"))) - .getEntity(); + .getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); @@ -308,7 +307,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))) - .getEntity(); + .getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); @@ -341,7 +340,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))) - .getEntity(); + .getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); @@ -390,7 +389,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) - .getEntity(); + .getEntity(); assertNotNull(entity); } @@ -448,7 +447,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) - .getEntity(); + .getEntity(); assertNotNull(entity); List<Property> properties = entity.getProperties(); assertNotNull(properties); @@ -467,7 +466,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) - .getEntity(); + .getEntity(); assertNotNull(entity); Link bindingToOne = entity.getNavigationBinding("NavPropertyETTwoPrimOne"); @@ -501,7 +500,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); Entity entity = deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim"))) - .getEntity(); + .getEntity(); Link bindingToMany = entity.getNavigationBinding("NavPropertyETTwoPrimMany"); assertNotNull(bindingToMany); assertTrue(bindingToMany.getBindingLinks().isEmpty()); @@ -643,12 +642,10 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe assertEquals((short) 3, e.getProperty("PropertyEnumString").getValue()); } - @SuppressWarnings("unused") @Test public void mappingTest() throws Exception { - Edm localEdm = - OData.newInstance().createServiceMetadata(new EdmTechProvider(), Collections.<EdmxReference> emptyList()) - .getEdm(); + OData.newInstance().createServiceMetadata(new EdmTechProvider(), Collections.<EdmxReference> emptyList()) + .getEdm(); EdmEntityType entityType = mock(EdmEntityType.class); when(entityType.getFullQualifiedName()).thenReturn(new FullQualifiedName("napespace", "name")); @@ -688,7 +685,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe assertEquals(Date.class, entity.getProperty("PropertyDateTimeOffset").getValue().getClass()); } -// ---------------------------------- Negative Tests ----------------------------------------------------------- + // ---------------------------------- Negative Tests ----------------------------------------------------------- @Test(expected = DeserializerException.class) public void etAllPrimWithInvalidNullValue() throws Exception { @@ -1416,28 +1413,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe } } -// @Test(expected = DeserializerException.class) -// public void invalidJsonValueForPrimCollectionTypeObject() throws Exception { -// final String entityString = "{" -// + "\"PropertyInt16\":32767," -// + "\"CollPropertyString\":" -// + "[\"[email protected]\",\"[email protected]\",\"[email protected]\"]," -// + "\"PropertyComp\":{\"PropertyInt16\":111,\"PropertyString\":\"TEST A\"}," -// + "\"CollPropertyComp\":[" -// + "{\"PropertyInt16\":123,\"PropertyString\":\"TEST 1\"}," -// + "{\"PropertyInt16\":456,\"PropertyString\":\"TEST 2\"}," -// + "{\"PropertyInt16\":789,\"PropertyString\":\"TEST 3\"}]}"; -// InputStream stream = new ByteArrayInputStream(entityString.getBytes()); -// ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); -// try { -// deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixPrimCollComp"))); -// } catch (DeserializerException e) { -// assertEquals(DeserializerException.MessageKeys.INVALID_JSON_TYPE_FOR_PROPERTY, e.getMessageKey()); -// throw e; -// } -// } - - private void checkPropertyJsonType(String entityString) throws DeserializerException { + private void checkPropertyJsonType(final String entityString) throws DeserializerException { InputStream stream = new ByteArrayInputStream(entityString.getBytes()); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); try { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/ExpandSelectMock.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/ExpandSelectMock.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/ExpandSelectMock.java index 1bf2c9d..71a8145 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/ExpandSelectMock.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/ExpandSelectMock.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
