Repository: olingo-odata4 Updated Branches: refs/heads/olingo786 576acf466 -> 67ccbf9dd
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/67ccbf9d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmConstantAnnotationExpressionImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmConstantAnnotationExpressionImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmConstantAnnotationExpressionImpl.java index f7aca3b..bbe0dbc 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmConstantAnnotationExpressionImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmConstantAnnotationExpressionImpl.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -31,7 +31,7 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.annotation.EdmConstantAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmDynamicAnnotationExpression; -import org.apache.olingo.commons.api.edm.provider.annotation.ConstantAnnotationExpression; +import org.apache.olingo.commons.api.edm.provider.annotation.CsdlConstantExpression; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; public class EdmConstantAnnotationExpressionImpl implements EdmConstantAnnotationExpression { @@ -39,8 +39,8 @@ public class EdmConstantAnnotationExpressionImpl implements EdmConstantAnnotatio private final Valuable value; private final EdmPrimitiveType type; - public EdmConstantAnnotationExpressionImpl(final ConstantAnnotationExpression constExprConstruct) { - if (constExprConstruct.getType() == ConstantAnnotationExpression.Type.EnumMember) { + public EdmConstantAnnotationExpressionImpl(final CsdlConstantExpression constExprConstruct) { + if (constExprConstruct.getType() == CsdlConstantExpression.ConstantExpressionType.EnumMember) { final List<Property> enumValues = new ArrayList<Property>(); String enumTypeName = null; for (String split : StringUtils.split(constExprConstruct.getValue(), ' ')) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/67ccbf9d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmEqImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmEqImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmEqImpl.java index f2df85f..bd88887 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmEqImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmEqImpl.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.commons.core.edm.annotation; -import org.apache.olingo.commons.api.edm.annotation.EdmDynamicAnnotationExpression; +import org.apache.olingo.commons.api.edm.annotation.EdmAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmEq; public class EdmEqImpl extends AbstractEdmTwoParamsOpDynamicAnnotationExpression implements EdmEq { - public EdmEqImpl(final EdmDynamicAnnotationExpression left, final EdmDynamicAnnotationExpression right) { + public EdmEqImpl(final EdmAnnotationExpression left, final EdmAnnotationExpression right) { super(left, right); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/67ccbf9d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmGeImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmGeImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmGeImpl.java index 7bef6bb..ace7a33 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmGeImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmGeImpl.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.commons.core.edm.annotation; -import org.apache.olingo.commons.api.edm.annotation.EdmDynamicAnnotationExpression; +import org.apache.olingo.commons.api.edm.annotation.EdmAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmGe; public class EdmGeImpl extends AbstractEdmTwoParamsOpDynamicAnnotationExpression implements EdmGe { - public EdmGeImpl(final EdmDynamicAnnotationExpression left, final EdmDynamicAnnotationExpression right) { + public EdmGeImpl(final EdmAnnotationExpression left, final EdmAnnotationExpression right) { super(left, right); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/67ccbf9d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmGtImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmGtImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmGtImpl.java index d6b1bb7..feed77c 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmGtImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmGtImpl.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.commons.core.edm.annotation; -import org.apache.olingo.commons.api.edm.annotation.EdmDynamicAnnotationExpression; +import org.apache.olingo.commons.api.edm.annotation.EdmAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmGt; public class EdmGtImpl extends AbstractEdmTwoParamsOpDynamicAnnotationExpression implements EdmGt { - public EdmGtImpl(final EdmDynamicAnnotationExpression left, final EdmDynamicAnnotationExpression right) { + public EdmGtImpl(final EdmAnnotationExpression left, final EdmAnnotationExpression right) { super(left, right); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/67ccbf9d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmIsOfImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmIsOfImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmIsOfImpl.java index 8b13788..9732a0a 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmIsOfImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmIsOfImpl.java @@ -23,20 +23,20 @@ import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.annotation.EdmDynamicAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmIsOf; import org.apache.olingo.commons.api.edm.geo.SRID; -import org.apache.olingo.commons.api.edm.provider.annotation.IsOf; +import org.apache.olingo.commons.api.edm.provider.annotation.CsdlIsOf; import org.apache.olingo.commons.core.edm.EdmTypeInfo; public class EdmIsOfImpl extends AbstractEdmAnnotatableDynamicAnnotationExpression implements EdmIsOf { private final Edm edm; - private final IsOf isOf; + private final CsdlIsOf isOf; private final EdmDynamicAnnotationExpression value; private EdmType type; - public EdmIsOfImpl(final Edm edm, final IsOf isOf, final EdmDynamicAnnotationExpression value) { + public EdmIsOfImpl(final Edm edm, final CsdlIsOf isOf, final EdmDynamicAnnotationExpression value) { this.edm = edm; this.isOf = isOf; this.value = value; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/67ccbf9d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmLeImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmLeImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmLeImpl.java index cfca96b..9a1f51d 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmLeImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmLeImpl.java @@ -18,12 +18,13 @@ */ package org.apache.olingo.commons.core.edm.annotation; +import org.apache.olingo.commons.api.edm.annotation.EdmAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmDynamicAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmLe; public class EdmLeImpl extends AbstractEdmTwoParamsOpDynamicAnnotationExpression implements EdmLe { - public EdmLeImpl(final EdmDynamicAnnotationExpression left, final EdmDynamicAnnotationExpression right) { + public EdmLeImpl(final EdmAnnotationExpression left, final EdmAnnotationExpression right) { super(left, right); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/67ccbf9d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmLtImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmLtImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmLtImpl.java index 83ac2e6..c59b877 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmLtImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmLtImpl.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.commons.core.edm.annotation; -import org.apache.olingo.commons.api.edm.annotation.EdmDynamicAnnotationExpression; +import org.apache.olingo.commons.api.edm.annotation.EdmAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmLt; public class EdmLtImpl extends AbstractEdmTwoParamsOpDynamicAnnotationExpression implements EdmLt { - public EdmLtImpl(final EdmDynamicAnnotationExpression left, final EdmDynamicAnnotationExpression right) { + public EdmLtImpl(final EdmAnnotationExpression left, final EdmAnnotationExpression right) { super(left, right); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/67ccbf9d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmNeImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmNeImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmNeImpl.java index 67679eb..aebadf2 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmNeImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmNeImpl.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.commons.core.edm.annotation; -import org.apache.olingo.commons.api.edm.annotation.EdmDynamicAnnotationExpression; +import org.apache.olingo.commons.api.edm.annotation.EdmAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmNe; public class EdmNeImpl extends AbstractEdmTwoParamsOpDynamicAnnotationExpression implements EdmNe { - public EdmNeImpl(final EdmDynamicAnnotationExpression left, final EdmDynamicAnnotationExpression right) { + public EdmNeImpl(final EdmAnnotationExpression left, final EdmAnnotationExpression right) { super(left, right); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/67ccbf9d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmNotImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmNotImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmNotImpl.java index cce2cbe..b34c255 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmNotImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmNotImpl.java @@ -18,19 +18,20 @@ */ package org.apache.olingo.commons.core.edm.annotation; +import org.apache.olingo.commons.api.edm.annotation.EdmAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmDynamicAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmNot; public class EdmNotImpl extends AbstractEdmDynamicAnnotationExpression implements EdmNot { - private final EdmDynamicAnnotationExpression expression; + private final EdmAnnotationExpression expression; - public EdmNotImpl(final EdmDynamicAnnotationExpression expression) { + public EdmNotImpl(final EdmAnnotationExpression expression) { this.expression = expression; } @Override - public EdmDynamicAnnotationExpression getExpression() { + public EdmAnnotationExpression getExpression() { return expression; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/67ccbf9d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmOrImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmOrImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmOrImpl.java index 3746300..30cc51d 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmOrImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmOrImpl.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.commons.core.edm.annotation; -import org.apache.olingo.commons.api.edm.annotation.EdmDynamicAnnotationExpression; +import org.apache.olingo.commons.api.edm.annotation.EdmAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmOr; public class EdmOrImpl extends AbstractEdmTwoParamsOpDynamicAnnotationExpression implements EdmOr { - public EdmOrImpl(final EdmDynamicAnnotationExpression left, final EdmDynamicAnnotationExpression right) { + public EdmOrImpl(final EdmAnnotationExpression left, final EdmAnnotationExpression right) { super(left, right); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/67ccbf9d/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ContainerProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ContainerProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ContainerProvider.java index 413dac4..d6f371d 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ContainerProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ContainerProvider.java @@ -22,18 +22,17 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation; -import org.apache.olingo.commons.api.edm.provider.annotation.ConstantAnnotationExpression; -import org.apache.olingo.commons.api.edm.provider.annotation.CsdlConstantAnnotationExpression; -import org.apache.olingo.commons.api.ex.ODataException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.provider.CsdlActionImport; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation; import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainer; import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainerInfo; import org.apache.olingo.commons.api.edm.provider.CsdlEntitySet; import org.apache.olingo.commons.api.edm.provider.CsdlFunctionImport; import org.apache.olingo.commons.api.edm.provider.CsdlNavigationPropertyBinding; import org.apache.olingo.commons.api.edm.provider.CsdlSingleton; +import org.apache.olingo.commons.api.edm.provider.annotation.CsdlConstantExpression; +import org.apache.olingo.commons.api.ex.ODataException; public class ContainerProvider { @@ -169,18 +168,18 @@ public class ContainerProvider { .asList(new CsdlNavigationPropertyBinding().setPath("NavPropertyETTwoPrimOne").setTarget("ESTwoPrim"), new CsdlNavigationPropertyBinding().setPath("NavPropertyETTwoPrimMany").setTarget("ESTwoPrim"))) .setAnnotations(Arrays.asList(new CsdlAnnotation().setTerm("Core.Description").setExpression( - new CsdlConstantAnnotationExpression(ConstantAnnotationExpression.Type.String, + new CsdlConstantExpression(CsdlConstantExpression.ConstantExpressionType.String, "Contains entities with all primitive types")), new CsdlAnnotation().setTerm("Core.LongDescription").setQualifier("EnabledForEntitySet").setExpression( - new CsdlConstantAnnotationExpression(ConstantAnnotationExpression.Type.String, + new CsdlConstantExpression(CsdlConstantExpression.ConstantExpressionType.String, "System Query Options: $filter, $count, $orderby, $skip, $top, $expand, $select, $format; " + "Operations: Create, Create with Deep Insert, Create with Bind Operation, Read")), new CsdlAnnotation().setTerm("Core.LongDescription").setQualifier("EnabledForEntity").setExpression( - new CsdlConstantAnnotationExpression(ConstantAnnotationExpression.Type.String, + new CsdlConstantExpression(CsdlConstantExpression.ConstantExpressionType.String, "System Query Options: $expand, $select, $format; Operations: " + "Read, Update, Update with Bind Operation, Delete")), new CsdlAnnotation().setTerm("Core.LongDescription").setQualifier("EnabledNavigationProperties") - .setExpression(new CsdlConstantAnnotationExpression(ConstantAnnotationExpression.Type.String, + .setExpression(new CsdlConstantExpression(CsdlConstantExpression.ConstantExpressionType.String, "NavPropertyETTwoPrimOne, NavPropertyETTwoPrimMany")))); } else if (name.equals("ESCollAllPrim")) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/67ccbf9d/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/TermProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/TermProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/TermProvider.java index 8e2ae19..74fcd13 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/TermProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/TermProvider.java @@ -18,13 +18,12 @@ */ package org.apache.olingo.server.tecsvc.provider; +import java.util.Arrays; + import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation; import org.apache.olingo.commons.api.edm.provider.CsdlTerm; -import org.apache.olingo.commons.api.edm.provider.annotation.ConstantAnnotationExpression; -import org.apache.olingo.commons.api.edm.provider.annotation.CsdlConstantAnnotationExpression; - -import java.util.Arrays; +import org.apache.olingo.commons.api.edm.provider.annotation.CsdlConstantExpression; /** */ @@ -48,13 +47,13 @@ public class TermProvider { if(TERM_DESCRIPTION.equals(termName)) { return new CsdlTerm().setName("Description").setType("Edm.String") .setAnnotations(Arrays.asList(new CsdlAnnotation().setTerm("Core.Description").setExpression( - new CsdlConstantAnnotationExpression(ConstantAnnotationExpression.Type.String, + new CsdlConstantExpression(CsdlConstantExpression.ConstantExpressionType.String, "A brief description of a model element")), new CsdlAnnotation().setTerm("Core.IsLanguageDependent"))); } else if(TERM_LONG_DESCRIPTION.equals(termName)) { return new CsdlTerm().setName("LongDescription").setType("Edm.String") .setAnnotations(Arrays.asList(new CsdlAnnotation().setTerm("Core.Description").setExpression( - new CsdlConstantAnnotationExpression(ConstantAnnotationExpression.Type.String, + new CsdlConstantExpression(CsdlConstantExpression.ConstantExpressionType.String, "A lengthy description of a model element")), new CsdlAnnotation().setTerm("Core.IsLanguageDependent"))); }
