diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java index 5b031f20b..3ffb6bea9 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java @@ -48,7 +48,7 @@ import org.apache.olingo.ext.proxy.api.OperationType; import org.apache.olingo.ext.proxy.api.annotations.Operation; import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.ext.proxy.utils.ClassUtils; -import org.apache.olingo.ext.proxy.utils.EngineUtils; +import org.apache.olingo.ext.proxy.utils.CoreUtils; abstract class AbstractInvocationHandler> implements InvocationHandler { @@ -171,7 +171,7 @@ abstract class AbstractInvocationHandler typeRef, final Object internal, final EntityContainerInvocationHandler containerHandler) { + super(client, containerHandler); this.internal = internal; this.typeRef = typeRef; @@ -78,7 +79,8 @@ public abstract class AbstractTypeInvocationHandler typeRef, final Object internal, final EntityTypeInvocationHandler targetHandler) { - super(client, targetHandler.containerHandler); + + super(client, targetHandler == null ? null : targetHandler.containerHandler); this.internal = internal; this.typeRef = typeRef; this.targetHandler = targetHandler; diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexTypeInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexTypeInvocationHandler.java index 05aa7ff6e..76bfe7f81 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexTypeInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexTypeInvocationHandler.java @@ -38,7 +38,7 @@ import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; import org.apache.olingo.ext.proxy.api.annotations.Property; import org.apache.olingo.ext.proxy.context.AttachedEntityStatus; import org.apache.olingo.ext.proxy.utils.ClassUtils; -import org.apache.olingo.ext.proxy.utils.EngineUtils; +import org.apache.olingo.ext.proxy.utils.CoreUtils; public class ComplexTypeInvocationHandler> extends AbstractTypeInvocationHandler { @@ -51,15 +51,16 @@ public class ComplexTypeInvocationHandler typeRef, final EntityTypeInvocationHandler handler) { - return new ComplexTypeInvocationHandler(complex, typeRef, handler); + return new ComplexTypeInvocationHandler(handler.targetHandler.getClient(), complex, typeRef, handler); } - private ComplexTypeInvocationHandler( + public ComplexTypeInvocationHandler( + final C client, final ODataComplexValue complex, final Class typeRef, final EntityTypeInvocationHandler handler) { - super(handler.containerHandler.getClient(), typeRef, complex, handler); + super(client, typeRef, complex, handler); } public void setComplex(final ODataComplexValue complex) { @@ -84,13 +85,12 @@ public class ComplexTypeInvocationHandler[] {(Class) type}, newComplex(name, (Class) type)); - EngineUtils.populate( + CoreUtils.populate( client.getCachedEdm(), res, (Class) type, @@ -98,8 +98,8 @@ public class ComplexTypeInvocationHandler property : handler.getLinkChanges().entrySet()) { @@ -409,7 +409,7 @@ class ContainerImpl implements Container { final URI targetURI = currentStatus == AttachedEntityStatus.NEW ? URI.create("$" + startingPos) : URIUtils.getURI( factory.getServiceRoot(), - EngineUtils.getEditMediaLink(streamedChanges.getKey(), entity).toASCIIString()); + CoreUtils.getEditMediaLink(streamedChanges.getKey(), entity).toASCIIString()); batchUpdateMediaResource(handler, targetURI, streamedChanges.getValue(), changeset); diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java index 244db5065..9b14fd172 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java @@ -221,7 +221,7 @@ class EntitySetInvocationHandler, T ext } @Override - public T get(KEY key) throws IllegalArgumentException { + public T get(final KEY key) throws IllegalArgumentException { return get(key, typeRef); } diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityTypeInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityTypeInvocationHandler.java index 7c4ea377b..242e85343 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityTypeInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityTypeInvocationHandler.java @@ -38,6 +38,7 @@ import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.commons.api.domain.CommonODataEntity; import org.apache.olingo.commons.api.domain.CommonODataProperty; import org.apache.olingo.commons.api.domain.ODataLinked; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataMediaFormat; import org.apache.olingo.ext.proxy.api.annotations.EntityType; @@ -45,7 +46,7 @@ import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; import org.apache.olingo.ext.proxy.api.annotations.Property; import org.apache.olingo.ext.proxy.context.AttachedEntityStatus; import org.apache.olingo.ext.proxy.context.EntityUUID; -import org.apache.olingo.ext.proxy.utils.EngineUtils; +import org.apache.olingo.ext.proxy.utils.CoreUtils; public class EntityTypeInvocationHandler> extends AbstractTypeInvocationHandler { @@ -106,7 +107,7 @@ public class EntityTypeInvocationHandler[] {(Class) type}, newComplex(name, (Class) type)); - EngineUtils.populate( + CoreUtils.populate( client.getCachedEdm(), res, (Class) type, Property.class, property.getValue().asComplex().iterator()); } else { - res = type == null - ? EngineUtils.getValueFromProperty(client.getCachedEdm(), property) - : EngineUtils.getValueFromProperty(client.getCachedEdm(), property, type); + ? CoreUtils.getValueFromProperty(client, property) + : CoreUtils.getValueFromProperty(client, property, type); if (res != null) { addPropertyChanges(name, res, false); @@ -257,7 +257,7 @@ public class EntityTypeInvocationHandler) { + final Class typeRef = ((ComplexTypeInvocationHandler)obj).getTypeRef(); + final Object complex = Proxy.newProxyInstance( + Thread.currentThread().getContextClassLoader(), + new Class[] {typeRef}, + (ComplexTypeInvocationHandler)obj); + + for (Method method : typeRef.getMethods()) { final Property complexPropertyAnn = method.getAnnotation(Property.class); try { if (complexPropertyAnn != null) { value.asComplex().add(getODataComplexProperty( - client, type.getFullQualifiedName(), complexPropertyAnn.name(), method.invoke(obj))); + client, type.getFullQualifiedName(), complexPropertyAnn.name(), method.invoke(complex))); } } catch (Exception ignore) { // ignore value @@ -132,7 +140,7 @@ public final class EngineUtils { final FullQualifiedName entity, final String property, final Object obj) { - + final EdmType edmType = client.getCachedEdm().getEntityType(entity).getProperty(property).getType(); final EdmTypeInfo type = new EdmTypeInfo.Builder(). setEdm(client.getCachedEdm()).setTypeExpression(edmType.getFullQualifiedName().toString()).build(); @@ -145,7 +153,7 @@ public final class EngineUtils { final FullQualifiedName complex, final String property, final Object obj) { - + final EdmType edmType = client.getCachedEdm().getComplexType(complex).getProperty(property).getType(); final EdmTypeInfo type = new EdmTypeInfo.Builder(). setEdm(client.getCachedEdm()).setTypeExpression(edmType.getFullQualifiedName().toString()).build(); @@ -155,7 +163,7 @@ public final class EngineUtils { public static CommonODataProperty getODataProperty( final CommonEdmEnabledODataClient client, final String name, final EdmTypeInfo type, final Object obj) { - + CommonODataProperty oprop; try { @@ -261,7 +269,7 @@ public final class EngineUtils { final Object bean, final Class getterAnn, final Iterator propItor) { - + if (bean != null) { populate(metadata, bean, bean.getClass(), getterAnn, propItor); } @@ -329,7 +337,8 @@ public final class EngineUtils { } @SuppressWarnings("unchecked") - public static Object getValueFromProperty(final Edm metadata, final CommonODataProperty property) + public static Object getValueFromProperty( + final CommonEdmEnabledODataClient client, final CommonODataProperty property) throws InstantiationException, IllegalAccessException { final Object value; @@ -347,15 +356,15 @@ public final class EngineUtils { } if (odataValue.isComplex()) { final Object collItem = - buildComplexInstance(metadata, property.getName(), odataValue.asComplex().iterator()); + buildComplexInstance(client.getCachedEdm(), property.getName(), odataValue.asComplex().iterator()); ((Collection) value).add(collItem); } } } else if (property.hasPrimitiveValue()) { value = primitiveValueToObject(property.getPrimitiveValue()); } else if (property.hasComplexValue()) { - value = buildComplexInstance( - metadata, property.getValue().asComplex().getTypeName(), property.getValue().asComplex().iterator()); + value = buildComplexInstance(client.getCachedEdm(), property.getValue().asComplex().getTypeName(), + property.getValue().asComplex().iterator()); } else { throw new IllegalArgumentException("Invalid property " + property); } @@ -381,7 +390,8 @@ public final class EngineUtils { } @SuppressWarnings({"unchecked", "rawtypes"}) - public static Object getValueFromProperty(final Edm metadata, final CommonODataProperty property, final Type type) + public static Object getValueFromProperty( + final CommonEdmEnabledODataClient client, final CommonODataProperty property, final Type type) throws InstantiationException, IllegalAccessException { final Object value; @@ -401,8 +411,11 @@ public final class EngineUtils { ((Collection) value).add(primitiveValueToObject(odataValue.asPrimitive())); } if (odataValue.isComplex()) { - final Object collItem = collItemClass.newInstance(); - populate(metadata, collItem, Property.class, odataValue.asComplex().iterator()); + final Object collItem = Proxy.newProxyInstance( + Thread.currentThread().getContextClassLoader(), + new Class[] {collItemClass}, + new ComplexTypeInvocationHandler(client, odataValue.asComplex(), collItemClass, null)); + populate(client.getCachedEdm(), collItem, Property.class, odataValue.asComplex().iterator()); ((Collection) value).add(collItem); } } diff --git a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractMetadataMojo.java b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractMetadataMojo.java index 23477619e..065e17207 100644 --- a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractMetadataMojo.java +++ b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractMetadataMojo.java @@ -105,7 +105,6 @@ public abstract class AbstractMetadataMojo extends AbstractMojo { } protected VelocityContext newContext() { - final VelocityContext ctx = new VelocityContext(); ctx.put("utility", getUtility()); diff --git a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java index 1a0ebf20d..052f41596 100644 --- a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java +++ b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java @@ -158,7 +158,6 @@ public abstract class AbstractUtility { } public EdmFunction getFunctionByName(final FullQualifiedName name) { - final EdmSchema targetSchema = metadata.getSchema(name.getNamespace()); if (targetSchema != null) { @@ -173,7 +172,6 @@ public abstract class AbstractUtility { } public EdmAction getActionByName(final FullQualifiedName name) { - final EdmSchema targetSchema = metadata.getSchema(name.getNamespace()); if (targetSchema != null) { @@ -188,7 +186,6 @@ public abstract class AbstractUtility { } public List getFunctionsBoundTo(final String typeExpression, final boolean collection) { - final List result = new ArrayList(); for (EdmSchema sch : getMetadata().getSchemas()) { @@ -210,7 +207,6 @@ public abstract class AbstractUtility { } public List getActionsBoundTo(final String typeExpression, final boolean collection) { - final List result = new ArrayList(); for (EdmSchema sch : getMetadata().getSchemas()) { diff --git a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/V3MetadataMojo.java b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/V3MetadataMojo.java index 28bcdd050..9ab6f482f 100644 --- a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/V3MetadataMojo.java +++ b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/V3MetadataMojo.java @@ -47,139 +47,138 @@ import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; @Mojo(name = "pojosV3", defaultPhase = LifecyclePhase.PROCESS_SOURCES) public class V3MetadataMojo extends AbstractMetadataMojo { - @Override - protected V3Utility getUtility() { - return (V3Utility) utility; + @Override + protected V3Utility getUtility() { + return (V3Utility) utility; + } + + @Override + protected String getVersion() { + return ODataServiceVersion.V30.name().toLowerCase(); + } + + @Override + public void execute() throws MojoExecutionException { + if (new File(outputDirectory + File.separator + TOOL_DIR).exists()) { + getLog().info("Nothing to do because " + TOOL_DIR + " directory already exists. Clean to update."); + return; } - @Override - protected String getVersion() { - return ODataServiceVersion.V30.name().toLowerCase(); - } + try { + Velocity.addProperty(Velocity.RESOURCE_LOADER, "class"); + Velocity.addProperty("class.resource.loader.class", ClasspathResourceLoader.class.getName()); - @Override - public void execute() throws MojoExecutionException { - if (new File(outputDirectory + File.separator + TOOL_DIR).exists()) { - getLog().info("Nothing to do because " + TOOL_DIR + " directory already exists. Clean to update."); - return; + final Edm metadata = ODataClientFactory.getV3().getRetrieveRequestFactory(). + getMetadataRequest(serviceRootURL).execute().getBody(); + + if (metadata == null) { + throw new IllegalStateException("Metadata not found"); + } + + for (EdmSchema schema : metadata.getSchemas()) { + namespaces.add(schema.getNamespace().toLowerCase()); + } + + final Set complexTypeNames = new HashSet(); + final File services = mkdir("META-INF/services"); + + for (EdmSchema schema : metadata.getSchemas()) { + utility = new V3Utility(metadata, schema, basePackage); + + // write package-info for the base package + final String schemaPath = utility.getNamespace().toLowerCase().replace('.', File.separatorChar); + final File base = mkPkgDir(schemaPath); + final String pkg = basePackage + "." + utility.getNamespace().toLowerCase(); + parseObj(base, pkg, "package-info", "package-info.java"); + + // write package-info for types package + final File typesBaseDir = mkPkgDir(schemaPath + "/types"); + final String typesPkg = pkg + ".types"; + parseObj(typesBaseDir, typesPkg, "package-info", "package-info.java"); + + final Map objs = new HashMap(); + + // write types into types package + for (EdmEnumType enumType : schema.getEnumTypes()) { + final String className = utility.capitalize(enumType.getName()); + objs.clear(); + objs.put("enumType", enumType); + parseObj(typesBaseDir, typesPkg, "enumType", className + ".java", objs); } - try { - Velocity.addProperty(Velocity.RESOURCE_LOADER, "class"); - Velocity.addProperty("class.resource.loader.class", ClasspathResourceLoader.class.getName()); - - final Edm metadata = - ODataClientFactory.getV3().getRetrieveRequestFactory().getMetadataRequest(serviceRootURL).execute(). - getBody(); - - if (metadata == null) { - throw new IllegalStateException("Metadata not found"); - } - - for (EdmSchema schema : metadata.getSchemas()) { - namespaces.add(schema.getNamespace().toLowerCase()); - } - - final Set complexTypeNames = new HashSet(); - final File services = mkdir("META-INF/services"); - - for (EdmSchema schema : metadata.getSchemas()) { - utility = new V3Utility(metadata, schema, basePackage); - - // write package-info for the base package - final String schemaPath = utility.getNamespace().toLowerCase().replace('.', File.separatorChar); - final File base = mkPkgDir(schemaPath); - final String pkg = basePackage + "." + utility.getNamespace().toLowerCase(); - parseObj(base, pkg, "package-info", "package-info.java"); - - // write package-info for types package - final File typesBaseDir = mkPkgDir(schemaPath + "/types"); - final String typesPkg = pkg + ".types"; - parseObj(typesBaseDir, typesPkg, "package-info", "package-info.java"); - - final Map objs = new HashMap(); - - // write types into types package - for (EdmEnumType enumType : schema.getEnumTypes()) { - final String className = utility.capitalize(enumType.getName()); - objs.clear(); - objs.put("enumType", enumType); - parseObj(typesBaseDir, typesPkg, "enumType", className + ".java", objs); - } - - for (EdmComplexType complex : schema.getComplexTypes()) { - final String className = utility.capitalize(complex.getName()); - complexTypeNames.add(typesPkg + "." + className); - objs.clear(); - objs.put("complexType", complex); - parseObj(typesBaseDir, typesPkg, "complexType", className + ".java", objs); - } - - for (EdmEntityType entity : schema.getEntityTypes()) { - objs.clear(); - objs.put("entityType", entity); - - final Map keys; - - EdmEntityType baseType = null; - if (entity.getBaseType() == null) { - keys = getUtility().getEntityKeyType(entity); - } else { - baseType = entity.getBaseType(); - objs.put("baseType", getUtility().getJavaType(baseType.getFullQualifiedName().toString())); - while (baseType.getBaseType() != null) { - baseType = baseType.getBaseType(); - } - keys = getUtility().getEntityKeyType(baseType); - } - - if (keys.size() > 1) { - // create compound key class - final String keyClassName = utility.capitalize(baseType == null - ? entity.getName() - : baseType.getName()) + "Key"; - objs.put("keyRef", keyClassName); - - if (entity.getBaseType() == null) { - objs.put("keys", keys); - parseObj(typesBaseDir, typesPkg, "entityTypeKey", keyClassName + ".java", objs); - } - } - - parseObj(typesBaseDir, typesPkg, "entityType", - utility.capitalize(entity.getName()) + ".java", objs); - parseObj(typesBaseDir, typesPkg, "entityCollection", - utility.capitalize(entity.getName()) + "Collection.java", objs); - } - - // write container and top entity sets into the base package - for (EdmEntityContainer container : schema.getEntityContainers()) { - objs.clear(); - objs.put("container", container); - objs.put("namespace", schema.getNamespace()); - parseObj(base, pkg, "container", - utility.capitalize(container.getName()) + ".java", objs); - - for (EdmEntitySet entitySet : container.getEntitySets()) { - objs.clear(); - objs.put("entitySet", entitySet); - parseObj(base, pkg, "entitySet", - utility.capitalize(entitySet.getName()) + ".java", objs); - } - } - - parseObj(services, true, null, "services", "org.apache.olingo.ext.proxy.api.AbstractComplexType", - Collections.singletonMap("services", (Object) complexTypeNames)); - } - } catch (Exception t) { - final StringWriter stringWriter = new StringWriter(); - final PrintWriter printWriter = new PrintWriter(stringWriter); - t.printStackTrace(printWriter); - getLog().error(stringWriter.toString()); - - throw (t instanceof MojoExecutionException) - ? (MojoExecutionException) t - : new MojoExecutionException("While executin mojo", t); + for (EdmComplexType complex : schema.getComplexTypes()) { + final String className = utility.capitalize(complex.getName()); + complexTypeNames.add(typesPkg + "." + className); + objs.clear(); + objs.put("complexType", complex); + parseObj(typesBaseDir, typesPkg, "complexType", className + ".java", objs); } + + for (EdmEntityType entity : schema.getEntityTypes()) { + objs.clear(); + objs.put("entityType", entity); + + final Map keys; + + EdmEntityType baseType = null; + if (entity.getBaseType() == null) { + keys = getUtility().getEntityKeyType(entity); + } else { + baseType = entity.getBaseType(); + objs.put("baseType", getUtility().getJavaType(baseType.getFullQualifiedName().toString())); + while (baseType.getBaseType() != null) { + baseType = baseType.getBaseType(); + } + keys = getUtility().getEntityKeyType(baseType); + } + + if (keys.size() > 1) { + // create compound key class + final String keyClassName = utility.capitalize(baseType == null + ? entity.getName() + : baseType.getName()) + "Key"; + objs.put("keyRef", keyClassName); + + if (entity.getBaseType() == null) { + objs.put("keys", keys); + parseObj(typesBaseDir, typesPkg, "entityTypeKey", keyClassName + ".java", objs); + } + } + + parseObj(typesBaseDir, typesPkg, "entityType", + utility.capitalize(entity.getName()) + ".java", objs); + parseObj(typesBaseDir, typesPkg, "entityCollection", + utility.capitalize(entity.getName()) + "Collection.java", objs); + } + + // write container and top entity sets into the base package + for (EdmEntityContainer container : schema.getEntityContainers()) { + objs.clear(); + objs.put("container", container); + objs.put("namespace", schema.getNamespace()); + parseObj(base, pkg, "container", + utility.capitalize(container.getName()) + ".java", objs); + + for (EdmEntitySet entitySet : container.getEntitySets()) { + objs.clear(); + objs.put("entitySet", entitySet); + parseObj(base, pkg, "entitySet", + utility.capitalize(entitySet.getName()) + ".java", objs); + } + } + + parseObj(services, true, null, "services", "org.apache.olingo.ext.proxy.api.AbstractComplexType", + Collections.singletonMap("services", (Object) complexTypeNames)); + } + } catch (Exception t) { + final StringWriter stringWriter = new StringWriter(); + final PrintWriter printWriter = new PrintWriter(stringWriter); + t.printStackTrace(printWriter); + getLog().error(stringWriter.toString()); + + throw (t instanceof MojoExecutionException) + ? (MojoExecutionException) t + : new MojoExecutionException("While executing mojo", t); } + } } diff --git a/ext/pojogen-maven-plugin/src/main/resources/complexType.vm b/ext/pojogen-maven-plugin/src/main/resources/complexType.vm index 05bc161d8..ba03282bc 100644 --- a/ext/pojogen-maven-plugin/src/main/resources/complexType.vm +++ b/ext/pojogen-maven-plugin/src/main/resources/complexType.vm @@ -27,7 +27,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; diff --git a/ext/pojogen-maven-plugin/src/main/resources/container.vm b/ext/pojogen-maven-plugin/src/main/resources/container.vm index 40fc44ad2..0692ad6df 100644 --- a/ext/pojogen-maven-plugin/src/main/resources/container.vm +++ b/ext/pojogen-maven-plugin/src/main/resources/container.vm @@ -31,7 +31,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; diff --git a/ext/pojogen-maven-plugin/src/main/resources/entityCollection.vm b/ext/pojogen-maven-plugin/src/main/resources/entityCollection.vm index b48e2de3a..c2d49c81d 100644 --- a/ext/pojogen-maven-plugin/src/main/resources/entityCollection.vm +++ b/ext/pojogen-maven-plugin/src/main/resources/entityCollection.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; @@ -46,8 +45,8 @@ import java.util.Calendar; import javax.xml.datatype.Duration; public interface $utility.capitalize($entityType.Name)Collection extends AbstractEntityCollection<$utility.capitalize($entityType.Name)> { -#set( $functions = $utility.getFunctionsBoundTo($entityType.Name, false) ) -#set( $actions = $utility.getActionsBoundTo($entityType.Name, false) ) +#set( $functions = $utility.getFunctionsBoundTo($entityType.Name, true) ) +#set( $actions = $utility.getActionsBoundTo($entityType.Name, true) ) #if( $functions.size() > 0 || $actions.size() > 0 ) Operations operations(); diff --git a/ext/pojogen-maven-plugin/src/main/resources/entitySet.vm b/ext/pojogen-maven-plugin/src/main/resources/entitySet.vm index 378eb8f6b..e98ed977f 100644 --- a/ext/pojogen-maven-plugin/src/main/resources/entitySet.vm +++ b/ext/pojogen-maven-plugin/src/main/resources/entitySet.vm @@ -27,7 +27,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; diff --git a/ext/pojogen-maven-plugin/src/main/resources/entityType.vm b/ext/pojogen-maven-plugin/src/main/resources/entityType.vm index e5873a185..3386d6be6 100644 --- a/ext/pojogen-maven-plugin/src/main/resources/entityType.vm +++ b/ext/pojogen-maven-plugin/src/main/resources/entityType.vm @@ -37,7 +37,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; @@ -95,7 +94,7 @@ public interface $utility.capitalize($entityType.Name) fcKeepInContent = #if($fcprops.containsKey("fcKeepInContent"))$fcprops.get("fcKeepInContent")#{else}false#end) $utility.getJavaType($property.Type, $property.Collection) get$utility.capitalize($property.Name)(); - void set$utility.capitalize($property.Name)(final $utility.getJavaType($property.Type, $property.Collection) _$utility.uncapitalize($property.Name)); + void set$utility.capitalize($property.Name)(final $utility.getJavaType($property.Type, $property.Collection) _$utility.uncapitalize($property.Name)); #if($utility.isComplex($property.Type.FullQualifiedName))#* *#$utility.getJavaType($property.Type) new$utility.capitalize($property.Name)(); #end diff --git a/ext/pojogen-maven-plugin/src/main/resources/entityTypeKey.vm b/ext/pojogen-maven-plugin/src/main/resources/entityTypeKey.vm index fe6b7f382..143ae5e10 100644 --- a/ext/pojogen-maven-plugin/src/main/resources/entityTypeKey.vm +++ b/ext/pojogen-maven-plugin/src/main/resources/entityTypeKey.vm @@ -32,7 +32,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; diff --git a/ext/pojogen-maven-plugin/src/main/resources/singleton.vm b/ext/pojogen-maven-plugin/src/main/resources/singleton.vm index b6b97b731..ed7a96622 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; 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 1a3cb88b9..05ec9f1df 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 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 property : entityType.getPropertyMap().entrySet()) { if (entry.getProperty(property.getKey()) == null && property.getValue().isNullable()) { 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 b87b6386b..6e42d1685 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) { 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 32e0073c9..e669478db 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) { 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 4c08cf939..0db1d80e4 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 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 8f54ede76..2035a1f81 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) { 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 7eb99d9c7..9e8f0501b 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) { 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 39d1fca93..fb31f09c4 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 providedAsync = new HashMap(); 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((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) { 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 122a8be8f..8271e53d8 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 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 f08c36b93..90f51d57f 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 properties; private final Map 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 getNavigationProperties() { return new HashSet(navigationProperties.values()); } 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 b55f91d0a..543fae75a 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; 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 9ff37d755..b7f2fd699 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 navigationProperties = - Commons.getMetadata(version).getNavigationProperties(entitySetName); + final Map navigationProperties = metadata.getNavigationProperties(entitySetName); // ----------------------------------------- // 0. Retrieve navigation links to be kept @@ -363,7 +365,6 @@ public abstract class AbstractUtilities { final HashSet uris = new HashSet(); - final Metadata metadata = Commons.getMetadata(version); final Map 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 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 navigationProperties = metadata.getNavigationProperties(entitySetName); return readEntities( 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 d99ac57fd..74c228442 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); 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 4ecc5a23f..ad060bad1 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"); 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 e5f785064..bddb01729 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 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 navProperties = entityType == null ? Collections.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; 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 ae89ec447..4ad3871c6 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 container, final String relativePath) - throws IOException { + public void putInMemory(final ResWrap 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) { 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 55cfb2dcd..7c6a54b2b 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> fieldIter = srcNode.fields(); - final Metadata metadata = Commons.getMetadata(version); final Map navigationProperties = metadata.getNavigationProperties(entitySetName); while (fieldIter.hasNext()) { 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 75c45e9be..b4f99693a 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 navigationProperties = metadata.getNavigationProperties(entitySetName); // add for links diff --git a/fit/src/main/resources/V40/openTypeMetadata.xml b/fit/src/main/resources/V40/openTypeMetadata.xml index 8c148af3b..70a02c37e 100644 --- a/fit/src/main/resources/V40/openTypeMetadata.xml +++ b/fit/src/main/resources/V40/openTypeMetadata.xml @@ -21,7 +21,7 @@ --> - + @@ -47,19 +47,19 @@ - + - + - + - + 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 e611e3fed..a3dfd330a 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"; 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 c995f2b38..40543e9e5 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); } 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 9444b0ea5..ca332523c 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)); 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 b7a9cc5f8..21f037a80 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; 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 f812916ee..f6d6b14ec 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; 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 134b3c81c..0e61b57a3 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; 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 21e7b56f0..9f5f00cfe 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; 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 089c62bb6..2ecb3625e 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; 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 7a6830b26..8c2c84221 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; 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 c9f42e997..18f23ccc1 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; 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 6cc45d2b4..80eda13a3 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; 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 e8ad45ff5..b091269e9 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; 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 e07e5b188..f1948885f 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; 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 c62f7ccc9..9717fbb5b 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; 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 f56cfa51b..011106934 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; 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 90d33dd55..f7bec5251 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; 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 31a65e0c7..0662bb217 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; 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 b11cf1f0e..e3d46c7e9 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; 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 af9daf716..2f399e41b 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; 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 a24642f73..d0bb9ff19 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; 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 4cbe005c4..a2c9730d3 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; 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 3230522f0..ee88968b6 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; 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 12caafdc0..ac2d569ac 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; 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 580d4854c..6bda5af5d 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; 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 9362449ac..e8ee8f093 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; 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 48321091b..fd7acdc63 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; 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 8b21bc32b..e3f0cae47 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; 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 49fdfff04..a97bfc987 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; 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 7417badad..f4a26df6d 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 getAlternativeNames(); void setAlternativeNames(final Collection _alternativeNames); + } 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 b43f0aff6..e85ce7667 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); + + } 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 0f4e93beb..d192f52db 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; 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 a7d27a77b..ff486d07e 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 getManyGeogPoint(); - void setManyGeogPoint(final Collection _manyGeogPoint); + void setManyGeogPoint(final Collection _manyGeogPoint); @Property(name = "ManyGeogLine", @@ -129,7 +129,7 @@ public interface AllSpatialCollectionTypes_Simple fcKeepInContent = false) Collection getManyGeogLine(); - void setManyGeogLine(final Collection _manyGeogLine); + void setManyGeogLine(final Collection _manyGeogLine); @Property(name = "ManyGeogPolygon", @@ -152,7 +152,7 @@ public interface AllSpatialCollectionTypes_Simple fcKeepInContent = false) Collection getManyGeogPolygon(); - void setManyGeogPolygon(final Collection _manyGeogPolygon); + void setManyGeogPolygon(final Collection _manyGeogPolygon); @Property(name = "ManyGeomPoint", @@ -175,7 +175,7 @@ public interface AllSpatialCollectionTypes_Simple fcKeepInContent = false) Collection getManyGeomPoint(); - void setManyGeomPoint(final Collection _manyGeomPoint); + void setManyGeomPoint(final Collection _manyGeomPoint); @Property(name = "ManyGeomLine", @@ -198,7 +198,7 @@ public interface AllSpatialCollectionTypes_Simple fcKeepInContent = false) Collection getManyGeomLine(); - void setManyGeomLine(final Collection _manyGeomLine); + void setManyGeomLine(final Collection _manyGeomLine); @Property(name = "ManyGeomPolygon", @@ -221,9 +221,11 @@ public interface AllSpatialCollectionTypes_Simple fcKeepInContent = false) Collection getManyGeomPolygon(); - void setManyGeomPolygon(final Collection _manyGeomPolygon); + void setManyGeomPolygon(final Collection _manyGeomPolygon); + + } 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 169ed6a3c..5a7f81b20 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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java index f0898d52a..3d18d0d45 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.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 AllSpatialTypes extends Serializable { + @Key @Property(name = "Id", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface AllSpatialTypes fcKeepInContent = false) Integer getId(); - void setId(final Integer _id); + void setId(final Integer _id); @Property(name = "Geog", @@ -105,7 +105,7 @@ public interface AllSpatialTypes fcKeepInContent = false) Geospatial getGeog(); - void setGeog(final Geospatial _geog); + void setGeog(final Geospatial _geog); @Property(name = "GeogPoint", @@ -128,7 +128,7 @@ public interface AllSpatialTypes fcKeepInContent = false) Point getGeogPoint(); - void setGeogPoint(final Point _geogPoint); + void setGeogPoint(final Point _geogPoint); @Property(name = "GeogLine", @@ -151,7 +151,7 @@ public interface AllSpatialTypes fcKeepInContent = false) LineString getGeogLine(); - void setGeogLine(final LineString _geogLine); + void setGeogLine(final LineString _geogLine); @Property(name = "GeogPolygon", @@ -174,7 +174,7 @@ public interface AllSpatialTypes fcKeepInContent = false) Polygon getGeogPolygon(); - void setGeogPolygon(final Polygon _geogPolygon); + void setGeogPolygon(final Polygon _geogPolygon); @Property(name = "GeogCollection", @@ -197,7 +197,7 @@ public interface AllSpatialTypes fcKeepInContent = false) GeospatialCollection getGeogCollection(); - void setGeogCollection(final GeospatialCollection _geogCollection); + void setGeogCollection(final GeospatialCollection _geogCollection); @Property(name = "GeogMultiPoint", @@ -220,7 +220,7 @@ public interface AllSpatialTypes fcKeepInContent = false) MultiPoint getGeogMultiPoint(); - void setGeogMultiPoint(final MultiPoint _geogMultiPoint); + void setGeogMultiPoint(final MultiPoint _geogMultiPoint); @Property(name = "GeogMultiLine", @@ -243,7 +243,7 @@ public interface AllSpatialTypes fcKeepInContent = false) MultiLineString getGeogMultiLine(); - void setGeogMultiLine(final MultiLineString _geogMultiLine); + void setGeogMultiLine(final MultiLineString _geogMultiLine); @Property(name = "GeogMultiPolygon", @@ -266,7 +266,7 @@ public interface AllSpatialTypes fcKeepInContent = false) MultiPolygon getGeogMultiPolygon(); - void setGeogMultiPolygon(final MultiPolygon _geogMultiPolygon); + void setGeogMultiPolygon(final MultiPolygon _geogMultiPolygon); @Property(name = "Geom", @@ -289,7 +289,7 @@ public interface AllSpatialTypes fcKeepInContent = false) Geospatial getGeom(); - void setGeom(final Geospatial _geom); + void setGeom(final Geospatial _geom); @Property(name = "GeomPoint", @@ -312,7 +312,7 @@ public interface AllSpatialTypes fcKeepInContent = false) Point getGeomPoint(); - void setGeomPoint(final Point _geomPoint); + void setGeomPoint(final Point _geomPoint); @Property(name = "GeomLine", @@ -335,7 +335,7 @@ public interface AllSpatialTypes fcKeepInContent = false) LineString getGeomLine(); - void setGeomLine(final LineString _geomLine); + void setGeomLine(final LineString _geomLine); @Property(name = "GeomPolygon", @@ -358,7 +358,7 @@ public interface AllSpatialTypes fcKeepInContent = false) Polygon getGeomPolygon(); - void setGeomPolygon(final Polygon _geomPolygon); + void setGeomPolygon(final Polygon _geomPolygon); @Property(name = "GeomCollection", @@ -381,7 +381,7 @@ public interface AllSpatialTypes fcKeepInContent = false) GeospatialCollection getGeomCollection(); - void setGeomCollection(final GeospatialCollection _geomCollection); + void setGeomCollection(final GeospatialCollection _geomCollection); @Property(name = "GeomMultiPoint", @@ -404,7 +404,7 @@ public interface AllSpatialTypes fcKeepInContent = false) MultiPoint getGeomMultiPoint(); - void setGeomMultiPoint(final MultiPoint _geomMultiPoint); + void setGeomMultiPoint(final MultiPoint _geomMultiPoint); @Property(name = "GeomMultiLine", @@ -427,7 +427,7 @@ public interface AllSpatialTypes fcKeepInContent = false) MultiLineString getGeomMultiLine(); - void setGeomMultiLine(final MultiLineString _geomMultiLine); + void setGeomMultiLine(final MultiLineString _geomMultiLine); @Property(name = "GeomMultiPolygon", @@ -450,9 +450,11 @@ public interface AllSpatialTypes fcKeepInContent = false) MultiPolygon getGeomMultiPolygon(); - void setGeomMultiPolygon(final MultiPolygon _geomMultiPolygon); + void setGeomMultiPolygon(final MultiPolygon _geomMultiPolygon); + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java index 48001b851..df8edbc0a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java index b4f6c39d2..56b63af61 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.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,6 +47,7 @@ import javax.xml.datatype.Duration; public interface AuditInfo extends Serializable { + @Property(name = "ModifiedDate", type = "Edm.DateTime", nullable = false) Calendar getModifiedDate(); @@ -68,5 +68,7 @@ public interface AuditInfo extends Serializable { void setConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newConcurrency(); + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java index c19ebd4ea..b257e4652 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.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 BackOrderLine extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine { + @Property(name = "OrderLineStream", type = "Edm.Stream", @@ -83,7 +83,7 @@ public interface BackOrderLine fcKeepInContent = false) java.io.InputStream getOrderLineStream(); - void setOrderLineStream(final java.io.InputStream _orderLineStream); + void setOrderLineStream(final java.io.InputStream _orderLineStream); @Key @Property(name = "OrderId", @@ -106,7 +106,7 @@ public interface BackOrderLine fcKeepInContent = false) Integer getOrderId(); - void setOrderId(final Integer _orderId); + void setOrderId(final Integer _orderId); @Key @Property(name = "ProductId", @@ -129,7 +129,7 @@ public interface BackOrderLine fcKeepInContent = false) Integer getProductId(); - void setProductId(final Integer _productId); + void setProductId(final Integer _productId); @Property(name = "Quantity", @@ -152,7 +152,7 @@ public interface BackOrderLine fcKeepInContent = false) Integer getQuantity(); - void setQuantity(final Integer _quantity); + void setQuantity(final Integer _quantity); @Property(name = "ConcurrencyToken", @@ -175,7 +175,7 @@ public interface BackOrderLine fcKeepInContent = false) String getConcurrencyToken(); - void setConcurrencyToken(final String _concurrencyToken); + void setConcurrencyToken(final String _concurrencyToken); @@ -200,4 +200,6 @@ public interface BackOrderLine + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java index 85caf1900..6cad5a54a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.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 BackOrderLine2 extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine { + @Property(name = "OrderLineStream", type = "Edm.Stream", @@ -83,7 +83,7 @@ public interface BackOrderLine2 fcKeepInContent = false) java.io.InputStream getOrderLineStream(); - void setOrderLineStream(final java.io.InputStream _orderLineStream); + void setOrderLineStream(final java.io.InputStream _orderLineStream); @Key @Property(name = "OrderId", @@ -106,7 +106,7 @@ public interface BackOrderLine2 fcKeepInContent = false) Integer getOrderId(); - void setOrderId(final Integer _orderId); + void setOrderId(final Integer _orderId); @Key @Property(name = "ProductId", @@ -129,7 +129,7 @@ public interface BackOrderLine2 fcKeepInContent = false) Integer getProductId(); - void setProductId(final Integer _productId); + void setProductId(final Integer _productId); @Property(name = "Quantity", @@ -152,7 +152,7 @@ public interface BackOrderLine2 fcKeepInContent = false) Integer getQuantity(); - void setQuantity(final Integer _quantity); + void setQuantity(final Integer _quantity); @Property(name = "ConcurrencyToken", @@ -175,7 +175,7 @@ public interface BackOrderLine2 fcKeepInContent = false) String getConcurrencyToken(); - void setConcurrencyToken(final String _concurrencyToken); + void setConcurrencyToken(final String _concurrencyToken); @@ -200,4 +200,6 @@ public interface BackOrderLine2 + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java index 257723ca4..1777b8611 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java index 07f93e2db..d728be24a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java index 08e86f192..91c9f3635 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.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 Car extends Serializable { + @Property(name = "Photo", type = "Edm.Stream", @@ -82,7 +82,7 @@ public interface Car fcKeepInContent = false) java.io.InputStream getPhoto(); - void setPhoto(final java.io.InputStream _photo); + void setPhoto(final java.io.InputStream _photo); @Property(name = "Video", @@ -105,7 +105,7 @@ public interface Car fcKeepInContent = false) java.io.InputStream getVideo(); - void setVideo(final java.io.InputStream _video); + void setVideo(final java.io.InputStream _video); @Key @Property(name = "VIN", @@ -128,7 +128,7 @@ public interface Car fcKeepInContent = false) Integer getVIN(); - void setVIN(final Integer _vIN); + void setVIN(final Integer _vIN); @Property(name = "Description", @@ -151,7 +151,7 @@ public interface Car fcKeepInContent = false) String getDescription(); - void setDescription(final String _description); + void setDescription(final String _description); @@ -159,4 +159,6 @@ public interface Car java.io.InputStream getStream(); + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java index 0bb77fd08..52881136a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java index 5c7d2163b..6f71b0c34 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.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,6 +47,7 @@ import javax.xml.datatype.Duration; public interface ComplexToCategory extends Serializable { + @Property(name = "Term", type = "Edm.String", nullable = true) String getTerm(); @@ -68,4 +68,5 @@ public interface ComplexToCategory extends Serializable { void setLabel(final String _label); + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java index 403585220..404db4ce6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.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,6 +47,7 @@ import javax.xml.datatype.Duration; public interface ComplexWithAllPrimitiveTypes extends Serializable { + @Property(name = "Binary", type = "Edm.Binary", nullable = true) byte[] getBinary(); @@ -145,4 +145,5 @@ public interface ComplexWithAllPrimitiveTypes extends Serializable { void setGeometryPoint(final Point _geometryPoint); + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java index 28319f937..e5bd861e3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.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 Computer extends Serializable { + @Key @Property(name = "ComputerId", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface Computer fcKeepInContent = false) Integer getComputerId(); - void setComputerId(final Integer _computerId); + void setComputerId(final Integer _computerId); @Property(name = "Name", @@ -105,7 +105,7 @@ public interface Computer fcKeepInContent = false) String getName(); - void setName(final String _name); + void setName(final String _name); @@ -123,13 +123,14 @@ public interface Computer Operations operations(); public interface Operations { + @Operation(name = "GetComputer", - type = OperationType.FUNCTION, - isComposable = false, + type = OperationType.ACTION, returnType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer") org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer getComputer( ); - } + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java index f7acf0f1e..745542cde 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.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; @@ -44,17 +43,4 @@ import java.util.Calendar; import javax.xml.datatype.Duration; public interface ComputerCollection extends AbstractEntityCollection { - Operations operations(); - - public interface Operations { - - @Operation(name = "GetComputer", - type = OperationType.FUNCTION, - isComposable = false, - returnType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer") - org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer getComputer( - ); - - - } } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java index 57f83824d..d31a5825d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.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 ComputerDetail extends Serializable { + @Key @Property(name = "ComputerDetailId", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface ComputerDetail fcKeepInContent = false) Integer getComputerDetailId(); - void setComputerDetailId(final Integer _computerDetailId); + void setComputerDetailId(final Integer _computerDetailId); @Property(name = "Manufacturer", @@ -105,7 +105,7 @@ public interface ComputerDetail fcKeepInContent = false) String getManufacturer(); - void setManufacturer(final String _manufacturer); + void setManufacturer(final String _manufacturer); @Property(name = "Model", @@ -128,7 +128,7 @@ public interface ComputerDetail fcKeepInContent = false) String getModel(); - void setModel(final String _model); + void setModel(final String _model); @Property(name = "Serial", @@ -151,7 +151,7 @@ public interface ComputerDetail fcKeepInContent = false) String getSerial(); - void setSerial(final String _serial); + void setSerial(final String _serial); @Property(name = "SpecificationsBag", @@ -174,7 +174,7 @@ public interface ComputerDetail fcKeepInContent = false) Collection getSpecificationsBag(); - void setSpecificationsBag(final Collection _specificationsBag); + void setSpecificationsBag(final Collection _specificationsBag); @Property(name = "PurchaseDate", @@ -197,7 +197,7 @@ public interface ComputerDetail fcKeepInContent = false) Calendar getPurchaseDate(); - void setPurchaseDate(final Calendar _purchaseDate); + void setPurchaseDate(final Calendar _purchaseDate); @Property(name = "Dimensions", @@ -220,8 +220,9 @@ public interface ComputerDetail fcKeepInContent = false) org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions(); - void setDimensions(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions); + void setDimensions(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions(); + @@ -239,14 +240,15 @@ public interface ComputerDetail Operations operations(); public interface Operations { + @Operation(name = "ResetComputerDetailsSpecifications", - type = OperationType.FUNCTION, - isComposable = false) + type = OperationType.ACTION) void resetComputerDetailsSpecifications( @Parameter(name = "specifications", type = "Collection(Edm.String)", nullable = false) Collection specifications, @Parameter(name = "purchaseTime", type = "Edm.DateTime", nullable = false) Calendar purchaseTime ); - } + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java index eca299dc3..940fd477d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.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; @@ -44,18 +43,4 @@ import java.util.Calendar; import javax.xml.datatype.Duration; public interface ComputerDetailCollection extends AbstractEntityCollection { - Operations operations(); - - public interface Operations { - - @Operation(name = "ResetComputerDetailsSpecifications", - type = OperationType.FUNCTION, - isComposable = false) - void resetComputerDetailsSpecifications( - @Parameter(name = "specifications", type = "Collection(Edm.String)", nullable = false) Collection specifications, - @Parameter(name = "purchaseTime", type = "Edm.DateTime", nullable = false) Calendar purchaseTime - ); - - - } } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java index 8426bfa82..2e76f758e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.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,6 +47,7 @@ import javax.xml.datatype.Duration; public interface ConcurrencyInfo extends Serializable { + @Property(name = "Token", type = "Edm.String", nullable = true) String getToken(); @@ -61,4 +61,5 @@ public interface ConcurrencyInfo extends Serializable { void setQueriedDateTime(final Calendar _queriedDateTime); + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java index 4b618f3c5..0787db478 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.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,6 +47,7 @@ import javax.xml.datatype.Duration; public interface ContactDetails extends Serializable { + @Property(name = "EmailBag", type = "Edm.String", nullable = false) Collection getEmailBag(); @@ -68,6 +68,7 @@ public interface ContactDetails extends Serializable { void setContactAlias(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases _contactAlias); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases newContactAlias(); + @Property(name = "HomePhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true) @@ -76,6 +77,7 @@ public interface ContactDetails extends Serializable { void setHomePhone(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _homePhone); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newHomePhone(); + @Property(name = "WorkPhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true) @@ -84,6 +86,7 @@ public interface ContactDetails extends Serializable { void setWorkPhone(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _workPhone); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newWorkPhone(); + @Property(name = "MobilePhoneBag", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = false) @@ -92,5 +95,7 @@ public interface ContactDetails extends Serializable { void setMobilePhoneBag(final Collection _mobilePhoneBag); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newMobilePhoneBag(); + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java index a020012e0..72000fe4f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.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 Contractor extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person { + @Key @Property(name = "PersonId", type = "Edm.Int32", @@ -83,7 +83,7 @@ public interface Contractor fcKeepInContent = false) Integer getPersonId(); - void setPersonId(final Integer _personId); + void setPersonId(final Integer _personId); @Property(name = "Name", @@ -106,7 +106,7 @@ public interface Contractor fcKeepInContent = false) String getName(); - void setName(final String _name); + void setName(final String _name); @Property(name = "ContratorCompanyId", @@ -129,7 +129,7 @@ public interface Contractor fcKeepInContent = false) Integer getContratorCompanyId(); - void setContratorCompanyId(final Integer _contratorCompanyId); + void setContratorCompanyId(final Integer _contratorCompanyId); @Property(name = "BillingRate", @@ -152,7 +152,7 @@ public interface Contractor fcKeepInContent = false) Integer getBillingRate(); - void setBillingRate(final Integer _billingRate); + void setBillingRate(final Integer _billingRate); @Property(name = "TeamContactPersonId", @@ -175,7 +175,7 @@ public interface Contractor fcKeepInContent = false) Integer getTeamContactPersonId(); - void setTeamContactPersonId(final Integer _teamContactPersonId); + void setTeamContactPersonId(final Integer _teamContactPersonId); @Property(name = "JobDescription", @@ -198,7 +198,7 @@ public interface Contractor fcKeepInContent = false) String getJobDescription(); - void setJobDescription(final String _jobDescription); + void setJobDescription(final String _jobDescription); @@ -213,4 +213,6 @@ public interface Contractor + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java index 79b8e04cd..f9d2ac1c8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java index 9bd8f4d8e..75dc0cd69 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.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 Customer extends Serializable { + @Property(name = "Thumbnail", type = "Edm.Stream", @@ -82,7 +82,7 @@ public interface Customer fcKeepInContent = false) java.io.InputStream getThumbnail(); - void setThumbnail(final java.io.InputStream _thumbnail); + void setThumbnail(final java.io.InputStream _thumbnail); @Property(name = "Video", @@ -105,7 +105,7 @@ public interface Customer fcKeepInContent = false) java.io.InputStream getVideo(); - void setVideo(final java.io.InputStream _video); + void setVideo(final java.io.InputStream _video); @Key @Property(name = "CustomerId", @@ -128,7 +128,7 @@ public interface Customer fcKeepInContent = false) Integer getCustomerId(); - void setCustomerId(final Integer _customerId); + void setCustomerId(final Integer _customerId); @Property(name = "Name", @@ -151,7 +151,7 @@ public interface Customer fcKeepInContent = false) String getName(); - void setName(final String _name); + void setName(final String _name); @Property(name = "PrimaryContactInfo", @@ -174,8 +174,9 @@ public interface Customer fcKeepInContent = false) org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails getPrimaryContactInfo(); - void setPrimaryContactInfo(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _primaryContactInfo); + void setPrimaryContactInfo(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _primaryContactInfo); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newPrimaryContactInfo(); + @Property(name = "BackupContactInfo", @@ -198,8 +199,9 @@ public interface Customer fcKeepInContent = false) Collection getBackupContactInfo(); - void setBackupContactInfo(final Collection _backupContactInfo); + void setBackupContactInfo(final Collection _backupContactInfo); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newBackupContactInfo(); + @Property(name = "Auditing", @@ -222,8 +224,9 @@ public interface Customer fcKeepInContent = false) org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo getAuditing(); - void setAuditing(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _auditing); + void setAuditing(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _auditing); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newAuditing(); + @@ -278,4 +281,6 @@ public interface Customer + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java index 719b88964..87f44c204 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java index 0c5a7ad0b..321487b5a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.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 CustomerInfo extends Serializable { + @Key @Property(name = "CustomerInfoId", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface CustomerInfo fcKeepInContent = false) Integer getCustomerInfoId(); - void setCustomerInfoId(final Integer _customerInfoId); + void setCustomerInfoId(final Integer _customerInfoId); @Property(name = "Information", @@ -105,7 +105,7 @@ public interface CustomerInfo fcKeepInContent = false) String getInformation(); - void setInformation(final String _information); + void setInformation(final String _information); @@ -113,4 +113,6 @@ public interface CustomerInfo java.io.InputStream getStream(); + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java index 5f1d74799..c3cb026d7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java index 5c9d8293b..5b4bbefb2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.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,6 +47,7 @@ import javax.xml.datatype.Duration; public interface Dimensions extends Serializable { + @Property(name = "Width", type = "Edm.Decimal", nullable = false) BigDecimal getWidth(); @@ -68,4 +68,5 @@ public interface Dimensions extends Serializable { void setDepth(final BigDecimal _depth); + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java index f5e6a949d..9327cbb6e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.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 DiscontinuedProduct extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product { + @Property(name = "Picture", type = "Edm.Stream", @@ -83,7 +83,7 @@ public interface DiscontinuedProduct fcKeepInContent = false) java.io.InputStream getPicture(); - void setPicture(final java.io.InputStream _picture); + void setPicture(final java.io.InputStream _picture); @Key @Property(name = "ProductId", @@ -106,7 +106,7 @@ public interface DiscontinuedProduct fcKeepInContent = false) Integer getProductId(); - void setProductId(final Integer _productId); + void setProductId(final Integer _productId); @Property(name = "Description", @@ -129,7 +129,7 @@ public interface DiscontinuedProduct fcKeepInContent = false) String getDescription(); - void setDescription(final String _description); + void setDescription(final String _description); @Property(name = "Dimensions", @@ -152,8 +152,9 @@ public interface DiscontinuedProduct fcKeepInContent = false) org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions(); - void setDimensions(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions); + void setDimensions(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions(); + @Property(name = "BaseConcurrency", @@ -176,7 +177,7 @@ public interface DiscontinuedProduct fcKeepInContent = false) String getBaseConcurrency(); - void setBaseConcurrency(final String _baseConcurrency); + void setBaseConcurrency(final String _baseConcurrency); @Property(name = "ComplexConcurrency", @@ -199,8 +200,9 @@ public interface DiscontinuedProduct fcKeepInContent = false) org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getComplexConcurrency(); - void setComplexConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _complexConcurrency); + void setComplexConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _complexConcurrency); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newComplexConcurrency(); + @Property(name = "NestedComplexConcurrency", @@ -223,8 +225,9 @@ public interface DiscontinuedProduct fcKeepInContent = false) org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo getNestedComplexConcurrency(); - void setNestedComplexConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _nestedComplexConcurrency); + void setNestedComplexConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _nestedComplexConcurrency); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newNestedComplexConcurrency(); + @Property(name = "Discontinued", @@ -247,7 +250,7 @@ public interface DiscontinuedProduct fcKeepInContent = false) Calendar getDiscontinued(); - void setDiscontinued(final Calendar _discontinued); + void setDiscontinued(final Calendar _discontinued); @Property(name = "ReplacementProductId", @@ -270,7 +273,7 @@ public interface DiscontinuedProduct fcKeepInContent = false) Integer getReplacementProductId(); - void setReplacementProductId(final Integer _replacementProductId); + void setReplacementProductId(final Integer _replacementProductId); @Property(name = "DiscontinuedPhone", @@ -293,8 +296,9 @@ public interface DiscontinuedProduct fcKeepInContent = false) org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getDiscontinuedPhone(); - void setDiscontinuedPhone(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _discontinuedPhone); + void setDiscontinuedPhone(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _discontinuedPhone); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newDiscontinuedPhone(); + @Property(name = "ChildConcurrencyToken", @@ -317,7 +321,7 @@ public interface DiscontinuedProduct fcKeepInContent = false) String getChildConcurrencyToken(); - void setChildConcurrencyToken(final String _childConcurrencyToken); + void setChildConcurrencyToken(final String _childConcurrencyToken); @@ -362,4 +366,6 @@ public interface DiscontinuedProduct + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java index 5f51306af..0feb7515d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java index a4e755a50..fcdc8f56f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.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 Driver extends Serializable { + @Key @Property(name = "Name", type = "Edm.String", @@ -82,7 +82,7 @@ public interface Driver fcKeepInContent = false) String getName(); - void setName(final String _name); + void setName(final String _name); @Property(name = "BirthDate", @@ -105,7 +105,7 @@ public interface Driver fcKeepInContent = false) Calendar getBirthDate(); - void setBirthDate(final Calendar _birthDate); + void setBirthDate(final Calendar _birthDate); @@ -120,4 +120,6 @@ public interface Driver + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java index 896323efa..3673a0f78 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java index 935119fcd..b2d2475a7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.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 Employee extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person { + @Key @Property(name = "PersonId", type = "Edm.Int32", @@ -83,7 +83,7 @@ public interface Employee fcKeepInContent = false) Integer getPersonId(); - void setPersonId(final Integer _personId); + void setPersonId(final Integer _personId); @Property(name = "Name", @@ -106,7 +106,7 @@ public interface Employee fcKeepInContent = false) String getName(); - void setName(final String _name); + void setName(final String _name); @Property(name = "ManagersPersonId", @@ -129,7 +129,7 @@ public interface Employee fcKeepInContent = false) Integer getManagersPersonId(); - void setManagersPersonId(final Integer _managersPersonId); + void setManagersPersonId(final Integer _managersPersonId); @Property(name = "Salary", @@ -152,7 +152,7 @@ public interface Employee fcKeepInContent = false) Integer getSalary(); - void setSalary(final Integer _salary); + void setSalary(final Integer _salary); @Property(name = "Title", @@ -175,7 +175,7 @@ public interface Employee fcKeepInContent = false) String getTitle(); - void setTitle(final String _title); + void setTitle(final String _title); @@ -203,12 +203,13 @@ public interface Employee Operations operations(); public interface Operations { + @Operation(name = "Sack", - type = OperationType.FUNCTION, - isComposable = false) + type = OperationType.ACTION) void sack( ); - } + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java index e239f17f4..9c0c22f20 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.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; @@ -48,12 +47,12 @@ public interface EmployeeCollection extends AbstractEntityCollection { public interface Operations { - @Operation(name = "Sack", - type = OperationType.FUNCTION, - isComposable = false) - void sack( + + @Operation(name = "IncreaseSalaries", + type = OperationType.ACTION) + void increaseSalaries( + @Parameter(name = "n", type = "Edm.Int32", nullable = false) Integer n ); - } } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java index d7f5bda24..4f7570ba0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.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 LastLogin extends Serializable { + @Key @Property(name = "Username", type = "Edm.String", @@ -82,7 +82,7 @@ public interface LastLogin fcKeepInContent = false) String getUsername(); - void setUsername(final String _username); + void setUsername(final String _username); @Property(name = "LoggedIn", @@ -105,7 +105,7 @@ public interface LastLogin fcKeepInContent = false) Calendar getLoggedIn(); - void setLoggedIn(final Calendar _loggedIn); + void setLoggedIn(final Calendar _loggedIn); @Property(name = "LoggedOut", @@ -128,7 +128,7 @@ public interface LastLogin fcKeepInContent = false) Calendar getLoggedOut(); - void setLoggedOut(final Calendar _loggedOut); + void setLoggedOut(final Calendar _loggedOut); @Property(name = "Duration", @@ -151,7 +151,7 @@ public interface LastLogin fcKeepInContent = false) Duration getDuration(); - void setDuration(final Duration _duration); + void setDuration(final Duration _duration); @@ -166,4 +166,6 @@ public interface LastLogin + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java index f4e0b6265..ab132b250 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java index e6318f442..c3ee9d904 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.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 License extends Serializable { + @Key @Property(name = "Name", type = "Edm.String", @@ -82,7 +82,7 @@ public interface License fcKeepInContent = false) String getName(); - void setName(final String _name); + void setName(final String _name); @Property(name = "LicenseNumber", @@ -105,7 +105,7 @@ public interface License fcKeepInContent = false) String getLicenseNumber(); - void setLicenseNumber(final String _licenseNumber); + void setLicenseNumber(final String _licenseNumber); @Property(name = "LicenseClass", @@ -128,7 +128,7 @@ public interface License fcKeepInContent = false) String getLicenseClass(); - void setLicenseClass(final String _licenseClass); + void setLicenseClass(final String _licenseClass); @Property(name = "Restrictions", @@ -151,7 +151,7 @@ public interface License fcKeepInContent = false) String getRestrictions(); - void setRestrictions(final String _restrictions); + void setRestrictions(final String _restrictions); @Property(name = "ExpirationDate", @@ -174,7 +174,7 @@ public interface License fcKeepInContent = false) Calendar getExpirationDate(); - void setExpirationDate(final Calendar _expirationDate); + void setExpirationDate(final Calendar _expirationDate); @@ -189,4 +189,6 @@ public interface License + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java index 4ae6c8df1..c8cc61f48 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java index f08e828d3..e5f51bbff 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.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 Login extends Serializable { + @Key @Property(name = "Username", type = "Edm.String", @@ -82,7 +82,7 @@ public interface Login fcKeepInContent = false) String getUsername(); - void setUsername(final String _username); + void setUsername(final String _username); @Property(name = "CustomerId", @@ -105,7 +105,7 @@ public interface Login fcKeepInContent = false) Integer getCustomerId(); - void setCustomerId(final Integer _customerId); + void setCustomerId(final Integer _customerId); @@ -160,4 +160,6 @@ public interface Login + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java index 3b1df7479..119e5e77c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java index 2c4a98c13..82e3cce0d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.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 MappedEntityType extends Serializable { + @Key @Property(name = "Id", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface MappedEntityType fcKeepInContent = false) Integer getId(); - void setId(final Integer _id); + void setId(final Integer _id); @Property(name = "Href", @@ -105,7 +105,7 @@ public interface MappedEntityType fcKeepInContent = false) String getHref(); - void setHref(final String _href); + void setHref(final String _href); @Property(name = "Title", @@ -128,7 +128,7 @@ public interface MappedEntityType fcKeepInContent = false) String getTitle(); - void setTitle(final String _title); + void setTitle(final String _title); @Property(name = "HrefLang", @@ -151,7 +151,7 @@ public interface MappedEntityType fcKeepInContent = false) String getHrefLang(); - void setHrefLang(final String _hrefLang); + void setHrefLang(final String _hrefLang); @Property(name = "Type", @@ -174,7 +174,7 @@ public interface MappedEntityType fcKeepInContent = false) String getType(); - void setType(final String _type); + void setType(final String _type); @Property(name = "Length", @@ -197,7 +197,7 @@ public interface MappedEntityType fcKeepInContent = false) Integer getLength(); - void setLength(final Integer _length); + void setLength(final Integer _length); @Property(name = "BagOfPrimitiveToLinks", @@ -220,7 +220,7 @@ public interface MappedEntityType fcKeepInContent = false) Collection getBagOfPrimitiveToLinks(); - void setBagOfPrimitiveToLinks(final Collection _bagOfPrimitiveToLinks); + void setBagOfPrimitiveToLinks(final Collection _bagOfPrimitiveToLinks); @Property(name = "Logo", @@ -243,7 +243,7 @@ public interface MappedEntityType fcKeepInContent = false) byte[] getLogo(); - void setLogo(final byte[] _logo); + void setLogo(final byte[] _logo); @Property(name = "BagOfDecimals", @@ -266,7 +266,7 @@ public interface MappedEntityType fcKeepInContent = false) Collection getBagOfDecimals(); - void setBagOfDecimals(final Collection _bagOfDecimals); + void setBagOfDecimals(final Collection _bagOfDecimals); @Property(name = "BagOfDoubles", @@ -289,7 +289,7 @@ public interface MappedEntityType fcKeepInContent = false) Collection getBagOfDoubles(); - void setBagOfDoubles(final Collection _bagOfDoubles); + void setBagOfDoubles(final Collection _bagOfDoubles); @Property(name = "BagOfSingles", @@ -312,7 +312,7 @@ public interface MappedEntityType fcKeepInContent = false) Collection getBagOfSingles(); - void setBagOfSingles(final Collection _bagOfSingles); + void setBagOfSingles(final Collection _bagOfSingles); @Property(name = "BagOfBytes", @@ -335,7 +335,7 @@ public interface MappedEntityType fcKeepInContent = false) Collection getBagOfBytes(); - void setBagOfBytes(final Collection _bagOfBytes); + void setBagOfBytes(final Collection _bagOfBytes); @Property(name = "BagOfInt16s", @@ -358,7 +358,7 @@ public interface MappedEntityType fcKeepInContent = false) Collection getBagOfInt16s(); - void setBagOfInt16s(final Collection _bagOfInt16s); + void setBagOfInt16s(final Collection _bagOfInt16s); @Property(name = "BagOfInt32s", @@ -381,7 +381,7 @@ public interface MappedEntityType fcKeepInContent = false) Collection getBagOfInt32s(); - void setBagOfInt32s(final Collection _bagOfInt32s); + void setBagOfInt32s(final Collection _bagOfInt32s); @Property(name = "BagOfInt64s", @@ -404,7 +404,7 @@ public interface MappedEntityType fcKeepInContent = false) Collection getBagOfInt64s(); - void setBagOfInt64s(final Collection _bagOfInt64s); + void setBagOfInt64s(final Collection _bagOfInt64s); @Property(name = "BagOfGuids", @@ -427,7 +427,7 @@ public interface MappedEntityType fcKeepInContent = false) Collection getBagOfGuids(); - void setBagOfGuids(final Collection _bagOfGuids); + void setBagOfGuids(final Collection _bagOfGuids); @Property(name = "BagOfDateTime", @@ -450,7 +450,7 @@ public interface MappedEntityType fcKeepInContent = false) Collection getBagOfDateTime(); - void setBagOfDateTime(final Collection _bagOfDateTime); + void setBagOfDateTime(final Collection _bagOfDateTime); @Property(name = "BagOfComplexToCategories", @@ -473,8 +473,9 @@ public interface MappedEntityType fcKeepInContent = false) Collection getBagOfComplexToCategories(); - void setBagOfComplexToCategories(final Collection _bagOfComplexToCategories); + void setBagOfComplexToCategories(final Collection _bagOfComplexToCategories); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory newBagOfComplexToCategories(); + @Property(name = "ComplexPhone", @@ -497,8 +498,9 @@ public interface MappedEntityType fcKeepInContent = false) org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getComplexPhone(); - void setComplexPhone(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _complexPhone); + void setComplexPhone(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _complexPhone); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newComplexPhone(); + @Property(name = "ComplexContactDetails", @@ -521,10 +523,13 @@ public interface MappedEntityType fcKeepInContent = false) org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails getComplexContactDetails(); - void setComplexContactDetails(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _complexContactDetails); + void setComplexContactDetails(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _complexContactDetails); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newComplexContactDetails(); + + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java index 363af239e..cc0b1c6ed 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java index 86ec54e66..642b1e763 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.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 Message extends Serializable { + @Key @Property(name = "MessageId", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface Message fcKeepInContent = false) Integer getMessageId(); - void setMessageId(final Integer _messageId); + void setMessageId(final Integer _messageId); @Key @Property(name = "FromUsername", @@ -105,7 +105,7 @@ public interface Message fcKeepInContent = false) String getFromUsername(); - void setFromUsername(final String _fromUsername); + void setFromUsername(final String _fromUsername); @Property(name = "ToUsername", @@ -128,7 +128,7 @@ public interface Message fcKeepInContent = false) String getToUsername(); - void setToUsername(final String _toUsername); + void setToUsername(final String _toUsername); @Property(name = "Sent", @@ -151,7 +151,7 @@ public interface Message fcKeepInContent = false) Calendar getSent(); - void setSent(final Calendar _sent); + void setSent(final Calendar _sent); @Property(name = "Subject", @@ -174,7 +174,7 @@ public interface Message fcKeepInContent = false) String getSubject(); - void setSubject(final String _subject); + void setSubject(final String _subject); @Property(name = "Body", @@ -197,7 +197,7 @@ public interface Message fcKeepInContent = false) String getBody(); - void setBody(final String _body); + void setBody(final String _body); @Property(name = "IsRead", @@ -220,7 +220,7 @@ public interface Message fcKeepInContent = false) Boolean getIsRead(); - void setIsRead(final Boolean _isRead); + void setIsRead(final Boolean _isRead); @@ -255,4 +255,6 @@ public interface Message + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java index 7c974ed7e..cbb06d6d3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.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 MessageAttachment extends Serializable { + @Key @Property(name = "AttachmentId", type = "Edm.Guid", @@ -82,7 +82,7 @@ public interface MessageAttachment fcKeepInContent = false) UUID getAttachmentId(); - void setAttachmentId(final UUID _attachmentId); + void setAttachmentId(final UUID _attachmentId); @Property(name = "Attachment", @@ -105,9 +105,11 @@ public interface MessageAttachment fcKeepInContent = false) byte[] getAttachment(); - void setAttachment(final byte[] _attachment); + void setAttachment(final byte[] _attachment); + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java index f00466f30..ea08cc011 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java index 517e125ed..713fa783e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java index 883f91247..e626b617f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java @@ -30,7 +30,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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java index 46d76250e..c97b7308a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.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 Order extends Serializable { + @Key @Property(name = "OrderId", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface Order fcKeepInContent = false) Integer getOrderId(); - void setOrderId(final Integer _orderId); + void setOrderId(final Integer _orderId); @Property(name = "CustomerId", @@ -105,7 +105,7 @@ public interface Order fcKeepInContent = false) Integer getCustomerId(); - void setCustomerId(final Integer _customerId); + void setCustomerId(final Integer _customerId); @Property(name = "Concurrency", @@ -128,8 +128,9 @@ public interface Order fcKeepInContent = false) org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getConcurrency(); - void setConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency); + void setConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newConcurrency(); + @@ -154,4 +155,6 @@ public interface Order + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java index 085d6f1ce..785f99518 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java index 456317835..9b9f79632 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.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 OrderLine extends Serializable { + @Property(name = "OrderLineStream", type = "Edm.Stream", @@ -82,7 +82,7 @@ public interface OrderLine fcKeepInContent = false) java.io.InputStream getOrderLineStream(); - void setOrderLineStream(final java.io.InputStream _orderLineStream); + void setOrderLineStream(final java.io.InputStream _orderLineStream); @Key @Property(name = "OrderId", @@ -105,7 +105,7 @@ public interface OrderLine fcKeepInContent = false) Integer getOrderId(); - void setOrderId(final Integer _orderId); + void setOrderId(final Integer _orderId); @Key @Property(name = "ProductId", @@ -128,7 +128,7 @@ public interface OrderLine fcKeepInContent = false) Integer getProductId(); - void setProductId(final Integer _productId); + void setProductId(final Integer _productId); @Property(name = "Quantity", @@ -151,7 +151,7 @@ public interface OrderLine fcKeepInContent = false) Integer getQuantity(); - void setQuantity(final Integer _quantity); + void setQuantity(final Integer _quantity); @Property(name = "ConcurrencyToken", @@ -174,7 +174,7 @@ public interface OrderLine fcKeepInContent = false) String getConcurrencyToken(); - void setConcurrencyToken(final String _concurrencyToken); + void setConcurrencyToken(final String _concurrencyToken); @@ -199,4 +199,6 @@ public interface OrderLine + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java index dbd605697..9be8a7d60 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java index 10b249ede..ab33ea2e2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java @@ -30,7 +30,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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java index 8a2e6bced..42b7c42cc 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.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 PageView extends Serializable { + @Key @Property(name = "PageViewId", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface PageView fcKeepInContent = false) Integer getPageViewId(); - void setPageViewId(final Integer _pageViewId); + void setPageViewId(final Integer _pageViewId); @Property(name = "Username", @@ -105,7 +105,7 @@ public interface PageView fcKeepInContent = false) String getUsername(); - void setUsername(final String _username); + void setUsername(final String _username); @Property(name = "Viewed", @@ -128,7 +128,7 @@ public interface PageView fcKeepInContent = false) Calendar getViewed(); - void setViewed(final Calendar _viewed); + void setViewed(final Calendar _viewed); @Property(name = "TimeSpentOnPage", @@ -151,7 +151,7 @@ public interface PageView fcKeepInContent = false) Duration getTimeSpentOnPage(); - void setTimeSpentOnPage(final Duration _timeSpentOnPage); + void setTimeSpentOnPage(final Duration _timeSpentOnPage); @Property(name = "PageUrl", @@ -174,7 +174,7 @@ public interface PageView fcKeepInContent = false) String getPageUrl(); - void setPageUrl(final String _pageUrl); + void setPageUrl(final String _pageUrl); @@ -189,4 +189,6 @@ public interface PageView + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java index b81523c2c..ddfb43643 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java index 883ecd69e..728d0c3c8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.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 Person extends Serializable { + @Key @Property(name = "PersonId", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface Person fcKeepInContent = false) Integer getPersonId(); - void setPersonId(final Integer _personId); + void setPersonId(final Integer _personId); @Property(name = "Name", @@ -105,7 +105,7 @@ public interface Person fcKeepInContent = false) String getName(); - void setName(final String _name); + void setName(final String _name); @@ -120,4 +120,6 @@ public interface Person + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java index 9efd3c1e1..550573522 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java index cfe280b9e..22d7730fe 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.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 PersonMetadata extends Serializable { + @Key @Property(name = "PersonMetadataId", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface PersonMetadata fcKeepInContent = false) Integer getPersonMetadataId(); - void setPersonMetadataId(final Integer _personMetadataId); + void setPersonMetadataId(final Integer _personMetadataId); @Property(name = "PersonId", @@ -105,7 +105,7 @@ public interface PersonMetadata fcKeepInContent = false) Integer getPersonId(); - void setPersonId(final Integer _personId); + void setPersonId(final Integer _personId); @Property(name = "PropertyName", @@ -128,7 +128,7 @@ public interface PersonMetadata fcKeepInContent = false) String getPropertyName(); - void setPropertyName(final String _propertyName); + void setPropertyName(final String _propertyName); @Property(name = "PropertyValue", @@ -151,7 +151,7 @@ public interface PersonMetadata fcKeepInContent = false) String getPropertyValue(); - void setPropertyValue(final String _propertyValue); + void setPropertyValue(final String _propertyValue); @@ -166,4 +166,6 @@ public interface PersonMetadata + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java index bef279ec5..2e7e596d1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java index d0e7844b3..f2eff1b39 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.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,6 +47,7 @@ import javax.xml.datatype.Duration; public interface Phone extends Serializable { + @Property(name = "PhoneNumber", type = "Edm.String", nullable = true) String getPhoneNumber(); @@ -61,4 +61,5 @@ public interface Phone extends Serializable { void setExtension(final String _extension); + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java index 0db55f356..ad5a92ac7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.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 Product extends Serializable { + @Property(name = "Picture", type = "Edm.Stream", @@ -82,7 +82,7 @@ public interface Product fcKeepInContent = false) java.io.InputStream getPicture(); - void setPicture(final java.io.InputStream _picture); + void setPicture(final java.io.InputStream _picture); @Key @Property(name = "ProductId", @@ -105,7 +105,7 @@ public interface Product fcKeepInContent = false) Integer getProductId(); - void setProductId(final Integer _productId); + void setProductId(final Integer _productId); @Property(name = "Description", @@ -128,7 +128,7 @@ public interface Product fcKeepInContent = false) String getDescription(); - void setDescription(final String _description); + void setDescription(final String _description); @Property(name = "Dimensions", @@ -151,8 +151,9 @@ public interface Product fcKeepInContent = false) org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions(); - void setDimensions(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions); + void setDimensions(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions(); + @Property(name = "BaseConcurrency", @@ -175,7 +176,7 @@ public interface Product fcKeepInContent = false) String getBaseConcurrency(); - void setBaseConcurrency(final String _baseConcurrency); + void setBaseConcurrency(final String _baseConcurrency); @Property(name = "ComplexConcurrency", @@ -198,8 +199,9 @@ public interface Product fcKeepInContent = false) org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getComplexConcurrency(); - void setComplexConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _complexConcurrency); + void setComplexConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _complexConcurrency); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newComplexConcurrency(); + @Property(name = "NestedComplexConcurrency", @@ -222,8 +224,9 @@ public interface Product fcKeepInContent = false) org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo getNestedComplexConcurrency(); - void setNestedComplexConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _nestedComplexConcurrency); + void setNestedComplexConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _nestedComplexConcurrency); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newNestedComplexConcurrency(); + @@ -271,13 +274,14 @@ public interface Product Operations operations(); public interface Operations { + @Operation(name = "ChangeProductDimensions", - type = OperationType.FUNCTION, - isComposable = false) + type = OperationType.ACTION) void changeProductDimensions( @Parameter(name = "dimensions", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions", nullable = true) org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions dimensions ); - } + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java index d90d95c6b..3ff5b2bbd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.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; @@ -44,17 +43,4 @@ import java.util.Calendar; import javax.xml.datatype.Duration; public interface ProductCollection extends AbstractEntityCollection { - Operations operations(); - - public interface Operations { - - @Operation(name = "ChangeProductDimensions", - type = OperationType.FUNCTION, - isComposable = false) - void changeProductDimensions( - @Parameter(name = "dimensions", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions", nullable = true) org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions dimensions - ); - - - } } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java index 5b75d44be..8cbc68f1f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.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 ProductDetail extends Serializable { + @Key @Property(name = "ProductId", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface ProductDetail fcKeepInContent = false) Integer getProductId(); - void setProductId(final Integer _productId); + void setProductId(final Integer _productId); @Property(name = "Details", @@ -105,7 +105,7 @@ public interface ProductDetail fcKeepInContent = false) String getDetails(); - void setDetails(final String _details); + void setDetails(final String _details); @@ -120,4 +120,6 @@ public interface ProductDetail + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java index 1ae704f56..6045a0f81 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java index 2d0fd74d8..a0d533f13 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.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 ProductPageView extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView { + @Key @Property(name = "PageViewId", type = "Edm.Int32", @@ -83,7 +83,7 @@ public interface ProductPageView fcKeepInContent = false) Integer getPageViewId(); - void setPageViewId(final Integer _pageViewId); + void setPageViewId(final Integer _pageViewId); @Property(name = "Username", @@ -106,7 +106,7 @@ public interface ProductPageView fcKeepInContent = false) String getUsername(); - void setUsername(final String _username); + void setUsername(final String _username); @Property(name = "Viewed", @@ -129,7 +129,7 @@ public interface ProductPageView fcKeepInContent = false) Calendar getViewed(); - void setViewed(final Calendar _viewed); + void setViewed(final Calendar _viewed); @Property(name = "TimeSpentOnPage", @@ -152,7 +152,7 @@ public interface ProductPageView fcKeepInContent = false) Duration getTimeSpentOnPage(); - void setTimeSpentOnPage(final Duration _timeSpentOnPage); + void setTimeSpentOnPage(final Duration _timeSpentOnPage); @Property(name = "PageUrl", @@ -175,7 +175,7 @@ public interface ProductPageView fcKeepInContent = false) String getPageUrl(); - void setPageUrl(final String _pageUrl); + void setPageUrl(final String _pageUrl); @Property(name = "ProductId", @@ -198,7 +198,7 @@ public interface ProductPageView fcKeepInContent = false) Integer getProductId(); - void setProductId(final Integer _productId); + void setProductId(final Integer _productId); @Property(name = "ConcurrencyToken", @@ -221,7 +221,7 @@ public interface ProductPageView fcKeepInContent = false) String getConcurrencyToken(); - void setConcurrencyToken(final String _concurrencyToken); + void setConcurrencyToken(final String _concurrencyToken); @@ -236,4 +236,6 @@ public interface ProductPageView + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java index 379799b63..a88b64101 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java index 9ce636d27..928856722 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.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 ProductPhoto extends Serializable { + @Key @Property(name = "ProductId", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface ProductPhoto fcKeepInContent = false) Integer getProductId(); - void setProductId(final Integer _productId); + void setProductId(final Integer _productId); @Key @Property(name = "PhotoId", @@ -105,7 +105,7 @@ public interface ProductPhoto fcKeepInContent = false) Integer getPhotoId(); - void setPhotoId(final Integer _photoId); + void setPhotoId(final Integer _photoId); @Property(name = "Photo", @@ -128,9 +128,11 @@ public interface ProductPhoto fcKeepInContent = false) byte[] getPhoto(); - void setPhoto(final byte[] _photo); + void setPhoto(final byte[] _photo); + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java index 84fb108a0..7271057a6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java index fb84c2574..5be493f38 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java @@ -30,7 +30,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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java index 8dbd1b283..f88cc2e7c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.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 ProductReview extends Serializable { + @Key @Property(name = "ProductId", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface ProductReview fcKeepInContent = false) Integer getProductId(); - void setProductId(final Integer _productId); + void setProductId(final Integer _productId); @Key @Property(name = "ReviewId", @@ -105,7 +105,7 @@ public interface ProductReview fcKeepInContent = false) Integer getReviewId(); - void setReviewId(final Integer _reviewId); + void setReviewId(final Integer _reviewId); @Property(name = "Review", @@ -128,7 +128,7 @@ public interface ProductReview fcKeepInContent = false) String getReview(); - void setReview(final String _review); + void setReview(final String _review); @Key @Property(name = "RevisionId", @@ -151,7 +151,7 @@ public interface ProductReview fcKeepInContent = false) String getRevisionId(); - void setRevisionId(final String _revisionId); + void setRevisionId(final String _revisionId); @@ -166,4 +166,6 @@ public interface ProductReview + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java index 8670cdf27..7fa44e28e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java index cfcaa95cc..2a4d312cb 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java @@ -30,7 +30,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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java index 40405b077..66c7b8171 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.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 RSAToken extends Serializable { + @Key @Property(name = "Serial", type = "Edm.String", @@ -82,7 +82,7 @@ public interface RSAToken fcKeepInContent = false) String getSerial(); - void setSerial(final String _serial); + void setSerial(final String _serial); @Property(name = "Issued", @@ -105,7 +105,7 @@ public interface RSAToken fcKeepInContent = false) Calendar getIssued(); - void setIssued(final Calendar _issued); + void setIssued(final Calendar _issued); @@ -120,4 +120,6 @@ public interface RSAToken + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java index e0b510661..f130e6afb 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java index 467ca473c..c851d8322 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.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 SpecialEmployee extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee { + @Key @Property(name = "PersonId", type = "Edm.Int32", @@ -83,7 +83,7 @@ public interface SpecialEmployee fcKeepInContent = false) Integer getPersonId(); - void setPersonId(final Integer _personId); + void setPersonId(final Integer _personId); @Property(name = "Name", @@ -106,7 +106,7 @@ public interface SpecialEmployee fcKeepInContent = false) String getName(); - void setName(final String _name); + void setName(final String _name); @Property(name = "ManagersPersonId", @@ -129,7 +129,7 @@ public interface SpecialEmployee fcKeepInContent = false) Integer getManagersPersonId(); - void setManagersPersonId(final Integer _managersPersonId); + void setManagersPersonId(final Integer _managersPersonId); @Property(name = "Salary", @@ -152,7 +152,7 @@ public interface SpecialEmployee fcKeepInContent = false) Integer getSalary(); - void setSalary(final Integer _salary); + void setSalary(final Integer _salary); @Property(name = "Title", @@ -175,7 +175,7 @@ public interface SpecialEmployee fcKeepInContent = false) String getTitle(); - void setTitle(final String _title); + void setTitle(final String _title); @Property(name = "CarsVIN", @@ -198,7 +198,7 @@ public interface SpecialEmployee fcKeepInContent = false) Integer getCarsVIN(); - void setCarsVIN(final Integer _carsVIN); + void setCarsVIN(final Integer _carsVIN); @Property(name = "Bonus", @@ -221,7 +221,7 @@ public interface SpecialEmployee fcKeepInContent = false) Integer getBonus(); - void setBonus(final Integer _bonus); + void setBonus(final Integer _bonus); @Property(name = "IsFullyVested", @@ -244,7 +244,7 @@ public interface SpecialEmployee fcKeepInContent = false) Boolean getIsFullyVested(); - void setIsFullyVested(final Boolean _isFullyVested); + void setIsFullyVested(final Boolean _isFullyVested); @@ -279,4 +279,6 @@ public interface SpecialEmployee + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java index a37f415f1..03765dffa 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityRetrieveTestITCase.java index 0d327a799..973449ebe 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityRetrieveTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityRetrieveTestITCase.java @@ -42,7 +42,7 @@ public class AuthEntityRetrieveTestITCase extends EntityRetrieveTestITCase { @BeforeClass public static void setupContaner() { - containerFactory = EntityContainerFactory.getV3Instance(testAuthServiceRootURL); + containerFactory = EntityContainerFactory.getV3(testAuthServiceRootURL); container = containerFactory.getEntityContainer(InMemoryEntities.class); assertNotNull(container); } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java index 57520570b..ad343c129 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java @@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java index 596b5f5f3..f73247c97 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java index 24763a9da..0b985c503 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java index 429f6d96a..4146de747 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java @@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java index f5b25c0af..85c781848 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java index f6e135f1f..68295bf8b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java @@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java index bd41f3fa7..e4b8b2215 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java @@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java index 933cd9308..a0102d5bf 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java @@ -28,7 +28,6 @@ import org.apache.olingo.ext.proxy.api.OperationType; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java index 1d6539015..ff9be59d9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java index fc166181f..c9e160a48 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java @@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java index a395b2288..d5b79cbb0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java @@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java index 3bcadf3cc..17fe0faf1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java @@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java index 245bd5c8e..9671d6cac 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java @@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java index fc77e7401..bddeb74e5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java @@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java index 123919a4e..d86d4f5e6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java @@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java index b50871755..e75abd6ef 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java index 49c7118c1..35b43bb73 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java @@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java index e9d66d809..2c81494f9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java @@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java index 726648085..04808c42c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java index 0392aabde..25d57c710 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 Account extends Serializable { + @Key @Property(name = "AccountID", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface Account fcKeepInContent = false) Integer getAccountID(); - void setAccountID(final Integer _accountID); + void setAccountID(final Integer _accountID); @Property(name = "Country", @@ -105,7 +105,7 @@ public interface Account fcKeepInContent = false) String getCountry(); - void setCountry(final String _country); + void setCountry(final String _country); @Property(name = "AccountInfo", @@ -128,8 +128,9 @@ public interface Account fcKeepInContent = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo getAccountInfo(); - void setAccountInfo(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo _accountInfo); + void setAccountInfo(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo _accountInfo); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo newAccountInfo(); + @@ -200,4 +201,6 @@ public interface Account ); } + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java index facd06658..00ec845f6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; @@ -44,31 +43,4 @@ import java.util.Calendar; import javax.xml.datatype.Duration; public interface AccountCollection extends AbstractEntityCollection { - Operations operations(); - - public interface Operations { - - @Operation(name = "GetDefaultPI", - type = OperationType.FUNCTION, - isComposable = false, - returnType = "Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument getDefaultPI( - ); - - @Operation(name = "GetAccountInfo", - type = OperationType.FUNCTION, - isComposable = true, - returnType = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo getAccountInfo( - ); - - - @Operation(name = "RefreshDefaultPI", - type = OperationType.ACTION, - returnType = "Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument refreshDefaultPI( - @Parameter(name = "newDate", type = "Edm.DateTimeOffset", nullable = true) Calendar newDate - ); - - } } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java index 4624e0bd2..da9f9bb77 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java @@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; @@ -50,6 +49,7 @@ import javax.xml.datatype.Duration; public interface AccountInfo extends Serializable { + @Property(name = "FirstName", type = "Edm.String", nullable = false, @@ -84,4 +84,5 @@ public interface AccountInfo extends Serializable { + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java index acfce4d18..1e805cd4d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java @@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; @@ -50,6 +49,7 @@ import javax.xml.datatype.Duration; public interface Address extends Serializable { + @Property(name = "Street", type = "Edm.String", nullable = false, @@ -101,4 +101,5 @@ public interface Address extends Serializable { + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java index cd00e934f..5c1a55032 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 Asset extends Serializable { + @Key @Property(name = "AssetID", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface Asset fcKeepInContent = false) Integer getAssetID(); - void setAssetID(final Integer _assetID); + void setAssetID(final Integer _assetID); @Property(name = "Name", @@ -105,7 +105,7 @@ public interface Asset fcKeepInContent = false) String getName(); - void setName(final String _name); + void setName(final String _name); @Property(name = "Number", @@ -128,9 +128,11 @@ public interface Asset fcKeepInContent = false) Integer getNumber(); - void setNumber(final Integer _number); + void setNumber(final Integer _number); + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java index be390b220..12b8ef127 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java index 223820605..84a46aac7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 Club extends Serializable { + @Key @Property(name = "ClubID", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface Club fcKeepInContent = false) Integer getClubID(); - void setClubID(final Integer _clubID); + void setClubID(final Integer _clubID); @Property(name = "Name", @@ -105,9 +105,11 @@ public interface Club fcKeepInContent = false) String getName(); - void setName(final String _name); + void setName(final String _name); + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java index 022a161a8..4647fed33 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java index ff78a0e8b..572a49277 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 Company extends Serializable { + @Key @Property(name = "CompanyID", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface Company fcKeepInContent = false) Integer getCompanyID(); - void setCompanyID(final Integer _companyID); + void setCompanyID(final Integer _companyID); @Property(name = "CompanyCategory", @@ -105,7 +105,7 @@ public interface Company fcKeepInContent = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory getCompanyCategory(); - void setCompanyCategory(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory _companyCategory); + void setCompanyCategory(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory _companyCategory); @Property(name = "Revenue", @@ -128,7 +128,7 @@ public interface Company fcKeepInContent = false) Long getRevenue(); - void setRevenue(final Long _revenue); + void setRevenue(final Long _revenue); @Property(name = "Name", @@ -151,7 +151,7 @@ public interface Company fcKeepInContent = false) String getName(); - void setName(final String _name); + void setName(final String _name); @Property(name = "Address", @@ -174,8 +174,9 @@ public interface Company fcKeepInContent = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address getAddress(); - void setAddress(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _address); + void setAddress(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _address); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newAddress(); + @@ -239,4 +240,6 @@ public interface Company ); } + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java index 8b44c961d..372f16da3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java @@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; @@ -51,6 +50,7 @@ import javax.xml.datatype.Duration; public interface CompanyAddress extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address { + @Property(name = "Street", type = "Edm.String", nullable = false, @@ -129,4 +129,5 @@ public interface CompanyAddress extends org.apache.olingo.fit.proxy.v4.staticser void setContact(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person _contact); + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java index b9d3c09e2..7eb03e441 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; @@ -44,24 +43,4 @@ import java.util.Calendar; import javax.xml.datatype.Duration; public interface CompanyCollection extends AbstractEntityCollection { - Operations operations(); - - public interface Operations { - - @Operation(name = "GetEmployeesCount", - type = OperationType.FUNCTION, - isComposable = false, - returnType = "Edm.Int32") - Integer getEmployeesCount( - ); - - - @Operation(name = "IncreaseRevenue", - type = OperationType.ACTION, - returnType = "Edm.Int64") - Long increaseRevenue( - @Parameter(name = "IncreaseValue", type = "Edm.Int64", nullable = true) Long increaseValue - ); - - } } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java index c9e034461..a29b82d70 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 CreditCardPI extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument { + @Key @Property(name = "PaymentInstrumentID", type = "Edm.Int32", @@ -83,7 +83,7 @@ public interface CreditCardPI fcKeepInContent = false) Integer getPaymentInstrumentID(); - void setPaymentInstrumentID(final Integer _paymentInstrumentID); + void setPaymentInstrumentID(final Integer _paymentInstrumentID); @Property(name = "FriendlyName", @@ -106,7 +106,7 @@ public interface CreditCardPI fcKeepInContent = false) String getFriendlyName(); - void setFriendlyName(final String _friendlyName); + void setFriendlyName(final String _friendlyName); @Property(name = "CreatedDate", @@ -129,7 +129,7 @@ public interface CreditCardPI fcKeepInContent = false) Calendar getCreatedDate(); - void setCreatedDate(final Calendar _createdDate); + void setCreatedDate(final Calendar _createdDate); @Property(name = "CardNumber", @@ -152,7 +152,7 @@ public interface CreditCardPI fcKeepInContent = false) String getCardNumber(); - void setCardNumber(final String _cardNumber); + void setCardNumber(final String _cardNumber); @Property(name = "CVV", @@ -175,7 +175,7 @@ public interface CreditCardPI fcKeepInContent = false) String getCVV(); - void setCVV(final String _cVV); + void setCVV(final String _cVV); @Property(name = "HolderName", @@ -198,7 +198,7 @@ public interface CreditCardPI fcKeepInContent = false) String getHolderName(); - void setHolderName(final String _holderName); + void setHolderName(final String _holderName); @Property(name = "Balance", @@ -221,7 +221,7 @@ public interface CreditCardPI fcKeepInContent = false) Double getBalance(); - void setBalance(final Double _balance); + void setBalance(final Double _balance); @Property(name = "ExperationDate", @@ -244,7 +244,7 @@ public interface CreditCardPI fcKeepInContent = false) Calendar getExperationDate(); - void setExperationDate(final Calendar _experationDate); + void setExperationDate(final Calendar _experationDate); @@ -289,4 +289,6 @@ public interface CreditCardPI + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java index 91be35853..d673c514c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java index 16b8a0754..9fdc7aab7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 CreditRecord extends Serializable { + @Key @Property(name = "CreditRecordID", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface CreditRecord fcKeepInContent = false) Integer getCreditRecordID(); - void setCreditRecordID(final Integer _creditRecordID); + void setCreditRecordID(final Integer _creditRecordID); @Property(name = "IsGood", @@ -105,7 +105,7 @@ public interface CreditRecord fcKeepInContent = false) Boolean getIsGood(); - void setIsGood(final Boolean _isGood); + void setIsGood(final Boolean _isGood); @Property(name = "Reason", @@ -128,7 +128,7 @@ public interface CreditRecord fcKeepInContent = false) String getReason(); - void setReason(final String _reason); + void setReason(final String _reason); @Property(name = "CreatedDate", @@ -151,9 +151,11 @@ public interface CreditRecord fcKeepInContent = false) Calendar getCreatedDate(); - void setCreatedDate(final Calendar _createdDate); + void setCreatedDate(final Calendar _createdDate); + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java index 6c891092d..24542010e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java index 863a6d319..76efb579d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 Customer extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person { + @Key @Property(name = "PersonID", type = "Edm.Int32", @@ -83,7 +83,7 @@ public interface Customer fcKeepInContent = false) Integer getPersonID(); - void setPersonID(final Integer _personID); + void setPersonID(final Integer _personID); @Property(name = "FirstName", @@ -106,7 +106,7 @@ public interface Customer fcKeepInContent = false) String getFirstName(); - void setFirstName(final String _firstName); + void setFirstName(final String _firstName); @Property(name = "LastName", @@ -129,7 +129,7 @@ public interface Customer fcKeepInContent = false) String getLastName(); - void setLastName(final String _lastName); + void setLastName(final String _lastName); @Property(name = "MiddleName", @@ -152,7 +152,7 @@ public interface Customer fcKeepInContent = false) String getMiddleName(); - void setMiddleName(final String _middleName); + void setMiddleName(final String _middleName); @Property(name = "HomeAddress", @@ -175,8 +175,9 @@ public interface Customer fcKeepInContent = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address getHomeAddress(); - void setHomeAddress(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress); + void setHomeAddress(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newHomeAddress(); + @Property(name = "Home", @@ -199,7 +200,7 @@ public interface Customer fcKeepInContent = false) Point getHome(); - void setHome(final Point _home); + void setHome(final Point _home); @Property(name = "Numbers", @@ -222,7 +223,7 @@ public interface Customer fcKeepInContent = false) Collection getNumbers(); - void setNumbers(final Collection _numbers); + void setNumbers(final Collection _numbers); @Property(name = "Emails", @@ -245,7 +246,7 @@ public interface Customer fcKeepInContent = false) Collection getEmails(); - void setEmails(final Collection _emails); + void setEmails(final Collection _emails); @Property(name = "City", @@ -268,7 +269,7 @@ public interface Customer fcKeepInContent = false) String getCity(); - void setCity(final String _city); + void setCity(final String _city); @Property(name = "Birthday", @@ -291,7 +292,7 @@ public interface Customer fcKeepInContent = false) Calendar getBirthday(); - void setBirthday(final Calendar _birthday); + void setBirthday(final Calendar _birthday); @Property(name = "TimeBetweenLastTwoOrders", @@ -314,7 +315,7 @@ public interface Customer fcKeepInContent = false) BigDecimal getTimeBetweenLastTwoOrders(); - void setTimeBetweenLastTwoOrders(final BigDecimal _timeBetweenLastTwoOrders); + void setTimeBetweenLastTwoOrders(final BigDecimal _timeBetweenLastTwoOrders); @@ -349,4 +350,6 @@ public interface Customer + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java index 3eb054828..2b0ce94c0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java index f2dc969d9..e970c94e3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 Department extends Serializable { + @Key @Property(name = "DepartmentID", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface Department fcKeepInContent = false) Integer getDepartmentID(); - void setDepartmentID(final Integer _departmentID); + void setDepartmentID(final Integer _departmentID); @Property(name = "Name", @@ -105,7 +105,7 @@ public interface Department fcKeepInContent = false) String getName(); - void setName(final String _name); + void setName(final String _name); @@ -120,4 +120,6 @@ public interface Department + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java index 5b78d8de8..27b40de0f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java index 6a8e3998c..8d2c61716 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 Employee extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person { + @Key @Property(name = "PersonID", type = "Edm.Int32", @@ -83,7 +83,7 @@ public interface Employee fcKeepInContent = false) Integer getPersonID(); - void setPersonID(final Integer _personID); + void setPersonID(final Integer _personID); @Property(name = "FirstName", @@ -106,7 +106,7 @@ public interface Employee fcKeepInContent = false) String getFirstName(); - void setFirstName(final String _firstName); + void setFirstName(final String _firstName); @Property(name = "LastName", @@ -129,7 +129,7 @@ public interface Employee fcKeepInContent = false) String getLastName(); - void setLastName(final String _lastName); + void setLastName(final String _lastName); @Property(name = "MiddleName", @@ -152,7 +152,7 @@ public interface Employee fcKeepInContent = false) String getMiddleName(); - void setMiddleName(final String _middleName); + void setMiddleName(final String _middleName); @Property(name = "HomeAddress", @@ -175,8 +175,9 @@ public interface Employee fcKeepInContent = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address getHomeAddress(); - void setHomeAddress(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress); + void setHomeAddress(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newHomeAddress(); + @Property(name = "Home", @@ -199,7 +200,7 @@ public interface Employee fcKeepInContent = false) Point getHome(); - void setHome(final Point _home); + void setHome(final Point _home); @Property(name = "Numbers", @@ -222,7 +223,7 @@ public interface Employee fcKeepInContent = false) Collection getNumbers(); - void setNumbers(final Collection _numbers); + void setNumbers(final Collection _numbers); @Property(name = "Emails", @@ -245,7 +246,7 @@ public interface Employee fcKeepInContent = false) Collection getEmails(); - void setEmails(final Collection _emails); + void setEmails(final Collection _emails); @Property(name = "DateHired", @@ -268,7 +269,7 @@ public interface Employee fcKeepInContent = false) Calendar getDateHired(); - void setDateHired(final Calendar _dateHired); + void setDateHired(final Calendar _dateHired); @Property(name = "Office", @@ -291,7 +292,7 @@ public interface Employee fcKeepInContent = false) Point getOffice(); - void setOffice(final Point _office); + void setOffice(final Point _office); @@ -316,4 +317,6 @@ public interface Employee + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java index d7886a214..9ed998727 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java index 2b92fccbe..2ffb326da 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 GiftCard extends Serializable { + @Key @Property(name = "GiftCardID", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface GiftCard fcKeepInContent = false) Integer getGiftCardID(); - void setGiftCardID(final Integer _giftCardID); + void setGiftCardID(final Integer _giftCardID); @Property(name = "GiftCardNO", @@ -105,7 +105,7 @@ public interface GiftCard fcKeepInContent = false) String getGiftCardNO(); - void setGiftCardNO(final String _giftCardNO); + void setGiftCardNO(final String _giftCardNO); @Property(name = "Amount", @@ -128,7 +128,7 @@ public interface GiftCard fcKeepInContent = false) Double getAmount(); - void setAmount(final Double _amount); + void setAmount(final Double _amount); @Property(name = "ExperationDate", @@ -151,7 +151,7 @@ public interface GiftCard fcKeepInContent = false) Calendar getExperationDate(); - void setExperationDate(final Calendar _experationDate); + void setExperationDate(final Calendar _experationDate); @@ -169,4 +169,6 @@ public interface GiftCard } + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java index 177906e7e..5ca4350d6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; @@ -44,18 +43,4 @@ import java.util.Calendar; import javax.xml.datatype.Duration; public interface GiftCardCollection extends AbstractEntityCollection { - Operations operations(); - - public interface Operations { - - @Operation(name = "GetActualAmount", - type = OperationType.FUNCTION, - isComposable = false, - returnType = "Edm.Double") - Double getActualAmount( - @Parameter(name = "bonusRate", type = "Edm.Double", nullable = true) Double bonusRate - ); - - - } } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java index cdeea546b..ed04d8b77 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java @@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; @@ -51,6 +50,7 @@ import javax.xml.datatype.Duration; public interface HomeAddress extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address { + @Property(name = "Street", type = "Edm.String", nullable = false, @@ -119,4 +119,5 @@ public interface HomeAddress extends org.apache.olingo.fit.proxy.v4.staticservic + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java index 575bc7869..0b39627be 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 LabourUnion extends Serializable { + @Key @Property(name = "LabourUnionID", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface LabourUnion fcKeepInContent = false) Integer getLabourUnionID(); - void setLabourUnionID(final Integer _labourUnionID); + void setLabourUnionID(final Integer _labourUnionID); @Property(name = "Name", @@ -105,9 +105,11 @@ public interface LabourUnion fcKeepInContent = false) String getName(); - void setName(final String _name); + void setName(final String _name); + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java index 67a2b94ea..644f6d865 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java index f3405ac23..40bbb2d7f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 Order extends Serializable { + @Key @Property(name = "OrderID", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface Order fcKeepInContent = false) Integer getOrderID(); - void setOrderID(final Integer _orderID); + void setOrderID(final Integer _orderID); @Property(name = "OrderDate", @@ -105,7 +105,7 @@ public interface Order fcKeepInContent = false) Calendar getOrderDate(); - void setOrderDate(final Calendar _orderDate); + void setOrderDate(final Calendar _orderDate); @Property(name = "ShelfLife", @@ -128,7 +128,7 @@ public interface Order fcKeepInContent = false) BigDecimal getShelfLife(); - void setShelfLife(final BigDecimal _shelfLife); + void setShelfLife(final BigDecimal _shelfLife); @Property(name = "OrderShelfLifes", @@ -151,7 +151,7 @@ public interface Order fcKeepInContent = false) Collection getOrderShelfLifes(); - void setOrderShelfLifes(final Collection _orderShelfLifes); + void setOrderShelfLifes(final Collection _orderShelfLifes); @@ -186,4 +186,6 @@ public interface Order + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java index e8b5eb616..3e3712cdb 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java index 15b643908..e753d9ddb 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 OrderDetail extends Serializable { + @Key @Property(name = "OrderID", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface OrderDetail fcKeepInContent = false) Integer getOrderID(); - void setOrderID(final Integer _orderID); + void setOrderID(final Integer _orderID); @Key @Property(name = "ProductID", @@ -105,7 +105,7 @@ public interface OrderDetail fcKeepInContent = false) Integer getProductID(); - void setProductID(final Integer _productID); + void setProductID(final Integer _productID); @Property(name = "OrderPlaced", @@ -128,7 +128,7 @@ public interface OrderDetail fcKeepInContent = false) Calendar getOrderPlaced(); - void setOrderPlaced(final Calendar _orderPlaced); + void setOrderPlaced(final Calendar _orderPlaced); @Property(name = "Quantity", @@ -151,7 +151,7 @@ public interface OrderDetail fcKeepInContent = false) Integer getQuantity(); - void setQuantity(final Integer _quantity); + void setQuantity(final Integer _quantity); @Property(name = "UnitPrice", @@ -174,7 +174,7 @@ public interface OrderDetail fcKeepInContent = false) Float getUnitPrice(); - void setUnitPrice(final Float _unitPrice); + void setUnitPrice(final Float _unitPrice); @@ -199,4 +199,6 @@ public interface OrderDetail + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java index 3a8dde771..a0d2058f7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java index 868e74b79..ba6b8b195 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java @@ -30,7 +30,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java index 69dc4bfc6..b9318fcba 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 PaymentInstrument extends Serializable { + @Key @Property(name = "PaymentInstrumentID", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface PaymentInstrument fcKeepInContent = false) Integer getPaymentInstrumentID(); - void setPaymentInstrumentID(final Integer _paymentInstrumentID); + void setPaymentInstrumentID(final Integer _paymentInstrumentID); @Property(name = "FriendlyName", @@ -105,7 +105,7 @@ public interface PaymentInstrument fcKeepInContent = false) String getFriendlyName(); - void setFriendlyName(final String _friendlyName); + void setFriendlyName(final String _friendlyName); @Property(name = "CreatedDate", @@ -128,7 +128,7 @@ public interface PaymentInstrument fcKeepInContent = false) Calendar getCreatedDate(); - void setCreatedDate(final Calendar _createdDate); + void setCreatedDate(final Calendar _createdDate); @@ -163,4 +163,6 @@ public interface PaymentInstrument + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java index aa3578032..878a3ffee 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java index d67f21744..03c48d1f5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 Person extends Serializable { + @Key @Property(name = "PersonID", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface Person fcKeepInContent = false) Integer getPersonID(); - void setPersonID(final Integer _personID); + void setPersonID(final Integer _personID); @Property(name = "FirstName", @@ -105,7 +105,7 @@ public interface Person fcKeepInContent = false) String getFirstName(); - void setFirstName(final String _firstName); + void setFirstName(final String _firstName); @Property(name = "LastName", @@ -128,7 +128,7 @@ public interface Person fcKeepInContent = false) String getLastName(); - void setLastName(final String _lastName); + void setLastName(final String _lastName); @Property(name = "MiddleName", @@ -151,7 +151,7 @@ public interface Person fcKeepInContent = false) String getMiddleName(); - void setMiddleName(final String _middleName); + void setMiddleName(final String _middleName); @Property(name = "HomeAddress", @@ -174,8 +174,9 @@ public interface Person fcKeepInContent = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address getHomeAddress(); - void setHomeAddress(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress); + void setHomeAddress(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newHomeAddress(); + @Property(name = "Home", @@ -198,7 +199,7 @@ public interface Person fcKeepInContent = false) Point getHome(); - void setHome(final Point _home); + void setHome(final Point _home); @Property(name = "Numbers", @@ -221,7 +222,7 @@ public interface Person fcKeepInContent = false) Collection getNumbers(); - void setNumbers(final Collection _numbers); + void setNumbers(final Collection _numbers); @Property(name = "Emails", @@ -244,7 +245,7 @@ public interface Person fcKeepInContent = false) Collection getEmails(); - void setEmails(final Collection _emails); + void setEmails(final Collection _emails); @@ -279,4 +280,6 @@ public interface Person ); } + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java index 84e4f5b45..778e8cc93 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; @@ -44,25 +43,4 @@ import java.util.Calendar; import javax.xml.datatype.Duration; public interface PersonCollection extends AbstractEntityCollection { - Operations operations(); - - public interface Operations { - - @Operation(name = "GetHomeAddress", - type = OperationType.FUNCTION, - isComposable = true, - returnType = "Microsoft.Test.OData.Services.ODataWCFService.HomeAddress") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress getHomeAddress( - ); - - - @Operation(name = "ResetAddress", - type = OperationType.ACTION, - returnType = "Microsoft.Test.OData.Services.ODataWCFService.Person") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person resetAddress( - @Parameter(name = "addresses", type = "Collection(Microsoft.Test.OData.Services.ODataWCFService.Address)", nullable = false) Collection addresses, - @Parameter(name = "index", type = "Edm.Int32", nullable = false) Integer index - ); - - } } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java index b087931ea..043f9c522 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 Product extends Serializable { + @Key @Property(name = "ProductID", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface Product fcKeepInContent = false) Integer getProductID(); - void setProductID(final Integer _productID); + void setProductID(final Integer _productID); @Property(name = "Name", @@ -105,7 +105,7 @@ public interface Product fcKeepInContent = false) String getName(); - void setName(final String _name); + void setName(final String _name); @Property(name = "QuantityPerUnit", @@ -128,7 +128,7 @@ public interface Product fcKeepInContent = false) String getQuantityPerUnit(); - void setQuantityPerUnit(final String _quantityPerUnit); + void setQuantityPerUnit(final String _quantityPerUnit); @Property(name = "UnitPrice", @@ -151,7 +151,7 @@ public interface Product fcKeepInContent = false) Float getUnitPrice(); - void setUnitPrice(final Float _unitPrice); + void setUnitPrice(final Float _unitPrice); @Property(name = "QuantityInStock", @@ -174,7 +174,7 @@ public interface Product fcKeepInContent = false) Integer getQuantityInStock(); - void setQuantityInStock(final Integer _quantityInStock); + void setQuantityInStock(final Integer _quantityInStock); @Property(name = "Discontinued", @@ -197,7 +197,7 @@ public interface Product fcKeepInContent = false) Boolean getDiscontinued(); - void setDiscontinued(final Boolean _discontinued); + void setDiscontinued(final Boolean _discontinued); @Property(name = "UserAccess", @@ -220,7 +220,7 @@ public interface Product fcKeepInContent = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel getUserAccess(); - void setUserAccess(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel _userAccess); + void setUserAccess(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel _userAccess); @Property(name = "SkinColor", @@ -243,7 +243,7 @@ public interface Product fcKeepInContent = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color getSkinColor(); - void setSkinColor(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color _skinColor); + void setSkinColor(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color _skinColor); @Property(name = "CoverColors", @@ -266,7 +266,7 @@ public interface Product fcKeepInContent = false) Collection getCoverColors(); - void setCoverColors(final Collection _coverColors); + void setCoverColors(final Collection _coverColors); @@ -301,4 +301,6 @@ public interface Product ); } + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java index 60f7c89f8..88cd63d34 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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,20 +47,12 @@ public interface ProductCollection extends AbstractEntityCollection { public interface Operations { - @Operation(name = "GetProductDetails", - type = OperationType.FUNCTION, - isComposable = true, - returnType = "Collection(Microsoft.Test.OData.Services.ODataWCFService.ProductDetail)") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection getProductDetails( - @Parameter(name = "count", type = "Edm.Int32", nullable = true) Integer count - ); - - @Operation(name = "AddAccessRight", + @Operation(name = "Discount", type = OperationType.ACTION, - returnType = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel addAccessRight( - @Parameter(name = "accessRight", type = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", nullable = true) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel accessRight + returnType = "Collection(Microsoft.Test.OData.Services.ODataWCFService.Product)") + org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection discount( + @Parameter(name = "percentage", type = "Edm.Int32", nullable = false) Integer percentage ); } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java index 73183cb7b..8e847ea69 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 ProductDetail extends Serializable { + @Key @Property(name = "ProductID", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface ProductDetail fcKeepInContent = false) Integer getProductID(); - void setProductID(final Integer _productID); + void setProductID(final Integer _productID); @Key @Property(name = "ProductDetailID", @@ -105,7 +105,7 @@ public interface ProductDetail fcKeepInContent = false) Integer getProductDetailID(); - void setProductDetailID(final Integer _productDetailID); + void setProductDetailID(final Integer _productDetailID); @Property(name = "ProductName", @@ -128,7 +128,7 @@ public interface ProductDetail fcKeepInContent = false) String getProductName(); - void setProductName(final String _productName); + void setProductName(final String _productName); @Property(name = "Description", @@ -151,7 +151,7 @@ public interface ProductDetail fcKeepInContent = false) String getDescription(); - void setDescription(final String _description); + void setDescription(final String _description); @@ -188,4 +188,6 @@ public interface ProductDetail } + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java index 7f961916d..31b8c1b1e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; @@ -44,17 +43,4 @@ import java.util.Calendar; import javax.xml.datatype.Duration; public interface ProductDetailCollection extends AbstractEntityCollection { - Operations operations(); - - public interface Operations { - - @Operation(name = "GetRelatedProduct", - type = OperationType.FUNCTION, - isComposable = true, - returnType = "Microsoft.Test.OData.Services.ODataWCFService.Product") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product getRelatedProduct( - ); - - - } } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java index 47949e878..713ba99c5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java @@ -30,7 +30,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java index 61a0cf778..221cdf59e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 ProductReview extends Serializable { + @Key @Property(name = "ProductID", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface ProductReview fcKeepInContent = false) Integer getProductID(); - void setProductID(final Integer _productID); + void setProductID(final Integer _productID); @Key @Property(name = "ProductDetailID", @@ -105,7 +105,7 @@ public interface ProductReview fcKeepInContent = false) Integer getProductDetailID(); - void setProductDetailID(final Integer _productDetailID); + void setProductDetailID(final Integer _productDetailID); @Key @Property(name = "ReviewTitle", @@ -128,7 +128,7 @@ public interface ProductReview fcKeepInContent = false) String getReviewTitle(); - void setReviewTitle(final String _reviewTitle); + void setReviewTitle(final String _reviewTitle); @Key @Property(name = "RevisionID", @@ -151,7 +151,7 @@ public interface ProductReview fcKeepInContent = false) Integer getRevisionID(); - void setRevisionID(final Integer _revisionID); + void setRevisionID(final Integer _revisionID); @Property(name = "Comment", @@ -174,7 +174,7 @@ public interface ProductReview fcKeepInContent = false) String getComment(); - void setComment(final String _comment); + void setComment(final String _comment); @Property(name = "Author", @@ -197,9 +197,11 @@ public interface ProductReview fcKeepInContent = false) String getAuthor(); - void setAuthor(final String _author); + void setAuthor(final String _author); + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java index a9d6eab96..9825a7005 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java index a9790c103..601b57444 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java @@ -30,7 +30,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java index 5612e2052..f56fbd61d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 PublicCompany extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company { + @Key @Property(name = "CompanyID", type = "Edm.Int32", @@ -83,7 +83,7 @@ public interface PublicCompany fcKeepInContent = false) Integer getCompanyID(); - void setCompanyID(final Integer _companyID); + void setCompanyID(final Integer _companyID); @Property(name = "CompanyCategory", @@ -106,7 +106,7 @@ public interface PublicCompany fcKeepInContent = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory getCompanyCategory(); - void setCompanyCategory(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory _companyCategory); + void setCompanyCategory(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory _companyCategory); @Property(name = "Revenue", @@ -129,7 +129,7 @@ public interface PublicCompany fcKeepInContent = false) Long getRevenue(); - void setRevenue(final Long _revenue); + void setRevenue(final Long _revenue); @Property(name = "Name", @@ -152,7 +152,7 @@ public interface PublicCompany fcKeepInContent = false) String getName(); - void setName(final String _name); + void setName(final String _name); @Property(name = "Address", @@ -175,8 +175,9 @@ public interface PublicCompany fcKeepInContent = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address getAddress(); - void setAddress(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _address); + void setAddress(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _address); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newAddress(); + @Property(name = "StockExchange", @@ -199,7 +200,7 @@ public interface PublicCompany fcKeepInContent = false) String getStockExchange(); - void setStockExchange(final String _stockExchange); + void setStockExchange(final String _stockExchange); @@ -274,4 +275,6 @@ public interface PublicCompany + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java index 8b6cf9dce..b90e82f90 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java index f776e6270..7f93e513f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 Statement extends Serializable { + @Key @Property(name = "StatementID", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface Statement fcKeepInContent = false) Integer getStatementID(); - void setStatementID(final Integer _statementID); + void setStatementID(final Integer _statementID); @Property(name = "TransactionType", @@ -105,7 +105,7 @@ public interface Statement fcKeepInContent = false) String getTransactionType(); - void setTransactionType(final String _transactionType); + void setTransactionType(final String _transactionType); @Property(name = "TransactionDescription", @@ -128,7 +128,7 @@ public interface Statement fcKeepInContent = false) String getTransactionDescription(); - void setTransactionDescription(final String _transactionDescription); + void setTransactionDescription(final String _transactionDescription); @Property(name = "Amount", @@ -151,9 +151,11 @@ public interface Statement fcKeepInContent = false) Double getAmount(); - void setAmount(final Double _amount); + void setAmount(final Double _amount); + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java index 4cb03c7e7..2f4c0a6de 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java index 524f02428..aed937b62 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 StoredPI extends Serializable { + @Key @Property(name = "StoredPIID", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface StoredPI fcKeepInContent = false) Integer getStoredPIID(); - void setStoredPIID(final Integer _storedPIID); + void setStoredPIID(final Integer _storedPIID); @Property(name = "PIName", @@ -105,7 +105,7 @@ public interface StoredPI fcKeepInContent = false) String getPIName(); - void setPIName(final String _pIName); + void setPIName(final String _pIName); @Property(name = "PIType", @@ -128,7 +128,7 @@ public interface StoredPI fcKeepInContent = false) String getPIType(); - void setPIType(final String _pIType); + void setPIType(final String _pIType); @Property(name = "CreatedDate", @@ -151,9 +151,11 @@ public interface StoredPI fcKeepInContent = false) Calendar getCreatedDate(); - void setCreatedDate(final Calendar _createdDate); + void setCreatedDate(final Calendar _createdDate); + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java index 171b1bffd..ba7ab8f6c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java index eb4abb5f4..5c172cf0d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java @@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 Subscription extends Serializable { + @Key @Property(name = "SubscriptionID", type = "Edm.Int32", @@ -82,7 +82,7 @@ public interface Subscription fcKeepInContent = false) Integer getSubscriptionID(); - void setSubscriptionID(final Integer _subscriptionID); + void setSubscriptionID(final Integer _subscriptionID); @Property(name = "TemplateGuid", @@ -105,7 +105,7 @@ public interface Subscription fcKeepInContent = false) String getTemplateGuid(); - void setTemplateGuid(final String _templateGuid); + void setTemplateGuid(final String _templateGuid); @Property(name = "Title", @@ -128,7 +128,7 @@ public interface Subscription fcKeepInContent = false) String getTitle(); - void setTitle(final String _title); + void setTitle(final String _title); @Property(name = "Category", @@ -151,7 +151,7 @@ public interface Subscription fcKeepInContent = false) String getCategory(); - void setCategory(final String _category); + void setCategory(final String _category); @Property(name = "CreatedDate", @@ -174,9 +174,11 @@ public interface Subscription fcKeepInContent = false) Calendar getCreatedDate(); - void setCreatedDate(final Calendar _createdDate); + void setCreatedDate(final Calendar _createdDate); + + } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java index fccaadc34..08393e72e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java @@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java index 7fe083707..c54e309cb 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java @@ -134,7 +134,11 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase { assertNotNull(created); assertEquals(2, created.getProperty("OrderShelfLifes").getCollectionValue().size()); - final ODataDeleteRequest deleteReq = getClient().getCUDRequestFactory().getDeleteRequest(created.getEditLink()); + final URI deleteURI = created.getEditLink() == null + ? getClient().getURIBuilder(testStaticServiceRootURL). + appendEntitySetSegment("Orders").appendKeySegment(id).build() + : created.getEditLink(); + final ODataDeleteRequest deleteReq = getClient().getCUDRequestFactory().getDeleteRequest(deleteURI); final ODataDeleteResponse deleteRes = deleteReq.execute(); assertEquals(204, deleteRes.getStatusCode()); } diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java index 3e66e1d41..060351e82 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java @@ -130,7 +130,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase { newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.Color", "Blue"))); product.getProperties().add(getClient().getObjectFactory().newCollectionProperty("CoverColors", getClient().getObjectFactory(). - newCollectionValue("Collection(Microsoft.Test.OData.Services.ODataWCFService.ProductDetail)"))); + newCollectionValue("Microsoft.Test.OData.Services.ODataWCFService.ProductDetail"))); product.getProperty("CoverColors").getCollectionValue().add(getClient().getObjectFactory(). newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.Color", "Green")); product.getProperty("CoverColors").getCollectionValue().add(getClient().getObjectFactory(). diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java index b01248532..ec82cca9f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java @@ -53,7 +53,7 @@ import org.junit.Test; */ public class EntityRetrieveTestITCase extends AbstractTestITCase { - private void withInlineEntry(final ODataClient client, final ODataPubFormat format) { + private void withInlineEntity(final ODataClient client, final ODataPubFormat format) { final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL). appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company"); @@ -68,10 +68,10 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase { assertEquals("Microsoft.Test.OData.Services.ODataWCFService.Customer", entity.getTypeName().toString()); assertTrue(entity.getProperty("Home").hasPrimitiveValue()); assertEquals("Edm.GeographyPoint", entity.getProperty("Home").getPrimitiveValue().getTypeName()); - assertEquals(testStaticServiceRootURL + "/Customers(1)", entity.getEditLink().toASCIIString()); // In JSON with minimal metadata, links are not provided if (format == ODataPubFormat.ATOM || format == ODataPubFormat.JSON_FULL_METADATA) { + assertEquals(testStaticServiceRootURL + "/Customers(1)", entity.getEditLink().toASCIIString()); assertEquals(3, entity.getNavigationLinks().size()); if (ODataPubFormat.ATOM == format) { @@ -109,21 +109,21 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase { } @Test - public void withInlineEntryFromAtom() { - withInlineEntry(client, ODataPubFormat.ATOM); + public void withInlineEntityFromAtom() { + withInlineEntity(client, ODataPubFormat.ATOM); } @Test - public void withInlineEntryFromFullJSON() { - withInlineEntry(client, ODataPubFormat.JSON_FULL_METADATA); + public void withInlineEntityFromFullJSON() { + withInlineEntity(client, ODataPubFormat.JSON_FULL_METADATA); } @Test - public void withInlineEntryFromJSON() { - withInlineEntry(edmClient, ODataPubFormat.JSON); + public void withInlineEntityFromJSON() { + withInlineEntity(edmClient, ODataPubFormat.JSON); } - private void withInlineFeed(final ODataClient client, final ODataPubFormat format) { + private void withInlineEntitySet(final ODataClient client, final ODataPubFormat format) { final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL). appendEntitySetSegment("Customers").appendKeySegment(1).expand("Orders"); @@ -152,18 +152,18 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase { } @Test - public void withInlineFeedFromAtom() { - withInlineFeed(client, ODataPubFormat.ATOM); + public void withInlineEntitySetFromAtom() { + withInlineEntitySet(client, ODataPubFormat.ATOM); } @Test - public void withInlineFeedFromFullJSON() { - withInlineFeed(client, ODataPubFormat.JSON_FULL_METADATA); + public void withInlineEntitySetFromFullJSON() { + withInlineEntitySet(client, ODataPubFormat.JSON_FULL_METADATA); } @Test - public void withInlineFeedFromJSON() { - withInlineFeed(edmClient, ODataPubFormat.JSON); + public void withInlineEntitySetFromJSON() { + withInlineEntitySet(edmClient, ODataPubFormat.JSON); } private void rawRequest(final ODataPubFormat format) { diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java index 37298b263..7ae5edab6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java @@ -55,8 +55,11 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase { final ODataEntity entity = res.getBody(); assertNotNull(entity); - assertFalse(entity.getEditLink().toASCIIString().contains("(")); - assertFalse(entity.getEditLink().toASCIIString().contains(")")); + // In JSON with minimal metadata, links are not provided + if (format == ODataPubFormat.ATOM || format == ODataPubFormat.JSON_FULL_METADATA) { + assertFalse(entity.getEditLink().toASCIIString().contains("(")); + assertFalse(entity.getEditLink().toASCIIString().contains(")")); + } } @Test @@ -76,7 +79,7 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase { @Test public void jsonCreateAndDelete() { - createAndDeleteOrder(ODataPubFormat.JSON, 1001); + createAndDeleteOrder(ODataPubFormat.JSON_FULL_METADATA, 1001); } private void update(final ODataPubFormat format) { diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java index f49f50ba6..01f5a7c70 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java @@ -139,8 +139,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase { contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("Single", getClient().getObjectFactory().newPrimitiveValueBuilder().buildSingle(Float.MAX_VALUE))); contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("Short", - getClient().getObjectFactory().newPrimitiveValueBuilder(). - setType(EdmPrimitiveTypeKind.Int16).setValue(Short.MAX_VALUE).build())); + getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt16(Short.MAX_VALUE))); contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("Int", getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(Integer.MAX_VALUE))); getClient().getBinder().add(rowIndex, @@ -157,12 +156,9 @@ public class OpenTypeTestITCase extends AbstractTestITCase { appendEntitySetSegment("RowIndex").appendKeySegment(id); rowIndex = read(format, builder.build()); assertNotNull(rowIndex); - assertEquals(EdmPrimitiveTypeKind.Int32, - rowIndex.getProperty("Id").getPrimitiveValue().getTypeKind()); - assertEquals(EdmPrimitiveTypeKind.String, - rowIndex.getProperty("aString").getPrimitiveValue().getTypeKind()); - assertEquals(EdmPrimitiveTypeKind.Boolean, - rowIndex.getProperty("aBoolean").getPrimitiveValue().getTypeKind()); + assertEquals(EdmPrimitiveTypeKind.Int32, rowIndex.getProperty("Id").getPrimitiveValue().getTypeKind()); + assertEquals(EdmPrimitiveTypeKind.String, rowIndex.getProperty("aString").getPrimitiveValue().getTypeKind()); + assertEquals(EdmPrimitiveTypeKind.Boolean, rowIndex.getProperty("aBoolean").getPrimitiveValue().getTypeKind()); assertTrue(rowIndex.getProperty("aDouble").hasPrimitiveValue()); assertTrue(rowIndex.getProperty("aByte").hasPrimitiveValue()); assertTrue(rowIndex.getProperty("aDate").hasPrimitiveValue()); diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java index e7bdfd08e..3fb155d94 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java @@ -393,12 +393,12 @@ public class EdmClientImpl extends AbstractEdm { } else { for (EntityContainer entityContainer : schema.getEntityContainers()) { @SuppressWarnings("unchecked") - final List functionImports = (List) entityContainer. - getFunctionImports(functionName.getName()); + final List functionImports = + (List) entityContainer.getFunctionImports(functionName.getName()); boolean found = false; for (final Iterator itor = functionImports.iterator(); itor.hasNext() && !found;) { final FunctionImport functionImport = itor.next(); - if (!FunctionImportUtils.canProxyFunction(functionImport) && functionImport.isBindable()) { + if (FunctionImportUtils.canProxyFunction(functionImport) && functionImport.isBindable()) { final EdmTypeInfo boundParam = new EdmTypeInfo.Builder().setEdm(this). setTypeExpression(functionImport.getParameters().get(0).getType()).build(); if (bindingParameterTypeName.equals(boundParam.getFullQualifiedName()) diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java index 61e5267d7..70009a55f 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java @@ -34,7 +34,9 @@ import org.apache.olingo.client.api.edm.xml.v4.Annotations; import org.apache.olingo.client.api.edm.xml.v4.Function; import org.apache.olingo.client.api.edm.xml.v4.Term; import org.apache.olingo.client.api.edm.xml.v4.TypeDefinition; +import org.apache.olingo.client.core.edm.v3.EdmActionProxy; import org.apache.olingo.client.core.edm.v3.EdmFunctionProxy; +import org.apache.olingo.client.core.edm.v3.FunctionImportUtils; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmAnnotation; @@ -186,6 +188,20 @@ public class EdmSchemaImpl extends AbstractEdmSchema { actions.add(EdmActionImpl.getInstance(edm, new FullQualifiedName(namespace, action.getName()), action)); } } + } else { + for (EntityContainer providerContainer : schema.getEntityContainers()) { + @SuppressWarnings("unchecked") + final List providerFunctions = (List) providerContainer.getFunctionImports(); + if (providerFunctions != null) { + for (FunctionImport functionImport : providerFunctions) { + if (!FunctionImportUtils.canProxyFunction(functionImport)) { + actions.add(EdmActionProxy.getInstance(edm, + new FullQualifiedName(namespace, functionImport.getName()), functionImport)); + } + } + } + + } } return actions; } @@ -207,9 +223,11 @@ public class EdmSchemaImpl extends AbstractEdmSchema { @SuppressWarnings("unchecked") final List providerFunctions = (List) providerContainer.getFunctionImports(); if (providerFunctions != null) { - for (FunctionImport function : providerFunctions) { - functions.add( - EdmFunctionProxy.getInstance(edm, new FullQualifiedName(namespace, function.getName()), function)); + for (FunctionImport functionImport : providerFunctions) { + if (FunctionImportUtils.canProxyFunction(functionImport)) { + functions.add(EdmFunctionProxy.getInstance(edm, + new FullQualifiedName(namespace, functionImport.getName()), functionImport)); + } } } diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmOperationProxy.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmOperationProxy.java index 9410bb5f3..477fc0d3c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmOperationProxy.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmOperationProxy.java @@ -68,14 +68,16 @@ public class EdmOperationProxy extends AbstractEdmOperation { @Override public FullQualifiedName getBindingParameterTypeFqn() { - //Not relevant for V3 - return null; + return getParameterNames().isEmpty() + ? null + : getParameter(getParameterNames().get(0)).getType().getFullQualifiedName(); } @Override public Boolean isBindingParameterTypeCollection() { - //Not relevant for V3 - return null; + return getParameterNames().isEmpty() + ? false + : getParameter(getParameterNames().get(0)).isCollection(); } @Override diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/MetadataTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/MetadataTest.java index f6bcdb938..ecd261ca0 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/MetadataTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/MetadataTest.java @@ -113,6 +113,35 @@ public class MetadataTest extends AbstractTest { assertTrue(sack.isBound()); assertEquals(1, sack.getParameterNames().size()); + final EdmAction sack2 = edm.getBoundAction( + new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService", "Sack"), + new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService", "Employee"), + true); + assertNull(sack2); + + final EdmFunction sack3 = edm.getBoundFunction( + new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService", "Sack"), + new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService", "Employee"), + false, + null); + assertNull(sack3); + + boolean found = false; + for (EdmAction action : edm.getSchemas().get(0).getActions()) { + if ("Sack".equals(action.getName()) && action.isBound()) { + found = true; + } + } + assertTrue(found); + + final EdmAction increaseSalaries = edm.getBoundAction( + new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService", "IncreaseSalaries"), + new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService", "Employee"), + true); + assertNotNull(increaseSalaries); + assertTrue(increaseSalaries.isBound()); + assertEquals(2, increaseSalaries.getParameterNames().size()); + // 4. EntityContainer final EdmEntityContainer container = edm.getEntityContainer( new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService", "DefaultContainer")); @@ -273,10 +302,10 @@ public class MetadataTest extends AbstractTest { final EdmEntityType computer = metadata.getEntityType(new FullQualifiedName(container.getNamespace(), "Computer")); assertNotNull(computer); - final EdmFunction getComputer = metadata.getBoundFunction( + final EdmAction getComputer = metadata.getBoundAction( new FullQualifiedName(container.getNamespace(), "GetComputer"), new FullQualifiedName(container.getNamespace(), computer.getName()), - Boolean.FALSE, Arrays.asList("computer")); + false); assertNotNull(getComputer); assertEquals(computer, getComputer.getParameter("computer").getType()); assertEquals(computer, getComputer.getReturnType().getType()); diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/ComputerDetail_-10.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/ComputerDetail_-10.json index 88c78047d..0d1098238 100644 --- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/ComputerDetail_-10.json +++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/ComputerDetail_-10.json @@ -1 +1,28 @@ -{"odata.metadata":"http://192.168.43.55:8080/DefaultService.svc/$metadata#ComputerDetail/@Element","odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://192.168.43.55:8080/DefaultService.svc/ComputerDetail(-10)","odata.editLink":"ComputerDetail(-10)","Computer@odata.navigationLinkUrl":"ComputerDetail(-10)/Computer","#DefaultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://192.168.43.55:8080/DefaultService.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-10,"Manufacturer":"sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk","Model":"usfvbkyxssojjebyzgvtnzkuik\u00dfuxrmllzyglnsssluyxf\u00dfssioyroouxafzbhbsabkrsslbyhghicjaplolzqss\u00dfhhfix","Serial":null,"SpecificationsBag@odata.type":"Collection(Edm.String)","SpecificationsBag":["vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv","rbsejgfgelhsdahkoqlnzvbq","ssfvnnquahsczxlu\u00dfnssrhpsszluundy\u00dfehyzjedssxom","xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx","eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee","\u30be\u3092\u4e5d\u30af\u305d"],"PurchaseDate@odata.type":"Edm.DateTime","PurchaseDate":"2020-12-15T01:33:35.8014568","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-8917.92836319839","Height@odata.type":"Edm.Decimal","Height":"-79228162514264337593543950335","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"}} +{ + "odata.metadata": "http://192.168.43.55:8080/DefaultService.svc/$metadata#ComputerDetail/@Element", + "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail", + "odata.id": "http://192.168.43.55:8080/DefaultService.svc/ComputerDetail(-10)", + "odata.editLink": "ComputerDetail(-10)", + "Computer@odata.navigationLinkUrl": "ComputerDetail(-10)/Computer", + "#DefaultContainer.ResetComputerDetailsSpecifications": { + "title": "ResetComputerDetailsSpecifications", + "target": "http://192.168.43.55:8080/DefaultService.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications" + }, + "ComputerDetailId": -10, + "Manufacturer": "sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk", + "Model": "usfvbkyxssojjebyzgvtnzkuik\u00dfuxrmllzyglnsssluyxf\u00dfssioyroouxafzbhbsabkrsslbyhghicjaplolzqss\u00dfhhfix", + "Serial": null, + "SpecificationsBag@odata.type": "Collection(Edm.String)", + "SpecificationsBag": ["vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv", "rbsejgfgelhsdahkoqlnzvbq", "ssfvnnquahsczxlu\u00dfnssrhpsszluundy\u00dfehyzjedssxom", "xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx", "eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee", "\u30be\u3092\u4e5d\u30af\u305d"], + "PurchaseDate@odata.type": "Edm.DateTime", + "PurchaseDate": "2020-12-15T01:33:35.8014568", + "Dimensions": { + "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions", + "Width@odata.type": "Edm.Decimal", + "Width": -8917.92836319839, + "Height@odata.type": "Edm.Decimal", + "Height": -79228162514264337593543950335, + "Depth@odata.type": "Edm.Decimal", + "Depth": -79228162514264337593543950335 + } +} diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/Product_-10_Dimensions_Width.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/Product_-10_Dimensions_Width.json index 2be5aa804..1932f6c5f 100644 --- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/Product_-10_Dimensions_Width.json +++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/Product_-10_Dimensions_Width.json @@ -1 +1,4 @@ -{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#Edm.Decimal","value":"-79228162514264337593543950335"} \ No newline at end of file +{ + "odata.metadata": "http://192.168.0.160:8080/DefaultService.svc/$metadata#Edm.Decimal", + "value": -79228162514264337593543950335 +} diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractJsonDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractJsonDeserializer.java index f94ff6821..33d8243b5 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractJsonDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractJsonDeserializer.java @@ -180,21 +180,20 @@ abstract class AbstractJsonDeserializer extends ODataJacksonDeserializer extends ODataJacksonSerializer { private static final EdmPrimitiveTypeKind[] NUMBER_TYPES = { EdmPrimitiveTypeKind.Byte, EdmPrimitiveTypeKind.SByte, EdmPrimitiveTypeKind.Single, EdmPrimitiveTypeKind.Double, - EdmPrimitiveTypeKind.Int16, EdmPrimitiveTypeKind.Int32, EdmPrimitiveTypeKind.Int64 + EdmPrimitiveTypeKind.Int16, EdmPrimitiveTypeKind.Int32, EdmPrimitiveTypeKind.Int64, + EdmPrimitiveTypeKind.Decimal }; private final JSONGeoValueSerializer geoSerializer = new JSONGeoValueSerializer(); @@ -202,7 +203,7 @@ abstract class AbstractJsonSerializer extends ODataJacksonSerializer { if (value.isLinkedComplex()) { links(value.asLinkedComplex(), jgen); } - + jgen.writeEndObject(); } }