http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/SRID.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/SRID.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/SRID.java index 2765483..c22f59a 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/SRID.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/SRID.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 @@ -19,6 +19,7 @@ package org.apache.olingo.commons.api.edm.geo; import java.io.Serializable; + import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.olingo.commons.api.edm.geo.Geospatial.Dimension; @@ -54,7 +55,7 @@ public class SRID implements Serializable { instance.value = Integer.valueOf(exp); if (instance.value < 0) { throw new IllegalArgumentException( - "The value of the SRID attribute MUST be a non-negative integer or the special value 'variable'"); + "The value of the SRID attribute MUST be a non-negative integer or the special value 'variable'"); } } @@ -75,10 +76,10 @@ public class SRID implements Serializable { private String getValue() { return value == null - ? dimension == Dimension.GEOMETRY - ? "0" + ? dimension == Dimension.GEOMETRY + ? "0" : "4326" - : value.toString(); + : value.toString(); } private boolean isVariable() { @@ -102,8 +103,8 @@ public class SRID implements Serializable { @Override public String toString() { return isVariable() - ? VARIABLE - : getValue(); + ? VARIABLE + : getValue(); } }
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/package-info.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/package-info.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/package-info.java index 052de43..652f914 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/package-info.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/package-info.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-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAbstractEdmItem.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAbstractEdmItem.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAbstractEdmItem.java index 0b02947..55beb26 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAbstractEdmItem.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAbstractEdmItem.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-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAbstractEdmProvider.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAbstractEdmProvider.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAbstractEdmProvider.java index 802cef8..cb53478 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAbstractEdmProvider.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAbstractEdmProvider.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 @@ -86,7 +86,7 @@ public abstract class CsdlAbstractEdmProvider implements CsdlEdmProvider { @Override public CsdlEntityContainerInfo getEntityContainerInfo(final FullQualifiedName entityContainerName) - throws ODataException { + throws ODataException { return null; } @@ -106,12 +106,12 @@ public abstract class CsdlAbstractEdmProvider implements CsdlEdmProvider { } @Override - public CsdlAnnotations getAnnotationsGroup(FullQualifiedName targetName) throws ODataException { + public CsdlAnnotations getAnnotationsGroup(final FullQualifiedName targetName) throws ODataException { return null; } @Override - public CsdlAnnotatable getAnnoatatable(FullQualifiedName annotatedName) throws ODataException { + public CsdlAnnotatable getAnnoatatable(final FullQualifiedName annotatedName) throws ODataException { return null; } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAction.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAction.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAction.java index bfd0d83..d72b953 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAction.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAction.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-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlActionImport.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlActionImport.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlActionImport.java index eb47c5c..90cb1c8 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlActionImport.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlActionImport.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 @@ -20,7 +20,6 @@ package org.apache.olingo.commons.api.edm.provider; import org.apache.olingo.commons.api.edm.FullQualifiedName; - public class CsdlActionImport extends CsdlOperationImport { private static final long serialVersionUID = 9186148718228340987L; @@ -42,7 +41,7 @@ public class CsdlActionImport extends CsdlOperationImport { public String getAction() { return action.getFullQualifiedNameAsString(); } - + public FullQualifiedName getActionFQN() { return action; } @@ -51,7 +50,7 @@ public class CsdlActionImport extends CsdlOperationImport { this.action = new FullQualifiedName(action); return this; } - + public CsdlActionImport setAction(final FullQualifiedName action) { this.action = action; return this; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAliasInfo.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAliasInfo.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAliasInfo.java index ba6067a..ad174be 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAliasInfo.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAliasInfo.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-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotatable.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotatable.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotatable.java index 393f353..87eca18 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotatable.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotatable.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. */ @@ -21,6 +21,6 @@ package org.apache.olingo.commons.api.edm.provider; import java.util.List; public interface CsdlAnnotatable { - + List<CsdlAnnotation> getAnnotations(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotation.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotation.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotation.java index 580c03f..db4413c 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotation.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotation.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 @@ -61,9 +61,9 @@ public class CsdlAnnotation extends CsdlAbstractEdmItem implements CsdlAnnotatab return this; } -// public List<Annotation> getAnnotation() { -// return annotation; -// } + // public List<Annotation> getAnnotation() { + // return annotation; + // } public CsdlAnnotation setAnnotations(final List<CsdlAnnotation> annotation) { this.annotation = annotation; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotations.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotations.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotations.java index 595eb96..59daf18 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotations.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotations.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. */ @@ -48,7 +48,7 @@ public class CsdlAnnotations extends CsdlAbstractEdmItem implements CsdlAnnotata this.qualifier = qualifier; return this; } - + @Override public List<CsdlAnnotation> getAnnotations() { return annotations; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlBindingTarget.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlBindingTarget.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlBindingTarget.java index c7143c7..1c79faf 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlBindingTarget.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlBindingTarget.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,10 +32,11 @@ public abstract class CsdlBindingTarget extends CsdlAbstractEdmItem implements C protected FullQualifiedName type; protected List<CsdlNavigationPropertyBinding> navigationPropertyBindings = - new ArrayList<CsdlNavigationPropertyBinding>(); - + new ArrayList<CsdlNavigationPropertyBinding>(); + private final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + @Override public String getName() { return name; } @@ -48,7 +49,7 @@ public abstract class CsdlBindingTarget extends CsdlAbstractEdmItem implements C public String getType() { return type.getFullQualifiedNameAsString(); } - + public FullQualifiedName getTypeFQN() { return type; } @@ -57,7 +58,7 @@ public abstract class CsdlBindingTarget extends CsdlAbstractEdmItem implements C this.type = new FullQualifiedName(type); return this; } - + public CsdlBindingTarget setType(final FullQualifiedName type) { this.type = type; return this; @@ -68,11 +69,11 @@ public abstract class CsdlBindingTarget extends CsdlAbstractEdmItem implements C } public CsdlBindingTarget setNavigationPropertyBindings( - final List<CsdlNavigationPropertyBinding> navigationPropertyBindings) { + final List<CsdlNavigationPropertyBinding> navigationPropertyBindings) { this.navigationPropertyBindings = navigationPropertyBindings; return this; } - + @Override public List<CsdlAnnotation> getAnnotations() { return annotations; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlComplexType.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlComplexType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlComplexType.java index 208d377..cb3f123 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlComplexType.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlComplexType.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 @@ -43,7 +43,7 @@ public class CsdlComplexType extends CsdlStructuralType { this.baseType = new FullQualifiedName(baseType); return this; } - + @Override public CsdlComplexType setBaseType(final FullQualifiedName baseType) { this.baseType = baseType; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEdmProvider.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEdmProvider.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEdmProvider.java index db40de1..ebfc173 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEdmProvider.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEdmProvider.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 @@ -27,7 +27,7 @@ public interface CsdlEdmProvider { /** * This method should return an {@link CsdlEnumType} or <b>null</b> if nothing is found - * + * * @param enumTypeName * @return {@link CsdlEnumType} for given name * @throws ODataException @@ -36,7 +36,7 @@ public interface CsdlEdmProvider { /** * This method should return an {@link CsdlTypeDefinition} or <b>null</b> if nothing is found - * + * * @param typeDefinitionName * @return {@link CsdlTypeDefinition} for given name * @throws ODataException @@ -45,7 +45,7 @@ public interface CsdlEdmProvider { /** * This method should return an {@link CsdlEntityType} or <b>null</b> if nothing is found - * + * * @param entityTypeName * @return {@link CsdlEntityType} for the given name * @throws ODataException @@ -54,7 +54,7 @@ public interface CsdlEdmProvider { /** * This method should return a {@link CsdlComplexType} or <b>null</b> if nothing is found. - * + * * @param complexTypeName * @return {@link CsdlComplexType} for the given name * @throws ODataException @@ -64,7 +64,7 @@ public interface CsdlEdmProvider { /** * This method should return a list of all {@link CsdlAction} for the FullQualifiedname * or <b>null</b> if nothing is found - * + * * @param actionName * @return List of {@link CsdlAction} or null * @throws ODataException @@ -74,7 +74,7 @@ public interface CsdlEdmProvider { /** * This method should return a list of all {@link CsdlFunction} for the FullQualifiedname or <b>null</b> if nothing is * found - * + * * @param functionName * @return List of {@link CsdlFunction} or null * @throws ODataException @@ -91,7 +91,7 @@ public interface CsdlEdmProvider { /** * This method should return an {@link CsdlEntitySet} or <b>null</b> if nothing is found - * + * * @param entityContainer this EntitySet is contained in * @param entitySetName * @return {@link CsdlEntitySet} for the given container and entityset name @@ -102,7 +102,7 @@ public interface CsdlEdmProvider { /** * This method should return an {@link CsdlSingleton} or <b>null</b> if nothing is found - * + * * @param entityContainer this Singleton is contained in * @param singletonName * @return {@link CsdlSingleton} for given container and singleton name @@ -113,7 +113,7 @@ public interface CsdlEdmProvider { /** * This method should return an {@link CsdlActionImport} or <b>null</b> if nothing is found - * + * * @param entityContainer this ActionImport is contained in * @param actionImportName * @return {@link CsdlActionImport} for the given container and ActionImport name @@ -124,7 +124,7 @@ public interface CsdlEdmProvider { /** * This method should return a {@link CsdlFunctionImport} or <b>null</b> if nothing is found - * + * * @param entityContainer this FunctionImport is contained in * @param functionImportName * @return {@link CsdlFunctionImport} for the given container name and function import name @@ -135,17 +135,17 @@ public interface CsdlEdmProvider { /** * This method should return an {@link CsdlEntityContainerInfo} or <b>null</b> if nothing is found - * + * * @param entityContainerName (null for default container) * @return {@link CsdlEntityContainerInfo} for the given name * @throws ODataException */ public CsdlEntityContainerInfo getEntityContainerInfo(final FullQualifiedName entityContainerName) - throws ODataException; + throws ODataException; /** * This method should return a list of all namespaces which have an alias - * + * * @return List of alias info * @throws ODataException */ @@ -153,7 +153,7 @@ public interface CsdlEdmProvider { /** * This method should return a collection of all {@link CsdlSchema} - * + * * @return List<{@link Schema}> * @throws ODataException */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityContainer.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityContainer.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityContainer.java index ee0a772..2ce9391 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityContainer.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityContainer.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 @@ -42,6 +42,7 @@ public class CsdlEntityContainer extends CsdlAbstractEdmItem implements CsdlName private final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); // Annotations + @Override public String getName() { return name; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityContainerInfo.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityContainerInfo.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityContainerInfo.java index 9445c89..757d100 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityContainerInfo.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityContainerInfo.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-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntitySet.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntitySet.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntitySet.java index d4a6002..3399f28 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntitySet.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntitySet.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,8 +25,8 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; public class CsdlEntitySet extends CsdlBindingTarget { private static final long serialVersionUID = 5291570018480936643L; - - //Default for EntitySets is true + + // Default for EntitySets is true private boolean includeInServiceDocument = true; @Override @@ -37,7 +37,7 @@ public class CsdlEntitySet extends CsdlBindingTarget { @Override public CsdlEntitySet setNavigationPropertyBindings( - final List<CsdlNavigationPropertyBinding> navigationPropertyBindings) { + final List<CsdlNavigationPropertyBinding> navigationPropertyBindings) { this.navigationPropertyBindings = navigationPropertyBindings; return this; } @@ -47,7 +47,7 @@ public class CsdlEntitySet extends CsdlBindingTarget { this.type = new FullQualifiedName(type); return this; } - + @Override public CsdlEntitySet setType(final FullQualifiedName type) { this.type = type; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntitySetPath.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntitySetPath.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntitySetPath.java index 073559e..446c636 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntitySetPath.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntitySetPath.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-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityType.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityType.java index fad6e7a..92f9c3c 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityType.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityType.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,7 +47,7 @@ public class CsdlEntityType extends CsdlStructuralType { this.key = key; return this; } - + @Override public CsdlEntityType setName(final String name) { this.name = name; @@ -65,7 +65,7 @@ public class CsdlEntityType extends CsdlStructuralType { this.baseType = new FullQualifiedName(baseType); return this; } - + @Override public CsdlEntityType setBaseType(final FullQualifiedName baseType) { this.baseType = baseType; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEnumMember.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEnumMember.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEnumMember.java index 8f11bf0..2ab5ec9 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEnumMember.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEnumMember.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 @@ -31,6 +31,7 @@ public class CsdlEnumMember extends CsdlAbstractEdmItem implements CsdlNamed, Cs private final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + @Override public String getName() { return name; } @@ -48,10 +49,10 @@ public class CsdlEnumMember extends CsdlAbstractEdmItem implements CsdlNamed, Cs this.value = value; return this; } - + @Override public List<CsdlAnnotation> getAnnotations() { return annotations; } - + } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEnumType.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEnumType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEnumType.java index 314ac04..9f0f693 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEnumType.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEnumType.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 @@ -34,9 +34,10 @@ public class CsdlEnumType extends CsdlAbstractEdmItem implements CsdlNamed, Csdl private FullQualifiedName underlyingType; private List<CsdlEnumMember> members = new ArrayList<CsdlEnumMember>(); - + private final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + @Override public String getName() { return name; } @@ -56,7 +57,7 @@ public class CsdlEnumType extends CsdlAbstractEdmItem implements CsdlNamed, Csdl } public String getUnderlyingType() { - if(underlyingType != null){ + if (underlyingType != null) { return underlyingType.getFullQualifiedNameAsString(); } return null; @@ -66,13 +67,12 @@ public class CsdlEnumType extends CsdlAbstractEdmItem implements CsdlNamed, Csdl this.underlyingType = new FullQualifiedName(underlyingType); return this; } - + public CsdlEnumType setUnderlyingType(final FullQualifiedName underlyingType) { this.underlyingType = underlyingType; return this; } - public List<CsdlEnumMember> getMembers() { return members; } @@ -105,7 +105,7 @@ public class CsdlEnumType extends CsdlAbstractEdmItem implements CsdlNamed, Csdl this.members = members; return this; } - + @Override public List<CsdlAnnotation> getAnnotations() { return annotations; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlExpression.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlExpression.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlExpression.java index cb3f765..f603062 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlExpression.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlExpression.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 @@ -19,5 +19,5 @@ package org.apache.olingo.commons.api.edm.provider; public class CsdlExpression { -//TODO: Expression implementation + // TODO: Expression implementation } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlFunction.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlFunction.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlFunction.java index 38b32c7..7ddfad3 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlFunction.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlFunction.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 @@ -23,7 +23,7 @@ import java.util.List; public class CsdlFunction extends CsdlOperation { private static final long serialVersionUID = 673858921468578957L; - + private boolean isComposable = false; public boolean isComposable() { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlFunctionImport.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlFunctionImport.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlFunctionImport.java index ed14759..a1c0004 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlFunctionImport.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlFunctionImport.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 @@ -20,14 +20,13 @@ package org.apache.olingo.commons.api.edm.provider; import org.apache.olingo.commons.api.edm.FullQualifiedName; - public class CsdlFunctionImport extends CsdlOperationImport { private static final long serialVersionUID = 8479762299534736719L; private FullQualifiedName function; - //Default include in service document is false for function imports + // Default include in service document is false for function imports private boolean includeInServiceDocument; @Override @@ -50,17 +49,16 @@ public class CsdlFunctionImport extends CsdlOperationImport { public String getFunction() { return function.getFullQualifiedNameAsString(); } - + public FullQualifiedName getFunctionFQN() { return function; } - public CsdlFunctionImport setFunction(final FullQualifiedName function) { this.function = function; return this; } - + public CsdlFunctionImport setFunction(final String function) { this.function = new FullQualifiedName(function); return this; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlMapping.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlMapping.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlMapping.java index 32bc782..779ab2e 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlMapping.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlMapping.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 @@ -34,12 +34,14 @@ public class CsdlMapping implements EdmMapping { * @param mappedJavaClass class to which is mapped * @return this for method chaining */ - public CsdlMapping setMappedJavaClass(Class<?> mappedJavaClass) { + public CsdlMapping setMappedJavaClass(final Class<?> mappedJavaClass) { this.mappedJavaClass = mappedJavaClass; return this; } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.apache.olingo.commons.api.edm.EdmMapping#getMappedJavaClass() */ @Override http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNamed.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNamed.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNamed.java index 24a5803..4529014 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNamed.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNamed.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-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNavigationProperty.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNavigationProperty.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNavigationProperty.java index 16fc68e..e1ed7e6 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNavigationProperty.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNavigationProperty.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 @@ -43,9 +43,10 @@ public class CsdlNavigationProperty extends CsdlAbstractEdmItem implements CsdlN private boolean nullable = true; private CsdlOnDelete onDelete; - + private List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + @Override public String getName() { return name; } @@ -67,9 +68,9 @@ public class CsdlNavigationProperty extends CsdlAbstractEdmItem implements CsdlN public FullQualifiedName getTypeFQN() { return type; } - + public String getType() { - if(type != null){ + if (type != null) { return type.getFullQualifiedNameAsString(); } return null; @@ -79,7 +80,7 @@ public class CsdlNavigationProperty extends CsdlAbstractEdmItem implements CsdlN this.type = type; return this; } - + public CsdlNavigationProperty setType(final String type) { this.type = new FullQualifiedName(type); return this; @@ -108,7 +109,7 @@ public class CsdlNavigationProperty extends CsdlAbstractEdmItem implements CsdlN } public CsdlNavigationProperty setReferentialConstraints( - final List<CsdlReferentialConstraint> referentialConstraints) { + final List<CsdlReferentialConstraint> referentialConstraints) { this.referentialConstraints = referentialConstraints; return this; } @@ -130,7 +131,7 @@ public class CsdlNavigationProperty extends CsdlAbstractEdmItem implements CsdlN this.onDelete = onDelete; return this; } - + @Override public List<CsdlAnnotation> getAnnotations() { return annotations; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNavigationPropertyBinding.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNavigationPropertyBinding.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNavigationPropertyBinding.java index ce14ead..9c4d16c 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNavigationPropertyBinding.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNavigationPropertyBinding.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,7 +18,6 @@ */ package org.apache.olingo.commons.api.edm.provider; - public class CsdlNavigationPropertyBinding extends CsdlAbstractEdmItem { private static final long serialVersionUID = 770380971233808502L; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOnDelete.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOnDelete.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOnDelete.java index 1b03ba8..3a3aa85 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOnDelete.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOnDelete.java @@ -1,25 +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.commons.api.edm.provider; - - public class CsdlOnDelete extends CsdlAbstractEdmItem { private static final long serialVersionUID = -7130889202653716784L; @@ -34,5 +32,5 @@ public class CsdlOnDelete extends CsdlAbstractEdmItem { this.action = action; return this; } - + } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOnDeleteAction.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOnDeleteAction.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOnDeleteAction.java index 822f0ce..24aec9e 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOnDeleteAction.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOnDeleteAction.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-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOperation.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOperation.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOperation.java index e7cd6af..695bfa5 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOperation.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOperation.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 @@ -34,9 +34,10 @@ public abstract class CsdlOperation extends CsdlAbstractEdmItem implements CsdlN protected List<CsdlParameter> parameters = new ArrayList<CsdlParameter>(); protected CsdlReturnType returnType; - + protected final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + @Override public String getName() { return name; } @@ -67,8 +68,8 @@ public abstract class CsdlOperation extends CsdlAbstractEdmItem implements CsdlN public List<CsdlParameter> getParameters() { return parameters; } - - public CsdlParameter getParameter(String name) { + + public CsdlParameter getParameter(final String name) { return getOneByName(name, getParameters()); } @@ -85,7 +86,8 @@ public abstract class CsdlOperation extends CsdlAbstractEdmItem implements CsdlN this.returnType = returnType; return this; } - + + @Override public List<CsdlAnnotation> getAnnotations() { return annotations; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOperationImport.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOperationImport.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOperationImport.java index af21471..37c7ae4 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOperationImport.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOperationImport.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 @@ -29,6 +29,7 @@ public abstract class CsdlOperationImport extends CsdlAbstractEdmItem implements protected String entitySet; protected final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + @Override public String getName() { return name; } @@ -46,7 +47,7 @@ public abstract class CsdlOperationImport extends CsdlAbstractEdmItem implements this.entitySet = entitySet; return this; } - + @Override public List<CsdlAnnotation> getAnnotations() { return annotations; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlParameter.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlParameter.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlParameter.java index 15c2c3a..c4fadb2 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlParameter.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlParameter.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 @@ -44,11 +44,12 @@ public class CsdlParameter extends CsdlAbstractEdmItem implements CsdlNamed, Csd private Integer precision; private Integer scale; - + private SRID srid; private final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + @Override public String getName() { return name; } @@ -61,7 +62,7 @@ public class CsdlParameter extends CsdlAbstractEdmItem implements CsdlNamed, Csd public String getType() { return type.getFullQualifiedNameAsString(); } - + public FullQualifiedName getTypeFQN() { return type; } @@ -70,7 +71,7 @@ public class CsdlParameter extends CsdlAbstractEdmItem implements CsdlNamed, Csd this.type = new FullQualifiedName(type); return this; } - + public CsdlParameter setType(final FullQualifiedName type) { this.type = type; return this; @@ -120,7 +121,7 @@ public class CsdlParameter extends CsdlAbstractEdmItem implements CsdlNamed, Csd this.scale = scale; return this; } - + public SRID getSrid() { return srid; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlProperty.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlProperty.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlProperty.java index 42f7b65..0db63d4 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlProperty.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlProperty.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.FullQualifiedName; import org.apache.olingo.commons.api.edm.geo.SRID; public class CsdlProperty extends CsdlAbstractEdmItem implements CsdlNamed, CsdlAnnotatable { - + private static final long serialVersionUID = -4224390853690843450L; private String name; @@ -50,12 +50,12 @@ public class CsdlProperty extends CsdlAbstractEdmItem implements CsdlNamed, Csdl private Integer scale; private boolean unicode = true; - + private SRID srid; private List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); - + @Override public String getName() { return name; } @@ -73,13 +73,13 @@ public class CsdlProperty extends CsdlAbstractEdmItem implements CsdlNamed, Csdl this.type = type; return this; } - - public FullQualifiedName getTypeAsFQNObject(){ + + public FullQualifiedName getTypeAsFQNObject() { return new FullQualifiedName(type); } - - public CsdlProperty setType(FullQualifiedName fqnName){ - this.type = fqnName.getFullQualifiedNameAsString(); + + public CsdlProperty setType(final FullQualifiedName fqnName) { + type = fqnName.getFullQualifiedNameAsString(); return this; } @@ -168,12 +168,12 @@ public class CsdlProperty extends CsdlAbstractEdmItem implements CsdlNamed, Csdl public List<CsdlAnnotation> getAnnotations() { return annotations; } - + public CsdlProperty setSrid(final SRID srid) { this.srid = srid; return this; } - + public SRID getSrid() { return srid; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlPropertyRef.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlPropertyRef.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlPropertyRef.java index a57ce4e..55cf3fd 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlPropertyRef.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlPropertyRef.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 @@ -26,6 +26,7 @@ public class CsdlPropertyRef extends CsdlAbstractEdmItem implements CsdlNamed { private String alias; + @Override public String getName() { return name; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlReferentialConstraint.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlReferentialConstraint.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlReferentialConstraint.java index 7c06724..c394c0c 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlReferentialConstraint.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlReferentialConstraint.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 @@ -48,7 +48,7 @@ public class CsdlReferentialConstraint extends CsdlAbstractEdmItem implements Cs this.referencedProperty = referencedProperty; return this; } - + @Override public List<CsdlAnnotation> getAnnotations() { return annotations; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlReturnType.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlReturnType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlReturnType.java index f0d5e9e..d300f03 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlReturnType.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlReturnType.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 @@ -37,13 +37,13 @@ public class CsdlReturnType extends CsdlAbstractEdmItem { private Integer precision; private Integer scale; - + private SRID srid; public String getType() { return type.getFullQualifiedNameAsString(); } - + public FullQualifiedName getTypeFQN() { return type; } @@ -52,7 +52,7 @@ public class CsdlReturnType extends CsdlAbstractEdmItem { this.type = new FullQualifiedName(type); return this; } - + public CsdlReturnType setType(final FullQualifiedName type) { this.type = type; return this; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlSchema.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlSchema.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlSchema.java index 8300eaa..478cbe1 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlSchema.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlSchema.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 @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; public class CsdlSchema extends CsdlAbstractEdmItem implements CsdlAnnotatable { - + private static final long serialVersionUID = -1527213201328056750L; private String namespace; @@ -46,13 +46,12 @@ public class CsdlSchema extends CsdlAbstractEdmItem implements CsdlAnnotatable { private CsdlEntityContainer entityContainer; private List<CsdlTerm> terms = new ArrayList<CsdlTerm>(); - + private final List<CsdlAnnotations> annotationGroups = new ArrayList<CsdlAnnotations>(); - + private final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); - - private Map<String, CsdlAnnotatable> annotatables; + private Map<String, CsdlAnnotatable> annotatables; public String getNamespace() { return namespace; @@ -71,11 +70,11 @@ public class CsdlSchema extends CsdlAbstractEdmItem implements CsdlAnnotatable { this.alias = alias; return this; } - + public List<CsdlEnumType> getEnumTypes() { return enumTypes; } - + public CsdlEnumType getEnumType(final String name) { return getOneByName(name, getEnumTypes()); } @@ -92,7 +91,7 @@ public class CsdlSchema extends CsdlAbstractEdmItem implements CsdlAnnotatable { public CsdlTypeDefinition getTypeDefinition(final String name) { return getOneByName(name, getTypeDefinitions()); } - + public CsdlSchema setTypeDefinitions(final List<CsdlTypeDefinition> typeDefinitions) { this.typeDefinitions = typeDefinitions; return this; @@ -105,7 +104,7 @@ public class CsdlSchema extends CsdlAbstractEdmItem implements CsdlAnnotatable { public CsdlEntityType getEntityType(final String name) { return getOneByName(name, getEntityTypes()); } - + public CsdlSchema setEntityTypes(final List<CsdlEntityType> entityTypes) { this.entityTypes = entityTypes; return this; @@ -136,7 +135,7 @@ public class CsdlSchema extends CsdlAbstractEdmItem implements CsdlAnnotatable { public List<CsdlAction> getActions(final String name) { return getAllByName(name, getActions()); } - + public CsdlSchema setActions(final List<CsdlAction> actions) { this.actions = actions; return this; @@ -145,7 +144,7 @@ public class CsdlSchema extends CsdlAbstractEdmItem implements CsdlAnnotatable { public List<CsdlFunction> getFunctions() { return functions; } - + /** * All functions with the given name * @param name @@ -172,17 +171,16 @@ public class CsdlSchema extends CsdlAbstractEdmItem implements CsdlAnnotatable { public List<CsdlTerm> getTerms() { return terms; } - + public CsdlTerm getTerm(final String name) { return getOneByName(name, getTerms()); } - public CsdlSchema setTerms(final List<CsdlTerm> terms) { this.terms = terms; return this; } - + public List<CsdlAnnotations> getAnnotationGroups() { return annotationGroups; } @@ -207,10 +205,11 @@ public class CsdlSchema extends CsdlAbstractEdmItem implements CsdlAnnotatable { return result; } + @Override public List<CsdlAnnotation> getAnnotations() { return annotations; } - + public Map<String, CsdlAnnotatable> getAnnotatables() { if (annotatables == null) { annotatables = new HashMap<String, CsdlAnnotatable>(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlSingleton.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlSingleton.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlSingleton.java index c5ca253..620021d 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlSingleton.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlSingleton.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 @@ -37,7 +37,7 @@ public class CsdlSingleton extends CsdlBindingTarget { this.type = new FullQualifiedName(type); return this; } - + @Override public CsdlSingleton setType(final FullQualifiedName type) { this.type = type; @@ -46,7 +46,7 @@ public class CsdlSingleton extends CsdlBindingTarget { @Override public CsdlSingleton setNavigationPropertyBindings( - final List<CsdlNavigationPropertyBinding> navigationPropertyBindings) { + final List<CsdlNavigationPropertyBinding> navigationPropertyBindings) { this.navigationPropertyBindings = navigationPropertyBindings; return this; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlStructuralType.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlStructuralType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlStructuralType.java index fdadf48..8b4d46e 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlStructuralType.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlStructuralType.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,6 +41,7 @@ public abstract class CsdlStructuralType extends CsdlAbstractEdmItem implements protected final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + @Override public String getName() { return name; } @@ -93,7 +94,7 @@ public abstract class CsdlStructuralType extends CsdlAbstractEdmItem implements return properties; } - public CsdlProperty getProperty(String name) { + public CsdlProperty getProperty(final String name) { return getOneByName(name, properties); } @@ -106,7 +107,7 @@ public abstract class CsdlStructuralType extends CsdlAbstractEdmItem implements return navigationProperties; } - public CsdlNavigationProperty getNavigationProperty(String name) { + public CsdlNavigationProperty getNavigationProperty(final String name) { return getOneByName(name, navigationProperties); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlTerm.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlTerm.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlTerm.java index ace5e36..ac50313 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlTerm.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlTerm.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,12 @@ public class CsdlTerm extends CsdlAbstractEdmItem implements CsdlNamed, CsdlAnno private Integer precision; private Integer scale; - + private SRID srid; private List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + @Override public String getName() { return name; } @@ -142,6 +143,7 @@ public class CsdlTerm extends CsdlAbstractEdmItem implements CsdlNamed, CsdlAnno return this; } + @Override public List<CsdlAnnotation> getAnnotations() { return annotations; } @@ -150,7 +152,7 @@ public class CsdlTerm extends CsdlAbstractEdmItem implements CsdlNamed, CsdlAnno this.annotations = annotations; return this; } - + public SRID getSrid() { return srid; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlTypeDefinition.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlTypeDefinition.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlTypeDefinition.java index 705c040..cf2c784 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlTypeDefinition.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlTypeDefinition.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,6 +45,7 @@ public class CsdlTypeDefinition extends CsdlAbstractEdmItem implements CsdlNamed private final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + @Override public String getName() { return name; } @@ -55,7 +56,7 @@ public class CsdlTypeDefinition extends CsdlAbstractEdmItem implements CsdlNamed } public String getUnderlyingType() { - if(underlyingType != null){ + if (underlyingType != null) { return underlyingType.getFullQualifiedNameAsString(); } return null; @@ -65,7 +66,7 @@ public class CsdlTypeDefinition extends CsdlAbstractEdmItem implements CsdlNamed this.underlyingType = new FullQualifiedName(underlyingType); return this; } - + public CsdlTypeDefinition setUnderlyingType(final FullQualifiedName underlyingType) { this.underlyingType = underlyingType; return this; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/AnnotationExpression.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/AnnotationExpression.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/AnnotationExpression.java index 0a8796c..77aeaa7 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/AnnotationExpression.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/AnnotationExpression.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-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/AnnotationPath.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/AnnotationPath.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/AnnotationPath.java index c000b88..81526e4 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/AnnotationPath.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/AnnotationPath.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-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Apply.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Apply.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Apply.java index 1490b89..c39c1ff 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Apply.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Apply.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-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Cast.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Cast.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Cast.java index 49011f3..a5a32d9 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Cast.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Cast.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-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Collection.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Collection.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Collection.java index 6c7862a..1005bb2 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Collection.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Collection.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. */
