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 11:04:56 UTC
[18/18] olingo-odata4 git commit: [OLINGO-573] Minor clean up after
merge with master
[OLINGO-573] Minor clean up after merge with master
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/7119be1f
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/7119be1f
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/7119be1f
Branch: refs/heads/master
Commit: 7119be1f26ead1827434057a4d3446c2b2e057f4
Parents: 3f79ced
Author: Michael Bolz <mi...@sap.com>
Authored: Thu Apr 2 10:40:27 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Thu Apr 2 10:40:43 2015 +0200
----------------------------------------------------------------------
.../org/apache/olingo/server/tecsvc/data/DataCreator.java | 9 ---------
.../org/apache/olingo/server/tecsvc/data/DataProvider.java | 6 ++----
.../org/apache/olingo/server/tecsvc/data/FunctionData.java | 7 +++----
3 files changed, 5 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7119be1f/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java
----------------------------------------------------------------------
diff --git 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
index 9de7166..7de80e7 100644
--- 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
@@ -565,10 +565,6 @@ public class DataCreator {
return new PropertyImpl(null, name, ValueType.COLLECTION_PRIMITIVE, Arrays.asList(values));
}
- protected static Property createComplex(final String name, String type, final Property... properties) {
- return createComplex(name, properties);
- }
-
protected static Property createComplex(final String name, final Property... properties) {
ComplexValue complexValue = new ComplexValueImpl();
for (final Property property : properties) {
@@ -577,11 +573,6 @@ public class DataCreator {
return new PropertyImpl(null, name, ValueType.COMPLEX, complexValue);
}
- protected static Property createComplexCollection(final String name, String type, final List<Property>...
- propertiesList) {
- return createComplexCollection(name, propertiesList);
- }
-
protected static Property createComplexCollection(final String name, final List<Property>... propertiesList) {
List<ComplexValue> complexCollection = new ArrayList<ComplexValue>();
for (final List<Property> properties : propertiesList) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7119be1f/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java
index 4fc9300..e4bb0a2 100644
--- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java
+++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java
@@ -217,12 +217,10 @@ public class DataProvider {
} else {
if (edmProperty.isCollection()) {
@SuppressWarnings("unchecked")
- Property newProperty2 = DataCreator.createComplexCollection(propertyName, edmProperty
- .getType().getFullQualifiedName().getFullQualifiedNameAsString());
+ Property newProperty2 = DataCreator.createComplexCollection(propertyName);
newProperty = newProperty2;
} else {
- newProperty = DataCreator.createComplex(propertyName, edmProperty.getType()
- .getFullQualifiedName().getFullQualifiedNameAsString());
+ newProperty = DataCreator.createComplex(propertyName);
createProperties((EdmComplexType) edmProperty.getType(), newProperty.asComplex().getValue());
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7119be1f/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/FunctionData.java
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/FunctionData.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/FunctionData.java
index 316a7b0..5451d5d 100644
--- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/FunctionData.java
+++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/FunctionData.java
@@ -31,7 +31,6 @@ import org.apache.olingo.commons.core.data.EntitySetImpl;
import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory;
import org.apache.olingo.server.api.uri.UriParameter;
import org.apache.olingo.server.tecsvc.data.DataProvider.DataProviderException;
-import org.apache.olingo.server.tecsvc.provider.ComplexTypeProvider;
public class FunctionData {
@@ -81,12 +80,12 @@ public class FunctionData {
} else if (name.equals("UFCRTCollString")) {
return data.get("ESCollAllPrim").getEntities().get(0).getProperty("CollPropertyString");
} else if (name.equals("UFCRTCTTwoPrim")) {
- return DataCreator.createComplex(name, ComplexTypeProvider.nameCTTwoPrim.getFullQualifiedNameAsString(),
+ return DataCreator.createComplex(name,
DataCreator.createPrimitive("PropertyInt16", 16),
DataCreator.createPrimitive("PropertyString", "UFCRTCTTwoPrim string value"));
} else if (name.equals("UFCRTCTTwoPrimParam")) {
try {
- return DataCreator.createComplex(name,ComplexTypeProvider.nameCTTwoPrim.getFullQualifiedNameAsString(),
+ return DataCreator.createComplex(name,
DataCreator.createPrimitive("PropertyInt16",
EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Int16).valueOfString(
getParameterText("ParameterInt16", parameters),
@@ -100,7 +99,7 @@ public class FunctionData {
throw new DataProviderException("Error in function " + name + ".", e);
}
} else if (name.equals("UFCRTCollCTTwoPrim")) {
- return DataCreator.createComplexCollection(name,ComplexTypeProvider.nameCTTwoPrim.getFullQualifiedNameAsString(),
+ return DataCreator.createComplexCollection(name,
Arrays.asList(DataCreator.createPrimitive("PropertyInt16", 16),
DataCreator.createPrimitive("PropertyString", "Test123")),
Arrays.asList(DataCreator.createPrimitive("PropertyInt16", 17),