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 2014/05/12 10:39:19 UTC
[44/50] [abbrv] Various small fixes and improvements
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/ext/pojogen-maven-plugin/src/main/resources/singleton.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/singleton.vm b/ext/pojogen-maven-plugin/src/main/resources/singleton.vm
index b6b97b7..ed7a966 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/singleton.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/singleton.vm
@@ -28,7 +28,6 @@ import ${basePackage}.${ns}.*;
import ${basePackage}.${ns}.types.*;
#end
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
index 1a3cb88..05ec9f1 100644
--- a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
+++ b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
@@ -121,6 +121,8 @@ public abstract class AbstractServices {
protected final ODataServiceVersion version;
+ protected final Metadata metadata;
+
protected final FITAtomDeserializer atomDeserializer;
protected final AtomSerializer atomSerializer;
@@ -133,24 +135,16 @@ public abstract class AbstractServices {
protected final JSONUtilities json;
- protected Metadata metadata;
-
- public AbstractServices(final ODataServiceVersion version) throws Exception {
+ public AbstractServices(final ODataServiceVersion version, final Metadata metadata) throws Exception {
this.version = version;
+ this.metadata = metadata;
this.atomDeserializer = Commons.getAtomDeserializer(version);
this.atomSerializer = Commons.getAtomSerializer(version);
this.mapper = Commons.getJSONMapper(version);
- this.dataBinder = new DataBinder(version);
+ this.dataBinder = new DataBinder(version, metadata);
- this.xml = new XMLUtilities(version);
- this.json = new JSONUtilities(version);
- }
-
- protected Metadata getMetadataObj() {
- if (metadata == null) {
- metadata = Commons.getMetadata(version);
- }
- return metadata;
+ this.xml = new XMLUtilities(version, metadata);
+ this.json = new JSONUtilities(version, metadata);
}
/**
@@ -447,7 +441,7 @@ public abstract class AbstractServices {
final String path = Commons.getEntityBasePath(entitySetName, entityId);
FSManager.instance(version).putInMemory(
- cres, path + File.separatorChar + Constants.get(version, ConstantKey.ENTITY));
+ cres, path + File.separatorChar + Constants.get(version, ConstantKey.ENTITY), dataBinder);
final Response response;
if ("return-content".equalsIgnoreCase(prefer)) {
@@ -510,7 +504,7 @@ public abstract class AbstractServices {
final String path = Commons.getEntityBasePath(entitySetName, entityId);
FSManager.instance(version).putInMemory(
- cres, path + File.separatorChar + Constants.get(version, ConstantKey.ENTITY));
+ cres, path + File.separatorChar + Constants.get(version, ConstantKey.ENTITY), dataBinder);
final Response response;
if ("return-content".equalsIgnoreCase(prefer)) {
@@ -560,7 +554,7 @@ public abstract class AbstractServices {
final ResWrap<AtomEntityImpl> container;
- final org.apache.olingo.fit.metadata.EntitySet entitySet = getMetadataObj().getEntitySet(entitySetName);
+ final org.apache.olingo.fit.metadata.EntitySet entitySet = metadata.getEntitySet(entitySetName);
final AtomEntityImpl entry;
final String entityKey;
@@ -632,7 +626,7 @@ public abstract class AbstractServices {
final String path = Commons.getEntityBasePath(entitySetName, entityKey);
FSManager.instance(version).putInMemory(
- result, path + File.separatorChar + Constants.get(version, ConstantKey.ENTITY));
+ result, path + File.separatorChar + Constants.get(version, ConstantKey.ENTITY), dataBinder);
final String location = uriInfo.getRequestUri().toASCIIString() + "(" + entityKey + ")";
@@ -729,7 +723,7 @@ public abstract class AbstractServices {
append(File.separatorChar).append(type).
append(File.separatorChar);
- path.append(getMetadataObj().getEntitySet(name).isSingleton()
+ path.append(metadata.getEntitySet(name).isSingleton()
? Constants.get(version, ConstantKey.ENTITY)
: Constants.get(version, ConstantKey.FEED));
@@ -788,7 +782,7 @@ public abstract class AbstractServices {
append(File.separatorChar).append(type).
append(File.separatorChar);
- path.append(getMetadataObj().getEntitySet(name).isSingleton()
+ path.append(metadata.getEntitySet(name).isSingleton()
? Constants.get(version, ConstantKey.ENTITY)
: Constants.get(version, ConstantKey.FEED));
@@ -861,7 +855,7 @@ public abstract class AbstractServices {
builder.append(Constants.get(version, ConstantKey.SKIP_TOKEN)).append(File.separatorChar).
append(skiptoken);
} else {
- builder.append(getMetadataObj().getEntitySet(name).isSingleton()
+ builder.append(metadata.getEntitySet(name).isSingleton()
? Constants.get(version, ConstantKey.ENTITY)
: Constants.get(version, ConstantKey.FEED));
}
@@ -1577,7 +1571,7 @@ public abstract class AbstractServices {
writer,
new JSONEntryContainer(container.getContextURL(),
container.getMetadataETag(),
- dataBinder.toJSONEntityType((AtomEntityImpl) container.getPayload())));
+ dataBinder.toJSONEntity((AtomEntityImpl) container.getPayload())));
}
}
@@ -1722,8 +1716,8 @@ public abstract class AbstractServices {
}
protected void normalizeAtomEntry(final AtomEntityImpl entry, final String entitySetName, final String entityKey) {
- final org.apache.olingo.fit.metadata.EntitySet entitySet = getMetadataObj().getEntitySet(entitySetName);
- final EntityType entityType = getMetadataObj().getEntityType(entitySet.getType());
+ final org.apache.olingo.fit.metadata.EntitySet entitySet = metadata.getEntitySet(entitySetName);
+ final EntityType entityType = metadata.getEntityOrComplexType(entitySet.getType());
for (Map.Entry<String, org.apache.olingo.fit.metadata.Property> property
: entityType.getPropertyMap().entrySet()) {
if (entry.getProperty(property.getKey()) == null && property.getValue().isNullable()) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/main/java/org/apache/olingo/fit/V3ActionOverloading.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/V3ActionOverloading.java b/fit/src/main/java/org/apache/olingo/fit/V3ActionOverloading.java
index b87b638..6e42d16 100644
--- a/fit/src/main/java/org/apache/olingo/fit/V3ActionOverloading.java
+++ b/fit/src/main/java/org/apache/olingo/fit/V3ActionOverloading.java
@@ -56,7 +56,7 @@ import org.springframework.stereotype.Service;
public class V3ActionOverloading extends AbstractServices {
public V3ActionOverloading() throws Exception {
- super(ODataServiceVersion.V30);
+ super(ODataServiceVersion.V30, Commons.getMetadata(ODataServiceVersion.V30));
}
private Response replaceServiceName(final Response response) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/main/java/org/apache/olingo/fit/V3OpenType.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/V3OpenType.java b/fit/src/main/java/org/apache/olingo/fit/V3OpenType.java
index 32e0073..e669478 100644
--- a/fit/src/main/java/org/apache/olingo/fit/V3OpenType.java
+++ b/fit/src/main/java/org/apache/olingo/fit/V3OpenType.java
@@ -61,12 +61,7 @@ public class V3OpenType {
this.openMetadata = new Metadata(FSManager.instance(ODataServiceVersion.V30).
readFile("openType" + StringUtils.capitalize(Constants.get(ODataServiceVersion.V30, ConstantKey.METADATA)),
Accept.XML), ODataServiceVersion.V30);
- this.services = new V3Services() {
- @Override
- protected Metadata getMetadataObj() {
- return openMetadata;
- }
- };
+ this.services = new V3Services(this.openMetadata);
}
private Response replaceServiceName(final Response response) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/main/java/org/apache/olingo/fit/V3Services.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/V3Services.java b/fit/src/main/java/org/apache/olingo/fit/V3Services.java
index 4c08cf9..0db1d80 100644
--- a/fit/src/main/java/org/apache/olingo/fit/V3Services.java
+++ b/fit/src/main/java/org/apache/olingo/fit/V3Services.java
@@ -47,6 +47,7 @@ import org.apache.cxf.interceptor.InInterceptors;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.apache.olingo.commons.api.data.EntitySet;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
+import org.apache.olingo.fit.metadata.Metadata;
import org.apache.olingo.fit.methods.MERGE;
import org.apache.olingo.fit.methods.PATCH;
import org.apache.olingo.fit.utils.AbstractUtilities;
@@ -64,7 +65,11 @@ import org.springframework.stereotype.Service;
public class V3Services extends AbstractServices {
public V3Services() throws Exception {
- super(ODataServiceVersion.V30);
+ super(ODataServiceVersion.V30, Commons.getMetadata(ODataServiceVersion.V30));
+ }
+
+ protected V3Services(final Metadata metadata) throws Exception {
+ super(ODataServiceVersion.V30, metadata);
}
@GET
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/main/java/org/apache/olingo/fit/V4Demo.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/V4Demo.java b/fit/src/main/java/org/apache/olingo/fit/V4Demo.java
index 8f54ede..2035a1f 100644
--- a/fit/src/main/java/org/apache/olingo/fit/V4Demo.java
+++ b/fit/src/main/java/org/apache/olingo/fit/V4Demo.java
@@ -58,12 +58,7 @@ public class V4Demo {
this.demoMetadata = new Metadata(FSManager.instance(ODataServiceVersion.V40).
readFile("demo" + StringUtils.capitalize(Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA)),
Accept.XML), ODataServiceVersion.V40);
- this.services = new V4Services() {
- @Override
- protected Metadata getMetadataObj() {
- return demoMetadata;
- }
- };
+ this.services = new V4Services(this.demoMetadata);
}
private Response replaceServiceName(final Response response) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java b/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java
index 7eb99d9..9e8f050 100644
--- a/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java
+++ b/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java
@@ -56,13 +56,8 @@ public class V4OpenType {
public V4OpenType() throws Exception {
this.openMetadata = new Metadata(FSManager.instance(ODataServiceVersion.V40).
readFile("openType" + StringUtils.capitalize(Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA)),
- Accept.XML), ODataServiceVersion.V40);
- this.services = new V4Services() {
- @Override
- protected Metadata getMetadataObj() {
- return openMetadata;
- }
- };
+ Accept.XML), ODataServiceVersion.V40);
+ this.services = new V4Services(openMetadata);
}
private Response replaceServiceName(final Response response) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/main/java/org/apache/olingo/fit/V4Services.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/V4Services.java b/fit/src/main/java/org/apache/olingo/fit/V4Services.java
index 39d1fca..fb31f09 100644
--- a/fit/src/main/java/org/apache/olingo/fit/V4Services.java
+++ b/fit/src/main/java/org/apache/olingo/fit/V4Services.java
@@ -74,9 +74,11 @@ import org.apache.olingo.commons.core.data.JSONEntityImpl;
import org.apache.olingo.commons.core.data.JSONPropertyImpl;
import org.apache.olingo.commons.core.data.PrimitiveValueImpl;
import org.apache.olingo.commons.core.edm.EdmTypeInfo;
+import org.apache.olingo.fit.metadata.Metadata;
import org.apache.olingo.fit.methods.PATCH;
import org.apache.olingo.fit.utils.AbstractUtilities;
import org.apache.olingo.fit.utils.Accept;
+import org.apache.olingo.fit.utils.Commons;
import org.apache.olingo.fit.utils.ConstantKey;
import org.apache.olingo.fit.utils.Constants;
import org.apache.olingo.fit.utils.FSManager;
@@ -103,7 +105,11 @@ public class V4Services extends AbstractServices {
private Map<String, String> providedAsync = new HashMap<String, String>();
public V4Services() throws Exception {
- super(ODataServiceVersion.V40);
+ super(ODataServiceVersion.V40, Commons.getMetadata(ODataServiceVersion.V40));
+ }
+
+ protected V4Services(final Metadata metadata) throws Exception {
+ super(ODataServiceVersion.V40, metadata);
}
@GET
@@ -224,7 +230,7 @@ public class V4Services extends AbstractServices {
final String basePath = name + File.separatorChar;
final StringBuilder path = new StringBuilder(basePath);
- path.append(getMetadataObj().getEntitySet(name).isSingleton()
+ path.append(metadata.getEntitySet(name).isSingleton()
? Constants.get(version, ConstantKey.ENTITY)
: Constants.get(version, ConstantKey.FEED));
@@ -821,7 +827,7 @@ public class V4Services extends AbstractServices {
entry);
}
- final EdmTypeInfo contained = new EdmTypeInfo.Builder().setTypeExpression(getMetadataObj().
+ final EdmTypeInfo contained = new EdmTypeInfo.Builder().setTypeExpression(metadata.
getNavigationProperties("Accounts").get(containedEntitySetName).getType()).build();
final String entityKey = getUtilities(contentTypeValue).
getDefaultEntryKey(contained.getFullQualifiedName().getName(), entry);
@@ -902,8 +908,8 @@ public class V4Services extends AbstractServices {
container = atomDeserializer.read(IOUtils.toInputStream(changes, Constants.ENCODING), AtomEntityImpl.class);
entryChanges = container.getPayload();
} else {
- final String entityType = getMetadataObj().getEntitySet(entitySetName).getType();
- final String containedType = getMetadataObj().getEntityType(entityType).
+ final String entityType = metadata.getEntitySet(entitySetName).getType();
+ final String containedType = metadata.getEntityOrComplexType(entityType).
getNavigationProperty(containedEntitySetName).getType();
final EdmTypeInfo typeInfo = new EdmTypeInfo.Builder().setTypeExpression(containedType).build();
@@ -923,7 +929,8 @@ public class V4Services extends AbstractServices {
}
FSManager.instance(version).putInMemory(new ResWrap<AtomEntityImpl>((URI) null, null, original),
- xml.getLinksBasePath(entitySetName, entityId) + containedEntitySetName + "(" + containedEntityId + ")");
+ xml.getLinksBasePath(entitySetName, entityId) + containedEntitySetName + "(" + containedEntityId + ")",
+ dataBinder);
return xml.createResponse(null, null, acceptType, Response.Status.NO_CONTENT);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java b/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java
index 122a8be..8271e53 100644
--- a/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java
+++ b/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java
@@ -25,6 +25,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
+import org.apache.olingo.fit.metadata.Metadata;
import org.apache.olingo.fit.utils.Accept;
import org.apache.olingo.fit.utils.ConstantKey;
import org.apache.olingo.fit.utils.Constants;
@@ -36,10 +37,15 @@ import org.springframework.stereotype.Service;
@Path("/V40/Vocabularies.svc")
public class V4Vocabularies {
+ private final Metadata metadata;
+
private final XMLUtilities xml;
public V4Vocabularies() throws Exception {
- this.xml = new XMLUtilities(ODataServiceVersion.V40);
+ this.metadata = new Metadata(FSManager.instance(ODataServiceVersion.V40).readFile(
+ "vocabularies-" + Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA), Accept.XML),
+ ODataServiceVersion.V40);
+ this.xml = new XMLUtilities(ODataServiceVersion.V40, metadata);
}
@GET
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/main/java/org/apache/olingo/fit/metadata/EntityType.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/metadata/EntityType.java b/fit/src/main/java/org/apache/olingo/fit/metadata/EntityType.java
index f08c36b..90f51d5 100644
--- a/fit/src/main/java/org/apache/olingo/fit/metadata/EntityType.java
+++ b/fit/src/main/java/org/apache/olingo/fit/metadata/EntityType.java
@@ -29,6 +29,8 @@ public class EntityType extends AbstractMetadataElement {
private String baseType;
+ private boolean openType = false;
+
private final Map<String, Property> properties;
private final Map<String, NavigationProperty> navigationProperties;
@@ -51,6 +53,14 @@ public class EntityType extends AbstractMetadataElement {
this.baseType = baseType;
}
+ public boolean isOpenType() {
+ return openType;
+ }
+
+ public void setOpenType(final boolean openType) {
+ this.openType = openType;
+ }
+
public Collection<NavigationProperty> getNavigationProperties() {
return new HashSet<NavigationProperty>(navigationProperties.values());
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/main/java/org/apache/olingo/fit/metadata/Metadata.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/metadata/Metadata.java b/fit/src/main/java/org/apache/olingo/fit/metadata/Metadata.java
index b55f91d..543fae7 100644
--- a/fit/src/main/java/org/apache/olingo/fit/metadata/Metadata.java
+++ b/fit/src/main/java/org/apache/olingo/fit/metadata/Metadata.java
@@ -31,6 +31,7 @@ import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.StartElement;
import javax.xml.stream.events.XMLEvent;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
import org.apache.olingo.fit.utils.ConstantKey;
@@ -134,7 +135,7 @@ public class Metadata extends AbstractMetadataElement {
return null;
}
- public EntityType getEntityType(final String fqn) {
+ public EntityType getEntityOrComplexType(final String fqn) {
EntityType result = null;
final String ns = StringUtils.substringBeforeLast(fqn, ".");
@@ -302,6 +303,10 @@ public class Metadata extends AbstractMetadataElement {
if (baseType != null) {
entityType.setBaseType(baseType.getValue());
}
+ final Attribute openType = start.getAttributeByName(new QName("OpenType"));
+ if (openType != null) {
+ entityType.setOpenType(BooleanUtils.toBoolean(openType.getValue()));
+ }
boolean completed = false;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java b/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java
index 9ff37d7..b7f2fd6 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java
@@ -91,6 +91,8 @@ public abstract class AbstractUtilities {
protected final ODataServiceVersion version;
+ protected final Metadata metadata;
+
protected final FSManager fsManager;
protected final DataBinder dataBinder;
@@ -101,10 +103,11 @@ public abstract class AbstractUtilities {
protected final ObjectMapper mapper;
- public AbstractUtilities(final ODataServiceVersion version) throws Exception {
+ public AbstractUtilities(final ODataServiceVersion version, final Metadata metadata) throws Exception {
this.version = version;
+ this.metadata = metadata;
this.fsManager = FSManager.instance(version);
- this.dataBinder = new DataBinder(version);
+ this.dataBinder = new DataBinder(version, metadata);
this.atomDeserializer = Commons.getAtomDeserializer(version);
this.atomSerializer = Commons.getAtomSerializer(version);
this.mapper = Commons.getJSONMapper(version);
@@ -217,8 +220,7 @@ public abstract class AbstractUtilities {
IOUtils.copy(is, bos);
IOUtils.closeQuietly(is);
- final Map<String, NavigationProperty> navigationProperties =
- Commons.getMetadata(version).getNavigationProperties(entitySetName);
+ final Map<String, NavigationProperty> navigationProperties = metadata.getNavigationProperties(entitySetName);
// -----------------------------------------
// 0. Retrieve navigation links to be kept
@@ -363,7 +365,6 @@ public abstract class AbstractUtilities {
final HashSet<String> uris = new HashSet<String>();
- final Metadata metadata = Commons.getMetadata(version);
final Map<String, NavigationProperty> navigationProperties = metadata.getNavigationProperties(entitySetName);
if (navigationProperties.get(linkName).isEntitySet()) {
@@ -610,7 +611,7 @@ public abstract class AbstractUtilities {
} else {
mapper.writeValue(
writer, new JSONEntryContainer(container.getContextURL(), container.getMetadataETag(),
- dataBinder.toJSONEntityType(container.getPayload())));
+ dataBinder.toJSONEntity(container.getPayload())));
}
return IOUtils.toInputStream(writer.toString(), Constants.ENCODING);
@@ -702,6 +703,8 @@ public abstract class AbstractUtilities {
Commons.SEQUENCE.put(entitySetName, messageId);
} else if ("Order".equals(entitySetName)) {
res = getDefaultEntryKey(entitySetName, entity, "OrderId");
+ } else if ("Product".equals(entitySetName)) {
+ res = getDefaultEntryKey(entitySetName, entity, "ProductId");
} else if ("Orders".equals(entitySetName)) {
res = getDefaultEntryKey(entitySetName, entity, "OrderID");
} else if ("Customer".equals(entitySetName)) {
@@ -778,7 +781,6 @@ public abstract class AbstractUtilities {
final LinkInfo linkInfo = new LinkInfo(fsManager.readFile(basePath + linkName, accept));
linkInfo.setEtag(Commons.getETag(basePath, version));
- final Metadata metadata = Commons.getMetadata(version);
final Map<String, NavigationProperty> navigationProperties = metadata.getNavigationProperties(entitySetName);
linkInfo.setFeed(navigationProperties.get(linkName.replaceAll("\\(.*\\)", "")).isEntitySet());
@@ -840,7 +842,6 @@ public abstract class AbstractUtilities {
// --------------------------------
// 1. Retrieve expanded object (entry or feed)
// --------------------------------
- final Metadata metadata = Commons.getMetadata(version);
final Map<String, NavigationProperty> navigationProperties = metadata.getNavigationProperties(entitySetName);
return readEntities(
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/main/java/org/apache/olingo/fit/utils/Commons.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/Commons.java b/fit/src/main/java/org/apache/olingo/fit/utils/Commons.java
index d99ac57..74c2284 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/Commons.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/Commons.java
@@ -87,6 +87,7 @@ public abstract class Commons {
SEQUENCE.put("Car", 1000);
SEQUENCE.put("Message", 1000);
SEQUENCE.put("Order", 1000);
+ SEQUENCE.put("Product", 1000);
SEQUENCE.put("ComputerDetail", 1000);
SEQUENCE.put("AllGeoTypesSet", 1000);
SEQUENCE.put("Orders", 1000);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/main/java/org/apache/olingo/fit/utils/Constants.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/Constants.java b/fit/src/main/java/org/apache/olingo/fit/utils/Constants.java
index 4ecc5a2..ad060ba 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/Constants.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/Constants.java
@@ -50,6 +50,7 @@ public class Constants {
v4constants.put(ConstantKey.JSON_ID_NAME, "@odata.id");
v4constants.put(ConstantKey.JSON_TYPE_NAME, "@odata.type");
v4constants.put(ConstantKey.JSON_NAVIGATION_SUFFIX, "@odata.navigationLink");
+ v4constants.put(ConstantKey.JSON_EDITLINK_NAME, "@odata.editLink");
v4constants.put(ConstantKey.DATASERVICES_NS, "http://docs.oasis-open.org/odata/ns/dataservices");
v4constants.put(ConstantKey.METADATA_NS, "http://docs.oasis-open.org/odata/ns/metadata");
v4constants.put(ConstantKey.GEORSS_NS, "http://www.georss.org/georss");
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/main/java/org/apache/olingo/fit/utils/DataBinder.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/DataBinder.java b/fit/src/main/java/org/apache/olingo/fit/utils/DataBinder.java
index e5f7850..bddb017 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/DataBinder.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/DataBinder.java
@@ -28,6 +28,7 @@ import org.apache.olingo.commons.api.data.EntitySet;
import org.apache.olingo.commons.api.data.Link;
import org.apache.olingo.commons.api.data.Property;
import org.apache.olingo.commons.api.data.Value;
+import org.apache.olingo.commons.api.edm.EdmPrimitiveType;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
import org.apache.olingo.commons.core.data.AtomEntityImpl;
import org.apache.olingo.commons.core.data.AtomEntitySetImpl;
@@ -47,8 +48,11 @@ public class DataBinder {
private final ODataServiceVersion version;
- public DataBinder(final ODataServiceVersion version) {
+ private final Metadata metadata;
+
+ public DataBinder(final ODataServiceVersion version, final Metadata metadata) {
this.version = version;
+ this.metadata = metadata;
}
public JSONEntitySetImpl toJSONEntitySet(final AtomEntitySetImpl atomEntitySet) {
@@ -61,7 +65,7 @@ public class DataBinder {
final Collection<Entity> entries = jsonEntitySet.getEntities();
for (Entity entity : atomEntitySet.getEntities()) {
- entries.add(toJSONEntityType((AtomEntityImpl) entity));
+ entries.add(toJSONEntity((AtomEntityImpl) entity));
}
return jsonEntitySet;
@@ -83,10 +87,14 @@ public class DataBinder {
return atomEntitySet;
}
- public JSONEntityImpl toJSONEntityType(final AtomEntityImpl atomEntity) {
+ public JSONEntityImpl toJSONEntity(final AtomEntityImpl atomEntity) {
final JSONEntityImpl jsonEntity = new JSONEntityImpl();
BeanUtils.copyProperties(atomEntity, jsonEntity, "baseURI", "properties", "links");
+ // This shouldn't ever happen, but...
+ if (atomEntity.getType() != null && atomEntity.getType().startsWith("Collection(")) {
+ jsonEntity.setType(atomEntity.getType().replaceAll("^Collection\\(", "").replaceAll("\\)$", ""));
+ }
jsonEntity.setBaseURI(atomEntity.getBaseURI() == null ? null : atomEntity.getBaseURI().toASCIIString());
jsonEntity.getOperations().addAll(atomEntity.getOperations());
@@ -100,7 +108,7 @@ public class DataBinder {
if (link.getInlineEntity() instanceof AtomEntityImpl) {
final Entity inlineEntity = link.getInlineEntity();
if (inlineEntity instanceof AtomEntityImpl) {
- jlink.setInlineEntity(toJSONEntityType((AtomEntityImpl) link.getInlineEntity()));
+ jlink.setInlineEntity(toJSONEntity((AtomEntityImpl) link.getInlineEntity()));
}
} else if (link.getInlineEntitySet() instanceof AtomEntitySetImpl) {
final EntitySet inlineEntitySet = link.getInlineEntitySet();
@@ -123,8 +131,6 @@ public class DataBinder {
public AtomEntityImpl toAtomEntity(final JSONEntityImpl jsonEntity) {
final AtomEntityImpl atomEntity = new AtomEntityImpl();
- final Metadata metadata = Commons.getMetadata(version);
-
BeanUtils.copyProperties(jsonEntity, atomEntity, "baseURI", "properties", "links");
atomEntity.setBaseURI(jsonEntity.getBaseURI() == null ? null : jsonEntity.getBaseURI().toASCIIString());
@@ -134,7 +140,7 @@ public class DataBinder {
alink.setTitle(link.getTitle());
final NavigationProperty navPropDetails =
- metadata.getEntityType(jsonEntity.getType()).getNavigationProperty(link.getTitle());
+ metadata.getEntityOrComplexType(jsonEntity.getType()).getNavigationProperty(link.getTitle());
alink.setType(navPropDetails != null && navPropDetails.isEntitySet()
? Constants.get(ConstantKey.ATOM_LINK_FEED) : Constants.get(ConstantKey.ATOM_LINK_ENTRY));
@@ -156,7 +162,7 @@ public class DataBinder {
}
final EntityType entityType = StringUtils.isBlank(jsonEntity.getType())
- ? null : metadata.getEntityType(jsonEntity.getType());
+ ? null : metadata.getEntityOrComplexType(jsonEntity.getType());
final Map<String, NavigationProperty> navProperties = entityType == null
? Collections.<String, NavigationProperty>emptyMap() : entityType.getNavigationPropertyMap();
@@ -238,49 +244,50 @@ public class DataBinder {
return jsonproperty;
}
- public AtomPropertyImpl toAtomProperty(final JSONPropertyImpl jsonproperty, final String entryType) {
+ public AtomPropertyImpl toAtomProperty(final JSONPropertyImpl jsonProperty, final String entryType) {
final AtomPropertyImpl atomproperty = new AtomPropertyImpl();
- atomproperty.setName(jsonproperty.getName());
+ atomproperty.setName(jsonProperty.getName());
- if (StringUtils.isNotBlank(jsonproperty.getType())) {
- atomproperty.setType(jsonproperty.getType());
- } else {
- final EntityType entityType = entryType == null ? null : Commons.getMetadata(version).getEntityType(entryType);
- if (entityType != null) {
- System.out.println("ZZZZZZZZZZZZZ " + entityType + " " + jsonproperty.getName() + " "
- + entityType.getProperty(jsonproperty.getName()));
- atomproperty.setType(entityType.getProperty(jsonproperty.getName()).getType());
- }
+ final EntityType entityType = entryType == null
+ ? null
+ : metadata.getEntityOrComplexType(entryType.replaceAll("^Collection\\(", "").replaceAll("\\)$", ""));
+
+ // For non-primitive types, alwasy trust what was sent - if available; otherwise, search metadata
+ if (StringUtils.isNotBlank(jsonProperty.getType())
+ && ((entityType != null && entityType.isOpenType())
+ || jsonProperty.getName() == null
+ || !jsonProperty.getType().startsWith(EdmPrimitiveType.EDM_NAMESPACE))) {
+
+ atomproperty.setType(jsonProperty.getType());
+ } else if (entityType != null) {
+ atomproperty.setType(entityType.getProperty(jsonProperty.getName()).getType());
}
- if (jsonproperty.getValue().isComplex()) {
+ if (jsonProperty.getValue().isComplex()) {
final ComplexValueImpl complex = new ComplexValueImpl();
atomproperty.setValue(complex);
- for (Property field : jsonproperty.getValue().asComplex().get()) {
+ for (Property field : jsonProperty.getValue().asComplex().get()) {
complex.get().add(toAtomProperty((JSONPropertyImpl) field, atomproperty.getType()));
}
- } else if (jsonproperty.getValue().isCollection()) {
+ } else if (jsonProperty.getValue().isCollection()) {
final CollectionValueImpl collection = new CollectionValueImpl();
atomproperty.setValue(collection);
- for (Value element : jsonproperty.getValue().asCollection().get()) {
+ for (Value element : jsonProperty.getValue().asCollection().get()) {
if (element instanceof ComplexValueImpl) {
final ComplexValueImpl complex = new ComplexValueImpl();
collection.get().add(complex);
for (Property field : element.asComplex().get()) {
- complex.get().add(toAtomProperty((JSONPropertyImpl) field,
- atomproperty.getType() == null
- ? null
- : atomproperty.getType().replaceAll("^Collection\\(", "").replaceAll("\\)$", "")));
+ complex.get().add(toAtomProperty((JSONPropertyImpl) field, atomproperty.getType()));
}
} else {
collection.get().add(element);
}
}
} else {
- atomproperty.setValue(jsonproperty.getValue());
+ atomproperty.setValue(jsonProperty.getValue());
}
return atomproperty;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java b/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java
index ae89ec4..4ad3871 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java
@@ -98,8 +98,8 @@ public class FSManager {
return memObject;
}
- public void putInMemory(final ResWrap<AtomEntityImpl> container, final String relativePath)
- throws IOException {
+ public void putInMemory(final ResWrap<AtomEntityImpl> container, final String relativePath,
+ final DataBinder dataBinder) throws IOException {
try {
final AtomSerializer atomSerializer = Commons.getAtomSerializer(version);
@@ -117,7 +117,7 @@ public class FSManager {
writer, new JSONEntryContainer(
container.getContextURL(),
container.getMetadataETag(),
- new DataBinder(version).toJSONEntityType(container.getPayload())));
+ dataBinder.toJSONEntity(container.getPayload())));
putInMemory(new ByteArrayInputStream(content.toByteArray()), getAbsolutePath(relativePath, Accept.JSON_FULLMETA));
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/main/java/org/apache/olingo/fit/utils/JSONUtilities.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/JSONUtilities.java b/fit/src/main/java/org/apache/olingo/fit/utils/JSONUtilities.java
index 55cfb2d..7c6a54b 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/JSONUtilities.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/JSONUtilities.java
@@ -42,8 +42,8 @@ import org.apache.olingo.fit.metadata.NavigationProperty;
public class JSONUtilities extends AbstractUtilities {
- public JSONUtilities(final ODataServiceVersion version) throws Exception {
- super(version);
+ public JSONUtilities(final ODataServiceVersion version, final Metadata metadata) throws Exception {
+ super(version, metadata);
}
@Override
@@ -105,7 +105,6 @@ public class JSONUtilities extends AbstractUtilities {
final Iterator<Map.Entry<String, JsonNode>> fieldIter = srcNode.fields();
- final Metadata metadata = Commons.getMetadata(version);
final Map<String, NavigationProperty> navigationProperties = metadata.getNavigationProperties(entitySetName);
while (fieldIter.hasNext()) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/main/java/org/apache/olingo/fit/utils/XMLUtilities.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/XMLUtilities.java b/fit/src/main/java/org/apache/olingo/fit/utils/XMLUtilities.java
index 75c45e9..b4f9969 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/XMLUtilities.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/XMLUtilities.java
@@ -63,8 +63,8 @@ public class XMLUtilities extends AbstractUtilities {
protected static XMLOutputFactory ofactory = null;
- public XMLUtilities(final ODataServiceVersion version) throws Exception {
- super(version);
+ public XMLUtilities(final ODataServiceVersion version, final Metadata metadata) throws Exception {
+ super(version, metadata);
}
@Override
@@ -148,7 +148,6 @@ public class XMLUtilities extends AbstractUtilities {
writer.add(entry.getValue().getStart());
- final Metadata metadata = Commons.getMetadata(version);
final Map<String, NavigationProperty> navigationProperties = metadata.getNavigationProperties(entitySetName);
// add for links
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/main/resources/V40/openTypeMetadata.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/openTypeMetadata.xml b/fit/src/main/resources/V40/openTypeMetadata.xml
index 8c148af..70a02c3 100644
--- a/fit/src/main/resources/V40/openTypeMetadata.xml
+++ b/fit/src/main/resources/V40/openTypeMetadata.xml
@@ -21,7 +21,7 @@
-->
<edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx">
<edmx:DataServices>
- <Schema Namespace="Microsoft.Test.OData.Services.ODataWCFService" xmlns="http://docs.oasis-open.org/odata/ns/edm">
+ <Schema Namespace="Microsoft.Test.OData.Services.OpenTypesService" xmlns="http://docs.oasis-open.org/odata/ns/edm">
<EnumType Name="Color">
<Member Name="Red" Value="1"/>
<Member Name="Green" Value="2"/>
@@ -47,19 +47,19 @@
</Key>
<Property Name="Id" Type="Edm.Guid" Nullable="false"/>
</EntityType>
- <EntityType Name="IndexedRow" BaseType="Microsoft.Test.OData.Services.ODataWCFService.Row" OpenType="true"/>
+ <EntityType Name="IndexedRow" BaseType="Microsoft.Test.OData.Services.OpenTypesService.Row" OpenType="true"/>
<EntityType Name="RowIndex" OpenType="true">
<Key>
<PropertyRef Name="Id"/>
</Key>
<Property Name="Id" Type="Edm.Int32" Nullable="false"/>
- <NavigationProperty Name="Rows" Type="Microsoft.Test.OData.Services.ODataWCFService.Row" Nullable="false"/>
+ <NavigationProperty Name="Rows" Type="Microsoft.Test.OData.Services.OpenTypesService.Row" Nullable="false"/>
</EntityType>
<EntityContainer Name="DefaultContainer">
- <EntitySet Name="Row" EntityType="Microsoft.Test.OData.Services.ODataWCFService.Row">
+ <EntitySet Name="Row" EntityType="Microsoft.Test.OData.Services.OpenTypesService.Row">
<NavigationPropertyBinding Path="Rows" Target="Row"/>
</EntitySet>
- <EntitySet Name="RowIndex" EntityType="Microsoft.Test.OData.Services.ODataWCFService.RowIndex"/>
+ <EntitySet Name="RowIndex" EntityType="Microsoft.Test.OData.Services.OpenTypesService.RowIndex"/>
</EntityContainer>
</Schema>
</edmx:DataServices>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTest.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTest.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTest.java
index e611e3f..a3dfd33 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTest.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTest.java
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertNotNull;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
-import java.util.Locale;
import org.apache.olingo.ext.proxy.EntityContainerFactory;
import org.apache.olingo.ext.proxy.context.EntityContext;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
@@ -68,14 +67,6 @@ public abstract class AbstractTest {
protected static DefaultContainer container;
- /**
- * This is needed for correct number handling (Double, for example).
- */
- @BeforeClass
- public static void setEnglishLocale() {
- Locale.setDefault(Locale.ENGLISH);
- }
-
@BeforeClass
public static void setUpODataServiceRoot() throws IOException {
testStaticServiceRootURL = "http://localhost:9080/stub/StaticService/V30/Static.svc";
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AuthEntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AuthEntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AuthEntityRetrieveTestITCase.java
index c995f2b..40543e9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AuthEntityRetrieveTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AuthEntityRetrieveTestITCase.java
@@ -43,7 +43,7 @@ public class AuthEntityRetrieveTestITCase extends EntityRetrieveTestITCase {
@BeforeClass
public static void setupContaner() {
- containerFactory = EntityContainerFactory.getV3Instance(testAuthServiceRootURL);
+ containerFactory = EntityContainerFactory.getV3(testAuthServiceRootURL);
container = containerFactory.getEntityContainer(DefaultContainer.class);
assertNotNull(container);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java
index 9444b0e..ca33252 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java
@@ -81,7 +81,7 @@ public class EntityRetrieveTestITCase extends AbstractTest {
protected DefaultContainer getContainer() {
return container;
}
-
+
@Test
public void exists() {
assertTrue(getContainer().getCar().exists(15));
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
index b7a9cc5..21f037a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
index f812916..f6d6b14 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
index 134b3c8..0e61b57 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
index 21e7b56..9f5f00c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
index 089c62b..2ecb362 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
index 7a6830b..8c2c842 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
index c9f42e9..18f23cc 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
index 6cc45d2..80eda13 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
@@ -28,7 +28,6 @@ import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
index e8ad45f..b091269 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
index e07e5b1..f194888 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java
index c62f7cc..9717fbb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
index f56cfa5..0111069 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
index 90d33dd..f7bec52 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
index 31a65e0..0662bb2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
index b11cf1f..e3d46c7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
index af9daf7..2f399e4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
index a24642f..d0bb9ff 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
index 4cbe005..a2c9730 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
index 3230522..ee88968 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
index 12caafd..ac2d569 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
index 580d485..6bda5af 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
index 9362449..e8ee8f0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
index 4832109..fd7acdc 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
index 8b21bc3..e3f0cae 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
index 49fdfff..a97bfc9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
index 7417bad..f4a26df 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -48,10 +47,12 @@ import javax.xml.datatype.Duration;
public interface Aliases extends Serializable {
+
@Property(name = "AlternativeNames", type = "Edm.String", nullable = false)
Collection<String> getAlternativeNames();
void setAlternativeNames(final Collection<String> _alternativeNames);
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
index b43f0af..e85ce76 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -61,6 +60,7 @@ public interface AllSpatialCollectionTypes
extends Serializable {
+
@Key
@Property(name = "Id",
type = "Edm.Int32",
@@ -82,9 +82,11 @@ public interface AllSpatialCollectionTypes
fcKeepInContent = false)
Integer getId();
- void setId(final Integer _id);
+ void setId(final Integer _id);
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
index 0f4e93b..d192f52 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
index a7d27a7..ff486d0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -62,6 +61,7 @@ public interface AllSpatialCollectionTypes_Simple
extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes {
+
@Key
@Property(name = "Id",
type = "Edm.Int32",
@@ -83,7 +83,7 @@ public interface AllSpatialCollectionTypes_Simple
fcKeepInContent = false)
Integer getId();
- void setId(final Integer _id);
+ void setId(final Integer _id);
@Property(name = "ManyGeogPoint",
@@ -106,7 +106,7 @@ public interface AllSpatialCollectionTypes_Simple
fcKeepInContent = false)
Collection<Point> getManyGeogPoint();
- void setManyGeogPoint(final Collection<Point> _manyGeogPoint);
+ void setManyGeogPoint(final Collection<Point> _manyGeogPoint);
@Property(name = "ManyGeogLine",
@@ -129,7 +129,7 @@ public interface AllSpatialCollectionTypes_Simple
fcKeepInContent = false)
Collection<LineString> getManyGeogLine();
- void setManyGeogLine(final Collection<LineString> _manyGeogLine);
+ void setManyGeogLine(final Collection<LineString> _manyGeogLine);
@Property(name = "ManyGeogPolygon",
@@ -152,7 +152,7 @@ public interface AllSpatialCollectionTypes_Simple
fcKeepInContent = false)
Collection<Polygon> getManyGeogPolygon();
- void setManyGeogPolygon(final Collection<Polygon> _manyGeogPolygon);
+ void setManyGeogPolygon(final Collection<Polygon> _manyGeogPolygon);
@Property(name = "ManyGeomPoint",
@@ -175,7 +175,7 @@ public interface AllSpatialCollectionTypes_Simple
fcKeepInContent = false)
Collection<Point> getManyGeomPoint();
- void setManyGeomPoint(final Collection<Point> _manyGeomPoint);
+ void setManyGeomPoint(final Collection<Point> _manyGeomPoint);
@Property(name = "ManyGeomLine",
@@ -198,7 +198,7 @@ public interface AllSpatialCollectionTypes_Simple
fcKeepInContent = false)
Collection<LineString> getManyGeomLine();
- void setManyGeomLine(final Collection<LineString> _manyGeomLine);
+ void setManyGeomLine(final Collection<LineString> _manyGeomLine);
@Property(name = "ManyGeomPolygon",
@@ -221,9 +221,11 @@ public interface AllSpatialCollectionTypes_Simple
fcKeepInContent = false)
Collection<Polygon> getManyGeomPolygon();
- void setManyGeomPolygon(final Collection<Polygon> _manyGeomPolygon);
+ void setManyGeomPolygon(final Collection<Polygon> _manyGeomPolygon);
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
index 169ed6a..5a7f81b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;