Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-630] Fixed type of complex value in OData sample service

This commit is contained in:
Christian Holzer 2015-04-22 16:44:50 +02:00
parent fe82f525e4
commit a5c51d6f8d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
samples/server/src/main/java/org/apache/olingo/server/sample/data/DataProvider.java
View File

@ -18,16 +18,15 @@
*/ */
package org.apache.olingo.server.sample.data; package org.apache.olingo.server.sample.data;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.ODataException;
import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.EntityCollection; import org.apache.olingo.commons.api.data.EntityCollection;
import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.data.Property;
import org.apache.olingo.commons.api.data.ValueType; 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.EdmEntitySet;
import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmEntityType;
import org.apache.olingo.commons.api.edm.EdmPrimitiveType; 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) { 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("Street", street));
addressProperties.add(createPrimitive("City", city)); addressProperties.add(createPrimitive("City", city));
addressProperties.add(createPrimitive("ZipCode", zipCode)); addressProperties.add(createPrimitive("ZipCode", zipCode));
addressProperties.add(createPrimitive("Country", country)); 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) { private Property createPrimitive(final String name, final Object value) {