Repository: olingo-odata4 Updated Branches: refs/heads/olingo-266-ref 8ca9b3c61 -> 70a989ce9
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/70a989ce/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/UriInfoImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/UriInfoImplTest.java b/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/UriInfoImplTest.java index a9d516d..f84562a 100644 --- a/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/UriInfoImplTest.java +++ b/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/UriInfoImplTest.java @@ -36,8 +36,6 @@ import org.apache.olingo.server.api.uri.UriInfoResource; import org.apache.olingo.server.api.uri.UriInfoService; import org.apache.olingo.server.api.uri.queryoption.CustomQueryOption; import org.apache.olingo.server.core.edm.provider.EdmProviderImpl; -import org.apache.olingo.server.core.testutil.EdmTechTestProvider; -import org.apache.olingo.server.core.testutil.techprovider.EntityTypeProvider; import org.apache.olingo.server.core.uri.queryoption.CountOptionImpl; import org.apache.olingo.server.core.uri.queryoption.CustomQueryOptionImpl; import org.apache.olingo.server.core.uri.queryoption.ExpandOptionImpl; @@ -52,6 +50,8 @@ import org.apache.olingo.server.core.uri.queryoption.SelectOptionImpl; import org.apache.olingo.server.core.uri.queryoption.SkipOptionImpl; import org.apache.olingo.server.core.uri.queryoption.SkipTokenOptionImpl; import org.apache.olingo.server.core.uri.queryoption.TopOptionImpl; +import org.apache.olingo.server.core.uri.testutil.EdmTechTestProvider; +import org.apache.olingo.server.ref.provider.EntityTypeProvider; import org.junit.Test; public class UriInfoImplTest { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/70a989ce/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java b/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java index bd4ac68..61ca4ef 100644 --- a/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java +++ b/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java @@ -41,12 +41,12 @@ import org.apache.olingo.server.core.edm.provider.EdmComplexTypeImpl; import org.apache.olingo.server.core.edm.provider.EdmEntitySetImpl; import org.apache.olingo.server.core.edm.provider.EdmProviderImpl; import org.apache.olingo.server.core.edm.provider.EdmSingletonImpl; -import org.apache.olingo.server.core.testutil.EdmTechTestProvider; -import org.apache.olingo.server.core.testutil.techprovider.ActionProvider; -import org.apache.olingo.server.core.testutil.techprovider.ComplexTypeProvider; -import org.apache.olingo.server.core.testutil.techprovider.EntityTypeProvider; import org.apache.olingo.server.core.uri.queryoption.expression.ExpressionImpl; import org.apache.olingo.server.core.uri.queryoption.expression.LiteralImpl; +import org.apache.olingo.server.core.uri.testutil.EdmTechTestProvider; +import org.apache.olingo.server.ref.provider.ActionProvider; +import org.apache.olingo.server.ref.provider.ComplexTypeProvider; +import org.apache.olingo.server.ref.provider.EntityTypeProvider; import org.junit.Test; public class UriResourceImplTest { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/70a989ce/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java ---------------------------------------------------------------------- diff --git a/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java b/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java index 702d559..1478cfe 100644 --- a/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java +++ b/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java @@ -30,15 +30,15 @@ import org.apache.olingo.server.api.uri.queryoption.expression.BinaryOperatorKin import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitException; import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind; import org.apache.olingo.server.core.edm.provider.EdmProviderImpl; -import org.apache.olingo.server.core.testutil.EdmTechTestProvider; -import org.apache.olingo.server.core.testutil.techprovider.ComplexTypeProvider; -import org.apache.olingo.server.core.testutil.techprovider.EntityTypeProvider; -import org.apache.olingo.server.core.testutil.techprovider.EnumTypeProvider; -import org.apache.olingo.server.core.testutil.techprovider.PropertyProvider; import org.apache.olingo.server.core.uri.parser.UriParserException; +import org.apache.olingo.server.core.uri.testutil.EdmTechTestProvider; import org.apache.olingo.server.core.uri.testutil.FilterValidator; import org.apache.olingo.server.core.uri.testutil.ResourceValidator; import org.apache.olingo.server.core.uri.testutil.TestUriValidator; +import org.apache.olingo.server.ref.provider.ComplexTypeProvider; +import org.apache.olingo.server.ref.provider.EntityTypeProvider; +import org.apache.olingo.server.ref.provider.EnumTypeProvider; +import org.apache.olingo.server.ref.provider.PropertyProvider; import org.junit.Test; public class TestFullResourcePath { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/70a989ce/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/antlr/TestUriParserImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/antlr/TestUriParserImpl.java b/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/antlr/TestUriParserImpl.java index 9a05cfb..4e5acf8 100644 --- a/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/antlr/TestUriParserImpl.java +++ b/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/antlr/TestUriParserImpl.java @@ -28,14 +28,14 @@ import org.apache.olingo.server.api.uri.UriInfoKind; import org.apache.olingo.server.api.uri.UriResourceKind; import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind; import org.apache.olingo.server.core.edm.provider.EdmProviderImpl; -import org.apache.olingo.server.core.testutil.EdmTechTestProvider; -import org.apache.olingo.server.core.testutil.techprovider.ComplexTypeProvider; -import org.apache.olingo.server.core.testutil.techprovider.EntityTypeProvider; -import org.apache.olingo.server.core.testutil.techprovider.PropertyProvider; import org.apache.olingo.server.core.uri.parser.UriParserException; +import org.apache.olingo.server.core.uri.testutil.EdmTechTestProvider; import org.apache.olingo.server.core.uri.testutil.FilterValidator; import org.apache.olingo.server.core.uri.testutil.ResourceValidator; import org.apache.olingo.server.core.uri.testutil.TestUriValidator; +import org.apache.olingo.server.ref.provider.ComplexTypeProvider; +import org.apache.olingo.server.ref.provider.EntityTypeProvider; +import org.apache.olingo.server.ref.provider.PropertyProvider; import org.junit.Test; public class TestUriParserImpl { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/70a989ce/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionTest.java ---------------------------------------------------------------------- diff --git a/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionTest.java b/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionTest.java index cce237e..7dcf5a5 100644 --- a/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionTest.java +++ b/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionTest.java @@ -28,11 +28,11 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.server.api.uri.UriInfoResource; import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind; import org.apache.olingo.server.core.edm.provider.EdmProviderImpl; -import org.apache.olingo.server.core.testutil.EdmTechTestProvider; import org.apache.olingo.server.core.uri.UriInfoImpl; import org.apache.olingo.server.core.uri.queryoption.expression.AliasImpl; import org.apache.olingo.server.core.uri.queryoption.expression.ExpressionImpl; import org.apache.olingo.server.core.uri.queryoption.expression.LiteralImpl; +import org.apache.olingo.server.core.uri.testutil.EdmTechTestProvider; import org.junit.Test; //TOOD add getKind check to all http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/70a989ce/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java ---------------------------------------------------------------------- diff --git a/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java b/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java index 2902bdc..c4d9926 100644 --- a/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java +++ b/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java @@ -36,15 +36,15 @@ import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitEx import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind; import org.apache.olingo.server.api.uri.queryoption.expression.UnaryOperatorKind; import org.apache.olingo.server.core.edm.provider.EdmProviderImpl; -import org.apache.olingo.server.core.testutil.EdmTechTestProvider; -import org.apache.olingo.server.core.testutil.techprovider.ActionProvider; -import org.apache.olingo.server.core.testutil.techprovider.EntityTypeProvider; -import org.apache.olingo.server.core.testutil.techprovider.EnumTypeProvider; -import org.apache.olingo.server.core.testutil.techprovider.FunctionProvider; import org.apache.olingo.server.core.uri.UriInfoImpl; import org.apache.olingo.server.core.uri.UriResourceActionImpl; import org.apache.olingo.server.core.uri.UriResourceFunctionImpl; +import org.apache.olingo.server.core.uri.testutil.EdmTechTestProvider; import org.apache.olingo.server.core.uri.testutil.FilterTreeToText; +import org.apache.olingo.server.ref.provider.ActionProvider; +import org.apache.olingo.server.ref.provider.EntityTypeProvider; +import org.apache.olingo.server.ref.provider.EnumTypeProvider; +import org.apache.olingo.server.ref.provider.FunctionProvider; import org.junit.Test; public class ExpressionTest { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/70a989ce/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/testutil/EdmTechTestProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/testutil/EdmTechTestProvider.java b/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/testutil/EdmTechTestProvider.java new file mode 100644 index 0000000..9a4b5fb --- /dev/null +++ b/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/testutil/EdmTechTestProvider.java @@ -0,0 +1,100 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * 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 + * + * 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 + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.server.core.uri.testutil; + +import java.util.Arrays; +import java.util.List; + +import org.apache.olingo.commons.api.ODataException; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.server.api.edm.provider.ComplexType; +import org.apache.olingo.server.api.edm.provider.EntitySet; +import org.apache.olingo.server.api.edm.provider.EntityType; +import org.apache.olingo.server.api.edm.provider.Property; +import org.apache.olingo.server.api.edm.provider.PropertyRef; +import org.apache.olingo.server.ref.provider.EdmTechProvider; + +/** + * Implement the EdmTechProvider and + * <li>adds a entity type <b>ETabc with</b> properties a,b,c,d,e,f</li> + * <li>adds a complex type <b>CTabc</b> with properties a,b,c,d,e,f</li> + * <li>adds a <b>abc</b> entity set of type <b>ETabc</b></li> + */ +public class EdmTechTestProvider extends EdmTechProvider { + + private static final FullQualifiedName nameInt16 = EdmPrimitiveTypeKind.Int16.getFullQualifiedName(); + public static final String nameSpace = "com.sap.odata.test1"; + public static final FullQualifiedName nameContainer = new FullQualifiedName(nameSpace, "Container"); + + Property propertyAInt16 = new Property().setName("a").setType(nameInt16); + Property propertyBInt16 = new Property().setName("b").setType(nameInt16); + Property propertyCInt16 = new Property().setName("c").setType(nameInt16); + Property propertyDInt16 = new Property().setName("d").setType(nameInt16); + Property propertyEInt16 = new Property().setName("e").setType(nameInt16); + Property propertyFInt16 = new Property().setName("f").setType(nameInt16); + + public static final FullQualifiedName nameCTabc = new FullQualifiedName(nameSpace, "CTabc"); + public static final FullQualifiedName nameETabc = new FullQualifiedName(nameSpace, "ETabc"); + + @Override + public ComplexType getComplexType(final FullQualifiedName complexTypeName) throws ODataException { + if (complexTypeName.equals(nameCTabc)) { + return new ComplexType() + .setName("CTabc") + .setProperties(Arrays.asList( + propertyAInt16, propertyBInt16, propertyCInt16, + propertyDInt16, propertyEInt16, propertyFInt16 + )); + + } + + return super.getComplexType(complexTypeName); + } + + @Override + public EntitySet getEntitySet(final FullQualifiedName entityContainer, final String name) throws ODataException { + if (nameContainer.equals(entityContainer)) { + if (name.equals("ESabc")) { + return new EntitySet() + .setName("ESabc") + .setType(nameETabc); + } + } + + return super.getEntitySet(entityContainer, name); + } + + @Override + public EntityType getEntityType(final FullQualifiedName entityTypeName) throws ODataException { + List<PropertyRef> oneKeyPropertyInt16 = Arrays.asList(new PropertyRef().setPropertyName("a")); + + if (entityTypeName.equals(nameETabc)) { + return new EntityType() + .setName("ETabc") + .setProperties(Arrays.asList( + propertyAInt16, propertyBInt16, propertyCInt16, + propertyDInt16, propertyEInt16, propertyFInt16)) + .setKey(oneKeyPropertyInt16); + } + + return super.getEntityType(entityTypeName); + } + +} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/70a989ce/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java ---------------------------------------------------------------------- diff --git a/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java b/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java index 0374b25..719a229 100644 --- a/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java +++ b/lib/server-ref/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java @@ -26,9 +26,9 @@ import java.util.ArrayList; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.server.api.uri.UriInfo; import org.apache.olingo.server.core.edm.provider.EdmProviderImpl; -import org.apache.olingo.server.core.testutil.techprovider.EdmTechProvider; import org.apache.olingo.server.core.uri.parser.Parser; import org.apache.olingo.server.core.uri.parser.UriParserException; +import org.apache.olingo.server.ref.provider.EdmTechProvider; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/70a989ce/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 761127a..5493dda 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ <artifactId>httpclient</artifactId> <version>${hc.client.version}</version> </dependency> - + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId>
