You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2015/04/30 17:02:24 UTC
[11/50] [abbrv] olingo-odata4 git commit: [OLINGO-564] Renamed
'edm.provider.*' classes
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/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 9b982aa..1f5bd03 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
@@ -24,13 +24,13 @@ 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.provider.ActionImport;
-import org.apache.olingo.commons.api.edm.provider.EntityContainer;
-import org.apache.olingo.commons.api.edm.provider.EntityContainerInfo;
-import org.apache.olingo.commons.api.edm.provider.EntitySet;
-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 org.apache.olingo.commons.api.edm.provider.CsdlActionImport;
+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;
public class ContainerProvider {
@@ -47,8 +47,8 @@ public class ContainerProvider {
public static final String AIRT_PARAM = "AIRTParam";
public static final String AIRT_TWO_PARAM = "AIRTTwoParam";
- EntityContainerInfo entityContainerInfoTest1 =
- new EntityContainerInfo().setContainerName(nameContainer);
+ CsdlEntityContainerInfo entityContainerInfoTest1 =
+ new CsdlEntityContainerInfo().setContainerName(nameContainer);
private EdmTechProvider prov;
@@ -56,7 +56,8 @@ public class ContainerProvider {
prov = edmTechProvider;
}
- public EntityContainerInfo getEntityContainerInfo(final FullQualifiedName entityContainerName) throws ODataException {
+ public CsdlEntityContainerInfo getEntityContainerInfo(final FullQualifiedName entityContainerName)
+ throws ODataException {
if (entityContainerName == null) {
return entityContainerInfoTest1;
} else if (entityContainerName.equals(nameContainer)) {
@@ -66,12 +67,12 @@ public class ContainerProvider {
return null;
}
- public EntityContainer getEntityContainer() throws ODataException {
- EntityContainer container = new EntityContainer();
+ public CsdlEntityContainer getEntityContainer() throws ODataException {
+ CsdlEntityContainer container = new CsdlEntityContainer();
container.setName(ContainerProvider.nameContainer.getName());
// EntitySets
- List<EntitySet> entitySets = new ArrayList<EntitySet>();
+ List<CsdlEntitySet> entitySets = new ArrayList<CsdlEntitySet>();
container.setEntitySets(entitySets);
entitySets.add(prov.getEntitySet(ContainerProvider.nameContainer, "ESAllPrim"));
entitySets.add(prov.getEntitySet(ContainerProvider.nameContainer, "ESCollAllPrim"));
@@ -100,16 +101,16 @@ public class ContainerProvider {
entitySets.add(prov.getEntitySet(ContainerProvider.nameContainer, "ESMixEnumDefCollComp"));
entitySets.add(prov.getEntitySet(ContainerProvider.nameContainer, "ESTwoBaseTwoKeyNav"));
entitySets.add(prov.getEntitySet(ContainerProvider.nameContainer, "ESKeyNavCont"));
-
+
// Singletons
- List<Singleton> singletons = new ArrayList<Singleton>();
+ List<CsdlSingleton> singletons = new ArrayList<CsdlSingleton>();
container.setSingletons(singletons);
singletons.add(prov.getSingleton(ContainerProvider.nameContainer, "SI"));
singletons.add(prov.getSingleton(ContainerProvider.nameContainer, "SINav"));
singletons.add(prov.getSingleton(ContainerProvider.nameContainer, "SIMedia"));
// ActionImports
- List<ActionImport> actionImports = new ArrayList<ActionImport>();
+ List<CsdlActionImport> actionImports = new ArrayList<CsdlActionImport>();
container.setActionImports(actionImports);
actionImports.add(prov.getActionImport(ContainerProvider.nameContainer, AIRT_STRING));
actionImports.add(prov.getActionImport(ContainerProvider.nameContainer, AIRT_COLL_STRING_TWO_PARAM));
@@ -124,7 +125,7 @@ public class ContainerProvider {
actionImports.add(prov.getActionImport(ContainerProvider.nameContainer, AIRT_TWO_PARAM));
// FunctionImports
- List<FunctionImport> functionImports = new ArrayList<FunctionImport>();
+ List<CsdlFunctionImport> functionImports = new ArrayList<CsdlFunctionImport>();
container.setFunctionImports(functionImports);
functionImports.add(prov.getFunctionImport(ContainerProvider.nameContainer, "FINRTInt16"));
functionImports.add(prov.getFunctionImport(ContainerProvider.nameContainer, "FINInvisibleRTInt16"));
@@ -148,291 +149,291 @@ public class ContainerProvider {
functionImports.add(prov.getFunctionImport(ContainerProvider.nameContainer, "FICRTCollESTwoKeyNavParam"));
functionImports.add(prov.getFunctionImport(ContainerProvider.nameContainer, "FICRTCollCTTwoPrimParam"));
functionImports.add(prov.getFunctionImport(ContainerProvider.nameContainer, "FINRTCollCTNavFiveProp"));
- functionImports.add(prov.getFunctionImport(ContainerProvider.nameContainer, "FICRTCollESKeyNavContParam"));
-
+ functionImports.add(prov.getFunctionImport(ContainerProvider.nameContainer, "FICRTCollESKeyNavContParam"));
+
return container;
}
- public EntitySet getEntitySet(final FullQualifiedName entityContainer, final String name) throws ODataException {
+ public CsdlEntitySet getEntitySet(final FullQualifiedName entityContainer, final String name) throws ODataException {
if (entityContainer == nameContainer) {
if (name.equals("ESAllPrim")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESAllPrim")
.setType(EntityTypeProvider.nameETAllPrim)
.setNavigationPropertyBindings(Arrays.asList(
- new NavigationPropertyBinding()
- .setPath("NavPropertyETTwoPrimOne")
- .setTarget("ESTwoPrim"),
- new NavigationPropertyBinding()
- .setPath("NavPropertyETTwoPrimMany")
- .setTarget("ESTwoPrim")
- ));
+ new CsdlNavigationPropertyBinding()
+ .setPath("NavPropertyETTwoPrimOne")
+ .setTarget("ESTwoPrim"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("NavPropertyETTwoPrimMany")
+ .setTarget("ESTwoPrim")
+ ));
} else if (name.equals("ESCollAllPrim")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESCollAllPrim")
.setType(EntityTypeProvider.nameETCollAllPrim);
} else if (name.equals("ESTwoPrim")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESTwoPrim")
.setType(EntityTypeProvider.nameETTwoPrim)
.setNavigationPropertyBindings(Arrays.asList(
- new NavigationPropertyBinding()
- .setPath("NavPropertyETAllPrimOne")
- .setTarget("ESAllPrim"),
- new NavigationPropertyBinding()
- .setPath("NavPropertyETAllPrimMany")
- .setTarget("ESAllPrim")
- ));
+ new CsdlNavigationPropertyBinding()
+ .setPath("NavPropertyETAllPrimOne")
+ .setTarget("ESAllPrim"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("NavPropertyETAllPrimMany")
+ .setTarget("ESAllPrim")
+ ));
} else if (name.equals("ESMixPrimCollComp")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESMixPrimCollComp")
.setType(EntityTypeProvider.nameETMixPrimCollComp);
} else if (name.equals("ESBase")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESBase")
.setType(EntityTypeProvider.nameETBase);
} else if (name.equals("ESTwoBase")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESTwoBase")
.setType(EntityTypeProvider.nameETTwoBase);
} else if (name.equals("ESTwoKeyTwoPrim")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESTwoKeyTwoPrim")
.setType(EntityTypeProvider.nameETTwoKeyTwoPrim);
} else if (name.equals("ESBaseTwoKeyTwoPrim")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESBaseTwoKeyTwoPrim")
.setType(EntityTypeProvider.nameETBaseTwoKeyTwoPrim);
} else if (name.equals("ESTwoBaseTwoKeyTwoPrim")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESTwoBaseTwoKeyTwoPrim")
.setType(EntityTypeProvider.nameETTwoBaseTwoKeyTwoPrim);
} else if (name.equals("ESAllKey")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESAllKey")
.setType(EntityTypeProvider.nameETAllKey);
} else if (name.equals("ESCompAllPrim")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESCompAllPrim")
.setType(EntityTypeProvider.nameETCompAllPrim);
} else if (name.equals("ESCompCollAllPrim")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESCompCollAllPrim")
.setType(EntityTypeProvider.nameETCompCollAllPrim);
} else if (name.equals("ESCompComp")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESCompComp")
.setType(EntityTypeProvider.nameETCompComp);
} else if (name.equals("ESCompCollComp")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESCompCollComp")
.setType(EntityTypeProvider.nameETCompCollComp);
} else if (name.equals("ESMedia")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESMedia")
.setType(EntityTypeProvider.nameETMedia)
.setIncludeInServiceDocument(true);
} else if (name.equals("ESKeyTwoKeyComp")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESKeyTwoKeyComp")
.setType(EntityTypeProvider.nameETKeyTwoKeyComp);
} else if (name.equals("ESInvisible")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESInvisible")
.setIncludeInServiceDocument(false)
.setType(EntityTypeProvider.nameETAllPrim);
} else if (name.equals("ESServerSidePaging")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESServerSidePaging")
.setType(EntityTypeProvider.nameETServerSidePaging);
} else if (name.equals("ESAllNullable")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESAllNullable")
.setType(EntityTypeProvider.nameETAllNullable);
} else if (name.equals("ESKeyNav")) {
-
- return new EntitySet()
+
+ return new CsdlEntitySet()
.setName("ESKeyNav")
.setType(EntityTypeProvider.nameETKeyNav)
.setNavigationPropertyBindings(Arrays.asList(
- new NavigationPropertyBinding()
- .setPath("NavPropertyETKeyNavOne")
- .setTarget("ESKeyNav"),
- new NavigationPropertyBinding()
- .setPath("NavPropertyETKeyNavMany")
- .setTarget("ESKeyNav"),
- new NavigationPropertyBinding()
- .setPath("NavPropertyETTwoKeyNavOne")
- .setTarget("ESTwoKeyNav"),
- new NavigationPropertyBinding()
- .setPath("NavPropertyETTwoKeyNavMany")
- .setTarget("ESTwoKeyNav"),
- new NavigationPropertyBinding()
- .setPath("NavPropertyETMediaOne")
- .setTarget("ESMedia"),
- new NavigationPropertyBinding()
- .setPath("NavPropertyETMediaMany")
- .setTarget("ESMedia"),
- new NavigationPropertyBinding()
- .setPath("PropertyCompNav/NavPropertyETTwoKeyNavOne")
- .setTarget("ESTwoKeyNav"),
- new NavigationPropertyBinding()
- .setPath("PropertyCompNav/NavPropertyETTwoKeyNavMany")
- .setTarget("ESTwoKeyNav"),
- new NavigationPropertyBinding()
- .setPath("PropertyCompNav/NavPropertyETMediaOne")
- .setTarget("ESMedia"),
- new NavigationPropertyBinding()
- .setPath("PropertyCompNav/NavPropertyETMediaMany")
- .setTarget("ESMedia"),
- new NavigationPropertyBinding()
- .setPath("PropertyCompCompNav/PropertyCompNav/NavPropertyETTwoKeyNavOne")
- .setTarget("ESTwoKeyNav"),
- new NavigationPropertyBinding()
- .setPath("PropertyCompCompNav/PropertyCompNav/NavPropertyETTwoKeyNavMany")
- .setTarget("ESTwoKeyNav"),
- new NavigationPropertyBinding()
- .setPath("PropertyCompCompNav/PropertyCompNav/NavPropertyETMediaOne")
- .setTarget("ESMedia"),
- new NavigationPropertyBinding()
- .setPath("PropertyCompCompNav/PropertyCompNav/NavPropertyETMediaMany")
- .setTarget("ESMedia"),
- new NavigationPropertyBinding()
- .setPath("ETKeyNav/PropertyCompNav/NavPropertyETTwoKeyNavMany")
- .setTarget("ESTwoKeyNav"),
- new NavigationPropertyBinding()
- .setPath("ETKeyNav/PropertyCompNav/NavPropertyETTwoKeyNavMany")
- .setTarget("ESTwoKeyNav"),
- new NavigationPropertyBinding()
- .setPath("PropertyCompNav/com.corp.odata.test1.CTNavFiveProp/NavPropertyETTwoKeyNavMany")
- .setTarget("ESTwoKeyNav")
+ new CsdlNavigationPropertyBinding()
+ .setPath("NavPropertyETKeyNavOne")
+ .setTarget("ESKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("NavPropertyETKeyNavMany")
+ .setTarget("ESKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("NavPropertyETTwoKeyNavOne")
+ .setTarget("ESTwoKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("NavPropertyETTwoKeyNavMany")
+ .setTarget("ESTwoKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("NavPropertyETMediaOne")
+ .setTarget("ESMedia"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("NavPropertyETMediaMany")
+ .setTarget("ESMedia"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("PropertyCompNav/NavPropertyETTwoKeyNavOne")
+ .setTarget("ESTwoKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("PropertyCompNav/NavPropertyETTwoKeyNavMany")
+ .setTarget("ESTwoKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("PropertyCompNav/NavPropertyETMediaOne")
+ .setTarget("ESMedia"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("PropertyCompNav/NavPropertyETMediaMany")
+ .setTarget("ESMedia"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("PropertyCompCompNav/PropertyCompNav/NavPropertyETTwoKeyNavOne")
+ .setTarget("ESTwoKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("PropertyCompCompNav/PropertyCompNav/NavPropertyETTwoKeyNavMany")
+ .setTarget("ESTwoKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("PropertyCompCompNav/PropertyCompNav/NavPropertyETMediaOne")
+ .setTarget("ESMedia"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("PropertyCompCompNav/PropertyCompNav/NavPropertyETMediaMany")
+ .setTarget("ESMedia"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("ETKeyNav/PropertyCompNav/NavPropertyETTwoKeyNavMany")
+ .setTarget("ESTwoKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("ETKeyNav/PropertyCompNav/NavPropertyETTwoKeyNavMany")
+ .setTarget("ESTwoKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("PropertyCompNav/com.corp.odata.test1.CTNavFiveProp/NavPropertyETTwoKeyNavMany")
+ .setTarget("ESTwoKeyNav")
));
-
+
} else if (name.equals("ESTwoKeyNav")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESTwoKeyNav")
.setType(EntityTypeProvider.nameETTwoKeyNav)
.setNavigationPropertyBindings(Arrays.asList(
- new NavigationPropertyBinding()
- .setPath("NavPropertyETKeyNavOne")
- .setTarget("ESKeyNav"),
- new NavigationPropertyBinding()
- .setPath("NavPropertyETKeyNavMany")
- .setTarget("ESKeyNav"),
- new NavigationPropertyBinding()
- .setPath("NavPropertyETTwoKeyNavOne")
- .setTarget("ESTwoKeyNav"),
- new NavigationPropertyBinding()
- .setPath("NavPropertyETTwoKeyNavMany")
- .setTarget("ESTwoKeyNav"),
- new NavigationPropertyBinding()
- .setPath("PropertyCompNav/NavPropertyETTwoKeyNavOne")
- .setTarget("ESTwoKeyNav"),
- new NavigationPropertyBinding()
- .setPath("PropertyCompNav/NavPropertyETTwoKeyNavMany")
- .setTarget("ESTwoKeyNav"),
- new NavigationPropertyBinding()
- .setPath("PropertyCompNav/NavPropertyETKeyNavOne")
- .setTarget("ESKeyNav"),
- new NavigationPropertyBinding()
- .setPath("PropertyCompNav/NavPropertyETKeyNavMany")
- .setTarget("ESKeyNav"),
- new NavigationPropertyBinding()
- .setPath("CollPropertyCompNav/NavPropertyETTwoKeyNavOne")
- .setTarget("ESTwoKeyNav"),
- new NavigationPropertyBinding()
- .setPath("CollPropertyCompNav/NavPropertyETTwoKeyNavMany")
- .setTarget("ESTwoKeyNav"),
- new NavigationPropertyBinding()
- .setPath("CollPropertyCompNav/NavPropertyETMediaOne")
- .setTarget("ESMedia"),
- new NavigationPropertyBinding()
- .setPath("CollPropertyCompNav/NavPropertyETMediaMany")
- .setTarget("ESMedia"),
- new NavigationPropertyBinding()
- .setPath("NavPropertyETTwoBaseTwoKeyNavOne")
- .setTarget("ESBaseTwoKeyNav"),
- new NavigationPropertyBinding()
- .setPath("ETBaseTwoKeyNav/CollPropertyCompNav/NavPropertyETTwoKeyNavMany")
- .setTarget("ESTwoKeyNav"),
- new NavigationPropertyBinding()
- .setPath("ETBaseTwoKeyNav/NavPropertyETTwoBaseTwoKeyNavOne")
- .setTarget("ESBaseTwoKeyNav"),
- new NavigationPropertyBinding()
- .setPath("NavPropertySINav")
- .setTarget("SINav")
- ));
-
- } else if(name.equals("ESKeyNavCont")) {
- return new EntitySet()
- .setName("ESKeyNavCont")
- .setType(EntityTypeProvider.nameETKeyNavCont)
- .setNavigationPropertyBindings(Arrays.asList(
- new NavigationPropertyBinding()
+ new CsdlNavigationPropertyBinding()
+ .setPath("NavPropertyETKeyNavOne")
+ .setTarget("ESKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("NavPropertyETKeyNavMany")
+ .setTarget("ESKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("NavPropertyETTwoKeyNavOne")
+ .setTarget("ESTwoKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("NavPropertyETTwoKeyNavMany")
+ .setTarget("ESTwoKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("PropertyCompNav/NavPropertyETTwoKeyNavOne")
+ .setTarget("ESTwoKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("PropertyCompNav/NavPropertyETTwoKeyNavMany")
+ .setTarget("ESTwoKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("PropertyCompNav/NavPropertyETKeyNavOne")
+ .setTarget("ESKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("PropertyCompNav/NavPropertyETKeyNavMany")
+ .setTarget("ESKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("CollPropertyCompNav/NavPropertyETTwoKeyNavOne")
+ .setTarget("ESTwoKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("CollPropertyCompNav/NavPropertyETTwoKeyNavMany")
+ .setTarget("ESTwoKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("CollPropertyCompNav/NavPropertyETMediaOne")
+ .setTarget("ESMedia"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("CollPropertyCompNav/NavPropertyETMediaMany")
+ .setTarget("ESMedia"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("NavPropertyETTwoBaseTwoKeyNavOne")
+ .setTarget("ESBaseTwoKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("ETBaseTwoKeyNav/CollPropertyCompNav/NavPropertyETTwoKeyNavMany")
+ .setTarget("ESTwoKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("ETBaseTwoKeyNav/NavPropertyETTwoBaseTwoKeyNavOne")
+ .setTarget("ESBaseTwoKeyNav"),
+ new CsdlNavigationPropertyBinding()
+ .setPath("NavPropertySINav")
+ .setTarget("SINav")
+ ));
+
+ } else if (name.equals("ESKeyNavCont")) {
+ return new CsdlEntitySet()
+ .setName("ESKeyNavCont")
+ .setType(EntityTypeProvider.nameETKeyNavCont)
+ .setNavigationPropertyBindings(Arrays.asList(
+ new CsdlNavigationPropertyBinding()
.setPath("NavPropertyETTwoKeyNavContOne/NavPropertyETKeyNavOne")
.setTarget("ESKeyNav"),
- new NavigationPropertyBinding()
+ new CsdlNavigationPropertyBinding()
.setPath("NavPropertyETTwoKeyNavContMany/NavPropertyETKeyNavOne")
.setTarget("ESKeyNav"),
- new NavigationPropertyBinding()
+ new CsdlNavigationPropertyBinding()
.setPath("PropertyCompNavCont/NavPropertyETKeyNavContMany/NavPropertyETKeyNavOne")
.setTarget("ESKeyNav"),
- new NavigationPropertyBinding()
+ new CsdlNavigationPropertyBinding()
.setPath("PropertyCompNavCont/NavPropertyETKeyNavContOne/NavPropertyETKeyNavOne")
.setTarget("ESKeyNav"),
- new NavigationPropertyBinding()
+ new CsdlNavigationPropertyBinding()
.setPath("PropertyCompNavCont/NavPropertyETTwoKeyNavContMany/NavPropertyETKeyNavOne")
.setTarget("ESKeyNav"),
- new NavigationPropertyBinding()
+ new CsdlNavigationPropertyBinding()
.setPath("PropertyCompNavCont/NavPropertyETTwoKeyNavContOne/NavPropertyETKeyNavOne")
.setTarget("ESKeyNav")
- ));
+ ));
} else if (name.equals("ESBaseTwoKeyNav")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESBaseTwoKeyNav")
.setType(EntityTypeProvider.nameETBaseTwoKeyNav)
.setNavigationPropertyBindings(Arrays.asList(
- new NavigationPropertyBinding()
- .setPath("NavPropertyETKeyNavMany")
- .setTarget("ESKeyNav"))
+ new CsdlNavigationPropertyBinding()
+ .setPath("NavPropertyETKeyNavMany")
+ .setTarget("ESKeyNav"))
);
- } else if(name.equals("ESTwoBaseTwoKeyNav")) {
- return new EntitySet()
- .setName("ESTwoBaseTwoKeyNav")
- .setType(EntityTypeProvider.nameETTwoBaseTwoKeyNav);
-
+ } else if (name.equals("ESTwoBaseTwoKeyNav")) {
+ return new CsdlEntitySet()
+ .setName("ESTwoBaseTwoKeyNav")
+ .setType(EntityTypeProvider.nameETTwoBaseTwoKeyNav);
+
} else if (name.equals("ESCompMixPrimCollComp")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESCompMixPrimCollComp")
.setType(EntityTypeProvider.nameETCompMixPrimCollComp);
} else if (name.equals("ESFourKeyAlias")) {
- return new EntitySet()
+ return new CsdlEntitySet()
.setName("ESFourKeyAlias")
.setType(EntityTypeProvider.nameETFourKeyAlias);
-
+
} else if (name.equals("ESMixEnumDefCollComp")) {
- return new EntitySet().setName("ESMixEnumDefCollComp").setType(
+ return new CsdlEntitySet().setName("ESMixEnumDefCollComp").setType(
EntityTypeProvider.nameETMixEnumDefCollComp);
}
}
@@ -440,63 +441,63 @@ public class ContainerProvider {
return null;
}
- public ActionImport getActionImport(final FullQualifiedName entityContainer, final String name)
+ public CsdlActionImport getActionImport(final FullQualifiedName entityContainer, final String name)
throws ODataException {
if (entityContainer.equals(nameContainer)) {
if (name.equals(AIRT_STRING)) {
- return new ActionImport()
+ return new CsdlActionImport()
.setName(AIRT_STRING)
.setAction(ActionProvider.nameUARTString);
} else if (name.equals(AIRT_COLL_STRING_TWO_PARAM)) {
- return new ActionImport()
+ return new CsdlActionImport()
.setName(AIRT_COLL_STRING_TWO_PARAM)
.setAction(ActionProvider.nameUARTCollStringTwoParam);
} else if (name.equals(AIRTCT_TWO_PRIM_PARAM)) {
- return new ActionImport()
+ return new CsdlActionImport()
.setName(AIRTCT_TWO_PRIM_PARAM)
.setAction(ActionProvider.nameUARTCTTwoPrimParam);
} else if (name.equals(AIRT_COLL_CT_TWO_PRIM_PARAM)) {
- return new ActionImport()
+ return new CsdlActionImport()
.setName(AIRT_COLL_CT_TWO_PRIM_PARAM)
.setAction(ActionProvider.nameUARTCollCTTwoPrimParam);
} else if (name.equals(AIRTET_TWO_KEY_TWO_PRIM_PARAM)) {
- return new ActionImport()
+ return new CsdlActionImport()
.setName(AIRTET_TWO_KEY_TWO_PRIM_PARAM)
.setAction(ActionProvider.nameUARTETTwoKeyTwoPrimParam);
} else if (name.equals(AIRT_COLL_ET_KEY_NAV_PARAM)) {
- return new ActionImport()
+ return new CsdlActionImport()
.setName(AIRT_COLL_ET_KEY_NAV_PARAM)
.setAction(ActionProvider.nameUARTCollETKeyNavParam);
} else if (name.equals(AIRTES_ALL_PRIM_PARAM)) {
- return new ActionImport()
+ return new CsdlActionImport()
.setName(AIRTES_ALL_PRIM_PARAM)
.setEntitySet("ESAllPrim")
.setAction(ActionProvider.nameUARTETAllPrimParam);
} else if (name.equals(AIRT_COLL_ES_ALL_PRIM_PARAM)) {
- return new ActionImport()
+ return new CsdlActionImport()
.setName(AIRT_COLL_ES_ALL_PRIM_PARAM)
.setEntitySet("ESAllPrim")
.setAction(ActionProvider.nameUARTCollETAllPrimParam);
} else if (name.equals(AIRT)) {
- return new ActionImport()
+ return new CsdlActionImport()
.setName(AIRT)
.setAction(ActionProvider.nameUART);
} else if (name.equals(AIRT_PARAM)) {
- return new ActionImport()
+ return new CsdlActionImport()
.setName(AIRT_PARAM)
.setAction(ActionProvider.nameUARTParam);
} else if (name.equals(AIRT_TWO_PARAM)) {
- return new ActionImport()
+ return new CsdlActionImport()
.setName(AIRT_TWO_PARAM)
.setAction(ActionProvider.nameUARTTwoParam);
}
@@ -505,179 +506,179 @@ public class ContainerProvider {
return null;
}
- public FunctionImport getFunctionImport(final FullQualifiedName entityContainer, final String name)
+ public CsdlFunctionImport getFunctionImport(final FullQualifiedName entityContainer, final String name)
throws ODataException {
if (entityContainer.equals(nameContainer)) {
if (name.equals("FINRTInt16")) {
- return new FunctionImport()
+ return new CsdlFunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFNRTInt16)
.setIncludeInServiceDocument(true);
} else if (name.equals("FINInvisibleRTInt16")) {
- return new FunctionImport()
+ return new CsdlFunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFNRTInt16);
} else if (name.equals("FINInvisible2RTInt16")) {
- return new FunctionImport()
+ return new CsdlFunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFNRTInt16);
} else if (name.equals("FICRTETKeyNav")) {
- return new FunctionImport()
+ return new CsdlFunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTETKeyNav);
} else if (name.equals("FICRTESTwoKeyNav")) {
- return new FunctionImport()
+ return new CsdlFunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTETTwoKeyNav)
.setEntitySet(entityContainer.getFullQualifiedNameAsString() + "/ESTwoKeyNav")
.setIncludeInServiceDocument(true);
} else if (name.equals("FICRTETTwoKeyNavParam")) {
- return new FunctionImport()
+ return new CsdlFunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTETTwoKeyNavParam)
.setIncludeInServiceDocument(true);
} else if (name.equals("FICRTStringTwoParam")) {
- return new FunctionImport()
+ return new CsdlFunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTStringTwoParam)
.setIncludeInServiceDocument(true);
} else if (name.equals("FICRTCollStringTwoParam")) {
- return new FunctionImport()
+ return new CsdlFunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTCollStringTwoParam)
.setIncludeInServiceDocument(true);
} else if (name.equals("FICRTCTAllPrimTwoParam")) {
- return new FunctionImport()
+ return new CsdlFunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTCTAllPrimTwoParam)
.setIncludeInServiceDocument(true);
} else if (name.equals("FICRTESMixPrimCollCompTwoParam")) {
- return new FunctionImport()
+ return new CsdlFunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTESMixPrimCollCompTwoParam)
.setIncludeInServiceDocument(true);
-
- } else if(name.equals("FINRTCollETMixPrimCollCompTwoParam")) {
- return new FunctionImport()
- .setName(name)
- .setFunction(FunctionProvider.nameUFNRTCollETMixPrimCollCompTwoParam)
- .setIncludeInServiceDocument(true);
-
+
+ } else if (name.equals("FINRTCollETMixPrimCollCompTwoParam")) {
+ return new CsdlFunctionImport()
+ .setName(name)
+ .setFunction(FunctionProvider.nameUFNRTCollETMixPrimCollCompTwoParam)
+ .setIncludeInServiceDocument(true);
+
} else if (name.equals("FICRTCollETMixPrimCollCompTwoParam")) {
- return new FunctionImport()
+ return new CsdlFunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTCollETMixPrimCollCompTwoParam)
.setIncludeInServiceDocument(true);
} else if (name.equals("FICRTCollCTTwoPrim")) {
- return new FunctionImport()
+ return new CsdlFunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTCollCTTwoPrim)
.setIncludeInServiceDocument(true);
} else if (name.equals("FICRTESMedia")) {
- return new FunctionImport()
+ return new CsdlFunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTETMedia)
.setEntitySet(entityContainer.getFullQualifiedNameAsString() + "/ESMedia")
.setIncludeInServiceDocument(true);
} else if (name.equals("FICRTCollESMedia")) {
- return new FunctionImport()
+ return new CsdlFunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTCollETMedia)
.setEntitySet(entityContainer.getFullQualifiedNameAsString() + "/ESMedia")
.setIncludeInServiceDocument(true);
} else if (name.equals("FICRTCTTwoPrimParam")) {
- return new FunctionImport()
+ return new CsdlFunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTCTTwoPrimParam)
.setIncludeInServiceDocument(true);
} else if (name.equals("FICRTCTTwoPrim")) {
- return new FunctionImport()
+ return new CsdlFunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTCTTwoPrim)
.setIncludeInServiceDocument(true);
} else if (name.equals("FICRTCollString")) {
- return new FunctionImport()
+ return new CsdlFunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTCollString)
.setIncludeInServiceDocument(true);
} else if (name.equals("FICRTString")) {
- return new FunctionImport()
+ return new CsdlFunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTString)
.setIncludeInServiceDocument(true);
} else if (name.equals("FICRTCollESTwoKeyNavParam")) {
- return new FunctionImport()
+ return new CsdlFunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTCollETTwoKeyNavParam)
.setEntitySet(entityContainer.getFullQualifiedNameAsString() + "/ESTwoKeyNav")
.setIncludeInServiceDocument(true);
} else if (name.equals("FICRTCollCTTwoPrimParam")) {
- return new FunctionImport()
+ return new CsdlFunctionImport()
.setName(name)
.setFunction(FunctionProvider.nameUFCRTCollCTTwoPrimParam)
.setIncludeInServiceDocument(true);
-
- } else if(name.equals("FINRTCollCTNavFiveProp")) {
- return new FunctionImport()
- .setName(name)
- .setFunction(FunctionProvider.nameUFNRTCollCTNavFiveProp)
- .setIncludeInServiceDocument(true);
-
- } else if(name.equals("FICRTCollESKeyNavContParam")) {
- return new FunctionImport()
- .setName(name)
- .setFunction(FunctionProvider.nameUFCRTCollETKeyNavContParam)
- .setEntitySet("ESKeyNavCont")
- .setIncludeInServiceDocument(true);
+
+ } else if (name.equals("FINRTCollCTNavFiveProp")) {
+ return new CsdlFunctionImport()
+ .setName(name)
+ .setFunction(FunctionProvider.nameUFNRTCollCTNavFiveProp)
+ .setIncludeInServiceDocument(true);
+
+ } else if (name.equals("FICRTCollESKeyNavContParam")) {
+ return new CsdlFunctionImport()
+ .setName(name)
+ .setFunction(FunctionProvider.nameUFCRTCollETKeyNavContParam)
+ .setEntitySet("ESKeyNavCont")
+ .setIncludeInServiceDocument(true);
}
}
-
+
return null;
}
- public Singleton getSingleton(final FullQualifiedName entityContainer, final String name) throws ODataException {
+ public CsdlSingleton getSingleton(final FullQualifiedName entityContainer, final String name) throws ODataException {
if (entityContainer.equals(nameContainer)) {
if (name.equals("SI")) {
- return new Singleton()
+ return new CsdlSingleton()
.setName("SI")
.setType(EntityTypeProvider.nameETTwoPrim);
} else if (name.equals("SINav")) {
- return new Singleton()
+ return new CsdlSingleton()
.setName("SINav")
.setType(EntityTypeProvider.nameETTwoKeyNav)
.setNavigationPropertyBindings(Arrays.asList(
- new NavigationPropertyBinding()
+ new CsdlNavigationPropertyBinding()
.setPath("NavPropertyETTwoKeyNavMany")
.setTarget("ESTwoKeyNav"),
- new NavigationPropertyBinding()
+ new CsdlNavigationPropertyBinding()
.setPath("NavPropertyETTwoKeyNavOne")
.setTarget("ESTwoKeyNav"),
- new NavigationPropertyBinding()
+ new CsdlNavigationPropertyBinding()
.setPath("NavPropertyETKeyNavOne")
.setTarget("ESKeyNav")
));
} else if (name.equals("SIMedia")) {
- return new Singleton()
+ return new CsdlSingleton()
.setName("SIMedia")
.setType(EntityTypeProvider.nameETMedia);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/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 410a0bc..afb23d6 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
@@ -24,25 +24,25 @@ 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.provider.AbstractEdmProvider;
-import org.apache.olingo.commons.api.edm.provider.Action;
-import org.apache.olingo.commons.api.edm.provider.ActionImport;
-import org.apache.olingo.commons.api.edm.provider.AliasInfo;
-import org.apache.olingo.commons.api.edm.provider.ComplexType;
-import org.apache.olingo.commons.api.edm.provider.EntityContainer;
-import org.apache.olingo.commons.api.edm.provider.EntityContainerInfo;
-import org.apache.olingo.commons.api.edm.provider.EntitySet;
-import org.apache.olingo.commons.api.edm.provider.EntityType;
-import org.apache.olingo.commons.api.edm.provider.EnumType;
-import org.apache.olingo.commons.api.edm.provider.Function;
-import org.apache.olingo.commons.api.edm.provider.FunctionImport;
-import org.apache.olingo.commons.api.edm.provider.Schema;
-import org.apache.olingo.commons.api.edm.provider.Singleton;
-import org.apache.olingo.commons.api.edm.provider.Term;
-import org.apache.olingo.commons.api.edm.provider.TypeDefinition;
+import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmProvider;
+import org.apache.olingo.commons.api.edm.provider.CsdlAction;
+import org.apache.olingo.commons.api.edm.provider.CsdlActionImport;
+import org.apache.olingo.commons.api.edm.provider.CsdlAliasInfo;
+import org.apache.olingo.commons.api.edm.provider.CsdlComplexType;
+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.CsdlEntityType;
+import org.apache.olingo.commons.api.edm.provider.CsdlEnumType;
+import org.apache.olingo.commons.api.edm.provider.CsdlFunction;
+import org.apache.olingo.commons.api.edm.provider.CsdlFunctionImport;
+import org.apache.olingo.commons.api.edm.provider.CsdlSchema;
+import org.apache.olingo.commons.api.edm.provider.CsdlSingleton;
+import org.apache.olingo.commons.api.edm.provider.CsdlTerm;
+import org.apache.olingo.commons.api.edm.provider.CsdlTypeDefinition;
import org.apache.olingo.server.api.edmx.EdmxReference;
-public class EdmTechProvider extends AbstractEdmProvider {
+public class EdmTechProvider extends CsdlAbstractEdmProvider {
public static final String nameSpace = "olingo.odata.test1";
@@ -71,83 +71,84 @@ public class EdmTechProvider extends AbstractEdmProvider {
}
@Override
- public List<AliasInfo> getAliasInfos() throws ODataException {
+ public List<CsdlAliasInfo> getAliasInfos() throws ODataException {
return Arrays.asList(
- new AliasInfo().setAlias("Namespace1_Alias").setNamespace(nameSpace)
+ new CsdlAliasInfo().setAlias("Namespace1_Alias").setNamespace(nameSpace)
);
}
@Override
- public EnumType getEnumType(final FullQualifiedName enumTypeName) throws ODataException {
+ public CsdlEnumType getEnumType(final FullQualifiedName enumTypeName) throws ODataException {
return enumTypeProvider.getEnumType(enumTypeName);
}
@Override
- public TypeDefinition getTypeDefinition(final FullQualifiedName typeDefinitionName) throws ODataException {
+ public CsdlTypeDefinition getTypeDefinition(final FullQualifiedName typeDefinitionName) throws ODataException {
return typeDefinitionProvider.getTypeDefinition(typeDefinitionName);
}
@Override
- public EntityType getEntityType(final FullQualifiedName entityTypeName) throws ODataException {
+ public CsdlEntityType getEntityType(final FullQualifiedName entityTypeName) throws ODataException {
return entityTypeProvider.getEntityType(entityTypeName);
}
@Override
- public ComplexType getComplexType(final FullQualifiedName complexTypeName) throws ODataException {
+ public CsdlComplexType getComplexType(final FullQualifiedName complexTypeName) throws ODataException {
return complexTypeProvider.getComplexType(complexTypeName);
}
@Override
- public List<Action> getActions(final FullQualifiedName actionName) throws ODataException {
+ public List<CsdlAction> getActions(final FullQualifiedName actionName) throws ODataException {
return actionProvider.getActions(actionName);
}
@Override
- public List<Function> getFunctions(final FullQualifiedName functionName) throws ODataException {
+ public List<CsdlFunction> getFunctions(final FullQualifiedName functionName) throws ODataException {
return functionProvider.getFunctions(functionName);
}
@Override
- public Term getTerm(final FullQualifiedName termName) throws ODataException {
+ public CsdlTerm getTerm(final FullQualifiedName termName) throws ODataException {
return null;
}
@Override
- public EntitySet getEntitySet(final FullQualifiedName entityContainer, final String entitySetName)
+ public CsdlEntitySet getEntitySet(final FullQualifiedName entityContainer, final String entitySetName)
throws ODataException {
return containerProvider.getEntitySet(entityContainer, entitySetName);
}
@Override
- public Singleton getSingleton(final FullQualifiedName entityContainer, final String singletonName)
+ public CsdlSingleton getSingleton(final FullQualifiedName entityContainer, final String singletonName)
throws ODataException {
return containerProvider.getSingleton(entityContainer, singletonName);
}
@Override
- public ActionImport getActionImport(final FullQualifiedName entityContainer, final String actionImportName)
+ public CsdlActionImport getActionImport(final FullQualifiedName entityContainer, final String actionImportName)
throws ODataException {
return containerProvider.getActionImport(entityContainer, actionImportName);
}
@Override
- public FunctionImport getFunctionImport(final FullQualifiedName entityContainer, final String functionImportName)
+ public CsdlFunctionImport getFunctionImport(final FullQualifiedName entityContainer, final String functionImportName)
throws ODataException {
return containerProvider.getFunctionImport(entityContainer, functionImportName);
}
@Override
- public List<Schema> getSchemas() throws ODataException {
+ public List<CsdlSchema> getSchemas() throws ODataException {
return schemaProvider.getSchemas();
}
@Override
- public EntityContainer getEntityContainer() throws ODataException {
+ public CsdlEntityContainer getEntityContainer() throws ODataException {
return containerProvider.getEntityContainer();
}
@Override
- public EntityContainerInfo getEntityContainerInfo(final FullQualifiedName entityContainerName) throws ODataException {
+ public CsdlEntityContainerInfo getEntityContainerInfo(final FullQualifiedName entityContainerName)
+ throws ODataException {
return containerProvider.getEntityContainerInfo(entityContainerName);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/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 4eb1b41..50a8004 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
@@ -20,11 +20,11 @@ package org.apache.olingo.server.tecsvc.provider;
import org.apache.olingo.commons.api.ODataException;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.commons.api.edm.provider.EntityType;
-import org.apache.olingo.commons.api.edm.provider.NavigationProperty;
-import org.apache.olingo.commons.api.edm.provider.Property;
-import org.apache.olingo.commons.api.edm.provider.PropertyRef;
-import org.apache.olingo.commons.api.edm.provider.ReferentialConstraint;
+import org.apache.olingo.commons.api.edm.provider.CsdlEntityType;
+import org.apache.olingo.commons.api.edm.provider.CsdlNavigationProperty;
+import org.apache.olingo.commons.api.edm.provider.CsdlProperty;
+import org.apache.olingo.commons.api.edm.provider.CsdlPropertyRef;
+import org.apache.olingo.commons.api.edm.provider.CsdlReferentialConstraint;
import java.util.Arrays;
@@ -81,12 +81,12 @@ public class EntityTypeProvider {
public static final FullQualifiedName nameETMixEnumDefCollComp = new FullQualifiedName(SchemaProvider.NAMESPACE,
"ETMixEnumDefCollComp");
- public EntityType getEntityType(final FullQualifiedName entityTypeName) throws ODataException {
+ public CsdlEntityType getEntityType(final FullQualifiedName entityTypeName) throws ODataException {
if (entityTypeName.equals(nameETAllPrim)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETAllPrim")
.setKey(Arrays.asList(
- new PropertyRef().setName("PropertyInt16")))
+ new CsdlPropertyRef().setName("PropertyInt16")))
.setProperties(Arrays.asList(
PropertyProvider.propertyInt16_NotNullable, PropertyProvider.propertyString,
PropertyProvider.propertyBoolean, PropertyProvider.propertyByte, PropertyProvider.propertySByte,
@@ -99,9 +99,9 @@ public class EntityTypeProvider {
PropertyProvider.collectionNavPropertyETTwoPrimMany_ETTwoPrim));
} else if (entityTypeName.equals(nameETCollAllPrim)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETCollAllPrim")
- .setKey(Arrays.asList(new PropertyRef().setName("PropertyInt16")))
+ .setKey(Arrays.asList(new CsdlPropertyRef().setName("PropertyInt16")))
.setProperties(
Arrays.asList(
@@ -120,9 +120,9 @@ public class EntityTypeProvider {
));
} else if (entityTypeName.equals(nameETTwoPrim)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETTwoPrim")
- .setKey(Arrays.asList(new PropertyRef().setName("PropertyInt16")))
+ .setKey(Arrays.asList(new CsdlPropertyRef().setName("PropertyInt16")))
.setProperties(Arrays.asList(
PropertyProvider.propertyInt16_NotNullable, PropertyProvider.propertyString))
.setNavigationProperties(
@@ -130,66 +130,66 @@ public class EntityTypeProvider {
PropertyProvider.collectionNavPropertyETAllPrimMany_ETAllPrim));
} else if (entityTypeName.equals(nameETMixPrimCollComp)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETMixPrimCollComp")
- .setKey(Arrays.asList(new PropertyRef().setName("PropertyInt16")))
+ .setKey(Arrays.asList(new CsdlPropertyRef().setName("PropertyInt16")))
.setProperties(Arrays.asList(
PropertyProvider.propertyInt16_NotNullable, PropertyProvider.collPropertyString,
PropertyProvider.propertyComp_CTTwoPrim, PropertyProvider.collPropertyComp_CTTwoPrim));
} else if (entityTypeName.equals(nameETTwoKeyTwoPrim)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETTwoKeyTwoPrim")
.setKey(Arrays.asList(
- new PropertyRef().setName("PropertyInt16"),
- new PropertyRef().setName("PropertyString")))
+ new CsdlPropertyRef().setName("PropertyInt16"),
+ new CsdlPropertyRef().setName("PropertyString")))
.setProperties(Arrays.asList(
PropertyProvider.propertyInt16_NotNullable, PropertyProvider.propertyString_NotNullable));
} else if (entityTypeName.equals(nameETBaseTwoKeyTwoPrim)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETBaseTwoKeyTwoPrim")
.setBaseType(nameETTwoKeyTwoPrim);
} else if (entityTypeName.equals(nameETTwoBaseTwoKeyTwoPrim)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETTwoBaseTwoKeyTwoPrim")
.setBaseType(nameETTwoKeyTwoPrim);
} else if (entityTypeName.equals(nameETBase)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETBase")
.setBaseType(nameETTwoPrim)
- .setProperties(Arrays.asList(new Property()
+ .setProperties(Arrays.asList(new CsdlProperty()
.setName("AdditionalPropertyString_5")
.setType(PropertyProvider.nameString)));
} else if (entityTypeName.equals(nameETTwoBase)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETTwoBase")
.setBaseType(nameETBase)
- .setProperties(Arrays.asList(new Property()
+ .setProperties(Arrays.asList(new CsdlProperty()
.setName("AdditionalPropertyString_6")
.setType(PropertyProvider.nameString))
);
} else if (entityTypeName.equals(nameETAllKey)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETAllKey")
.setKey(Arrays.asList(
- new PropertyRef().setName("PropertyString"),
- new PropertyRef().setName("PropertyBoolean"),
- new PropertyRef().setName("PropertyByte"),
- new PropertyRef().setName("PropertySByte"),
- new PropertyRef().setName("PropertyInt16"),
- new PropertyRef().setName("PropertyInt32"),
- new PropertyRef().setName("PropertyInt64"),
- new PropertyRef().setName("PropertyDecimal"),
- new PropertyRef().setName("PropertyDate"),
- new PropertyRef().setName("PropertyDateTimeOffset"),
- new PropertyRef().setName("PropertyDuration"),
- new PropertyRef().setName("PropertyGuid"),
- new PropertyRef().setName("PropertyTimeOfDay")))
+ new CsdlPropertyRef().setName("PropertyString"),
+ new CsdlPropertyRef().setName("PropertyBoolean"),
+ new CsdlPropertyRef().setName("PropertyByte"),
+ new CsdlPropertyRef().setName("PropertySByte"),
+ new CsdlPropertyRef().setName("PropertyInt16"),
+ new CsdlPropertyRef().setName("PropertyInt32"),
+ new CsdlPropertyRef().setName("PropertyInt64"),
+ new CsdlPropertyRef().setName("PropertyDecimal"),
+ new CsdlPropertyRef().setName("PropertyDate"),
+ new CsdlPropertyRef().setName("PropertyDateTimeOffset"),
+ new CsdlPropertyRef().setName("PropertyDuration"),
+ new CsdlPropertyRef().setName("PropertyGuid"),
+ new CsdlPropertyRef().setName("PropertyTimeOfDay")))
.setProperties(
Arrays.asList(
PropertyProvider.propertyString_NotNullable, PropertyProvider.propertyBoolean_NotNullable,
@@ -202,56 +202,56 @@ public class EntityTypeProvider {
PropertyProvider.propertyTimeOfDay_NotNullable));
} else if (entityTypeName.equals(nameETCompAllPrim)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETCompAllPrim")
- .setKey(Arrays.asList(new PropertyRef().setName("PropertyInt16")))
+ .setKey(Arrays.asList(new CsdlPropertyRef().setName("PropertyInt16")))
.setProperties(
Arrays.asList(PropertyProvider.propertyInt16_NotNullable, PropertyProvider.propertyComp_CTAllPrim));
} else if (entityTypeName.equals(nameETCompCollAllPrim)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETCompCollAllPrim")
- .setKey(Arrays.asList(new PropertyRef().setName("PropertyInt16")))
+ .setKey(Arrays.asList(new CsdlPropertyRef().setName("PropertyInt16")))
.setProperties(
Arrays.asList(PropertyProvider.propertyInt16_NotNullable,
PropertyProvider.propertyComp_CTCollAllPrim));
} else if (entityTypeName.equals(nameETCompComp)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETCompComp")
- .setKey(Arrays.asList(new PropertyRef().setName("PropertyInt16")))
+ .setKey(Arrays.asList(new CsdlPropertyRef().setName("PropertyInt16")))
.setProperties(
Arrays.asList(PropertyProvider.propertyInt16_NotNullable, PropertyProvider.propertyComp_CTCompComp));
} else if (entityTypeName.equals(nameETCompCollComp)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETCompCollComp")
- .setKey(Arrays.asList(new PropertyRef().setName("PropertyInt16")))
+ .setKey(Arrays.asList(new CsdlPropertyRef().setName("PropertyInt16")))
.setProperties(
Arrays
.asList(PropertyProvider.propertyInt16_NotNullable, PropertyProvider.propertyComp_CTCompCollComp));
} else if (entityTypeName.equals(nameETMedia)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETMedia")
- .setKey(Arrays.asList(new PropertyRef().setName("PropertyInt16")))
+ .setKey(Arrays.asList(new CsdlPropertyRef().setName("PropertyInt16")))
.setProperties(Arrays.asList(PropertyProvider.propertyInt16_NotNullable))
.setHasStream(true);
} else if (entityTypeName.equals(nameETKeyTwoKeyComp)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETKeyTwoKeyComp")
.setKey(Arrays.asList(
- new PropertyRef()
+ new CsdlPropertyRef()
.setName("PropertyInt16"),
- new PropertyRef()
+ new CsdlPropertyRef()
.setName("PropertyComp/PropertyInt16")
.setAlias("KeyAlias1"),
- new PropertyRef()
+ new CsdlPropertyRef()
.setName("PropertyComp/PropertyString")
.setAlias("KeyAlias2"),
- new PropertyRef()
+ new CsdlPropertyRef()
.setName("PropertyCompComp/PropertyComp/PropertyString")
.setAlias("KeyAlias3")))
.setProperties(
@@ -260,19 +260,19 @@ public class EntityTypeProvider {
PropertyProvider.propertyCompComp_CTCompComp));
} else if (entityTypeName.equals(nameETServerSidePaging)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName(nameETServerSidePaging.getName())
- .setKey(Arrays.asList(new PropertyRef().setName("PropertyInt16")))
+ .setKey(Arrays.asList(new CsdlPropertyRef().setName("PropertyInt16")))
.setProperties(Arrays.asList(PropertyProvider.propertyInt16_NotNullable,
PropertyProvider.propertyString_NotNullable));
} else if (entityTypeName.equals(nameETAllNullable)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETAllNullable")
- .setKey(Arrays.asList(new PropertyRef().setName("PropertyKey")))
+ .setKey(Arrays.asList(new CsdlPropertyRef().setName("PropertyKey")))
.setProperties(
Arrays.asList(
- new Property()
+ new CsdlProperty()
.setName("PropertyKey").setType(PropertyProvider.nameInt16).setNullable(false),
PropertyProvider.propertyInt16_ExplicitNullable, PropertyProvider.propertyString_ExplicitNullable,
PropertyProvider.propertyBoolean_ExplicitNullable, PropertyProvider.propertyByte_ExplicitNullable,
@@ -301,9 +301,9 @@ public class EntityTypeProvider {
PropertyProvider.collPropertyTimeOfDay_ExplicitNullable));
} else if (entityTypeName.equals(nameETKeyNav)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETKeyNav")
- .setKey(Arrays.asList(new PropertyRef().setName("PropertyInt16")))
+ .setKey(Arrays.asList(new CsdlPropertyRef().setName("PropertyInt16")))
.setProperties(
Arrays.asList(
PropertyProvider.propertyInt16_NotNullable, PropertyProvider.propertyString_NotNullable,
@@ -311,7 +311,7 @@ public class EntityTypeProvider {
PropertyProvider.propertyCompAllPrim_CTAllPrim, PropertyProvider.propertyCompTwoPrim_CTTwoPrim,
PropertyProvider.collPropertyString, PropertyProvider.collPropertyInt16,
PropertyProvider.collPropertyComp_CTPrimComp,
- new Property()
+ new CsdlProperty()
.setName("PropertyCompCompNav").setType(ComplexTypeProvider.nameCTCompNav)
))
.setNavigationProperties(
@@ -323,18 +323,18 @@ public class EntityTypeProvider {
PropertyProvider.navPropertyETMediaOne_ETMedia,
PropertyProvider.collectionNavPropertyETMediaMany_ETMedia));
} else if (entityTypeName.equals(nameETKeyPrimNav)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETKeyPrimNav")
- .setKey(Arrays.asList(new PropertyRef().setName("PropertyInt16")))
+ .setKey(Arrays.asList(new CsdlPropertyRef().setName("PropertyInt16")))
.setProperties(Arrays.asList(
PropertyProvider.propertyInt16_NotNullable, PropertyProvider.propertyString_ExplicitNullable))
.setNavigationProperties(
Arrays.asList(
PropertyProvider.navPropertyETKeyPrimNavOne_ETKeyPrimNav));
} else if(entityTypeName.equals(nameETKeyNavCont)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETKeyNavCont")
- .setKey(Arrays.asList(new PropertyRef().setName("PropertyInt16")))
+ .setKey(Arrays.asList(new CsdlPropertyRef().setName("PropertyInt16")))
.setProperties(Arrays.asList(
PropertyProvider.propertyInt16_NotNullable, PropertyProvider.propertyString_NotNullable,
PropertyProvider.propertyCompNavCont))
@@ -344,28 +344,28 @@ public class EntityTypeProvider {
));
} else if (entityTypeName.equals(nameETTwoKeyNav)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETTwoKeyNav")
.setKey(Arrays.asList(
- new PropertyRef().setName("PropertyInt16"),
- new PropertyRef().setName("PropertyString")))
+ new CsdlPropertyRef().setName("PropertyInt16"),
+ new CsdlPropertyRef().setName("PropertyString")))
.setProperties(
Arrays.asList(
PropertyProvider.propertyInt16_NotNullable, PropertyProvider.propertyString_NotNullable,
PropertyProvider.propertyComp_CTPrimComp_NotNullable,
- new Property().setName("PropertyCompNav").setType(ComplexTypeProvider.nameCTBasePrimCompNav)
+ new CsdlProperty().setName("PropertyCompNav").setType(ComplexTypeProvider.nameCTBasePrimCompNav)
.setNullable(false),
PropertyProvider.collPropertyComp_CTPrimComp,
- new Property().setName("CollPropertyCompNav").setType(ComplexTypeProvider.nameCTNavFiveProp)
+ new CsdlProperty().setName("CollPropertyCompNav").setType(ComplexTypeProvider.nameCTNavFiveProp)
.setCollection(true),
PropertyProvider.collPropertyString, PropertyProvider.propertyCompTwoPrim_CTTwoPrim
))
.setNavigationProperties(Arrays.asList(
- new NavigationProperty()
+ new CsdlNavigationProperty()
.setName("NavPropertyETKeyNavOne")
.setType(nameETKeyNav)
.setReferentialConstraints(Arrays.asList(
- new ReferentialConstraint()
+ new CsdlReferentialConstraint()
.setProperty("PropertyInt16")
.setReferencedProperty("PropertyInt16"))),
PropertyProvider.collectionNavPropertyETKeyNavMany_ETKeyNav,
@@ -374,70 +374,70 @@ public class EntityTypeProvider {
PropertyProvider.collectionNavPropertySINav));
} else if (entityTypeName.equals(nameETBaseTwoKeyNav)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETBaseTwoKeyNav")
.setBaseType(nameETTwoKeyNav)
.setProperties(Arrays.asList(PropertyProvider.propertyDate_ExplicitNullable))
.setNavigationProperties(Arrays.asList(
- new NavigationProperty()
+ new CsdlNavigationProperty()
.setName("NavPropertyETBaseTwoKeyNavOne")
.setType(nameETBaseTwoKeyNav),
- new NavigationProperty()
+ new CsdlNavigationProperty()
.setName("NavPropertyETTwoBaseTwoKeyNavOne")
.setType(nameETTwoBaseTwoKeyNav)));
} else if (entityTypeName.equals(nameETTwoBaseTwoKeyNav)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETTwoBaseTwoKeyNav")
.setBaseType(nameETBaseTwoKeyNav)
- .setKey(Arrays.asList(new PropertyRef().setName("PropertyInt16")))
+ .setKey(Arrays.asList(new CsdlPropertyRef().setName("PropertyInt16")))
.setProperties(Arrays.asList(PropertyProvider.propertyGuid_ExplicitNullable))
.setNavigationProperties(Arrays.asList(
- new NavigationProperty()
+ new CsdlNavigationProperty()
.setName("NavPropertyETBaseTwoKeyNavMany")
.setType(nameETBaseTwoKeyNav)
.setCollection(true)
));
} else if (entityTypeName.equals(nameETFourKeyAlias)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETFourKeyAlias")
.setKey(
Arrays.asList(
- new PropertyRef().setName("PropertyInt16"),
- new PropertyRef().setName("PropertyComp/PropertyInt16").setAlias("KeyAlias1"),
- new PropertyRef().setName("PropertyComp/PropertyString").setAlias("KeyAlias2"),
- new PropertyRef().setName("PropertyCompComp/PropertyComp/PropertyString").setAlias("KeyAlias3")))
+ new CsdlPropertyRef().setName("PropertyInt16"),
+ new CsdlPropertyRef().setName("PropertyComp/PropertyInt16").setAlias("KeyAlias1"),
+ new CsdlPropertyRef().setName("PropertyComp/PropertyString").setAlias("KeyAlias2"),
+ new CsdlPropertyRef().setName("PropertyCompComp/PropertyComp/PropertyString").setAlias("KeyAlias3")))
.setProperties(
Arrays.asList(PropertyProvider.propertyInt16_NotNullable,
PropertyProvider.propertyComp_CTTwoPrim_NotNullable,
PropertyProvider.propertyCompComp_CTCompComp_NotNullable));
} else if (entityTypeName.equals(nameETCompMixPrimCollComp)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETCompMixPrimCollComp")
.setKey(Arrays.asList(
- new PropertyRef()
+ new CsdlPropertyRef()
.setName("PropertyInt16")))
.setProperties(
Arrays.asList(PropertyProvider.propertyInt16_NotNullable,
PropertyProvider.propertyMixedPrimCollComp_CTMixPrimCollComp));
} else if (entityTypeName.equals(nameETAbstract)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETAbstract")
.setAbstract(true)
.setProperties(Arrays.asList(PropertyProvider.propertyString));
} else if (entityTypeName.equals(nameETAbstractBase)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName("ETAbstractBase")
.setBaseType(nameETAbstract)
- .setKey(Arrays.asList(new PropertyRef().setName("PropertyInt16")))
+ .setKey(Arrays.asList(new CsdlPropertyRef().setName("PropertyInt16")))
.setProperties(Arrays.asList(
PropertyProvider.propertyInt16_NotNullable));
} else if (entityTypeName.equals(nameETMixEnumDefCollComp)) {
- return new EntityType()
+ return new CsdlEntityType()
.setName(nameETMixEnumDefCollComp.getName())
- .setKey(Arrays.asList(new PropertyRef().setName("PropertyInt16")))
+ .setKey(Arrays.asList(new CsdlPropertyRef().setName("PropertyInt16")))
.setProperties(Arrays.asList(
PropertyProvider.propertyInt16_NotNullable,
PropertyProvider.propertyEnumString_ENString,
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/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 6b68a33..b9eb069 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
@@ -21,8 +21,8 @@ package org.apache.olingo.server.tecsvc.provider;
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.provider.EnumMember;
-import org.apache.olingo.commons.api.edm.provider.EnumType;
+import org.apache.olingo.commons.api.edm.provider.CsdlEnumMember;
+import org.apache.olingo.commons.api.edm.provider.CsdlEnumType;
import java.util.Arrays;
@@ -30,16 +30,16 @@ public class EnumTypeProvider {
public static final FullQualifiedName nameENString = new FullQualifiedName(SchemaProvider.NAMESPACE, "ENString");
- public EnumType getEnumType(final FullQualifiedName enumTypeName) throws ODataException {
+ public CsdlEnumType getEnumType(final FullQualifiedName enumTypeName) throws ODataException {
if (enumTypeName.equals(nameENString)) {
- return new EnumType()
+ return new CsdlEnumType()
.setName("ENString")
.setFlags(true)
.setUnderlyingType(EdmPrimitiveTypeKind.Int16.getFullQualifiedName())
.setMembers(Arrays.asList(
- new EnumMember().setName("String1").setValue("1"),
- new EnumMember().setName("String2").setValue("2"),
- new EnumMember().setName("String3").setValue("4")));
+ new CsdlEnumMember().setName("String1").setValue("1"),
+ new CsdlEnumMember().setName("String2").setValue("2"),
+ new CsdlEnumMember().setName("String3").setValue("4")));
}
return null;