[OLINGO-786] Unify Annotations setter for csdl classes
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/2ffb8139 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/2ffb8139 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/2ffb8139 Branch: refs/heads/master Commit: 2ffb813931209f3d823cbe13743f05f1011c498b Parents: b69cd6e Author: Christian Amend <[email protected]> Authored: Fri Oct 9 15:48:48 2015 +0200 Committer: Christian Amend <[email protected]> Committed: Fri Oct 9 15:48:48 2015 +0200 ---------------------------------------------------------------------- .../olingo/commons/api/edm/EdmAnnotatable.java | 2 +- .../commons/api/edm/provider/CsdlAction.java | 11 ++++++--- .../api/edm/provider/CsdlActionImport.java | 14 +++++++++--- .../api/edm/provider/CsdlAnnotation.java | 10 ++++---- .../api/edm/provider/CsdlAnnotations.java | 12 +++++++++- .../api/edm/provider/CsdlBindingTarget.java | 9 ++++++-- .../api/edm/provider/CsdlComplexType.java | 10 ++++++-- .../api/edm/provider/CsdlEntityType.java | 10 ++++++-- .../api/edm/provider/CsdlEnumMember.java | 13 +++++++++-- .../commons/api/edm/provider/CsdlEnumType.java | 12 +++++++++- .../commons/api/edm/provider/CsdlFunction.java | 10 ++++++-- .../api/edm/provider/CsdlFunctionImport.java | 12 ++++++++-- .../edm/provider/CsdlNavigationProperty.java | 10 ++++++++ .../commons/api/edm/provider/CsdlOperation.java | 12 +++++++++- .../api/edm/provider/CsdlOperationImport.java | 12 +++++++++- .../commons/api/edm/provider/CsdlParameter.java | 12 +++++++++- .../commons/api/edm/provider/CsdlProperty.java | 10 ++++++++ .../edm/provider/CsdlReferentialConstraint.java | 12 +++++++++- .../commons/api/edm/provider/CsdlSchema.java | 24 ++++++++++++++++++-- .../commons/api/edm/provider/CsdlSingleton.java | 6 +++++ .../api/edm/provider/CsdlStructuralType.java | 12 +++++++++- .../api/edm/provider/CsdlTypeDefinition.java | 12 +++++++++- .../core/edm/EdmNavigationPropertyImpl.java | 1 - .../provider/AbstractEdmAnnotatableTest.java | 4 ---- 24 files changed, 213 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotatable.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotatable.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotatable.java index 5cbbc58..a73659b 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotatable.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotatable.java @@ -26,7 +26,7 @@ import java.util.List; public interface EdmAnnotatable { /** - * @param term term for annotation + * @param term term used for the annotation. MUST NOT be null. * @param qualifier for the term. Can be <code>NULL</code> * @return annotation according to term */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 5c1ad19..ac35691 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 @@ -51,10 +51,15 @@ public class CsdlAction extends CsdlOperation { return this; } - @Override public CsdlAction setReturnType(final CsdlReturnType returnType) { this.returnType = returnType; return this; } + + @Override + public CsdlAction setAnnotations(final List<CsdlAnnotation> annotations) { + this.annotations = annotations; + return this; + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 33047de..d4df8f4 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 @@ -18,6 +18,8 @@ */ package org.apache.olingo.commons.api.edm.provider; +import java.util.List; + import org.apache.olingo.commons.api.edm.FullQualifiedName; /** @@ -50,7 +52,7 @@ public class CsdlActionImport extends CsdlOperationImport { } /** - * Returns the full qualified name of the action + * Returns the full qualified name of the action * @return full qualified name */ public FullQualifiedName getActionFQN() { @@ -76,4 +78,10 @@ public class CsdlActionImport extends CsdlOperationImport { this.action = action; return this; } + + @Override + public CsdlActionImport setAnnotations(final List<CsdlAnnotation> annotations) { + this.annotations = annotations; + return this; + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 caec733..a1f838e 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 @@ -34,7 +34,7 @@ public class CsdlAnnotation extends CsdlAbstractEdmItem implements CsdlAnnotatab private String qualifier; - private List<CsdlAnnotation> annotation = new ArrayList<CsdlAnnotation>(); + private List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); private AnnotationExpression annotationExpression; @@ -93,16 +93,16 @@ public class CsdlAnnotation extends CsdlAbstractEdmItem implements CsdlAnnotatab /** * Sets a list of annotations - * @param annotation list of annotations + * @param annotations list of annotations * @return this instance */ - public CsdlAnnotation setAnnotations(final List<CsdlAnnotation> annotation) { - this.annotation = annotation; + public CsdlAnnotation setAnnotations(final List<CsdlAnnotation> annotations) { + this.annotations = annotations; return this; } @Override public List<CsdlAnnotation> getAnnotations() { - return annotation; + return annotations; } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 7d4c4c1..7f65f52 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 @@ -28,7 +28,7 @@ public class CsdlAnnotations extends CsdlAbstractEdmItem implements CsdlAnnotata private static final long serialVersionUID = 8283036066408166150L; - private final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + private List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); private String target; @@ -80,6 +80,16 @@ public class CsdlAnnotations extends CsdlAbstractEdmItem implements CsdlAnnotata } /** + * Sets a list of annotations + * @param annotations list of annotations + * @return this instance + */ + public CsdlAnnotations setAnnotations(final List<CsdlAnnotation> annotations) { + this.annotations = annotations; + return this; + } + + /** * Gets annotation. * * @param term the term http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 2c9a99f..9043eb7 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 @@ -46,7 +46,7 @@ public abstract class CsdlBindingTarget extends CsdlAbstractEdmItem implements C protected List<CsdlNavigationPropertyBinding> navigationPropertyBindings = new ArrayList<CsdlNavigationPropertyBinding>(); - private final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + private List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); @Override public String getName() { @@ -130,8 +130,13 @@ public abstract class CsdlBindingTarget extends CsdlAbstractEdmItem implements C return annotations; } + /** + * Sets a list of annotations + * @param annotations list of annotations + * @return this instance + */ public CsdlBindingTarget setAnnotations(final List<CsdlAnnotation> annotations) { - this.annotations.addAll(annotations); + this.annotations = annotations; return this; } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 7635d57..979a898 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 @@ -70,4 +70,10 @@ public class CsdlComplexType extends CsdlStructuralType { this.navigationProperties = navigationProperties; return this; } + + @Override + public CsdlComplexType setAnnotations(final List<CsdlAnnotation> annotations) { + this.annotations = annotations; + return this; + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 25ed899..17fb822 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 @@ -114,4 +114,10 @@ public class CsdlEntityType extends CsdlStructuralType { this.navigationProperties = navigationProperties; return this; } + + @Override + public CsdlEntityType setAnnotations(final List<CsdlAnnotation> annotations) { + this.annotations = annotations; + return this; + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 ba8a82d..bb79b62 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 @@ -32,7 +32,7 @@ public class CsdlEnumMember extends CsdlAbstractEdmItem implements CsdlNamed, Cs private String value; - private final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + private List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); @Override public String getName() { @@ -74,5 +74,14 @@ public class CsdlEnumMember extends CsdlAbstractEdmItem implements CsdlNamed, Cs public List<CsdlAnnotation> getAnnotations() { return annotations; } - + + /** + * Sets a list of annotations + * @param annotations list of annotations + * @return this instance + */ + public CsdlEnumMember setAnnotations(final List<CsdlAnnotation> annotations) { + this.annotations = annotations; + return this; + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 88c2f93..ca15607 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 @@ -38,7 +38,7 @@ public class CsdlEnumType extends CsdlAbstractEdmItem implements CsdlNamed, Csdl private List<CsdlEnumMember> members = new ArrayList<CsdlEnumMember>(); - private final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + private List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); @Override public String getName() { @@ -170,4 +170,14 @@ public class CsdlEnumType extends CsdlAbstractEdmItem implements CsdlNamed, Csdl public List<CsdlAnnotation> getAnnotations() { return annotations; } + + /** + * Sets a list of annotations + * @param annotations list of annotations + * @return this instance + */ + public CsdlEnumType setAnnotations(final List<CsdlAnnotation> annotations) { + this.annotations = annotations; + return this; + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 e9c22fe..b7364d9 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 @@ -78,4 +78,10 @@ public class CsdlFunction extends CsdlOperation { this.returnType = returnType; return this; } + + @Override + public CsdlFunction setAnnotations(final List<CsdlAnnotation> annotations) { + this.annotations = annotations; + return this; + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 9b6f534..e293af1 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 @@ -18,6 +18,8 @@ */ package org.apache.olingo.commons.api.edm.provider; +import java.util.List; + import org.apache.olingo.commons.api.edm.FullQualifiedName; /** @@ -108,4 +110,10 @@ public class CsdlFunctionImport extends CsdlOperationImport { this.includeInServiceDocument = includeInServiceDocument; return this; } + + @Override + public CsdlFunctionImport setAnnotations(final List<CsdlAnnotation> annotations) { + this.annotations = annotations; + return this; + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 37e4de1..741d754 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 @@ -233,4 +233,14 @@ public class CsdlNavigationProperty extends CsdlAbstractEdmItem implements CsdlN public List<CsdlAnnotation> getAnnotations() { return annotations; } + + /** + * Sets a list of annotations + * @param annotations list of annotations + * @return this instance + */ + public CsdlNavigationProperty setAnnotations(final List<CsdlAnnotation> annotations) { + this.annotations = annotations; + return this; + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 79acae1..bbd5477 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 @@ -56,7 +56,7 @@ public abstract class CsdlOperation extends CsdlAbstractEdmItem implements CsdlN /** * The Annotations. */ - protected final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + protected List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); @Override public String getName() { @@ -168,4 +168,14 @@ public abstract class CsdlOperation extends CsdlAbstractEdmItem implements CsdlN public List<CsdlAnnotation> getAnnotations() { return annotations; } + + /** + * Sets a list of annotations + * @param annotations list of annotations + * @return this instance + */ + public CsdlOperation setAnnotations(final List<CsdlAnnotation> annotations) { + this.annotations = annotations; + return this; + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 d43417c..4e92bd1 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 @@ -39,7 +39,7 @@ public abstract class CsdlOperationImport extends CsdlAbstractEdmItem implements /** * The Annotations. */ - protected final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + protected List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); @Override public String getName() { @@ -81,4 +81,14 @@ public abstract class CsdlOperationImport extends CsdlAbstractEdmItem implements public List<CsdlAnnotation> getAnnotations() { return annotations; } + + /** + * Sets a list of annotations + * @param annotations list of annotations + * @return this instance + */ + public CsdlOperationImport setAnnotations(final List<CsdlAnnotation> annotations) { + this.annotations = annotations; + return this; + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 4f5f0c7..4873873 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 @@ -50,7 +50,7 @@ public class CsdlParameter extends CsdlAbstractEdmItem implements CsdlNamed, Csd private SRID srid; - private final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + private List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); @Override public String getName() { @@ -232,6 +232,16 @@ public class CsdlParameter extends CsdlAbstractEdmItem implements CsdlNamed, Csd public List<CsdlAnnotation> getAnnotations() { return annotations; } + + /** + * Sets a list of annotations + * @param annotations list of annotations + * @return this instance + */ + public CsdlParameter setAnnotations(final List<CsdlAnnotation> annotations) { + this.annotations = annotations; + return this; + } /** * Gets mapping. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 fc5b645..1127bde 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 @@ -300,6 +300,16 @@ public class CsdlProperty extends CsdlAbstractEdmItem implements CsdlNamed, Csdl } /** + * Sets a list of annotations + * @param annotations list of annotations + * @return this instance + */ + public CsdlProperty setAnnotations(final List<CsdlAnnotation> annotations) { + this.annotations = annotations; + return this; + } + + /** * Sets srid. * * @param srid the srid http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 6acd60c..ab9fa6b 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 @@ -32,7 +32,7 @@ public class CsdlReferentialConstraint extends CsdlAbstractEdmItem implements Cs private String referencedProperty; - private final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + private List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); /** * Gets property. @@ -78,4 +78,14 @@ public class CsdlReferentialConstraint extends CsdlAbstractEdmItem implements Cs public List<CsdlAnnotation> getAnnotations() { return annotations; } + + /** + * Sets a list of annotations + * @param annotations list of annotations + * @return this instance + */ + public CsdlReferentialConstraint setAnnotations(final List<CsdlAnnotation> annotations) { + this.annotations = annotations; + return this; + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 882397e..6068aa1 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 @@ -48,9 +48,9 @@ public class CsdlSchema extends CsdlAbstractEdmItem implements CsdlAnnotatable { private List<CsdlTerm> terms = new ArrayList<CsdlTerm>(); - private final List<CsdlAnnotations> annotationGroups = new ArrayList<CsdlAnnotations>(); + private List<CsdlAnnotations> annotationGroups = new ArrayList<CsdlAnnotations>(); - private final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + private List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); /** * Gets namespace. @@ -328,6 +328,16 @@ public class CsdlSchema extends CsdlAbstractEdmItem implements CsdlAnnotatable { public List<CsdlAnnotations> getAnnotationGroups() { return annotationGroups; } + + /** + * Sets a list of annotations + * @param annotations list of annotations + * @return this instance + */ + public CsdlSchema setAnnotationsGroup(final List<CsdlAnnotations> annotationGroups) { + this.annotationGroups = annotationGroups; + return this; + } /** * Gets annotation group. @@ -366,4 +376,14 @@ public class CsdlSchema extends CsdlAbstractEdmItem implements CsdlAnnotatable { public List<CsdlAnnotation> getAnnotations() { return annotations; } + + /** + * Sets a list of annotations + * @param annotations list of annotations + * @return this instance + */ + public CsdlSchema setAnnotations(final List<CsdlAnnotation> annotations) { + this.annotations = annotations; + return this; + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 bcde448..b05766f 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 @@ -53,4 +53,10 @@ public class CsdlSingleton extends CsdlBindingTarget { this.navigationPropertyBindings = navigationPropertyBindings; return this; } + + @Override + public CsdlSingleton setAnnotations(final List<CsdlAnnotation> annotations) { + super.setAnnotations(annotations); + return this; + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 50413ae..1ae4898 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 @@ -63,7 +63,7 @@ public abstract class CsdlStructuralType extends CsdlAbstractEdmItem implements /** * The Annotations. */ - protected final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + protected List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); @Override public String getName() { @@ -228,4 +228,14 @@ public abstract class CsdlStructuralType extends CsdlAbstractEdmItem implements public List<CsdlAnnotation> getAnnotations() { return annotations; } + + /** + * Sets a list of annotations + * @param annotations list of annotations + * @return this instance + */ + public CsdlStructuralType setAnnotations(final List<CsdlAnnotation> annotations) { + this.annotations = annotations; + return this; + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 d8b979f..62b4ac7 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 @@ -46,7 +46,7 @@ public class CsdlTypeDefinition extends CsdlAbstractEdmItem implements CsdlNamed private SRID srid; - private final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); + private List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); @Override public String getName() { @@ -202,4 +202,14 @@ public class CsdlTypeDefinition extends CsdlAbstractEdmItem implements CsdlNamed public List<CsdlAnnotation> getAnnotations() { return annotations; } + + /** + * Sets a list of annotations + * @param annotations list of annotations + * @return this instance + */ + public CsdlTypeDefinition setAnnotations(final List<CsdlAnnotation> annotations) { + this.annotations = annotations; + return this; + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/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 0a37c6e..380bd3b 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 @@ -29,7 +29,6 @@ import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmNavigationProperty; import org.apache.olingo.commons.api.edm.EdmReferentialConstraint; import org.apache.olingo.commons.api.edm.EdmStructuredType; -import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.provider.CsdlNavigationProperty; import org.apache.olingo.commons.api.edm.provider.CsdlReferentialConstraint; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ffb8139/lib/commons-core/src/test/java/org/apache/olingo/server/core/edm/provider/AbstractEdmAnnotatableTest.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/test/java/org/apache/olingo/server/core/edm/provider/AbstractEdmAnnotatableTest.java b/lib/commons-core/src/test/java/org/apache/olingo/server/core/edm/provider/AbstractEdmAnnotatableTest.java index 2ecf0c7..b658ee4 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/server/core/edm/provider/AbstractEdmAnnotatableTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/server/core/edm/provider/AbstractEdmAnnotatableTest.java @@ -36,7 +36,6 @@ import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation; import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainer; import org.apache.olingo.commons.core.edm.AbstractEdmAnnotatable; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; public class AbstractEdmAnnotatableTest { @@ -68,7 +67,6 @@ public class AbstractEdmAnnotatableTest { assertNull(anno.getAnnotation(null, "qualifier")); } - @Ignore @Test public void singleAnnotation() { CsdlEntityContainer annotatable = new CsdlEntityContainer(); @@ -84,8 +82,6 @@ public class AbstractEdmAnnotatableTest { assertNotNull(anno.getAnnotation(term, null)); assertNull(anno.getAnnotation(term, "qualifier")); - assertNull(anno.getAnnotation(null, null)); - assertNull(anno.getAnnotation(null, "qualifier")); } private class EdmAnnotatableTester extends AbstractEdmAnnotatable {
