http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/ActionMapKey.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/ActionMapKey.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/ActionMapKey.java index d4baad4..7847084 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/ActionMapKey.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/ActionMapKey.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/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImpl.java index a7b42d3..de107b8 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImpl.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/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImportImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImportImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImportImpl.java index c36b947..dff574f 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImportImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImportImpl.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/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmAnnotationImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmAnnotationImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmAnnotationImpl.java index f38a2bc..d867885 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmAnnotationImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmAnnotationImpl.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. */ @@ -103,61 +103,61 @@ public class EdmAnnotationImpl extends AbstractEdmAnnotatable implements EdmAnno _expression = new EdmNotImpl(getDynamicExpression(exp.asNot().getExpression())); } else if (exp.isTwoParamsOp()) { switch (exp.asTwoParamsOp().getType()) { - case And: - _expression = new EdmAndImpl( - getDynamicExpression(exp.asTwoParamsOp().getLeftExpression()), - getDynamicExpression(exp.asTwoParamsOp().getRightExpression())); - break; - - case Or: - _expression = new EdmOrImpl( - getDynamicExpression(exp.asTwoParamsOp().getLeftExpression()), - getDynamicExpression(exp.asTwoParamsOp().getRightExpression())); - break; - - case Eq: - _expression = new EdmEqImpl( - getDynamicExpression(exp.asTwoParamsOp().getLeftExpression()), - getDynamicExpression(exp.asTwoParamsOp().getRightExpression())); - break; - - case Ne: - _expression = new EdmNeImpl( - getDynamicExpression(exp.asTwoParamsOp().getLeftExpression()), - getDynamicExpression(exp.asTwoParamsOp().getRightExpression())); - break; - - case Ge: - _expression = new EdmGeImpl( - getDynamicExpression(exp.asTwoParamsOp().getLeftExpression()), - getDynamicExpression(exp.asTwoParamsOp().getRightExpression())); - break; - - case Gt: - _expression = new EdmGtImpl( - getDynamicExpression(exp.asTwoParamsOp().getLeftExpression()), - getDynamicExpression(exp.asTwoParamsOp().getRightExpression())); - break; - - case Le: - _expression = new EdmLeImpl( - getDynamicExpression(exp.asTwoParamsOp().getLeftExpression()), - getDynamicExpression(exp.asTwoParamsOp().getRightExpression())); - break; - - case Lt: - _expression = new EdmLtImpl( - getDynamicExpression(exp.asTwoParamsOp().getLeftExpression()), - getDynamicExpression(exp.asTwoParamsOp().getRightExpression())); - break; - - default: + case And: + _expression = new EdmAndImpl( + getDynamicExpression(exp.asTwoParamsOp().getLeftExpression()), + getDynamicExpression(exp.asTwoParamsOp().getRightExpression())); + break; + + case Or: + _expression = new EdmOrImpl( + getDynamicExpression(exp.asTwoParamsOp().getLeftExpression()), + getDynamicExpression(exp.asTwoParamsOp().getRightExpression())); + break; + + case Eq: + _expression = new EdmEqImpl( + getDynamicExpression(exp.asTwoParamsOp().getLeftExpression()), + getDynamicExpression(exp.asTwoParamsOp().getRightExpression())); + break; + + case Ne: + _expression = new EdmNeImpl( + getDynamicExpression(exp.asTwoParamsOp().getLeftExpression()), + getDynamicExpression(exp.asTwoParamsOp().getRightExpression())); + break; + + case Ge: + _expression = new EdmGeImpl( + getDynamicExpression(exp.asTwoParamsOp().getLeftExpression()), + getDynamicExpression(exp.asTwoParamsOp().getRightExpression())); + break; + + case Gt: + _expression = new EdmGtImpl( + getDynamicExpression(exp.asTwoParamsOp().getLeftExpression()), + getDynamicExpression(exp.asTwoParamsOp().getRightExpression())); + break; + + case Le: + _expression = new EdmLeImpl( + getDynamicExpression(exp.asTwoParamsOp().getLeftExpression()), + getDynamicExpression(exp.asTwoParamsOp().getRightExpression())); + break; + + case Lt: + _expression = new EdmLtImpl( + getDynamicExpression(exp.asTwoParamsOp().getLeftExpression()), + getDynamicExpression(exp.asTwoParamsOp().getRightExpression())); + break; + + default: } } else if (exp.isAnnotationPath()) { _expression = new EdmAnnotationPathImpl(exp.asAnnotationPath().getValue()); } else if (exp.isApply()) { final List<EdmAnnotationExpression> parameters = - new ArrayList<EdmAnnotationExpression>(exp.asApply().getParameters().size()); + new ArrayList<EdmAnnotationExpression>(exp.asApply().getParameters().size()); for (AnnotationExpression param : exp.asApply().getParameters()) { parameters.add(getExpression(param)); } @@ -166,21 +166,21 @@ public class EdmAnnotationImpl extends AbstractEdmAnnotatable implements EdmAnno _expression = new EdmCastImpl(edm, exp.asCast(), getDynamicExpression(exp.asCast().getValue())); } else if (exp.isCollection()) { final List<EdmAnnotationExpression> items = - new ArrayList<EdmAnnotationExpression>(exp.asCollection().getItems().size()); + new ArrayList<EdmAnnotationExpression>(exp.asCollection().getItems().size()); for (AnnotationExpression param : exp.asCollection().getItems()) { items.add(getExpression(param)); } _expression = new EdmCollectionImpl(items); } else if (exp.isIf()) { _expression = new EdmIfImpl( - getExpression(exp.asIf().getGuard()), - getExpression(exp.asIf().getThen()), - getExpression(exp.asIf().getElse())); + getExpression(exp.asIf().getGuard()), + getExpression(exp.asIf().getThen()), + getExpression(exp.asIf().getElse())); } else if (exp.isIsOf()) { _expression = new EdmIsOfImpl(edm, exp.asIsOf(), getDynamicExpression(exp.asIsOf().getValue())); } else if (exp.isLabeledElement()) { _expression = new EdmLabeledElementImpl( - exp.asLabeledElement().getName(), getDynamicExpression(exp.asLabeledElement().getValue())); + exp.asLabeledElement().getName(), getDynamicExpression(exp.asLabeledElement().getValue())); } else if (exp.isLabeledElementReference()) { _expression = new EdmLabeledElementReferenceImpl(exp.asLabeledElementReference().getValue()); } else if (exp.isNull()) { @@ -193,13 +193,13 @@ public class EdmAnnotationImpl extends AbstractEdmAnnotatable implements EdmAnno _expression = new EdmPropertyPathImpl(exp.asPropertyPath().getValue()); } else if (exp.isPropertyValue()) { _expression = new EdmPropertyValueImpl( - exp.asPropertyValue().getProperty(), getExpression(exp.asPropertyValue().getValue())); + exp.asPropertyValue().getProperty(), getExpression(exp.asPropertyValue().getValue())); } else if (exp.isRecord()) { final List<EdmPropertyValue> propertyValues = - new ArrayList<EdmPropertyValue>(exp.asRecord().getPropertyValues().size()); + new ArrayList<EdmPropertyValue>(exp.asRecord().getPropertyValues().size()); for (PropertyValue propertyValue : exp.asRecord().getPropertyValues()) { propertyValues.add(new EdmPropertyValueImpl( - propertyValue.getProperty(), getExpression(propertyValue.getValue()))); + propertyValue.getProperty(), getExpression(propertyValue.getValue()))); } _expression = new EdmRecordImpl(edm, exp.asRecord().getType(), propertyValues); } else if (exp.isUrlRef()) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmAnnotationsImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmAnnotationsImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmAnnotationsImpl.java index 772838b..baadcce 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmAnnotationsImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmAnnotationsImpl.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 @@ -55,7 +55,7 @@ public class EdmAnnotationsImpl implements EdmAnnotations { if (structured != null) { _target = path == null ? structured - : structured.getStructuralProperty(path); + : structured.getStructuralProperty(path); if (_target == null) { _target = structured.getNavigationProperty(path); } @@ -68,7 +68,7 @@ public class EdmAnnotationsImpl implements EdmAnnotations { if (enumType != null) { _target = path == null ? enumType - : enumType.getMember(path); + : enumType.getMember(path); } return _target; } @@ -81,13 +81,13 @@ public class EdmAnnotationsImpl implements EdmAnnotations { final String path = splitted.length > 1 ? splitted[1] : null; final EdmEntityContainer baseEntityContainer = schema.getEntityContainer(); - - EdmAnnotationsTarget localTarget = baseEntityContainer == null ? null - : baseEntityContainer.getActionImport(path); + + EdmAnnotationsTarget localTarget = baseEntityContainer == null ? null + : baseEntityContainer.getActionImport(path); if (localTarget == null) { localTarget = getTarget(edm.getComplexType(base), path); if (localTarget == null) { - if(baseEntityContainer != null && baseEntityContainer.getFullQualifiedName().equals(base)){ + if (baseEntityContainer != null && baseEntityContainer.getFullQualifiedName().equals(base)) { localTarget = baseEntityContainer; } if (localTarget == null) { @@ -115,7 +115,7 @@ public class EdmAnnotationsImpl implements EdmAnnotations { } target = localTarget; } - + return target; } @@ -142,7 +142,7 @@ public class EdmAnnotationsImpl implements EdmAnnotations { for (CsdlAnnotation annotation : annotationGroup.getAnnotations()) { annotationsLocal.add(new EdmAnnotationImpl(edm, annotation)); } - + annotations = Collections.unmodifiableList(annotationsLocal); } return annotations; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmComplexTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmComplexTypeImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmComplexTypeImpl.java index 20e0836..08993eb 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmComplexTypeImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmComplexTypeImpl.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/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntityContainerImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntityContainerImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntityContainerImpl.java index 3112f4b..027364a 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntityContainerImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntityContainerImpl.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 @@ -51,23 +51,23 @@ public class EdmEntityContainerImpl extends AbstractEdmNamed implements EdmEntit private List<EdmSingleton> singletons; private final Map<String, EdmSingleton> singletonCache = Collections.synchronizedMap( - new LinkedHashMap<String, EdmSingleton>()); + new LinkedHashMap<String, EdmSingleton>()); private List<EdmEntitySet> entitySets; private final Map<String, EdmEntitySet> entitySetCache = Collections.synchronizedMap( - new LinkedHashMap<String, EdmEntitySet>()); + new LinkedHashMap<String, EdmEntitySet>()); private List<EdmActionImport> actionImports; private final Map<String, EdmActionImport> actionImportCache = Collections.synchronizedMap( - new LinkedHashMap<String, EdmActionImport>()); + new LinkedHashMap<String, EdmActionImport>()); private List<EdmFunctionImport> functionImports; private final Map<String, EdmFunctionImport> functionImportCache = Collections.synchronizedMap( - new LinkedHashMap<String, EdmFunctionImport>()); + new LinkedHashMap<String, EdmFunctionImport>()); public EdmEntityContainerImpl(final Edm edm, final CsdlEdmProvider provider, final CsdlEntityContainerInfo entityContainerInfo) { super(edm, entityContainerInfo.getContainerName().getName(), null); this.provider = provider; - this.entityContainerName = entityContainerInfo.getContainerName(); - this.parentContainerName = entityContainerInfo.getExtendsContainer(); + entityContainerName = entityContainerInfo.getContainerName(); + parentContainerName = entityContainerInfo.getExtendsContainer(); } public EdmEntityContainerImpl(final Edm edm, final CsdlEdmProvider provider, final FullQualifiedName containerFQN, @@ -75,8 +75,8 @@ public class EdmEntityContainerImpl extends AbstractEdmNamed implements EdmEntit super(edm, containerFQN.getName(), entityContainer); this.provider = provider; container = entityContainer; - this.entityContainerName = containerFQN; - this.parentContainerName = entityContainer.getExtendsContainerFQN(); + entityContainerName = containerFQN; + parentContainerName = entityContainer.getExtendsContainerFQN(); } @Override @@ -238,7 +238,7 @@ public class EdmEntityContainerImpl extends AbstractEdmNamed implements EdmEntit loadContainer(); final List<CsdlEntitySet> providerEntitySets = container.getEntitySets(); final List<EdmEntitySet> entitySetsLocal = new ArrayList<EdmEntitySet>(); - + if (providerEntitySets != null) { for (CsdlEntitySet entitySet : providerEntitySets) { final EdmEntitySetImpl impl = new EdmEntitySetImpl(edm, this, entitySet); @@ -253,7 +253,7 @@ public class EdmEntityContainerImpl extends AbstractEdmNamed implements EdmEntit loadContainer(); final List<CsdlFunctionImport> providerFunctionImports = container.getFunctionImports(); final ArrayList<EdmFunctionImport> functionImportsLocal = new ArrayList<EdmFunctionImport>(); - + if (providerFunctionImports != null) { for (CsdlFunctionImport functionImport : providerFunctionImports) { EdmFunctionImportImpl impl = new EdmFunctionImportImpl(edm, this, functionImport); @@ -268,7 +268,7 @@ public class EdmEntityContainerImpl extends AbstractEdmNamed implements EdmEntit loadContainer(); final List<CsdlSingleton> providerSingletons = container.getSingletons(); final List<EdmSingleton> singletonsLocal = new ArrayList<EdmSingleton>(); - + if (providerSingletons != null) { for (CsdlSingleton singleton : providerSingletons) { final EdmSingletonImpl impl = new EdmSingletonImpl(edm, this, singleton); @@ -302,7 +302,7 @@ public class EdmEntityContainerImpl extends AbstractEdmNamed implements EdmEntit if (containerLocal == null) { containerLocal = new CsdlEntityContainer().setName(getName()); } - + container = containerLocal; } catch (ODataException e) { throw new EdmException(e); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntitySetImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntitySetImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntitySetImpl.java index a840841..b080637 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntitySetImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntitySetImpl.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/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntityTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntityTypeImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntityTypeImpl.java index 73d8758..a1a8cbd 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntityTypeImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntityTypeImpl.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,7 @@ public class EdmEntityTypeImpl extends AbstractEdmStructuredType implements EdmE private final boolean hasStream; protected EdmEntityType entityBaseType; private final List<String> keyPredicateNames = Collections.synchronizedList(new ArrayList<String>()); - private final Map<String, EdmKeyPropertyRef> keyPropertyRefs = + private final Map<String, EdmKeyPropertyRef> keyPropertyRefs = Collections.synchronizedMap(new LinkedHashMap<String, EdmKeyPropertyRef>()); private List<EdmKeyPropertyRef> keyPropertyRefsList; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEnumTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEnumTypeImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEnumTypeImpl.java index d04e406..f1311c1 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEnumTypeImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEnumTypeImpl.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 @@ -73,8 +73,8 @@ public class EdmEnumTypeImpl extends EdmTypeImpl implements EdmEnumType { } this.enumType = enumType; - this.uriPrefix = enumName.getFullQualifiedNameAsString() + '\''; - this.uriSuffix = "'"; + uriPrefix = enumName.getFullQualifiedNameAsString() + '\''; + uriSuffix = "'"; } @Override @@ -106,7 +106,7 @@ public class EdmEnumTypeImpl extends EdmTypeImpl implements EdmEnumType { membersMapLocal.put(member.getName(), new EdmMemberImpl(edm, getFullQualifiedName(), member)); memberNamesLocal.add(member.getName()); } - + membersMap = membersMapLocal; memberNames = memberNamesLocal; } @@ -154,7 +154,7 @@ public class EdmEnumTypeImpl extends EdmTypeImpl implements EdmEnumType { @Override public <T> T valueOfString(final String value, final Boolean isNullable, final Integer maxLength, final Integer precision, final Integer scale, final Boolean isUnicode, final Class<T> returnType) - throws EdmPrimitiveTypeException { + throws EdmPrimitiveTypeException { if (value == null) { if (isNullable != null && !isNullable) { @@ -203,7 +203,7 @@ public class EdmEnumTypeImpl extends EdmTypeImpl implements EdmEnumType { } private Collection<EdmMember> getMembers() { - if(membersMap == null){ + if (membersMap == null) { createEdmMembers(); } return membersMap.values(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImpl.java index 8ed366b..fc41a89 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImpl.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/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImportImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImportImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImportImpl.java index 64a80c6..30ce314 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImportImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImportImpl.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 @@ -32,7 +32,7 @@ public class EdmFunctionImportImpl extends AbstractEdmOperationImport implements private final CsdlFunctionImport functionImport; public EdmFunctionImportImpl(final Edm edm, final EdmEntityContainer container, - final CsdlFunctionImport functionImport) { + final CsdlFunctionImport functionImport) { super(edm, container, functionImport); this.functionImport = functionImport; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmKeyPropertyRefImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmKeyPropertyRefImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmKeyPropertyRefImpl.java index 13199ee..482f9e2 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmKeyPropertyRefImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmKeyPropertyRefImpl.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 EdmKeyPropertyRefImpl implements EdmKeyPropertyRef { public String getAlias() { return ref.getAlias(); } - + @Override public EdmProperty getProperty() { if (property == null) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmMemberImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmMemberImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmMemberImpl.java index 7fd05e4..a84bafa 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmMemberImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmMemberImpl.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 @@ -33,7 +33,7 @@ public class EdmMemberImpl extends AbstractEdmNamed implements EdmMember { this.enumFQN = enumFQN; this.member = member; } - + @Override public TargetType getAnnotationsTargetType() { return TargetType.Member; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmNavigationPropertyBindingImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmNavigationPropertyBindingImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmNavigationPropertyBindingImpl.java index 5815a6c..88a8b24 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmNavigationPropertyBindingImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmNavigationPropertyBindingImpl.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/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmNavigationPropertyImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmNavigationPropertyImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmNavigationPropertyImpl.java index 2904dea..4b387e3 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmNavigationPropertyImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmNavigationPropertyImpl.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 @@ -119,7 +119,7 @@ public class EdmNavigationPropertyImpl extends AbstractEdmNamed implements EdmEl referentialConstraintsLocal.add(new EdmReferentialConstraintImpl(edm, constraint)); } } - + referentialConstraints = referentialConstraintsLocal; } return Collections.unmodifiableList(referentialConstraints); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmParameterImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmParameterImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmParameterImpl.java index 33f2fd0..622dd05 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmParameterImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmParameterImpl.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 @@ -36,7 +36,7 @@ public class EdmParameterImpl extends AbstractEdmNamed implements EdmParameter, public EdmParameterImpl(final Edm edm, final CsdlParameter parameter) { super(edm, parameter.getName(), parameter); this.parameter = parameter; - this.typeInfo = new EdmTypeInfo.Builder().setEdm(edm).setTypeExpression(parameter.getType()).build(); + typeInfo = new EdmTypeInfo.Builder().setEdm(edm).setTypeExpression(parameter.getType()).build(); } @Override http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmPropertyImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmPropertyImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmPropertyImpl.java index 853e235..7a54a10 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmPropertyImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmPropertyImpl.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 @@ -54,7 +54,7 @@ public class EdmPropertyImpl extends AbstractEdmNamed implements EdmProperty, Ed return propertyType; } - + @Override public boolean isCollection() { return property.isCollection(); @@ -114,7 +114,7 @@ public class EdmPropertyImpl extends AbstractEdmNamed implements EdmProperty, Ed public String getAnnotationsTargetPath() { return getName(); } - + @Override public FullQualifiedName getAnnotationsTargetFQN() { return structuredTypeName; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmProviderImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmProviderImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmProviderImpl.java index 4f3c004..3239276 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmProviderImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmProviderImpl.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 @@ -182,29 +182,29 @@ public class EdmProviderImpl extends AbstractEdm { } final List<String> parameterNamesCopy = parameterNames == null ? Collections.<String> emptyList() : parameterNames; - for (CsdlFunction function : functions) { - if (function.isBound()) { - List<CsdlParameter> providerParameters = function.getParameters(); - if (providerParameters == null || providerParameters.size() == 0) { - throw new EdmException("No parameter specified for bound function: " + functionName); - } - final CsdlParameter bindingParameter = providerParameters.get(0); - if (bindingParameterTypeName.equals(bindingParameter.getTypeFQN()) - && isBindingParameterCollection.booleanValue() == bindingParameter.isCollection()) { - - if (parameterNamesCopy.size() == providerParameters.size() - 1) { - final List<String> providerParameterNames = new ArrayList<String>(); - for (int i = 1; i < providerParameters.size(); i++) { - providerParameterNames.add(providerParameters.get(i).getName()); + for (CsdlFunction function : functions) { + if (function.isBound()) { + List<CsdlParameter> providerParameters = function.getParameters(); + if (providerParameters == null || providerParameters.size() == 0) { + throw new EdmException("No parameter specified for bound function: " + functionName); } - if (parameterNamesCopy.containsAll(providerParameterNames)) { - return new EdmFunctionImpl(this, functionName, function); + final CsdlParameter bindingParameter = providerParameters.get(0); + if (bindingParameterTypeName.equals(bindingParameter.getTypeFQN()) + && isBindingParameterCollection.booleanValue() == bindingParameter.isCollection()) { + + if (parameterNamesCopy.size() == providerParameters.size() - 1) { + final List<String> providerParameterNames = new ArrayList<String>(); + for (int i = 1; i < providerParameters.size(); i++) { + providerParameterNames.add(providerParameters.get(i).getName()); + } + if (parameterNamesCopy.containsAll(providerParameterNames)) { + return new EdmFunctionImpl(this, functionName, function); + } + } } } } - } - } - return null; + return null; } catch (ODataException e) { throw new EdmException(e); } @@ -291,25 +291,25 @@ public class EdmProviderImpl extends AbstractEdm { final List<String> parameterNamesCopy = parameterNames == null ? Collections.<String> emptyList() : parameterNames; - for (CsdlFunction function : functions) { - if (!function.isBound()) { - List<CsdlParameter> providerParameters = function.getParameters(); - if (providerParameters == null) { - providerParameters = Collections.emptyList(); - } - if (parameterNamesCopy.size() == providerParameters.size()) { - final List<String> functionParameterNames = new ArrayList<String>(); - for (CsdlParameter parameter : providerParameters) { - functionParameterNames.add(parameter.getName()); - } + for (CsdlFunction function : functions) { + if (!function.isBound()) { + List<CsdlParameter> providerParameters = function.getParameters(); + if (providerParameters == null) { + providerParameters = Collections.emptyList(); + } + if (parameterNamesCopy.size() == providerParameters.size()) { + final List<String> functionParameterNames = new ArrayList<String>(); + for (CsdlParameter parameter : providerParameters) { + functionParameterNames.add(parameter.getName()); + } - if (parameterNamesCopy.containsAll(functionParameterNames)) { - return new EdmFunctionImpl(this, functionName, function); + if (parameterNamesCopy.containsAll(functionParameterNames)) { + return new EdmFunctionImpl(this, functionName, function); + } + } } } - } - } - return null; + return null; } catch (ODataException e) { throw new EdmException(e); } @@ -341,7 +341,7 @@ public class EdmProviderImpl extends AbstractEdm { } } - //TODO: Check Provider annotations implementation + // TODO: Check Provider annotations implementation @Override protected EdmAnnotations createAnnotationGroup(final FullQualifiedName targetName) { try { @@ -362,8 +362,8 @@ public class EdmProviderImpl extends AbstractEdm { CsdlAnnotatable providerAnnotatable = provider.getAnnoatatable(annotatedName); if (providerAnnotatable != null && providerAnnotatable.getAnnotations() != null) { List<EdmAnnotation> result = new ArrayList<EdmAnnotation>(); - for(CsdlAnnotation annotation : providerAnnotatable.getAnnotations()){ - //Load Term + for (CsdlAnnotation annotation : providerAnnotatable.getAnnotations()) { + // Load Term getTerm(new FullQualifiedName(annotation.getTerm())); result.add(new EdmAnnotationImpl(this, annotation)); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmReferentialConstraintImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmReferentialConstraintImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmReferentialConstraintImpl.java index 7393499..0bb8045 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmReferentialConstraintImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmReferentialConstraintImpl.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,7 +25,7 @@ import org.apache.olingo.commons.api.edm.provider.CsdlReferentialConstraint; public class EdmReferentialConstraintImpl extends AbstractEdmAnnotatable implements EdmReferentialConstraint { private final CsdlReferentialConstraint constraint; - + public EdmReferentialConstraintImpl(final Edm edm, final CsdlReferentialConstraint constraint) { super(edm, constraint); this.constraint = constraint; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmReturnTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmReturnTypeImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmReturnTypeImpl.java index efd58c8..37d3f26 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmReturnTypeImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmReturnTypeImpl.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 @@ -30,10 +30,10 @@ public class EdmReturnTypeImpl implements EdmReturnType { private final CsdlReturnType returnType; private final EdmTypeInfo typeInfo; private EdmType typeImpl; - + public EdmReturnTypeImpl(final Edm edm, final CsdlReturnType returnType) { this.returnType = returnType; - this.typeInfo = new EdmTypeInfo.Builder().setEdm(edm).setTypeExpression(returnType.getType()).build(); + typeInfo = new EdmTypeInfo.Builder().setEdm(edm).setTypeExpression(returnType.getType()).build(); } @Override @@ -65,7 +65,7 @@ public class EdmReturnTypeImpl implements EdmReturnType { public SRID getSrid() { return returnType.getSrid(); } - + @Override public EdmType getType() { if (typeImpl == null) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSchemaImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSchemaImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSchemaImpl.java index 1c7bb4c..4d00a1c 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSchemaImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSchemaImpl.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,8 +69,8 @@ public class EdmSchemaImpl implements EdmSchema { this.edm = edm; this.provider = provider; this.schema = schema; - this.namespace = schema.getNamespace(); - this.alias = schema.getAlias(); + namespace = schema.getNamespace(); + alias = schema.getAlias(); if (alias != null) { edm.cacheAliasNamespaceInfo(alias, namespace); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSingletonImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSingletonImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSingletonImpl.java index c64a866..20b86bf 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSingletonImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSingletonImpl.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/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTermImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTermImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTermImpl.java index efda3a7..0f60716 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTermImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTermImpl.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. */ @@ -47,8 +47,8 @@ public class EdmTermImpl extends AbstractEdmNamed implements EdmTerm { super(edm, term.getName(), term); this.term = term; - this.fqn = new FullQualifiedName(namespace, term.getName()); - this.typeInfo = new EdmTypeInfo.Builder().setEdm(edm).setTypeExpression(term.getType()).build(); + fqn = new FullQualifiedName(namespace, term.getName()); + typeInfo = new EdmTypeInfo.Builder().setEdm(edm).setTypeExpression(term.getType()).build(); } @Override @@ -60,17 +60,17 @@ public class EdmTermImpl extends AbstractEdmNamed implements EdmTerm { public EdmType getType() { if (termType == null) { termType = typeInfo.isPrimitiveType() - ? EdmPrimitiveTypeFactory.getInstance(typeInfo.getPrimitiveTypeKind()) - : typeInfo.isTypeDefinition() + ? EdmPrimitiveTypeFactory.getInstance(typeInfo.getPrimitiveTypeKind()) + : typeInfo.isTypeDefinition() ? typeInfo.getTypeDefinition() - : typeInfo.isEnumType() - ? typeInfo.getEnumType() - : typeInfo.isComplexType() - ? typeInfo.getComplexType() - : null; - if (termType == null) { - throw new EdmException("Cannot find type with name: " + typeInfo.getFullQualifiedName()); - } + : typeInfo.isEnumType() + ? typeInfo.getEnumType() + : typeInfo.isComplexType() + ? typeInfo.getComplexType() + : null; + if (termType == null) { + throw new EdmException("Cannot find type with name: " + typeInfo.getFullQualifiedName()); + } } return termType; @@ -95,7 +95,7 @@ public class EdmTermImpl extends AbstractEdmNamed implements EdmTerm { LOG.error("Could not load Edm class for {}", element, e); } } - + appliesTo = appliesToLocal; } return appliesTo; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeDefinitionImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeDefinitionImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeDefinitionImpl.java index 6e15f35..9c777d9 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeDefinitionImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeDefinitionImpl.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 @@ -57,16 +57,16 @@ public class EdmTypeDefinitionImpl extends AbstractEdmNamed implements EdmTypeDe public EdmTypeKind getKind() { return EdmTypeKind.DEFINITION; } - + @Override public EdmPrimitiveType getUnderlyingType() { - if(edmPrimitiveTypeInstance == null){ + if (edmPrimitiveTypeInstance == null) { try { if (typeDefinition.getUnderlyingType() == null) { throw new EdmException("Underlying Type for type definition: " + typeDefinitionName.getFullQualifiedNameAsString() + " must not be null."); } - this.edmPrimitiveTypeInstance = EdmPrimitiveTypeFactory.getInstance( + edmPrimitiveTypeInstance = EdmPrimitiveTypeFactory.getInstance( EdmPrimitiveTypeKind.valueOfFQN(typeDefinition.getUnderlyingType())); } catch (IllegalArgumentException e) { throw new EdmException("Invalid underlying type: " + typeDefinition.getUnderlyingType(), e); @@ -99,7 +99,7 @@ public class EdmTypeDefinitionImpl extends AbstractEdmNamed implements EdmTypeDe public Boolean isUnicode() { return typeDefinition.isUnicode(); } - + @Override public boolean isCompatible(final EdmPrimitiveType primitiveType) { return getUnderlyingType().isCompatible(primitiveType); @@ -145,7 +145,6 @@ public class EdmTypeDefinitionImpl extends AbstractEdmNamed implements EdmTypeDe return getUnderlyingType().fromUriLiteral(literal); } - @Override public TargetType getAnnotationsTargetType() { return TargetType.TypeDefinition; @@ -155,7 +154,7 @@ public class EdmTypeDefinitionImpl extends AbstractEdmNamed implements EdmTypeDe public FullQualifiedName getAnnotationsTargetFQN() { return getFullQualifiedName(); } - + @Override public String getAnnotationsTargetPath() { return getName(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeImpl.java index 3b6f070..66fcf9e 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeImpl.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 @@ -30,7 +30,7 @@ public class EdmTypeImpl extends AbstractEdmNamed implements EdmType { protected final EdmTypeKind kind; public EdmTypeImpl(final Edm edm, final FullQualifiedName typeName, final EdmTypeKind kind, - final CsdlAnnotatable annotatable) { + final CsdlAnnotatable annotatable) { super(edm, typeName.getName(), annotatable); this.typeName = typeName; this.kind = kind; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeInfo.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeInfo.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeInfo.java index 67008ab..ae2e3da 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeInfo.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeInfo.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 @@ -56,7 +56,7 @@ public class EdmTypeInfo { public EdmTypeInfo build() { return new EdmTypeInfo(edm, typeExpression.indexOf('.') == -1 && StringUtils.isNotBlank(defaultNamespace) ? defaultNamespace + "." + typeExpression - : typeExpression); + : typeExpression); } } @@ -149,7 +149,7 @@ public class EdmTypeInfo { if (isPrimitiveType()) { serialize.append(getFullQualifiedName().getName()); - }else{ + } else { serialize.append(getFullQualifiedName().toString()); } @@ -215,14 +215,14 @@ public class EdmTypeInfo { public EdmType getType() { return isPrimitiveType() ? EdmPrimitiveTypeFactory.getInstance(getPrimitiveTypeKind()) - : isTypeDefinition() + : isTypeDefinition() ? getTypeDefinition() - : isEnumType() + : isEnumType() ? getEnumType() - : isComplexType() + : isComplexType() ? getComplexType() - : isEntityType() + : isEntityType() ? getEntityType() - : null; + : null; } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/FunctionMapKey.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/FunctionMapKey.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/FunctionMapKey.java index 13cf5eb..0b37b0c 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/FunctionMapKey.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/FunctionMapKey.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 @@ -18,13 +18,13 @@ */ package org.apache.olingo.commons.core.edm; -import org.apache.olingo.commons.api.edm.EdmException; -import org.apache.olingo.commons.api.edm.FullQualifiedName; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.apache.olingo.commons.api.edm.EdmException; +import org.apache.olingo.commons.api.edm.FullQualifiedName; + public class FunctionMapKey { private final FullQualifiedName functionName; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/Target.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/Target.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/Target.java index 083ef6f..3b6e855 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/Target.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/Target.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 @@ -30,7 +30,7 @@ public class Target { private String targetName; private FullQualifiedName entityContainer; - public Target(String target, EdmEntityContainer defaultContainer) { + public Target(final String target, final EdmEntityContainer defaultContainer) { final String[] bindingTargetParts = target.split("/"); if (bindingTargetParts.length == 1) { entityContainer = defaultContainer.getFullQualifiedName(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmAnnotatableDynamicAnnotationExpression.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmAnnotatableDynamicAnnotationExpression.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmAnnotatableDynamicAnnotationExpression.java index 06f12d3..86fd669 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmAnnotatableDynamicAnnotationExpression.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmAnnotatableDynamicAnnotationExpression.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 @@ -18,15 +18,15 @@ */ package org.apache.olingo.commons.core.edm.annotation; +import java.util.ArrayList; +import java.util.List; + import org.apache.olingo.commons.api.edm.EdmAnnotatable; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmTerm; -import java.util.ArrayList; -import java.util.List; - public abstract class AbstractEdmAnnotatableDynamicAnnotationExpression - extends AbstractEdmDynamicAnnotationExpression implements EdmAnnotatable { +extends AbstractEdmDynamicAnnotationExpression implements EdmAnnotatable { private final List<EdmAnnotation> annotations = new ArrayList<EdmAnnotation>(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmAnnotationEspression.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmAnnotationEspression.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmAnnotationEspression.java index 9913595..bb2c918 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmAnnotationEspression.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmAnnotationEspression.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/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmDynamicAnnotationExpression.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmDynamicAnnotationExpression.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmDynamicAnnotationExpression.java index 9ac92cc..ed11b88 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmDynamicAnnotationExpression.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmDynamicAnnotationExpression.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 @@ import org.apache.olingo.commons.api.edm.annotation.EdmRecord; import org.apache.olingo.commons.api.edm.annotation.EdmUrlRef; public abstract class AbstractEdmDynamicAnnotationExpression - extends AbstractEdmAnnotationEspression implements EdmDynamicAnnotationExpression { +extends AbstractEdmAnnotationEspression implements EdmDynamicAnnotationExpression { @Override public boolean isNot() { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmElementOrAttributeNotation.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmElementOrAttributeNotation.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmElementOrAttributeNotation.java index a0f4fae..aafe681 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmElementOrAttributeNotation.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmElementOrAttributeNotation.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/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmTwoParamsOpDynamicAnnotationExpression.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmTwoParamsOpDynamicAnnotationExpression.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmTwoParamsOpDynamicAnnotationExpression.java index cdf64d9..78bb35a 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmTwoParamsOpDynamicAnnotationExpression.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmTwoParamsOpDynamicAnnotationExpression.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 @@ -22,7 +22,7 @@ import org.apache.olingo.commons.api.edm.annotation.EdmDynamicAnnotationExpressi import org.apache.olingo.commons.api.edm.annotation.EdmTwoParamsOpDynamicAnnotationExpression; public abstract class AbstractEdmTwoParamsOpDynamicAnnotationExpression - extends AbstractEdmDynamicAnnotationExpression implements EdmTwoParamsOpDynamicAnnotationExpression { +extends AbstractEdmDynamicAnnotationExpression implements EdmTwoParamsOpDynamicAnnotationExpression { private final EdmDynamicAnnotationExpression left; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmAndImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmAndImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmAndImpl.java index 744c9b6..02e4b48 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmAndImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmAndImpl.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/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmAnnotationPathImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmAnnotationPathImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmAnnotationPathImpl.java index 0944872..38d70fa 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmAnnotationPathImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmAnnotationPathImpl.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/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmApplyImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmApplyImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmApplyImpl.java index 1d1e56a..bc0a7af 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmApplyImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmApplyImpl.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 @@ -18,11 +18,11 @@ */ package org.apache.olingo.commons.core.edm.annotation; +import java.util.List; + import org.apache.olingo.commons.api.edm.annotation.EdmAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmApply; -import java.util.List; - public class EdmApplyImpl extends AbstractEdmAnnotatableDynamicAnnotationExpression implements EdmApply { private final String function; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmCastImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmCastImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmCastImpl.java index 419adea..086bdf2 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmCastImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmCastImpl.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. */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmCollectionImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmCollectionImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmCollectionImpl.java index c6dd506..41472d0 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmCollectionImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmCollectionImpl.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 @@ -18,11 +18,11 @@ */ package org.apache.olingo.commons.core.edm.annotation; +import java.util.List; + import org.apache.olingo.commons.api.edm.annotation.EdmAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmCollection; -import java.util.List; - public class EdmCollectionImpl extends AbstractEdmDynamicAnnotationExpression implements EdmCollection { private final List<EdmAnnotationExpression> items; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmConstantAnnotationExpressionImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmConstantAnnotationExpressionImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmConstantAnnotationExpressionImpl.java index cc9f4fb..0096fbb 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmConstantAnnotationExpressionImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmConstantAnnotationExpressionImpl.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 @@ -98,10 +98,10 @@ public class EdmConstantAnnotationExpressionImpl implements EdmConstantAnnotatio type = EdmPrimitiveTypeFactory.getInstance(kind); try { final Object valueOfString = type.valueOfString(constExprConstruct.getValue(), - null, null, Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null, - type.getDefaultType()); + null, null, Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null, + type.getDefaultType()); value = new Property(kind.getFullQualifiedName().getFullQualifiedNameAsString(), - null, ValueType.PRIMITIVE, valueOfString); + null, ValueType.PRIMITIVE, valueOfString); } catch (EdmPrimitiveTypeException e) { throw new IllegalArgumentException(e); } @@ -137,7 +137,7 @@ public class EdmConstantAnnotationExpressionImpl implements EdmConstantAnnotatio public String getValueAsString() { if (value == null) { return ""; - } else if(value.isEnum()) { + } else if (value.isEnum()) { return value.toString(); } else if (value.isGeospatial()) { return value.toString(); @@ -145,7 +145,7 @@ public class EdmConstantAnnotationExpressionImpl implements EdmConstantAnnotatio // TODO: check after copied from ClientPrimitiveValueImpl try { return type.valueToString(value.getValue(), null, null, - Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null); + Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null); } catch (EdmPrimitiveTypeException e) { throw new IllegalArgumentException(e); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmEqImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmEqImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmEqImpl.java index db8ce04..f2df85f 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmEqImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmEqImpl.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/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmGeImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmGeImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmGeImpl.java index 37de9b6..7bef6bb 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmGeImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmGeImpl.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/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmGtImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmGtImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmGtImpl.java index 91cff4b..d6b1bb7 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmGtImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmGtImpl.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/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmIfImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmIfImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmIfImpl.java index 79c2fd7..e868e34 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmIfImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmIfImpl.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/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmIsOfImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmIsOfImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmIsOfImpl.java index 03ae319..8b13788 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmIsOfImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmIsOfImpl.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. */
