Repository: olingo-odata4 Updated Branches: refs/heads/master fe82f525e -> a5c51d6f8
[OLINGO-630] Fixed type of complex value in OData sample service Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/a5c51d6f Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/a5c51d6f Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/a5c51d6f Branch: refs/heads/master Commit: a5c51d6f8d23f3d1b05cea8957e894c09a412932 Parents: fe82f52 Author: Christian Holzer <[email protected]> Authored: Wed Apr 22 16:44:50 2015 +0200 Committer: Christian Holzer <[email protected]> Committed: Wed Apr 22 16:44:50 2015 +0200 ---------------------------------------------------------------------- .../org/apache/olingo/server/sample/data/DataProvider.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a5c51d6f/samples/server/src/main/java/org/apache/olingo/server/sample/data/DataProvider.java ---------------------------------------------------------------------- diff --git a/samples/server/src/main/java/org/apache/olingo/server/sample/data/DataProvider.java b/samples/server/src/main/java/org/apache/olingo/server/sample/data/DataProvider.java index c2a1b1c..69a4530 100644 --- a/samples/server/src/main/java/org/apache/olingo/server/sample/data/DataProvider.java +++ b/samples/server/src/main/java/org/apache/olingo/server/sample/data/DataProvider.java @@ -18,16 +18,15 @@ */ package org.apache.olingo.server.sample.data; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.EntityCollection; import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.data.ValueType; +import org.apache.olingo.commons.api.data.ComplexValue; import org.apache.olingo.commons.api.edm.EdmEntitySet; import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; @@ -157,12 +156,13 @@ public class DataProvider { } private Property createAddress(final String street, final String city, final String zipCode, final String country) { - List<Property> addressProperties = new ArrayList<Property>(); + ComplexValue complexValue=new ComplexValue(); + List<Property> addressProperties = complexValue.getValue(); addressProperties.add(createPrimitive("Street", street)); addressProperties.add(createPrimitive("City", city)); addressProperties.add(createPrimitive("ZipCode", zipCode)); addressProperties.add(createPrimitive("Country", country)); - return new Property(null, "Address", ValueType.COMPLEX, addressProperties); + return new Property(null, "Address", ValueType.COMPLEX, complexValue); } private Property createPrimitive(final String name, final Object value) {
