You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2015/04/04 19:05:18 UTC
[12/50] [abbrv] olingo-odata4 git commit: [OLINGO-575] Edm Cleanup
part 2
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/898d745b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java
index 47a9136..2e2d4a6 100644
--- a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java
+++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java
@@ -249,7 +249,7 @@ public class MetadataDocumentXmlSerializerTest {
properties.add(new Property().setName("prop2").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName()));
complexType.setProperties(properties);
- EdmComplexTypeImpl c1 = EdmComplexTypeImpl.getInstance(edm, name, complexType);
+ EdmComplexTypeImpl c1 = new EdmComplexTypeImpl(edm, name, complexType);
complexTypes.add(c1);
when(schema.getComplexTypes()).thenReturn(complexTypes);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/898d745b/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 90ffca1..ee62068 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
@@ -18,9 +18,12 @@
*/
package org.apache.olingo.server.tecsvc.provider;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
import org.apache.olingo.commons.api.ODataException;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.commons.api.edm.Target;
import org.apache.olingo.commons.api.edm.provider.ActionImport;
import org.apache.olingo.commons.api.edm.provider.EntityContainer;
import org.apache.olingo.commons.api.edm.provider.EntityContainerInfo;
@@ -29,10 +32,6 @@ import org.apache.olingo.commons.api.edm.provider.FunctionImport;
import org.apache.olingo.commons.api.edm.provider.NavigationPropertyBinding;
import org.apache.olingo.commons.api.edm.provider.Singleton;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
public class ContainerProvider {
public static final FullQualifiedName nameContainer = new FullQualifiedName(SchemaProvider.NAMESPACE, "Container");
@@ -158,10 +157,10 @@ public class ContainerProvider {
.setNavigationPropertyBindings(Arrays.asList(
new NavigationPropertyBinding()
.setPath("NavPropertyETTwoPrimOne")
- .setTarget(new Target().setTargetName("ESTwoPrim").toString()),
+ .setTarget("ESTwoPrim"),
new NavigationPropertyBinding()
.setPath("NavPropertyETTwoPrimMany")
- .setTarget(new Target().setTargetName("ESTwoPrim").toString())
+ .setTarget("ESTwoPrim")
));
} else if (name.equals("ESCollAllPrim")) {
@@ -176,10 +175,10 @@ public class ContainerProvider {
.setNavigationPropertyBindings(Arrays.asList(
new NavigationPropertyBinding()
.setPath("NavPropertyETAllPrimOne")
- .setTarget(new Target().setTargetName("ESAllPrim").toString()),
+ .setTarget("ESAllPrim"),
new NavigationPropertyBinding()
.setPath("NavPropertyETAllPrimMany")
- .setTarget(new Target().setTargetName("ESAllPrim").toString())
+ .setTarget("ESAllPrim")
));
} else if (name.equals("ESMixPrimCollComp")) {
@@ -272,55 +271,55 @@ public class ContainerProvider {
.setNavigationPropertyBindings(Arrays.asList(
new NavigationPropertyBinding()
.setPath("NavPropertyETKeyNavOne")
- .setTarget(new Target().setTargetName("ESKeyNav").toString()),
+ .setTarget("ESKeyNav"),
new NavigationPropertyBinding()
.setPath("NavPropertyETKeyNavMany")
- .setTarget(new Target().setTargetName("ESKeyNav").toString()),
+ .setTarget("ESKeyNav"),
new NavigationPropertyBinding()
.setPath("NavPropertyETTwoKeyNavOne")
- .setTarget(new Target().setTargetName("ESTwoKeyNav").toString()),
+ .setTarget("ESTwoKeyNav"),
new NavigationPropertyBinding()
.setPath("NavPropertyETTwoKeyNavMany")
- .setTarget(new Target().setTargetName("ESTwoKeyNav").toString()),
+ .setTarget("ESTwoKeyNav"),
new NavigationPropertyBinding()
.setPath("NavPropertyETMediaOne")
- .setTarget(new Target().setTargetName("ESMedia").toString()),
+ .setTarget("ESMedia"),
new NavigationPropertyBinding()
.setPath("NavPropertyETMediaMany")
- .setTarget(new Target().setTargetName("ESMedia").toString()),
+ .setTarget("ESMedia"),
new NavigationPropertyBinding()
.setPath("PropertyCompNav/NavPropertyETTwoKeyNavOn")
- .setTarget(new Target().setTargetName("ESTwoKeyNav").toString()),
+ .setTarget("ESTwoKeyNav"),
new NavigationPropertyBinding()
.setPath("PropertyCompNav/NavPropertyETTwoKeyNavMany")
- .setTarget(new Target().setTargetName("ESTwoKeyNav").toString()),
+ .setTarget("ESTwoKeyNav"),
new NavigationPropertyBinding()
.setPath("PropertyCompNav/NavPropertyETMediaOne")
- .setTarget(new Target().setTargetName("ESMedia").toString()),
+ .setTarget("ESMedia"),
new NavigationPropertyBinding()
.setPath("PropertyCompNav/NavPropertyETMediaMany")
- .setTarget(new Target().setTargetName("ESMedia").toString()),
+ .setTarget("ESMedia"),
new NavigationPropertyBinding()
.setPath("PropertyCompCompNav/PropertyCompNav/NavPropertyETTwoKeyNavOne")
- .setTarget(new Target().setTargetName("ESTwoKeyNav").toString()),
+ .setTarget("ESTwoKeyNav"),
new NavigationPropertyBinding()
.setPath("PropertyCompCompNav/PropertyCompNav/NavPropertyETTwoKeyNavMany")
- .setTarget(new Target().setTargetName("ESTwoKeyNav").toString()),
+ .setTarget("ESTwoKeyNav"),
new NavigationPropertyBinding()
.setPath("PropertyCompCompNav/PropertyCompNav/NavPropertyETMediaOne")
- .setTarget(new Target().setTargetName("ESMedia").toString()),
+ .setTarget("ESMedia"),
new NavigationPropertyBinding()
.setPath("PropertyCompCompNav/PropertyCompNav/NavPropertyETMediaMany")
- .setTarget(new Target().setTargetName("ESMedia").toString()),
+ .setTarget("ESMedia"),
new NavigationPropertyBinding()
.setPath("ETKeyNav/PropertyCompNav/NavPropertyETTwoKeyNavMany")
- .setTarget(new Target().setTargetName("ESTwoKeyNav").toString()),
+ .setTarget("ESTwoKeyNav"),
new NavigationPropertyBinding()
.setPath("ETKeyNav/PropertyCompNav/NavPropertyETTwoKeyNavMany")
- .setTarget(new Target().setTargetName("ESTwoKeyNav").toString()),
+ .setTarget("ESTwoKeyNav"),
new NavigationPropertyBinding()
.setPath("PropertyCompNav/com.corp.odata.test1.CTNavFiveProp/NavPropertyETTwoKeyNavMany")
- .setTarget(new Target().setTargetName("ESTwoKeyNav").toString())
+ .setTarget("ESTwoKeyNav")
));
} else if (name.equals("ESTwoKeyNav")) {
@@ -330,49 +329,49 @@ public class ContainerProvider {
.setNavigationPropertyBindings(Arrays.asList(
new NavigationPropertyBinding()
.setPath("NavPropertyETKeyNavOne")
- .setTarget(new Target().setTargetName("ESKeyNav").toString()),
+ .setTarget("ESKeyNav"),
new NavigationPropertyBinding()
.setPath("NavPropertyETKeyNavMany")
- .setTarget(new Target().setTargetName("ESKeyNav").toString()),
+ .setTarget("ESKeyNav"),
new NavigationPropertyBinding()
.setPath("NavPropertyETTwoKeyNavOne")
- .setTarget(new Target().setTargetName("ESTwoKeyNav").toString()),
+ .setTarget("ESTwoKeyNav"),
new NavigationPropertyBinding()
.setPath("NavPropertyETTwoKeyNavMany")
- .setTarget(new Target().setTargetName("ESTwoKeyNav").toString()),
+ .setTarget("ESTwoKeyNav"),
new NavigationPropertyBinding()
.setPath("PropertyCompNav/NavPropertyETTwoKeyNavOne")
- .setTarget(new Target().setTargetName("ESTwoKeyNav").toString()),
+ .setTarget("ESTwoKeyNav"),
new NavigationPropertyBinding()
.setPath("PropertyCompNav/NavPropertyETTwoKeyNavMany")
- .setTarget(new Target().setTargetName("ESTwoKeyNav").toString()),
+ .setTarget("ESTwoKeyNav"),
new NavigationPropertyBinding()
.setPath("PropertyCompNav/NavPropertyETKeyNavOne")
- .setTarget(new Target().setTargetName("ESKeyNav").toString()),
+ .setTarget("ESKeyNav"),
new NavigationPropertyBinding()
.setPath("PropertyCompNav/NavPropertyETKeyNavMany")
- .setTarget(new Target().setTargetName("ESKeyNav").toString()),
+ .setTarget("ESKeyNav"),
new NavigationPropertyBinding()
.setPath("CollPropertyCompNav/NavPropertyETTwoKeyNavOne")
- .setTarget(new Target().setTargetName("ESTwoKeyNav").toString()),
+ .setTarget("ESTwoKeyNav"),
new NavigationPropertyBinding()
.setPath("CollPropertyCompNav/NavPropertyETTwoKeyNavMany")
- .setTarget(new Target().setTargetName("ESTwoKeyNav").toString()),
+ .setTarget("ESTwoKeyNav"),
new NavigationPropertyBinding()
.setPath("CollPropertyCompNav/NavPropertyETMediaOne")
- .setTarget(new Target().setTargetName("ESMedia").toString()),
+ .setTarget("ESMedia"),
new NavigationPropertyBinding()
.setPath("CollPropertyCompNav/NavPropertyETMediaMany")
- .setTarget(new Target().setTargetName("ESMedia").toString()),
+ .setTarget("ESMedia"),
new NavigationPropertyBinding()
.setPath("CollPropertyCompNav/NavPropertyETTwoKeyNavMany")
- .setTarget(new Target().setTargetName("ESTwoKeyNav").toString()),
+ .setTarget("ESTwoKeyNav"),
new NavigationPropertyBinding()
.setPath("NavPropertyETTwoBaseTwoKeyNavOne")
- .setTarget(new Target().setTargetName("ESBaseTwoKeyNav").toString()),
+ .setTarget("ESBaseTwoKeyNav"),
new NavigationPropertyBinding()
.setPath("NavPropertySINav")
- .setTarget(new Target().setTargetName("SINav").toString())
+ .setTarget("SINav")
));
} else if (name.equals("ESBaseTwoKeyNav")) {
@@ -491,7 +490,7 @@ public class ContainerProvider {
return new FunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTETTwoKeyNav)
- .setEntitySet(new Target().setEntityContainer(entityContainer).setTargetName("ESTwoKeyNav").toString())
+ .setEntitySet(entityContainer.getFullQualifiedNameAsString() + "/ESTwoKeyNav")
.setIncludeInServiceDocument(true);
} else if (name.equals("FICRTETTwoKeyNavParam")) {
return new FunctionImport()
@@ -539,13 +538,13 @@ public class ContainerProvider {
return new FunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTETMedia)
- .setEntitySet(new Target().setEntityContainer(entityContainer).setTargetName("ESMedia").toString())
+ .setEntitySet(entityContainer.getFullQualifiedNameAsString() + "/ESMedia")
.setIncludeInServiceDocument(true);
} else if (name.equals("FICRTCollESMedia")) {
return new FunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTCollETMedia)
- .setEntitySet(new Target().setEntityContainer(entityContainer).setTargetName("ESMedia").toString())
+ .setEntitySet(entityContainer.getFullQualifiedNameAsString() + "/ESMedia")
.setIncludeInServiceDocument(true);
} else if (name.equals("FICRTCTTwoPrimParam")) {
@@ -576,7 +575,7 @@ public class ContainerProvider {
return new FunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTCollETTwoKeyNavParam)
- .setEntitySet(new Target().setEntityContainer(entityContainer).setTargetName("ESTwoKeyNav").toString())
+ .setEntitySet(entityContainer.getFullQualifiedNameAsString() + "/ESTwoKeyNav")
.setIncludeInServiceDocument(true);
} else if (name.equals("FICRTCollCTTwoPrimParam")) {
@@ -606,7 +605,7 @@ public class ContainerProvider {
.setNavigationPropertyBindings(Arrays.asList(
new NavigationPropertyBinding()
.setPath("NavPropertyETTwoKeyNavMany")
- .setTarget(new Target().setTargetName("ESTwoKeyNav").toString())));
+ .setTarget("ESTwoKeyNav")));
} else if (name.equals("SIMedia")) {
return new Singleton()
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/898d745b/samples/server/src/main/java/org/apache/olingo/server/sample/edmprovider/CarsEdmProvider.java
----------------------------------------------------------------------
diff --git a/samples/server/src/main/java/org/apache/olingo/server/sample/edmprovider/CarsEdmProvider.java b/samples/server/src/main/java/org/apache/olingo/server/sample/edmprovider/CarsEdmProvider.java
index 5f59db4..dac970d 100644
--- a/samples/server/src/main/java/org/apache/olingo/server/sample/edmprovider/CarsEdmProvider.java
+++ b/samples/server/src/main/java/org/apache/olingo/server/sample/edmprovider/CarsEdmProvider.java
@@ -25,7 +25,6 @@ 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.commons.api.edm.Target;
import org.apache.olingo.commons.api.edm.provider.ComplexType;
import org.apache.olingo.commons.api.edm.provider.EdmProvider;
import org.apache.olingo.commons.api.edm.provider.EntityContainer;
@@ -122,15 +121,14 @@ public class CarsEdmProvider extends EdmProvider {
.setNavigationPropertyBindings(
Arrays.asList(
new NavigationPropertyBinding().setPath("Manufacturer").setTarget(
- new Target().setTargetName(ES_MANUFACTURER_NAME).setEntityContainer(CONTAINER_FQN)
- .toString())));
+ CONTAINER_FQN.getFullQualifiedNameAsString() + "/" + ES_MANUFACTURER_NAME)));
} else if (ES_MANUFACTURER_NAME.equals(entitySetName)) {
return new EntitySet()
.setName(ES_MANUFACTURER_NAME)
.setType(ET_MANUFACTURER).setNavigationPropertyBindings(
Arrays.asList(
- new NavigationPropertyBinding().setPath("Cars").setTarget(
- new Target().setTargetName(ES_CARS_NAME).setEntityContainer(CONTAINER_FQN).toString())));
+ new NavigationPropertyBinding().setPath("Cars")
+ .setTarget(CONTAINER_FQN.getFullQualifiedNameAsString() + "/" + ES_CARS_NAME)));
}
}