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:47 UTC
[41/50] [abbrv] olingo-odata4 git commit: [OLINGO-545] TecSvc EDM
enhanced
[OLINGO-545] TecSvc EDM enhanced
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/fd9ba8bf
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/fd9ba8bf
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/fd9ba8bf
Branch: refs/heads/OLINGO-549-ODataV4-JPA
Commit: fd9ba8bf27e80d99ef5012b821daa67e4148d669
Parents: 5855c6b
Author: Christian Holzer <c....@sap.com>
Authored: Wed Apr 1 15:20:11 2015 +0200
Committer: Christian Holzer <c....@sap.com>
Committed: Wed Apr 1 15:32:48 2015 +0200
----------------------------------------------------------------------
.../server/tecsvc/provider/ActionProvider.java | 27 ++++++++++-----
.../tecsvc/provider/ContainerProvider.java | 36 +++++++++++++++-----
.../tecsvc/provider/FunctionProvider.java | 19 ++++++++++-
.../tecsvc/provider/PropertyProvider.java | 2 +-
.../server/tecsvc/provider/SchemaProvider.java | 1 +
5 files changed, 66 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fd9ba8bf/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 d00b953..6426327 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
@@ -49,6 +49,9 @@ public class ActionProvider {
public static final FullQualifiedName nameBAETTwoKeyNavRTETTwoKeyNav =
new FullQualifiedName(SchemaProvider.NAMESPACE, "BAETTwoKeyNavRTETTwoKeyNav");
+ public static final FullQualifiedName nameBAESAllPrimRT =
+ new FullQualifiedName(SchemaProvider.NAMESPACE, "BAESAllPrimRT");
+
public static final FullQualifiedName nameBAETAllPrimRT =
new FullQualifiedName(SchemaProvider.NAMESPACE, "BAETAllPrimRT");
@@ -75,6 +78,7 @@ public class ActionProvider {
public static final FullQualifiedName nameUARTTwoParam =
new FullQualifiedName(SchemaProvider.NAMESPACE, "UARTTwoParam");
+
public List<Action> getActions(final FullQualifiedName actionName) throws ODataException {
if (actionName.equals(nameUARTString)) {
return Collections.singletonList(
@@ -237,15 +241,20 @@ public class ActionProvider {
.setParameters(Arrays.asList(
new Parameter().setName("ParameterETAllPrim")
.setNullable(false)
- .setType(EntityTypeProvider.nameETAllPrim))),
- new Action().setName("BAETAllPrimRT")
- .setBound(true)
- .setParameters(Arrays.asList(
- new Parameter().setName("ParameterETAllPrim")
- .setNullable(false)
- .setCollection(true)
- .setType(EntityTypeProvider.nameETAllPrim))));
- }
+ .setType(EntityTypeProvider.nameETAllPrim)
+ )));
+ } else if(actionName.equals(nameBAESAllPrimRT)) {
+ return Arrays.asList(
+ new Action().setName("BAESAllPrimRT")
+ .setBound(true)
+ .setParameters(Arrays.asList(
+ new Parameter().setName("ParameterETAllPrim")
+ .setNullable(false)
+ .setCollection(true)
+ .setType(EntityTypeProvider.nameETAllPrim)
+ ))
+ );
+ }
return null;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fd9ba8bf/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 12cdb6f..9b982aa 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
@@ -98,7 +98,9 @@ public class ContainerProvider {
entitySets.add(prov.getEntitySet(ContainerProvider.nameContainer, "ESCompMixPrimCollComp"));
entitySets.add(prov.getEntitySet(ContainerProvider.nameContainer, "ESFourKeyAlias"));
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>();
container.setSingletons(singletons);
@@ -135,6 +137,7 @@ public class ContainerProvider {
functionImports.add(prov.getFunctionImport(ContainerProvider.nameContainer, "FICRTCTAllPrimTwoParam"));
functionImports.add(prov.getFunctionImport(ContainerProvider.nameContainer, "FICRTESMixPrimCollCompTwoParam"));
functionImports.add(prov.getFunctionImport(ContainerProvider.nameContainer, "FICRTCollETMixPrimCollCompTwoParam"));
+ functionImports.add(prov.getFunctionImport(ContainerProvider.nameContainer, "FINRTCollETMixPrimCollCompTwoParam"));
functionImports.add(prov.getFunctionImport(ContainerProvider.nameContainer, "FICRTCollCTTwoPrim"));
functionImports.add(prov.getFunctionImport(ContainerProvider.nameContainer, "FICRTESMedia"));
functionImports.add(prov.getFunctionImport(ContainerProvider.nameContainer, "FICRTCollESMedia"));
@@ -144,7 +147,9 @@ public class ContainerProvider {
functionImports.add(prov.getFunctionImport(ContainerProvider.nameContainer, "FICRTString"));
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"));
+
return container;
}
@@ -364,9 +369,6 @@ public class ContainerProvider {
.setPath("CollPropertyCompNav/NavPropertyETMediaMany")
.setTarget("ESMedia"),
new NavigationPropertyBinding()
- .setPath("CollPropertyCompNav/NavPropertyETTwoKeyNavMany")
- .setTarget("ESTwoKeyNav"),
- new NavigationPropertyBinding()
.setPath("NavPropertyETTwoBaseTwoKeyNavOne")
.setTarget("ESBaseTwoKeyNav"),
new NavigationPropertyBinding()
@@ -563,7 +565,13 @@ public class ContainerProvider {
.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("FICRTCollETMixPrimCollCompTwoParam")) {
return new FunctionImport()
.setName(name)
@@ -625,10 +633,22 @@ public class ContainerProvider {
.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);
}
}
-
+
return null;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fd9ba8bf/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 84f57ff..bcf0863 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
@@ -176,6 +176,9 @@ public class FunctionProvider {
public static final FullQualifiedName nameUFNRTCollCTNavFiveProp = new FullQualifiedName(SchemaProvider.NAMESPACE,
"UFNRTCollCTNavFiveProp");
+ public static final FullQualifiedName nameUFNRTCollETMixPrimCollCompTwoParam
+ = new FullQualifiedName(SchemaProvider.NAMESPACE, "UFNRTCollETMixPrimCollCompTwoParam");
+
public List<Function> getFunctions(final FullQualifiedName functionName) throws ODataException {
if (functionName.equals(nameUFNRTInt16)) {
@@ -332,6 +335,20 @@ public class FunctionProvider {
new ReturnType().setType(ComplexTypeProvider.nameCTAllPrim).setNullable(false))
);
+ } else if(functionName.equals(nameUFNRTCollETMixPrimCollCompTwoParam)) {
+ return Arrays.asList(
+ new Function()
+ .setName("UFNRTCollETMixPrimCollCompTwoParam")
+ .setParameters(Arrays.asList(
+ new Parameter().setName("ParameterString").setType(PropertyProvider.nameString).setNullable(false),
+ new Parameter().setName("ParameterInt16").setType(PropertyProvider.nameInt16).setNullable(false)))
+ .setComposable(false)
+ .setBound(false)
+ .setReturnType(
+ new ReturnType().setType(ComplexTypeProvider.nameCTMixPrimCollComp)
+ .setNullable(false)
+ .setCollection(true))
+ );
} else if (functionName.equals(nameUFCRTCTTwoPrimParam)) {
return Arrays.asList(
new Function()
@@ -855,7 +872,7 @@ public class FunctionProvider {
Arrays.asList(
new Parameter().setName("BindingParam").setType(EntityTypeProvider.nameETTwoKeyNav)
.setCollection(true).setNullable(false),
- new Parameter().setName("ParameterComplex").setType(ComplexTypeProvider.nameCTTwoPrim)
+ new Parameter().setName("ParameterComp").setType(ComplexTypeProvider.nameCTTwoPrim)
.setNullable(false)))
.setComposable(true)
.setReturnType(
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fd9ba8bf/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/PropertyProvider.java
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/PropertyProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/PropertyProvider.java
index ff2ad65..07fbd25 100644
--- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/PropertyProvider.java
+++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/PropertyProvider.java
@@ -733,7 +733,7 @@ public class PropertyProvider {
.setType(EntityTypeProvider.nameETKeyNav);
public static final NavigationProperty navPropertyETTwoKeyNavContOneCT_ETTwoKeyNav = new NavigationProperty()
- .setName("NavPropertyETKeyNavContOne")
+ .setName("NavPropertyETTwoKeyNavContOne")
.setContainsTarget(true)
.setType(EntityTypeProvider.nameETTwoKeyNav);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fd9ba8bf/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 ad3693c..b8e5ad3 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
@@ -185,6 +185,7 @@ public class SchemaProvider {
functions.addAll(prov.getFunctions(FunctionProvider.nameBFCESTwoKeyNavRTStringParam));
functions.addAll(prov.getFunctions(FunctionProvider.nameBFCESKeyNavRTETKeyNavParam));
functions.addAll(prov.getFunctions(FunctionProvider.nameBFCCTPrimCompRTETTwoKeyNavParam));
+ functions.addAll(prov.getFunctions(FunctionProvider.nameUFNRTCollETMixPrimCollCompTwoParam));
// functions.addAll(prov.getFunctions(FunctionProvider.nameBFCCTPrimCompRTESTwoKeyNavParam));
// EntityContainer