[OLINGO-356] Renamed namespace for technical service
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/dff439fd Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/dff439fd Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/dff439fd Branch: refs/heads/master Commit: dff439fd7b3ab5d78e3b064127f89403ebc84138 Parents: 3ece19c Author: Michael Bolz <[email protected]> Authored: Fri Sep 5 07:05:12 2014 +0200 Committer: Michael Bolz <[email protected]> Committed: Fri Sep 5 07:05:12 2014 +0200 ---------------------------------------------------------------------- .../olingo/fit/tecsvc/client/BasicITCase.java | 4 +- .../olingo/fit/v4/AbstractTestITCase.java | 1 - .../server/tecsvc/provider/ActionProvider.java | 22 +- .../tecsvc/provider/ComplexTypeProvider.java | 30 +- .../tecsvc/provider/ContainerProvider.java | 2 +- .../server/tecsvc/provider/EdmTechProvider.java | 2 +- .../tecsvc/provider/EntityTypeProvider.java | 50 +- .../tecsvc/provider/EnumTypeProvider.java | 2 +- .../tecsvc/provider/FunctionProvider.java | 96 ++-- .../server/tecsvc/provider/SchemaProvider.java | 4 +- .../server/tecsvc/data/DataProviderTest.java | 2 +- .../json/ODataJsonSerializerTest.java | 2 +- .../server/core/uri/UriResourceImplTest.java | 12 +- .../core/uri/antlr/TestFullResourcePath.java | 508 +++++++++---------- .../core/uri/antlr/TestUriParserImpl.java | 80 +-- .../queryoption/expression/ExpressionTest.java | 4 +- .../core/uri/testutil/EdmTechTestProvider.java | 8 +- .../core/uri/validator/UriValidatorTest.java | 4 +- 18 files changed, 416 insertions(+), 417 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/dff439fd/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java index ef9dab2..49aa989 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java @@ -96,8 +96,8 @@ public class BasicITCase extends AbstractBaseTestITCase { Edm edm = response.getBody(); assertNotNull(edm); - assertEquals("com.sap.odata.test1", edm.getSchema("com.sap.odata.test1").getNamespace()); - assertEquals("Namespace1_Alias", edm.getSchema("com.sap.odata.test1").getAlias()); + assertEquals("olingo.odata.test1", edm.getSchema("olingo.odata.test1").getNamespace()); + assertEquals("Namespace1_Alias", edm.getSchema("olingo.odata.test1").getAlias()); assertNotNull(edm.getTerm(new FullQualifiedName("Core.Description"))); assertEquals(2, edm.getSchemas().size()); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/dff439fd/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java index ddaa52e..6dd1e56 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java @@ -36,7 +36,6 @@ import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.core.domain.v4.ODataEntityImpl; import org.apache.olingo.fit.AbstractBaseTestITCase; -import org.hamcrest.CoreMatchers; import org.junit.BeforeClass; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/dff439fd/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ActionProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ActionProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ActionProvider.java index 83540b8..729855d 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ActionProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ActionProvider.java @@ -31,34 +31,34 @@ public class ActionProvider { // Bound Actions public static final FullQualifiedName nameBAESAllPrimRTETAllPrim = - new FullQualifiedName(SchemaProvider.nameSpace, "BAESAllPrimRTETAllPrim"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BAESAllPrimRTETAllPrim"); public static final FullQualifiedName nameBAESTwoKeyNavRTESTwoKeyNav = - new FullQualifiedName(SchemaProvider.nameSpace, "BAESTwoKeyNavRTESTwoKeyNav"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BAESTwoKeyNavRTESTwoKeyNav"); public static final FullQualifiedName nameBAETBaseTwoKeyNavRTETBaseTwoKeyNav = - new FullQualifiedName(SchemaProvider.nameSpace, "BAETBaseTwoKeyNavRTETBaseTwoKeyNav"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BAETBaseTwoKeyNavRTETBaseTwoKeyNav"); public static final FullQualifiedName nameBAETTwoBaseTwoKeyNavRTETBaseTwoKeyNav = - new FullQualifiedName(SchemaProvider.nameSpace, "BAETTwoBaseTwoKeyNavRTETBaseTwoKeyNav"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BAETTwoBaseTwoKeyNavRTETBaseTwoKeyNav"); public static final FullQualifiedName nameBAETTwoKeyNavRTETTwoKeyNav = - new FullQualifiedName(SchemaProvider.nameSpace, "BAETTwoKeyNavRTETTwoKeyNav"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BAETTwoKeyNavRTETTwoKeyNav"); // Unbound Actions - public static final FullQualifiedName nameUARTCompCollParam = new FullQualifiedName(SchemaProvider.nameSpace, + public static final FullQualifiedName nameUARTCompCollParam = new FullQualifiedName(SchemaProvider.NAMESPACE, "UARTCompCollParam"); - public static final FullQualifiedName nameUARTCompParam = new FullQualifiedName(SchemaProvider.nameSpace, + public static final FullQualifiedName nameUARTCompParam = new FullQualifiedName(SchemaProvider.NAMESPACE, "UARTCompParam"); public static final FullQualifiedName nameUARTESParam = - new FullQualifiedName(SchemaProvider.nameSpace, "UARTESParam"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "UARTESParam"); public static final FullQualifiedName nameUARTETParam = - new FullQualifiedName(SchemaProvider.nameSpace, "UARTETParam"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "UARTETParam"); - public static final FullQualifiedName nameUARTPrimParam = new FullQualifiedName(SchemaProvider.nameSpace, + public static final FullQualifiedName nameUARTPrimParam = new FullQualifiedName(SchemaProvider.NAMESPACE, "UARTPrimParam"); - public static final FullQualifiedName nameUARTPrimCollParam = new FullQualifiedName(SchemaProvider.nameSpace, + public static final FullQualifiedName nameUARTPrimCollParam = new FullQualifiedName(SchemaProvider.NAMESPACE, "UARTPrimCollParam"); public List<Action> getActions(final FullQualifiedName actionName) throws ODataException { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/dff439fd/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ComplexTypeProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ComplexTypeProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ComplexTypeProvider.java index cac9f32..31e270d 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ComplexTypeProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ComplexTypeProvider.java @@ -28,28 +28,28 @@ import java.util.Arrays; public class ComplexTypeProvider { - public static final FullQualifiedName nameCTAllPrim = new FullQualifiedName(SchemaProvider.nameSpace, "CTAllPrim"); - public static final FullQualifiedName nameCTBase = new FullQualifiedName(SchemaProvider.nameSpace, "CTBase"); - public static final FullQualifiedName nameCTBasePrimCompNav = new FullQualifiedName(SchemaProvider.nameSpace, + public static final FullQualifiedName nameCTAllPrim = new FullQualifiedName(SchemaProvider.NAMESPACE, "CTAllPrim"); + public static final FullQualifiedName nameCTBase = new FullQualifiedName(SchemaProvider.NAMESPACE, "CTBase"); + public static final FullQualifiedName nameCTBasePrimCompNav = new FullQualifiedName(SchemaProvider.NAMESPACE, "CTBasePrimCompNav"); - public static final FullQualifiedName nameCTCollAllPrim = new FullQualifiedName(SchemaProvider.nameSpace, + public static final FullQualifiedName nameCTCollAllPrim = new FullQualifiedName(SchemaProvider.NAMESPACE, "CTCollAllPrim"); - public static final FullQualifiedName nameCTCompCollComp = new FullQualifiedName(SchemaProvider.nameSpace, + public static final FullQualifiedName nameCTCompCollComp = new FullQualifiedName(SchemaProvider.NAMESPACE, "CTCompCollComp"); - public static final FullQualifiedName nameCTCompComp = new FullQualifiedName(SchemaProvider.nameSpace, "CTCompComp"); - public static final FullQualifiedName nameCTCompNav = new FullQualifiedName(SchemaProvider.nameSpace, "CTCompNav"); + public static final FullQualifiedName nameCTCompComp = new FullQualifiedName(SchemaProvider.NAMESPACE, "CTCompComp"); + public static final FullQualifiedName nameCTCompNav = new FullQualifiedName(SchemaProvider.NAMESPACE, "CTCompNav"); - public static final FullQualifiedName nameCTMixPrimCollComp = new FullQualifiedName(SchemaProvider.nameSpace, + public static final FullQualifiedName nameCTMixPrimCollComp = new FullQualifiedName(SchemaProvider.NAMESPACE, "CTMixPrimCollComp"); - public static final FullQualifiedName nameCTNavFiveProp = new FullQualifiedName(SchemaProvider.nameSpace, + public static final FullQualifiedName nameCTNavFiveProp = new FullQualifiedName(SchemaProvider.NAMESPACE, "CTNavFiveProp"); - public static final FullQualifiedName nameCTPrim = new FullQualifiedName(SchemaProvider.nameSpace, "CTPrim"); - public static final FullQualifiedName nameCTPrimComp = new FullQualifiedName(SchemaProvider.nameSpace, "CTPrimComp"); - public static final FullQualifiedName nameCTPrimEnum = new FullQualifiedName(SchemaProvider.nameSpace, "CTPrimEnum"); - public static final FullQualifiedName nameCTTwoBase = new FullQualifiedName(SchemaProvider.nameSpace, "CTTwoBase"); + public static final FullQualifiedName nameCTPrim = new FullQualifiedName(SchemaProvider.NAMESPACE, "CTPrim"); + public static final FullQualifiedName nameCTPrimComp = new FullQualifiedName(SchemaProvider.NAMESPACE, "CTPrimComp"); + public static final FullQualifiedName nameCTPrimEnum = new FullQualifiedName(SchemaProvider.NAMESPACE, "CTPrimEnum"); + public static final FullQualifiedName nameCTTwoBase = new FullQualifiedName(SchemaProvider.NAMESPACE, "CTTwoBase"); public static final FullQualifiedName nameCTTwoBasePrimCompNav = - new FullQualifiedName(SchemaProvider.nameSpace, "CTTwoBasePrimCompNav"); - public static final FullQualifiedName nameCTTwoPrim = new FullQualifiedName(SchemaProvider.nameSpace, "CTTwoPrim"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "CTTwoBasePrimCompNav"); + public static final FullQualifiedName nameCTTwoPrim = new FullQualifiedName(SchemaProvider.NAMESPACE, "CTTwoPrim"); public ComplexType getComplexType(final FullQualifiedName complexTypeName) throws ODataException { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/dff439fd/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 e4390b4..813bb87 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 @@ -35,7 +35,7 @@ import java.util.List; public class ContainerProvider { - public static final FullQualifiedName nameContainer = new FullQualifiedName(SchemaProvider.nameSpace, "Container"); + public static final FullQualifiedName nameContainer = new FullQualifiedName(SchemaProvider.NAMESPACE, "Container"); EntityContainerInfo entityContainerInfoTest1 = new EntityContainerInfo().setContainerName(nameContainer); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/dff439fd/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EdmTechProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EdmTechProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EdmTechProvider.java index ca3ce37..c15727b 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EdmTechProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EdmTechProvider.java @@ -42,7 +42,7 @@ import java.util.List; public class EdmTechProvider extends EdmProvider { - public static final String nameSpace = "com.sap.odata.test1"; + public static final String nameSpace = "olingo.odata.test1"; private final SchemaProvider schemaProvider; private final EntityTypeProvider entityTypeProvider; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/dff439fd/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EntityTypeProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EntityTypeProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EntityTypeProvider.java index 1db1fa7..389efd1 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EntityTypeProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EntityTypeProvider.java @@ -30,48 +30,48 @@ import java.util.Arrays; public class EntityTypeProvider { - public static final FullQualifiedName nameETAllKey = new FullQualifiedName(SchemaProvider.nameSpace, "ETAllKey"); - public static final FullQualifiedName nameETAllNullable = new FullQualifiedName(SchemaProvider.nameSpace, + public static final FullQualifiedName nameETAllKey = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETAllKey"); + public static final FullQualifiedName nameETAllNullable = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETAllNullable"); - public static final FullQualifiedName nameETAllPrim = new FullQualifiedName(SchemaProvider.nameSpace, "ETAllPrim"); - public static final FullQualifiedName nameETBase = new FullQualifiedName(SchemaProvider.nameSpace, "ETBase"); - public static final FullQualifiedName nameETBaseTwoKeyNav = new FullQualifiedName(SchemaProvider.nameSpace, + public static final FullQualifiedName nameETAllPrim = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETAllPrim"); + public static final FullQualifiedName nameETBase = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETBase"); + public static final FullQualifiedName nameETBaseTwoKeyNav = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETBaseTwoKeyNav"); public static final FullQualifiedName nameETBaseTwoKeyTwoPrim = - new FullQualifiedName(SchemaProvider.nameSpace, "ETBaseTwoKeyTwoPrim"); - public static final FullQualifiedName nameETCollAllPrim = new FullQualifiedName(SchemaProvider.nameSpace, + new FullQualifiedName(SchemaProvider.NAMESPACE, "ETBaseTwoKeyTwoPrim"); + public static final FullQualifiedName nameETCollAllPrim = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETCollAllPrim"); - public static final FullQualifiedName nameETCompAllPrim = new FullQualifiedName(SchemaProvider.nameSpace, + public static final FullQualifiedName nameETCompAllPrim = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETCompAllPrim"); - public static final FullQualifiedName nameETCompCollAllPrim = new FullQualifiedName(SchemaProvider.nameSpace, + public static final FullQualifiedName nameETCompCollAllPrim = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETCompCollAllPrim"); - public static final FullQualifiedName nameETCompCollComp = new FullQualifiedName(SchemaProvider.nameSpace, + public static final FullQualifiedName nameETCompCollComp = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETCompCollComp"); - public static final FullQualifiedName nameETCompComp = new FullQualifiedName(SchemaProvider.nameSpace, "ETCompComp"); + public static final FullQualifiedName nameETCompComp = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETCompComp"); public static final FullQualifiedName nameETCompMixPrimCollComp = - new FullQualifiedName(SchemaProvider.nameSpace, "ETCompMixPrimCollComp"); - public static final FullQualifiedName nameETFourKeyAlias = new FullQualifiedName(SchemaProvider.nameSpace, + new FullQualifiedName(SchemaProvider.NAMESPACE, "ETCompMixPrimCollComp"); + public static final FullQualifiedName nameETFourKeyAlias = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETFourKeyAlias"); - public static final FullQualifiedName nameETKeyNav = new FullQualifiedName(SchemaProvider.nameSpace, "ETKeyNav"); - public static final FullQualifiedName nameETKeyPrimNav = new FullQualifiedName(SchemaProvider.nameSpace, + public static final FullQualifiedName nameETKeyNav = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETKeyNav"); + public static final FullQualifiedName nameETKeyPrimNav = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETKeyPrimNav"); - public static final FullQualifiedName nameETKeyTwoKeyComp = new FullQualifiedName(SchemaProvider.nameSpace, + public static final FullQualifiedName nameETKeyTwoKeyComp = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETKeyTwoKeyComp"); - public static final FullQualifiedName nameETMedia = new FullQualifiedName(SchemaProvider.nameSpace, "ETMedia"); - public static final FullQualifiedName nameETMixPrimCollComp = new FullQualifiedName(SchemaProvider.nameSpace, + public static final FullQualifiedName nameETMedia = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETMedia"); + public static final FullQualifiedName nameETMixPrimCollComp = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETMixPrimCollComp"); public static final FullQualifiedName nameETServerSidePaging = - new FullQualifiedName(SchemaProvider.nameSpace, "ETServerSidePaging"); - public static final FullQualifiedName nameETTwoBase = new FullQualifiedName(SchemaProvider.nameSpace, "ETTwoBase"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "ETServerSidePaging"); + public static final FullQualifiedName nameETTwoBase = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETTwoBase"); public static final FullQualifiedName nameETTwoBaseTwoKeyNav = - new FullQualifiedName(SchemaProvider.nameSpace, "ETTwoBaseTwoKeyNav"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "ETTwoBaseTwoKeyNav"); public static final FullQualifiedName nameETTwoBaseTwoKeyTwoPrim = - new FullQualifiedName(SchemaProvider.nameSpace, "ETTwoBaseTwoKeyTwoPrim"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "ETTwoBaseTwoKeyTwoPrim"); public static final FullQualifiedName nameETTwoKeyNav = - new FullQualifiedName(SchemaProvider.nameSpace, "ETTwoKeyNav"); - public static final FullQualifiedName nameETTwoKeyTwoPrim = new FullQualifiedName(SchemaProvider.nameSpace, + new FullQualifiedName(SchemaProvider.NAMESPACE, "ETTwoKeyNav"); + public static final FullQualifiedName nameETTwoKeyTwoPrim = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETTwoKeyTwoPrim"); - public static final FullQualifiedName nameETTwoPrim = new FullQualifiedName(SchemaProvider.nameSpace, "ETTwoPrim"); + public static final FullQualifiedName nameETTwoPrim = new FullQualifiedName(SchemaProvider.NAMESPACE, "ETTwoPrim"); public EntityType getEntityType(final FullQualifiedName entityTypeName) throws ODataException { if (entityTypeName.equals(nameETAllPrim)) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/dff439fd/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EnumTypeProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EnumTypeProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EnumTypeProvider.java index 0b31557..16e6e56 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EnumTypeProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EnumTypeProvider.java @@ -28,7 +28,7 @@ import java.util.Arrays; public class EnumTypeProvider { - public static final FullQualifiedName nameENString = new FullQualifiedName(SchemaProvider.nameSpace, "ENString"); + public static final FullQualifiedName nameENString = new FullQualifiedName(SchemaProvider.NAMESPACE, "ENString"); public EnumType getEnumType(final FullQualifiedName enumTypeName) throws ODataException { if (enumTypeName.equals(nameENString)) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/dff439fd/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/FunctionProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/FunctionProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/FunctionProvider.java index 69b4345..c4ee503 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/FunctionProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/FunctionProvider.java @@ -32,137 +32,137 @@ public class FunctionProvider { // Bound Functions public static final FullQualifiedName nameBFCCollCTPrimCompRTESAllPrim = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCCollCTPrimCompRTESAllPrim"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCCollCTPrimCompRTESAllPrim"); public static final FullQualifiedName nameBFCCollStringRTESTwoKeyNav = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCCollStringRTESTwoKeyNav"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCCollStringRTESTwoKeyNav"); public static final FullQualifiedName nameBFCCTPrimCompRTESBaseTwoKeyNav = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCCTPrimCompRTESBaseTwoKeyNav"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCCTPrimCompRTESBaseTwoKeyNav"); public static final FullQualifiedName nameBFCCTPrimCompRTESTwoKeyNav = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCCTPrimCompRTESTwoKeyNav"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCCTPrimCompRTESTwoKeyNav"); public static final FullQualifiedName nameBFCCTPrimCompRTESTwoKeyNavParam = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCCTPrimCompRTESTwoKeyNavParam"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCCTPrimCompRTESTwoKeyNavParam"); public static final FullQualifiedName nameBFCCTPrimCompRTETTwoKeyNavParam = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCCTPrimCompRTETTwoKeyNavParam"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCCTPrimCompRTETTwoKeyNavParam"); public static final FullQualifiedName nameBFCESAllPrimRTCTAllPrim = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCESAllPrimRTCTAllPrim"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCESAllPrimRTCTAllPrim"); public static final FullQualifiedName nameBFCESBaseTwoKeyNavRTESBaseTwoKey = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCESBaseTwoKeyNavRTESBaseTwoKey"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCESBaseTwoKeyNavRTESBaseTwoKey"); public static final FullQualifiedName nameBFCESKeyNavRTETKeyNav = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCESKeyNavRTETKeyNav"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCESKeyNavRTETKeyNav"); public static final FullQualifiedName nameBFCESKeyNavRTETKeyNavParam = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCESKeyNavRTETKeyNavParam"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCESKeyNavRTETKeyNavParam"); public static final FullQualifiedName nameBFCESTwoKeyNavRTCollCTTwoPrim = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCESTwoKeyNavRTCollCTTwoPrim"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCESTwoKeyNavRTCollCTTwoPrim"); public static final FullQualifiedName nameBFCESTwoKeyNavRTCollString = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCESTwoKeyNavRTCollString"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCESTwoKeyNavRTCollString"); public static final FullQualifiedName nameBFCESTwoKeyNavRTCTTwoPrim = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCESTwoKeyNavRTCTTwoPrim"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCESTwoKeyNavRTCTTwoPrim"); public static final FullQualifiedName nameBFCESTwoKeyNavRTESTwoKeyNav = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCESTwoKeyNavRTESTwoKeyNav"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCESTwoKeyNavRTESTwoKeyNav"); public static final FullQualifiedName nameBFCESTwoKeyNavRTString = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCESTwoKeyNavRTString"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCESTwoKeyNavRTString"); public static final FullQualifiedName nameBFCESTwoKeyNavRTStringParam = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCESTwoKeyNavRTStringParam"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCESTwoKeyNavRTStringParam"); public static final FullQualifiedName nameBFCESTwoKeyNavRTTwoKeyNav = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCESTwoKeyNavRTTwoKeyNav"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCESTwoKeyNavRTTwoKeyNav"); public static final FullQualifiedName nameBFCETBaseTwoKeyNavRTESBaseTwoKey = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCETBaseTwoKeyNavRTESBaseTwoKey"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCETBaseTwoKeyNavRTESBaseTwoKey"); public static final FullQualifiedName nameBFCETBaseTwoKeyNavRTESTwoKeyNav = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCETBaseTwoKeyNavRTESTwoKeyNav"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCETBaseTwoKeyNavRTESTwoKeyNav"); public static final FullQualifiedName nameBFCETBaseTwoKeyNavRTETTwoKeyNav = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCETBaseTwoKeyNavRTETTwoKeyNav"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCETBaseTwoKeyNavRTETTwoKeyNav"); public static final FullQualifiedName nameBFCETKeyNavRTETKeyNav = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCETKeyNavRTETKeyNav"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCETKeyNavRTETKeyNav"); public static final FullQualifiedName nameBFCETTwoKeyNavRTCTTwoPrim = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCETTwoKeyNavRTCTTwoPrim"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCETTwoKeyNavRTCTTwoPrim"); public static final FullQualifiedName nameBFCETTwoKeyNavRTESTwoKeyNav = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCETTwoKeyNavRTESTwoKeyNav"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCETTwoKeyNavRTESTwoKeyNav"); public static final FullQualifiedName nameBFCETTwoKeyNavRTETTwoKeyNav = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCETTwoKeyNavRTETTwoKeyNav"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCETTwoKeyNavRTETTwoKeyNav"); public static final FullQualifiedName nameBFCSINavRTESTwoKeyNav = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCSINavRTESTwoKeyNav"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCSINavRTESTwoKeyNav"); public static final FullQualifiedName nameBFCStringRTESTwoKeyNav = - new FullQualifiedName(SchemaProvider.nameSpace, "BFCStringRTESTwoKeyNav"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFCStringRTESTwoKeyNav"); public static final FullQualifiedName nameBFESTwoKeyNavRTESTwoKeyNav = - new FullQualifiedName(SchemaProvider.nameSpace, "BFESTwoKeyNavRTESTwoKeyNav"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "BFESTwoKeyNavRTESTwoKeyNav"); // Unbound Functions public static final FullQualifiedName nameUFCRTCollCTTwoPrim = - new FullQualifiedName(SchemaProvider.nameSpace, "UFCRTCollCTTwoPrim"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "UFCRTCollCTTwoPrim"); public static final FullQualifiedName nameUFCRTCollCTTwoPrimParam = - new FullQualifiedName(SchemaProvider.nameSpace, "UFCRTCollCTTwoPrimParam"); - public static final FullQualifiedName nameUFCRTCollString = new FullQualifiedName(SchemaProvider.nameSpace, + new FullQualifiedName(SchemaProvider.NAMESPACE, "UFCRTCollCTTwoPrimParam"); + public static final FullQualifiedName nameUFCRTCollString = new FullQualifiedName(SchemaProvider.NAMESPACE, "UFCRTCollString"); public static final FullQualifiedName nameUFCRTCollStringTwoParam = - new FullQualifiedName(SchemaProvider.nameSpace, "UFCRTCollStringTwoParam"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "UFCRTCollStringTwoParam"); public static final FullQualifiedName nameUFCRTCTAllPrimTwoParam = - new FullQualifiedName(SchemaProvider.nameSpace, "UFCRTCTAllPrimTwoParam"); - public static final FullQualifiedName nameUFCRTCTTwoPrim = new FullQualifiedName(SchemaProvider.nameSpace, + new FullQualifiedName(SchemaProvider.NAMESPACE, "UFCRTCTAllPrimTwoParam"); + public static final FullQualifiedName nameUFCRTCTTwoPrim = new FullQualifiedName(SchemaProvider.NAMESPACE, "UFCRTCTTwoPrim"); public static final FullQualifiedName nameUFCRTCTTwoPrimParam = - new FullQualifiedName(SchemaProvider.nameSpace, "UFCRTCTTwoPrimParam"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "UFCRTCTTwoPrimParam"); public static final FullQualifiedName nameUFCRTESMixPrimCollCompTwoParam = - new FullQualifiedName(SchemaProvider.nameSpace, "UFCRTESMixPrimCollCompTwoParam"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "UFCRTESMixPrimCollCompTwoParam"); public static final FullQualifiedName nameUFCRTESTwoKeyNavParam = - new FullQualifiedName(SchemaProvider.nameSpace, "UFCRTESTwoKeyNavParam"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "UFCRTESTwoKeyNavParam"); public static final FullQualifiedName nameUFCRTETAllPrimTwoParam = - new FullQualifiedName(SchemaProvider.nameSpace, "UFCRTETAllPrimTwoParam"); - public static final FullQualifiedName nameUFCRTETKeyNav = new FullQualifiedName(SchemaProvider.nameSpace, + new FullQualifiedName(SchemaProvider.NAMESPACE, "UFCRTETAllPrimTwoParam"); + public static final FullQualifiedName nameUFCRTETKeyNav = new FullQualifiedName(SchemaProvider.NAMESPACE, "UFCRTETKeyNav"); - public static final FullQualifiedName nameUFCRTETMedia = new FullQualifiedName(SchemaProvider.nameSpace, + public static final FullQualifiedName nameUFCRTETMedia = new FullQualifiedName(SchemaProvider.NAMESPACE, "UFCRTETMedia"); public static final FullQualifiedName nameUFCRTETTwoKeyNavParam = - new FullQualifiedName(SchemaProvider.nameSpace, "UFCRTETTwoKeyNavParam"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "UFCRTETTwoKeyNavParam"); public static final FullQualifiedName nameUFCRTETTwoKeyNavParamCTTwoPrim = - new FullQualifiedName(SchemaProvider.nameSpace, "UFCRTETTwoKeyNavParamCTTwoPrim"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "UFCRTETTwoKeyNavParamCTTwoPrim"); public static final FullQualifiedName nameUFCRTString = - new FullQualifiedName(SchemaProvider.nameSpace, "UFCRTString"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "UFCRTString"); public static final FullQualifiedName nameUFCRTStringTwoParam = - new FullQualifiedName(SchemaProvider.nameSpace, "UFCRTStringTwoParam"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "UFCRTStringTwoParam"); public static final FullQualifiedName nameUFNRTESMixPrimCollCompTwoParam = - new FullQualifiedName(SchemaProvider.nameSpace, "UFNRTESMixPrimCollCompTwoParam"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "UFNRTESMixPrimCollCompTwoParam"); public static final FullQualifiedName nameUFNRTInt16 = - new FullQualifiedName(SchemaProvider.nameSpace, "UFNRTInt16"); + new FullQualifiedName(SchemaProvider.NAMESPACE, "UFNRTInt16"); - public static final FullQualifiedName nameUFNRTCollCTNavFiveProp = new FullQualifiedName(SchemaProvider.nameSpace, + public static final FullQualifiedName nameUFNRTCollCTNavFiveProp = new FullQualifiedName(SchemaProvider.NAMESPACE, "UFNRTCollCTNavFiveProp"); public static final FullQualifiedName nameBFCESTwoKeyNavRTCTNavFiveProp = new FullQualifiedName( - SchemaProvider.nameSpace, "BFCESTwoKeyNavRTCTNavFiveProp"); + SchemaProvider.NAMESPACE, "BFCESTwoKeyNavRTCTNavFiveProp"); public static final FullQualifiedName nameBFCESTwoKeyNavRTCollCTNavFiveProp = new FullQualifiedName( - SchemaProvider.nameSpace, "BFCESTwoKeyNavRTCollCTNavFiveProp"); + SchemaProvider.NAMESPACE, "BFCESTwoKeyNavRTCollCTNavFiveProp"); public List<Function> getFunctions(final FullQualifiedName functionName) throws ODataException { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/dff439fd/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/SchemaProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/SchemaProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/SchemaProvider.java index d780173..a0a282e 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/SchemaProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/SchemaProvider.java @@ -33,7 +33,7 @@ public class SchemaProvider { private EdmTechProvider prov; - public static final String nameSpace = "com.sap.odata.test1"; + public static final String NAMESPACE = "olingo.odata.test1"; public SchemaProvider(final EdmTechProvider prov) { this.prov = prov; @@ -42,7 +42,7 @@ public class SchemaProvider { public List<Schema> getSchemas() throws ODataException { List<Schema> schemas = new ArrayList<Schema>(); Schema schema = new Schema(); - schema.setNamespace("com.sap.odata.test1"); + schema.setNamespace(NAMESPACE); schema.setAlias("Namespace1_Alias"); schemas.add(schema); // EnumTypes http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/dff439fd/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java b/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java index bfeea90..581ec1d 100644 --- a/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java +++ b/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java @@ -40,7 +40,7 @@ public class DataProviderTest { private final Edm edm = OData.newInstance().createEdm(new EdmTechProvider()); private final EdmEntityContainer entityContainer = edm.getEntityContainer( - new FullQualifiedName("com.sap.odata.test1", "Container")); + new FullQualifiedName("olingo.odata.test1", "Container")); private final EdmEntitySet esAllPrim; private final EdmEntitySet esCompAllPrim; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/dff439fd/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java index f7b4eec..8e6d3ad 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java @@ -46,7 +46,7 @@ public class ODataJsonSerializerTest { private final Edm edm = OData.newInstance().createEdm(new EdmTechProvider()); private final EdmEntityContainer entityContainer = edm.getEntityContainer( - new FullQualifiedName("com.sap.odata.test1", "Container")); + new FullQualifiedName("olingo.odata.test1", "Container")); private final DataProvider data = new DataProvider(); private ODataSerializer serializer = new ODataJsonSerializer(ODataFormat.JSON); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/dff439fd/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java index f778edc..ba808ee 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java @@ -279,11 +279,11 @@ public class UriResourceImplTest { impl.setCollectionTypeFilter(entityTypeBaseColl); assertEquals(entityTypeBaseColl, impl.getTypeFilterOnCollection()); assertEquals("mock", impl.toString(false)); - assertEquals("mock/com.sap.odata.test1.ETBaseTwoKeyNav", impl.toString(true)); + assertEquals("mock/olingo.odata.test1.ETBaseTwoKeyNav", impl.toString(true)); impl.setEntryTypeFilter(entityTypeBaseEntry); assertEquals(entityTypeBaseEntry, impl.getTypeFilterOnEntry()); assertEquals("mock", impl.toString(false)); - assertEquals("mock/com.sap.odata.test1.ETBaseTwoKeyNav/()com.sap.odata.test1.ETTwoBaseTwoKeyNav", + assertEquals("mock/olingo.odata.test1.ETBaseTwoKeyNav/()olingo.odata.test1.ETTwoBaseTwoKeyNav", impl.toString(true)); // set entry @@ -292,7 +292,7 @@ public class UriResourceImplTest { impl.setEntryTypeFilter(entityTypeBaseEntry); assertEquals(entityTypeBaseEntry, impl.getTypeFilterOnEntry()); assertEquals("mock", impl.toString(false)); - assertEquals("mock/com.sap.odata.test1.ETTwoBaseTwoKeyNav", impl.toString(true)); + assertEquals("mock/olingo.odata.test1.ETTwoBaseTwoKeyNav", impl.toString(true)); // set collection impl = new Mock(); @@ -300,7 +300,7 @@ public class UriResourceImplTest { impl.setCollectionTypeFilter(entityTypeBaseColl); assertEquals(entityTypeBaseColl, impl.getTypeFilterOnCollection()); assertEquals("mock", impl.toString(false)); - assertEquals("mock/com.sap.odata.test1.ETBaseTwoKeyNav", impl.toString(true)); + assertEquals("mock/olingo.odata.test1.ETBaseTwoKeyNav", impl.toString(true)); impl = new Mock(); UriParameterImpl parameter = new UriParameterImpl().setName("ParameterInt16"); @@ -357,7 +357,7 @@ public class UriResourceImplTest { impl.setTypeFilter(entityTypeBaseColl); assertEquals(entityTypeBaseColl, impl.getTypeFilter()); assertEquals("mock", impl.toString()); - assertEquals("mock/com.sap.odata.test1.ETBaseTwoKeyNav", impl.toString(true)); + assertEquals("mock/olingo.odata.test1.ETBaseTwoKeyNav", impl.toString(true)); assertEquals("mock", impl.toString(false)); // } @@ -491,7 +491,7 @@ public class UriResourceImplTest { EdmEntityType entityType = edm.getEntityType(EntityTypeProvider.nameETTwoKeyNav); impl.setType(entityType); - assertEquals("com.sap.odata.test1.ETTwoKeyNav", impl.toString()); + assertEquals("olingo.odata.test1.ETTwoKeyNav", impl.toString()); assertEquals(entityType, impl.getType()); UriParameterImpl parameter = new UriParameterImpl().setName("ParameterInt16");
