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/02 08:30:09 UTC
[3/8] olingo-odata4 git commit: [OLINGO-573] Merge branch 'master'
into OLINGO-573
[OLINGO-573] Merge branch 'master' into OLINGO-573
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/de3f7fd3
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/de3f7fd3
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/de3f7fd3
Branch: refs/heads/OLINGO-573
Commit: de3f7fd3e7008f497a6e2ff6e67b8599fd295992
Parents: bce3ca6 26be7d2
Author: Michael Bolz <mi...@sap.com>
Authored: Wed Apr 1 13:17:12 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Wed Apr 1 13:17:12 2015 +0200
----------------------------------------------------------------------
.../org/apache/olingo/fit/AbstractServices.java | 18 +-
.../olingo/fit/tecsvc/client/BasicITCase.java | 2 +-
.../olingo/fit/tecsvc/client/BindingITCase.java | 3 +-
.../fit/tecsvc/client/DeepInsertITCase.java | 25 +-
.../tecsvc/client/FilterSystemQueryITCase.java | 4 +-
.../core/serialization/ODataBinderImpl.java | 22 +-
.../olingo/commons/api/data/Valuable.java | 55 ++++
.../commons/core/data/AbstractValuable.java | 24 ++
.../core/serialization/AtomSerializer.java | 2 +-
.../serialization/JsonPropertySerializer.java | 4 +-
.../core/serialization/JsonSerializer.java | 10 +-
.../olingo/server/tecsvc/data/DataCreator.java | 255 +++++++------------
.../server/tecsvc/provider/ActionProvider.java | 52 +++-
.../tecsvc/provider/ComplexTypeProvider.java | 19 +-
.../tecsvc/provider/ContainerProvider.java | 61 ++++-
.../tecsvc/provider/EntityTypeProvider.java | 21 +-
.../tecsvc/provider/FunctionProvider.java | 54 +++-
.../tecsvc/provider/PropertyProvider.java | 55 +++-
.../server/tecsvc/provider/SchemaProvider.java | 12 +-
.../olingo/server/core/ODataHandlerTest.java | 2 +-
.../serializer/xml/MetadataDocumentTest.java | 6 +-
.../core/uri/antlr/TestFullResourcePath.java | 2 +-
22 files changed, 460 insertions(+), 248 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/de3f7fd3/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java
----------------------------------------------------------------------
diff --cc lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java
index 1f28900,413ef34..45fd740
--- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java
+++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java
@@@ -190,21 -175,15 +175,14 @@@ public class DataCreator
createPrimitive("PropertyInt64", Long.MAX_VALUE),
createPrimitive("PropertySByte", Byte.MAX_VALUE),
createPrimitive("PropertyTimeOfDay", getTime(21, 5, 59)))))
- .addProperty(
- createComplex("PropertyCompNav",
- ComplexTypeProvider.nameCTCompNav.getFullQualifiedNameAsString(),
+ .addProperty(createComplex("PropertyCompNav",
createPrimitive("PropertyInt16", 1),
createKeyNavAllPrimComplexValue("PropertyComp")))
- .addProperty(createComplexCollection("CollPropertyComp", null))
- .addProperty(
- createComplexCollection("CollPropertyCompNav",
- ComplexTypeProvider.nameCTCompNav.getFullQualifiedNameAsString(),
+ .addProperty(createComplexCollection("CollPropertyComp"))
+ .addProperty(createComplexCollection("CollPropertyCompNav",
Arrays.asList(createPrimitive("PropertyInt16", 1))))
.addProperty(createPrimitiveCollection("CollPropertyString", 1, 2))
- .addProperty(
- createComplex("PropertyCompTwoPrim",
- ComplexTypeProvider.nameCTTwoPrim.getFullQualifiedNameAsString(),
- .addProperty(createComplex("PropertyCompTwoPrim",
-- createPrimitive("PropertyInt16", 11),
++ .addProperty(createComplex("PropertyCompTwoPrim", createPrimitive("PropertyInt16", 11),
createPrimitive("PropertyString", "11")));
}
@@@ -234,36 -213,32 +212,24 @@@
entitySet.getEntities().add(new EntityImpl()
.addProperty(createPrimitive("PropertyInt16", Short.MAX_VALUE))
- .addProperty(createComplex("PropertyComp", null,
- createComplexCollection("CollPropertyComp", ComplexTypeProvider.nameCTTwoPrim
- .getFullQualifiedNameAsString(),
- .addProperty(createComplex("PropertyComp",
- createComplexCollection("CollPropertyComp",
-- Arrays.asList(
-- createPrimitive("PropertyInt16", 555),
-- createPrimitive("PropertyString", "1 Test Complex in Complex Property")),
-- Arrays.asList(
-- createPrimitive("PropertyInt16", 666),
-- createPrimitive("PropertyString", "2 Test Complex in Complex Property")),
-- Arrays.asList(
-- createPrimitive("PropertyInt16", 777),
-- createPrimitive("PropertyString", "3 Test Complex in Complex Property"))))));
++ .addProperty(createComplex("PropertyComp", createComplexCollection("CollPropertyComp", Arrays
++ .asList(createPrimitive("PropertyInt16", 555),
++ createPrimitive("PropertyString", "1 Test Complex in Complex Property")), Arrays
++ .asList(createPrimitive("PropertyInt16", 666),
++ createPrimitive("PropertyString", "2 Test Complex in Complex Property")), Arrays
++ .asList(createPrimitive("PropertyInt16", 777),
++ createPrimitive("PropertyString", "3 Test Complex in Complex Property"))))));
entitySet.getEntities().add(new EntityImpl()
.addProperty(createPrimitive("PropertyInt16", 12345))
- .addProperty(createComplex("PropertyComp",null,
- createComplexCollection("CollPropertyComp", ComplexTypeProvider.nameCTTwoPrim
- .getFullQualifiedNameAsString(),
- .addProperty(createComplex("PropertyComp",
- createComplexCollection("CollPropertyComp",
-- Arrays.asList(
-- createPrimitive("PropertyInt16", 888),
-- createPrimitive("PropertyString", "11 Test Complex in Complex Property")),
-- Arrays.asList(
-- createPrimitive("PropertyInt16", 999),
-- createPrimitive("PropertyString", "12 Test Complex in Complex Property")),
-- Arrays.asList(
-- createPrimitive("PropertyInt16", 0),
-- createPrimitive("PropertyString", "13 Test Complex in Complex Property"))))));
- for (Entity en:entitySet.getEntities()) {
- en.setType(EntityTypeProvider.nameETCompCollComp.getFullQualifiedNameAsString());
- }
++ .addProperty(createComplex("PropertyComp", createComplexCollection("CollPropertyComp", Arrays
++ .asList(createPrimitive("PropertyInt16", 888),
++ createPrimitive("PropertyString", "11 Test Complex in Complex Property")), Arrays
++ .asList(createPrimitive("PropertyInt16", 999),
++ createPrimitive("PropertyString", "12 Test Complex in Complex Property")), Arrays
++ .asList(createPrimitive("PropertyInt16", 0),
++ createPrimitive("PropertyString", "13 Test Complex in Complex Property"))))));
+
return entitySet;
}
@@@ -294,37 -267,37 +258,30 @@@
private EntitySet createESAllPrim() {
EntitySet entitySet = new EntitySetImpl();
-- entitySet.getEntities().add(new EntityImpl()
-- .addProperty(createPrimitive("PropertyInt16", Short.MAX_VALUE))
++ entitySet.getEntities().add(new EntityImpl().addProperty(createPrimitive("PropertyInt16", Short.MAX_VALUE))
.addProperty(createPrimitive("PropertyString", "First Resource - positive values"))
-- .addProperty(createPrimitive("PropertyBoolean", true))
-- .addProperty(createPrimitive("PropertyByte", 255))
++ .addProperty(createPrimitive("PropertyBoolean", true)).addProperty(createPrimitive("PropertyByte", 255))
.addProperty(createPrimitive("PropertySByte", Byte.MAX_VALUE))
.addProperty(createPrimitive("PropertyInt32", Integer.MAX_VALUE))
.addProperty(createPrimitive("PropertyInt64", Long.MAX_VALUE))
.addProperty(createPrimitive("PropertySingle", 1.79000000E+20))
.addProperty(createPrimitive("PropertyDouble", -1.7900000000000000E+19))
-- .addProperty(createPrimitive("PropertyDecimal", 34))
-- .addProperty(createPrimitive("PropertyBinary",
++ .addProperty(createPrimitive("PropertyDecimal", 34)).addProperty(createPrimitive("PropertyBinary",
new byte[] { 0x01, 0x23, 0x45, 0x67, (byte) 0x89, (byte) 0xAB, (byte) 0xCD, (byte) 0xEF }))
.addProperty(createPrimitive("PropertyDate", getDateTime(2012, 12, 3, 0, 0, 0)))
.addProperty(createPrimitive("PropertyDateTimeOffset", getDateTime(2012, 12, 3, 7, 16, 23)))
-- .addProperty(createPrimitive("PropertyDuration", 6))
-- .addProperty(createPrimitive("PropertyGuid", GUID))
++ .addProperty(createPrimitive("PropertyDuration", 6)).addProperty(createPrimitive("PropertyGuid", GUID))
.addProperty(createPrimitive("PropertyTimeOfDay", getTime(3, 26, 5))));
-- entitySet.getEntities().add(new EntityImpl()
-- .addProperty(createPrimitive("PropertyInt16", Short.MIN_VALUE))
++ entitySet.getEntities().add(new EntityImpl().addProperty(createPrimitive("PropertyInt16", Short.MIN_VALUE))
.addProperty(createPrimitive("PropertyString", "Second Resource - negative values"))
-- .addProperty(createPrimitive("PropertyBoolean", false))
-- .addProperty(createPrimitive("PropertyByte", 0))
++ .addProperty(createPrimitive("PropertyBoolean", false)).addProperty(createPrimitive("PropertyByte", 0))
.addProperty(createPrimitive("PropertySByte", Byte.MIN_VALUE))
.addProperty(createPrimitive("PropertyInt32", Integer.MIN_VALUE))
.addProperty(createPrimitive("PropertyInt64", Long.MIN_VALUE))
.addProperty(createPrimitive("PropertySingle", -1.79000000E+08))
.addProperty(createPrimitive("PropertyDouble", -1.7900000000000000E+05))
-- .addProperty(createPrimitive("PropertyDecimal", -34))
-- .addProperty(createPrimitive("PropertyBinary",
++ .addProperty(createPrimitive("PropertyDecimal", -34)).addProperty(createPrimitive("PropertyBinary",
new byte[] { 0x01, 0x23, 0x45, 0x67, (byte) 0x89, (byte) 0xAB, (byte) 0xCD, (byte) 0xEF }))
.addProperty(createPrimitive("PropertyDate", getDateTime(2015, 11, 5, 0, 0, 0)))
.addProperty(createPrimitive("PropertyDateTimeOffset", getDateTime(2005, 12, 3, 7, 17, 8)))
@@@ -382,50 -353,48 +337,35 @@@
entity = new EntityImpl();
entity.addProperty(createPrimitive("PropertyInt16", 7));
- entity.addProperty(createComplex("PropertyComp",ctPropComp,
- entity.addProperty(createComplex("PropertyComp",
-- createPrimitive("PropertyString", "Second Resource - second"),
++ entity.addProperty(createComplex("PropertyComp", createPrimitive("PropertyString", "Second Resource - second"),
createPrimitive("PropertyBinary",
new byte[] { 0x01, 0x23, 0x45, 0x67, (byte) 0x89, (byte) 0xAB, (byte) 0xCD, (byte) 0xEF }),
-- createPrimitive("PropertyBoolean", true),
-- createPrimitive("PropertyByte", 255),
++ createPrimitive("PropertyBoolean", true), createPrimitive("PropertyByte", 255),
createPrimitive("PropertyDate", getDateTime(2013, 11, 4, 0, 0, 0)),
createPrimitive("PropertyDateTimeOffset", getDateTime(2013, 11, 4, 7, 16, 23)),
-- createPrimitive("PropertyDecimal", 34.27),
-- createPrimitive("PropertySingle", 1.79000000E+20),
-- createPrimitive("PropertyDouble", -1.7900000000000000E+02),
-- createPrimitive("PropertyDuration", 6),
-- createPrimitive("PropertyGuid", GUID),
-- createPrimitive("PropertyInt16", 25),
-- createPrimitive("PropertyInt32", Integer.MAX_VALUE),
-- createPrimitive("PropertyInt64", Long.MAX_VALUE),
++ createPrimitive("PropertyDecimal", 34.27), createPrimitive("PropertySingle", 1.79000000E+20),
++ createPrimitive("PropertyDouble", -1.7900000000000000E+02), createPrimitive("PropertyDuration", 6),
++ createPrimitive("PropertyGuid", GUID), createPrimitive("PropertyInt16", 25),
++ createPrimitive("PropertyInt32", Integer.MAX_VALUE), createPrimitive("PropertyInt64", Long.MAX_VALUE),
createPrimitive("PropertySByte", Byte.MAX_VALUE),
createPrimitive("PropertyTimeOfDay", getTimestamp(1, 1, 1, 7, 45, 12, 765432100))));
entitySet.getEntities().add(entity);
entity = new EntityImpl();
entity.addProperty(createPrimitive("PropertyInt16", 0));
- entity.addProperty(createComplex("PropertyComp",ctPropComp,
- entity.addProperty(createComplex("PropertyComp",
-- createPrimitive("PropertyString", "Third Resource - third"),
++ entity.addProperty(createComplex("PropertyComp", createPrimitive("PropertyString", "Third Resource - third"),
createPrimitive("PropertyBinary",
new byte[] { 0x01, 0x23, 0x45, 0x67, (byte) 0x89, (byte) 0xAB, (byte) 0xCD, (byte) 0xEF }),
-- createPrimitive("PropertyBoolean", true),
-- createPrimitive("PropertyByte", 255),
++ createPrimitive("PropertyBoolean", true), createPrimitive("PropertyByte", 255),
createPrimitive("PropertyDate", getDateTime(2014, 12, 5, 0, 0, 0)),
createPrimitive("PropertyDateTimeOffset", getTimestamp(2014, 12, 5, 8, 17, 45, 123456700)),
-- createPrimitive("PropertyDecimal", 17.98),
-- createPrimitive("PropertySingle", 1.79000000E+20),
-- createPrimitive("PropertyDouble", -1.7900000000000000E+02),
-- createPrimitive("PropertyDuration", 6),
-- createPrimitive("PropertyGuid", GUID),
-- createPrimitive("PropertyInt16", -25),
-- createPrimitive("PropertyInt32", Integer.MAX_VALUE),
-- createPrimitive("PropertyInt64", Long.MAX_VALUE),
-- createPrimitive("PropertySByte", Byte.MAX_VALUE),
-- createPrimitive("PropertyTimeOfDay", getTime(13, 27, 45))));
++ createPrimitive("PropertyDecimal", 17.98), createPrimitive("PropertySingle", 1.79000000E+20),
++ createPrimitive("PropertyDouble", -1.7900000000000000E+02), createPrimitive("PropertyDuration", 6),
++ createPrimitive("PropertyGuid", GUID), createPrimitive("PropertyInt16", -25),
++ createPrimitive("PropertyInt32", Integer.MAX_VALUE), createPrimitive("PropertyInt64", Long.MAX_VALUE),
++ createPrimitive("PropertySByte", Byte.MAX_VALUE), createPrimitive("PropertyTimeOfDay", getTime(13, 27, 45))));
entitySet.getEntities().add(entity);
- for (Entity en:entitySet.getEntities()) {
- en.setType(EntityTypeProvider.nameETCompAllPrim.getFullQualifiedNameAsString());
- }
+
return entitySet;
}
@@@ -501,34 -468,32 +439,29 @@@
entitySet.getEntities().add(new EntityImpl()
.addProperty(createPrimitive("PropertyInt16", 7))
-- .addProperty(createPrimitiveCollection("CollPropertyString",
-- "Employee1@company.example", "Employee2@company.example", "Employee3@company.example"))
- .addProperty(createComplex("PropertyComp",ctPropComp,
- .addProperty(createComplex("PropertyComp",
-- createPrimitive("PropertyInt16", 222),
++ .addProperty(
++ createPrimitiveCollection("CollPropertyString", "Employee1@company.example", "Employee2@company.example",
++ "Employee3@company.example"))
++ .addProperty(createComplex("PropertyComp", createPrimitive("PropertyInt16", 222),
createPrimitive("PropertyString", "TEST B")))
.addProperty(complexCollection));
entitySet.getEntities().add(new EntityImpl()
.addProperty(createPrimitive("PropertyInt16", 0))
-- .addProperty(createPrimitiveCollection("CollPropertyString",
-- "Employee1@company.example", "Employee2@company.example", "Employee3@company.example"))
- .addProperty(createComplex("PropertyComp",ctPropComp,
- .addProperty(createComplex("PropertyComp",
-- createPrimitive("PropertyInt16", 333),
++ .addProperty(createPrimitiveCollection("CollPropertyString", "Employee1@company.example",
++ "Employee2@company.example", "Employee3@company.example"))
++ .addProperty(createComplex("PropertyComp", createPrimitive("PropertyInt16", 333),
createPrimitive("PropertyString", "TEST C")))
.addProperty(complexCollection));
- for (Entity en:entitySet.getEntities()) {
- en.setType(EntityTypeProvider.nameETMixPrimCollComp.getFullQualifiedNameAsString());
- }
+
return entitySet;
}
private EntitySet createESAllKey() {
EntitySet entitySet = new EntitySetImpl();
-- entitySet.getEntities().add(new EntityImpl()
-- .addProperty(createPrimitive("PropertyString", "First"))
-- .addProperty(createPrimitive("PropertyBoolean", true))
-- .addProperty(createPrimitive("PropertyByte", 255))
++ entitySet.getEntities().add(new EntityImpl().addProperty(createPrimitive("PropertyString", "First"))
++ .addProperty(createPrimitive("PropertyBoolean", true)).addProperty(createPrimitive("PropertyByte", 255))
.addProperty(createPrimitive("PropertySByte", Byte.MAX_VALUE))
.addProperty(createPrimitive("PropertyInt16", Short.MAX_VALUE))
.addProperty(createPrimitive("PropertyInt32", Integer.MAX_VALUE))
@@@ -536,8 -501,8 +469,7 @@@
.addProperty(createPrimitive("PropertyDecimal", 34))
.addProperty(createPrimitive("PropertyDate", getDateTime(2012, 12, 3, 0, 0, 0)))
.addProperty(createPrimitive("PropertyDateTimeOffset", getDateTime(2012, 12, 3, 7, 16, 23)))
-- .addProperty(createPrimitive("PropertyDuration", 6))
-- .addProperty(createPrimitive("PropertyGuid", GUID))
++ .addProperty(createPrimitive("PropertyDuration", 6)).addProperty(createPrimitive("PropertyGuid", GUID))
.addProperty(createPrimitive("PropertyTimeOfDay", getTime(2, 48, 21))));
entitySet.getEntities().add(new EntityImpl()
@@@ -573,14 -536,12 +503,11 @@@
entity = new EntityImpl();
entity.addProperty(createPrimitive("PropertyInt16", 2));
- entity.addProperty(createComplex("PropertyComp", null,
- createComplex("PropertyComp",ctPropComp,
- createPrimitive("PropertyInt16", 987),
+ entity.addProperty(createComplex("PropertyComp",
- createComplex("PropertyComp",
- createPrimitive("PropertyInt16", 987),
++ createComplex("PropertyComp", createPrimitive("PropertyInt16", 987),
createPrimitive("PropertyString", "String 2"))));
entitySet.getEntities().add(entity);
- for (Entity en:entitySet.getEntities()) {
- en.setType(EntityTypeProvider.nameETCompComp.getFullQualifiedNameAsString());
- }
+
return entitySet;
}
@@@ -629,8 -588,8 +554,7 @@@
final EntitySet entitySet = data.get("ESTwoPrim");
final List<Entity> targetEntities = data.get("ESAllPrim").getEntities();
-- setLinks(entitySet.getEntities().get(1), "NavPropertyETAllPrimMany",
-- targetEntities.get(1), targetEntities.get(2));
++ setLinks(entitySet.getEntities().get(1), "NavPropertyETAllPrimMany", targetEntities.get(1), targetEntities.get(2));
setLink(entitySet.getEntities().get(3), "NavPropertyETAllPrimOne", targetEntities.get(0));
}
@@@ -653,10 -612,10 +577,8 @@@
final List<Entity> esMediaTargets = data.get("ESMedia").getEntities();
// NavPropertyETKeyNavMany
-- setLinks(entitySet.getEntities().get(0), "NavPropertyETKeyNavMany",
-- esKeyNavTargets.get(0), esKeyNavTargets.get(1));
-- setLinks(entitySet.getEntities().get(1), "NavPropertyETKeyNavMany",
-- esKeyNavTargets.get(1), esKeyNavTargets.get(2));
++ setLinks(entitySet.getEntities().get(0), "NavPropertyETKeyNavMany", esKeyNavTargets.get(0), esKeyNavTargets.get(1));
++ setLinks(entitySet.getEntities().get(1), "NavPropertyETKeyNavMany", esKeyNavTargets.get(1), esKeyNavTargets.get(2));
// NavPropertyETKeyNavOne
setLink(entitySet.getEntities().get(0), "NavPropertyETKeyNavOne", esKeyNavTargets.get(1));
@@@ -668,8 -627,8 +590,8 @@@
setLink(entitySet.getEntities().get(2), "NavPropertyETTwoKeyNavOne", esTwoKeyNavTargets.get(2));
// NavPropertyETTwoKeyNavMany
-- setLinks(entitySet.getEntities().get(0), "NavPropertyETTwoKeyNavMany",
-- esTwoKeyNavTargets.get(0), esTwoKeyNavTargets.get(1));
++ setLinks(entitySet.getEntities().get(0), "NavPropertyETTwoKeyNavMany", esTwoKeyNavTargets.get(0),
++ esTwoKeyNavTargets.get(1));
setLinks(entitySet.getEntities().get(1), "NavPropertyETTwoKeyNavMany", esTwoKeyNavTargets.get(2));
setLinks(entitySet.getEntities().get(2), "NavPropertyETTwoKeyNavMany", esTwoKeyNavTargets.get(3));
@@@ -786,4 -744,4 +707,4 @@@
link.getInlineEntitySet().getEntities().addAll(Arrays.asList(targets));
}
}
--}
++}