From f1cbc4aff6f09137eb1fa83767642aee295e9e3a Mon Sep 17 00:00:00 2001 From: fmartelli Date: Sun, 11 May 2014 18:05:39 +0200 Subject: [PATCH] [OLINGO-260] provided proxy entity create mechanism; still working on EntityCreateTestITCase since it seems to hang the integration tests when executed with others --- .../AbstractTypeInvocationHandler.java | 71 ++---- .../commons/ComplexTypeInvocationHandler.java | 93 ++++++-- .../commons/EntityTypeInvocationHandler.java | 89 +++++--- .../commons/FactoryInvocationHandler.java | 84 +++++++ .../olingo/ext/proxy/utils/CoreUtils.java | 132 +++++++---- .../olingo/ext/pojogen/AbstractUtility.java | 12 + .../src/main/resources/entityType.vm | 29 ++- .../src/main/resources/v30/complexType.vm | 23 +- .../src/main/resources/v40/complexType.vm | 23 +- .../apache/olingo/fit/AbstractServices.java | 75 ++++--- .../olingo/fit/utils/AbstractUtilities.java | 18 +- .../V30/CustomerInfo/16/entity.full.json | 11 + .../resources/V30/CustomerInfo/16/entity.xml | 37 +++ .../olingo/fit/proxy/v3/AbstractTest.java | 22 +- .../fit/proxy/v3/EntityCreateTestITCase.java | 210 ++++++++++++++++++ .../proxy/v3/EntityRetrieveTestITCase.java | 38 +++- .../AllGeoCollectionTypesSet.java | 1 + .../astoriadefaultservice/AllGeoTypesSet.java | 1 + .../services/astoriadefaultservice/Car.java | 1 + .../astoriadefaultservice/Computer.java | 1 + .../astoriadefaultservice/ComputerDetail.java | 1 + .../astoriadefaultservice/Customer.java | 1 + .../astoriadefaultservice/CustomerInfo.java | 1 + .../DefaultContainer.java | 1 + .../astoriadefaultservice/Driver.java | 1 + .../astoriadefaultservice/LastLogin.java | 1 + .../astoriadefaultservice/License.java | 1 + .../services/astoriadefaultservice/Login.java | 1 + .../MappedEntityType.java | 1 + .../astoriadefaultservice/Message.java | 1 + .../MessageAttachment.java | 1 + .../services/astoriadefaultservice/Order.java | 1 + .../astoriadefaultservice/OrderLine.java | 1 + .../astoriadefaultservice/PageView.java | 1 + .../astoriadefaultservice/Person.java | 1 + .../astoriadefaultservice/PersonMetadata.java | 1 + .../astoriadefaultservice/Product.java | 1 + .../astoriadefaultservice/ProductDetail.java | 1 + .../astoriadefaultservice/ProductPhoto.java | 1 + .../astoriadefaultservice/ProductReview.java | 1 + .../astoriadefaultservice/RSAToken.java | 1 + .../astoriadefaultservice/package-info.java | 1 + .../astoriadefaultservice/types/Aliases.java | 5 +- .../types/AllSpatialCollectionTypes.java | 3 +- .../AllSpatialCollectionTypesCollection.java | 1 + .../AllSpatialCollectionTypes_Simple.java | 3 +- ...atialCollectionTypes_SimpleCollection.java | 1 + .../types/AllSpatialTypes.java | 3 +- .../types/AllSpatialTypesCollection.java | 1 + .../types/AuditInfo.java | 17 +- .../types/BackOrderLine.java | 3 +- .../types/BackOrderLine2.java | 3 +- .../types/BackOrderLine2Collection.java | 1 + .../types/BackOrderLineCollection.java | 1 + .../astoriadefaultservice/types/Car.java | 3 +- .../types/CarCollection.java | 1 + .../types/ComplexToCategory.java | 5 +- .../types/ComplexWithAllPrimitiveTypes.java | 5 +- .../astoriadefaultservice/types/Computer.java | 7 +- .../types/ComputerCollection.java | 1 + .../types/ComputerDetail.java | 17 +- .../types/ComputerDetailCollection.java | 1 + .../types/ConcurrencyInfo.java | 5 +- .../types/ContactDetails.java | 41 ++-- .../types/Contractor.java | 3 +- .../types/ContractorCollection.java | 1 + .../astoriadefaultservice/types/Customer.java | 29 ++- .../types/CustomerCollection.java | 1 + .../types/CustomerInfo.java | 3 +- .../types/CustomerInfoCollection.java | 1 + .../types/Dimensions.java | 5 +- .../types/DiscontinuedProduct.java | 38 ++-- .../types/DiscontinuedProductCollection.java | 1 + .../astoriadefaultservice/types/Driver.java | 3 +- .../types/DriverCollection.java | 1 + .../astoriadefaultservice/types/Employee.java | 7 +- .../types/EmployeeCollection.java | 1 + .../types/LastLogin.java | 3 +- .../types/LastLoginCollection.java | 1 + .../astoriadefaultservice/types/License.java | 3 +- .../types/LicenseCollection.java | 1 + .../astoriadefaultservice/types/Login.java | 3 +- .../types/LoginCollection.java | 1 + .../types/MappedEntityType.java | 29 ++- .../types/MappedEntityTypeCollection.java | 1 + .../astoriadefaultservice/types/Message.java | 3 +- .../types/MessageAttachment.java | 3 +- .../types/MessageAttachmentCollection.java | 1 + .../types/MessageCollection.java | 1 + .../types/MessageKey.java | 1 + .../astoriadefaultservice/types/Order.java | 13 +- .../types/OrderCollection.java | 1 + .../types/OrderLine.java | 3 +- .../types/OrderLineCollection.java | 1 + .../types/OrderLineKey.java | 1 + .../astoriadefaultservice/types/PageView.java | 3 +- .../types/PageViewCollection.java | 1 + .../astoriadefaultservice/types/Person.java | 3 +- .../types/PersonCollection.java | 1 + .../types/PersonMetadata.java | 3 +- .../types/PersonMetadataCollection.java | 1 + .../astoriadefaultservice/types/Phone.java | 5 +- .../astoriadefaultservice/types/Product.java | 33 ++- .../types/ProductCollection.java | 1 + .../types/ProductDetail.java | 3 +- .../types/ProductDetailCollection.java | 1 + .../types/ProductPageView.java | 3 +- .../types/ProductPageViewCollection.java | 1 + .../types/ProductPhoto.java | 3 +- .../types/ProductPhotoCollection.java | 1 + .../types/ProductPhotoKey.java | 1 + .../types/ProductReview.java | 3 +- .../types/ProductReviewCollection.java | 1 + .../types/ProductReviewKey.java | 1 + .../astoriadefaultservice/types/RSAToken.java | 3 +- .../types/RSATokenCollection.java | 1 + .../types/SpecialEmployee.java | 3 +- .../types/SpecialEmployeeCollection.java | 1 + .../types/package-info.java | 1 + .../services/odatawcfservice/Accounts.java | 1 + .../odata/services/odatawcfservice/Boss.java | 1 + .../services/odatawcfservice/Company.java | 1 + .../services/odatawcfservice/Customers.java | 1 + .../odatawcfservice/DefaultStoredPI.java | 1 + .../services/odatawcfservice/Departments.java | 1 + .../services/odatawcfservice/Employees.java | 1 + .../odatawcfservice/InMemoryEntities.java | 1 + .../services/odatawcfservice/LabourUnion.java | 1 + .../odatawcfservice/OrderDetails.java | 1 + .../services/odatawcfservice/Orders.java | 1 + .../services/odatawcfservice/People.java | 1 + .../odatawcfservice/ProductDetails.java | 1 + .../odatawcfservice/ProductReviews.java | 1 + .../services/odatawcfservice/Products.java | 1 + .../odatawcfservice/PublicCompany.java | 1 + .../services/odatawcfservice/StoredPIs.java | 1 + .../SubscriptionTemplates.java | 1 + .../services/odatawcfservice/VipCustomer.java | 1 + .../odatawcfservice/package-info.java | 1 + .../odatawcfservice/types/AccessLevel.java | 1 + .../odatawcfservice/types/Account.java | 17 +- .../types/AccountCollection.java | 1 + .../odatawcfservice/types/AccountInfo.java | 5 +- .../odatawcfservice/types/Address.java | 5 +- .../services/odatawcfservice/types/Asset.java | 3 +- .../types/AssetCollection.java | 1 + .../services/odatawcfservice/types/Club.java | 3 +- .../odatawcfservice/types/ClubCollection.java | 1 + .../services/odatawcfservice/types/Color.java | 1 + .../odatawcfservice/types/Company.java | 17 +- .../odatawcfservice/types/CompanyAddress.java | 5 +- .../types/CompanyCategory.java | 1 + .../types/CompanyCollection.java | 1 + .../odatawcfservice/types/CreditCardPI.java | 3 +- .../types/CreditCardPICollection.java | 1 + .../odatawcfservice/types/CreditRecord.java | 3 +- .../types/CreditRecordCollection.java | 1 + .../odatawcfservice/types/Customer.java | 14 +- .../types/CustomerCollection.java | 1 + .../odatawcfservice/types/Department.java | 3 +- .../types/DepartmentCollection.java | 1 + .../odatawcfservice/types/Employee.java | 14 +- .../types/EmployeeCollection.java | 1 + .../odatawcfservice/types/GiftCard.java | 7 +- .../types/GiftCardCollection.java | 1 + .../odatawcfservice/types/HomeAddress.java | 5 +- .../odatawcfservice/types/LabourUnion.java | 3 +- .../types/LabourUnionCollection.java | 1 + .../services/odatawcfservice/types/Order.java | 3 +- .../types/OrderCollection.java | 1 + .../odatawcfservice/types/OrderDetail.java | 3 +- .../types/OrderDetailCollection.java | 1 + .../odatawcfservice/types/OrderDetailKey.java | 1 + .../types/PaymentInstrument.java | 3 +- .../types/PaymentInstrumentCollection.java | 1 + .../odatawcfservice/types/Person.java | 17 +- .../types/PersonCollection.java | 1 + .../odatawcfservice/types/Product.java | 7 +- .../types/ProductCollection.java | 1 + .../odatawcfservice/types/ProductDetail.java | 7 +- .../types/ProductDetailCollection.java | 1 + .../types/ProductDetailKey.java | 1 + .../odatawcfservice/types/ProductReview.java | 3 +- .../types/ProductReviewCollection.java | 1 + .../types/ProductReviewKey.java | 1 + .../odatawcfservice/types/PublicCompany.java | 14 +- .../types/PublicCompanyCollection.java | 1 + .../odatawcfservice/types/Statement.java | 3 +- .../types/StatementCollection.java | 1 + .../odatawcfservice/types/StoredPI.java | 3 +- .../types/StoredPICollection.java | 1 + .../odatawcfservice/types/Subscription.java | 3 +- .../types/SubscriptionCollection.java | 1 + .../odatawcfservice/types/package-info.java | 1 + .../apache/olingo/fit/v3/BatchTestITCase.java | 13 ++ 195 files changed, 1172 insertions(+), 426 deletions(-) create mode 100644 ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/FactoryInvocationHandler.java create mode 100644 fit/src/main/resources/V30/CustomerInfo/16/entity.full.json create mode 100644 fit/src/main/resources/V30/CustomerInfo/16/entity.xml create mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractTypeInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractTypeInvocationHandler.java index d1ab039ef..f10cb0375 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractTypeInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractTypeInvocationHandler.java @@ -31,8 +31,6 @@ import org.apache.olingo.client.api.CommonEdmEnabledODataClient; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; 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.ODataComplexValue; import org.apache.olingo.commons.api.domain.ODataInlineEntity; import org.apache.olingo.commons.api.domain.ODataInlineEntitySet; import org.apache.olingo.commons.api.domain.ODataLink; @@ -40,19 +38,25 @@ import org.apache.olingo.commons.api.domain.ODataLinked; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.ext.proxy.EntityContainerFactory; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; import org.apache.olingo.ext.proxy.api.annotations.EntityType; 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.EntityContext; import org.apache.olingo.ext.proxy.utils.ClassUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class AbstractTypeInvocationHandler> extends AbstractInvocationHandler { private static final long serialVersionUID = 2629912294765040037L; + /** + * Logger. + */ + protected static final Logger LOG = LoggerFactory.getLogger(AbstractTypeInvocationHandler.class); + protected final Class typeRef; protected final EntityContext entityContext = EntityContainerFactory.getContext().entityContext(); @@ -104,11 +108,17 @@ public abstract class AbstractTypeInvocationHandler[] {returnType}, OperationInvocationHandler.getInstance(targetHandler)); + } else if ("factory".equals(method.getName()) && ArrayUtils.isEmpty(args)) { + final Class returnType = method.getReturnType(); + + return Proxy.newProxyInstance( + Thread.currentThread().getContextClassLoader(), + new Class[] {returnType}, + FactoryInvocationHandler.getInstance(targetHandler, this)); } else if (method.getName().startsWith("get")) { // Assumption: for each getter will always exist a setter and viceversa. // get method annotation and check if it exists as expected final Object res; - final Method getter = typeRef.getMethod(method.getName()); final Property property = ClassUtils.getAnnotation(Property.class, getter); @@ -152,22 +162,6 @@ public abstract class AbstractTypeInvocationHandler complexTypeHandler = newComplex(property.name(), getter.getReturnType()); - - return Proxy.newProxyInstance( - Thread.currentThread().getContextClassLoader(), - new Class[] {getter.getReturnType()}, - complexTypeHandler); } else { throw new UnsupportedOperationException("Method not found: " + method); } @@ -193,39 +187,6 @@ public abstract class AbstractTypeInvocationHandler newComplex(final String propertyName, final Class reference) { - final Class complexTypeRef; - final boolean isCollection; - if (Collection.class.isAssignableFrom(reference)) { - complexTypeRef = ClassUtils.extractTypeArg(reference); - isCollection = true; - } else { - complexTypeRef = reference; - isCollection = false; - } - - final ComplexType annotation = complexTypeRef.getAnnotation(ComplexType.class); - if (annotation == null) { - throw new IllegalArgumentException("Invalid complex type " + complexTypeRef); - } - - final FullQualifiedName typeName = - new FullQualifiedName(ClassUtils.getNamespace(complexTypeRef), annotation.name()); - - final ODataComplexValue complex = - client.getObjectFactory().newComplexValue(typeName.toString()); - - final ComplexTypeInvocationHandler handler = (ComplexTypeInvocationHandler) ComplexTypeInvocationHandler. - getInstance(complex, complexTypeRef, targetHandler); - - attach(AttachedEntityStatus.CHANGED); - - addPropertyChanges(propertyName, handler, isCollection); - - return handler; - } - protected abstract Object getNavigationPropertyValue(final NavigationProperty property, final Method getter); protected Object retriveNavigationProperty(final NavigationProperty property, final Method getter) { @@ -296,7 +257,7 @@ public abstract class AbstractTypeInvocationHandler getInstance( + final CommonEdmEnabledODataClient client, + final String propertyName, + final Class reference, + final EntityTypeInvocationHandler handler) { + final Class complexTypeRef; + if (Collection.class.isAssignableFrom(reference)) { + complexTypeRef = ClassUtils.extractTypeArg(reference); + } else { + complexTypeRef = reference; + } + + final ComplexType annotation = complexTypeRef.getAnnotation(ComplexType.class); + if (annotation == null) { + throw new IllegalArgumentException("Invalid complex type " + complexTypeRef); + } + + final FullQualifiedName typeName = + new FullQualifiedName(ClassUtils.getNamespace(complexTypeRef), annotation.name()); + + final ODataComplexValue complex = + client.getObjectFactory().newComplexValue(typeName.toString()); + + return (ComplexTypeInvocationHandler) ComplexTypeInvocationHandler.getInstance( + client, complex, complexTypeRef, handler); + } + @SuppressWarnings({"unchecked", "rawtypes"}) static ComplexTypeInvocationHandler getInstance( + final CommonEdmEnabledODataClient client, final ODataComplexValue complex, final Class typeRef, final EntityTypeInvocationHandler handler) { - return new ComplexTypeInvocationHandler(handler.targetHandler.getClient(), complex, typeRef, handler); + return new ComplexTypeInvocationHandler(client, complex, typeRef, handler); } public ComplexTypeInvocationHandler( @@ -83,19 +114,38 @@ public class ComplexTypeInvocationHandler[] {(Class) type}, - newComplex(name, (Class) type)); + ComplexTypeInvocationHandler.getInstance( + client, property.getValue().asComplex(), (Class) type, targetHandler)); - CoreUtils.populate( - client.getCachedEdm(), - res, - (Class) type, - Property.class, - property.getValue().asComplex().iterator()); + } else if (property.hasCollectionValue()) { + final ParameterizedType collType = (ParameterizedType) type; + final Class collItemClass = (Class) collType.getActualTypeArguments()[0]; + + final ArrayList collection = new ArrayList(); + + final Iterator collPropItor = property.getValue().asCollection().iterator(); + while (collPropItor.hasNext()) { + final ODataValue value = collPropItor.next(); + if (value.isPrimitive()) { + collection.add(CoreUtils.primitiveValueToObject(value.asPrimitive())); + } else if (value.isComplex()) { + final Object collItem = Proxy.newProxyInstance( + Thread.currentThread().getContextClassLoader(), + new Class[] {collItemClass}, + ComplexTypeInvocationHandler.getInstance( + client, value.asComplex(), collItemClass, targetHandler)); + + collection.add(collItem); + } + } + + res = collection; } else { res = type == null ? CoreUtils.getValueFromProperty(client, property) @@ -131,17 +181,34 @@ public class ComplexTypeInvocationHandler(); + for (Object obj : (Collection) value) { + ((Collection) toBeAdded).add(obj instanceof Proxy ? Proxy.getInvocationHandler(obj) : obj); + } + } else if (value instanceof Proxy) { + toBeAdded = Proxy.getInvocationHandler(value); + } else { + toBeAdded = value; + } + final EdmTypeInfo type = new EdmTypeInfo.Builder(). setEdm(client.getCachedEdm()).setTypeExpression( - edmProperty.isCollection() ? "Collection(" + property.type() + ")" : property.type()).build(); + edmProperty.isCollection() ? "Collection(" + property.type() + ")" : property.type()).build(); - client.getBinder().add(getComplex(), CoreUtils.getODataProperty(client, property.name(), type, value)); + client.getBinder().add( + getComplex(), CoreUtils.getODataProperty(client, property.name(), type, toBeAdded)); if (targetHandler != null && !entityContext.isAttached(targetHandler)) { entityContext.attach(targetHandler, AttachedEntityStatus.CHANGED); @@ -158,7 +225,7 @@ public class ComplexTypeInvocationHandler[] {(Class) type}, - (ComplexTypeInvocationHandler) propertyChanges.get(name)) - : propertyChanges.get(name); + res = propertyChanges.get(name); + } else if (property == null) { + res = null; } else if (property.hasComplexValue()) { res = Proxy.newProxyInstance( Thread.currentThread().getContextClassLoader(), new Class[] {(Class) type}, - newComplex(name, (Class) type)); + ComplexTypeInvocationHandler.getInstance( + client, property.getValue().asComplex(), (Class) type, this)); - CoreUtils.populate( - client.getCachedEdm(), - res, - (Class) type, - Property.class, - property.getValue().asComplex().iterator()); + addPropertyChanges(name, res); + } else if (property.hasCollectionValue()) { + final ParameterizedType collType = (ParameterizedType) type; + final Class collItemClass = (Class) collType.getActualTypeArguments()[0]; + + final ArrayList collection = new ArrayList(); + + final Iterator collPropItor = property.getValue().asCollection().iterator(); + while (collPropItor.hasNext()) { + final ODataValue value = collPropItor.next(); + if (value.isPrimitive()) { + collection.add(CoreUtils.primitiveValueToObject(value.asPrimitive())); + } else if (value.isComplex()) { + final Object collItem = Proxy.newProxyInstance( + Thread.currentThread().getContextClassLoader(), + new Class[] {collItemClass}, + ComplexTypeInvocationHandler.getInstance( + client, value.asComplex(), collItemClass, this)); + + collection.add(collItem); + } + } + + res = collection; + + addPropertyChanges(name, res); } else { res = type == null ? CoreUtils.getValueFromProperty(client, property) : CoreUtils.getValueFromProperty(client, property, type); if (res != null) { - addPropertyChanges(name, res, false); + addPropertyChanges(name, res); } } @@ -256,11 +276,27 @@ public class EntityTypeInvocationHandler(); + for (Object obj : (Collection) value) { + ((Collection) toBeAdded).add(obj instanceof Proxy ? Proxy.getInvocationHandler(obj) : obj); + } + } else if (value instanceof Proxy) { + toBeAdded = Proxy.getInvocationHandler(value); + } else { + toBeAdded = value; + } + + addPropertyChanges(property.name(), toBeAdded); } attach(AttachedEntityStatus.CHANGED); @@ -360,22 +396,9 @@ public class EntityTypeInvocationHandler(); - propertyChanges.put(name, collItem); - } - - ((Collection) collItem).add(value); - } else { - propertyChanges.put(name, value); - } - + propertyChanges.put(name, value); updatePropertiesTag(checkpoint); } diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/FactoryInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/FactoryInvocationHandler.java new file mode 100644 index 000000000..5cfe52ee8 --- /dev/null +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/FactoryInvocationHandler.java @@ -0,0 +1,84 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.ext.proxy.commons; + +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import org.apache.olingo.client.api.CommonEdmEnabledODataClient; +import org.apache.olingo.ext.proxy.api.OperationExecutor; +import org.apache.olingo.ext.proxy.api.annotations.Property; +import org.apache.olingo.ext.proxy.utils.ClassUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +class FactoryInvocationHandler> extends AbstractInvocationHandler + implements OperationExecutor { + + private static final long serialVersionUID = 2629912294765040027L; + + /** + * Logger. + */ + private static final Logger LOG = LoggerFactory.getLogger(FactoryInvocationHandler.class); + + private final EntityTypeInvocationHandler entityHandler; + + private final AbstractTypeInvocationHandler invokerHandler; + + @SuppressWarnings({"rawtypes", "unchecked"}) + static FactoryInvocationHandler getInstance( + final EntityTypeInvocationHandler entityHandler, + final AbstractTypeInvocationHandler targetHandler) { + return new FactoryInvocationHandler(entityHandler, targetHandler); + } + + @SuppressWarnings("unchecked") + private FactoryInvocationHandler( + final EntityTypeInvocationHandler entityHandler, + final AbstractTypeInvocationHandler targetHandler) { + super(targetHandler.containerHandler.getClient(), targetHandler.containerHandler); + this.invokerHandler = targetHandler; + this.entityHandler = entityHandler; + } + + @Override + @SuppressWarnings("unchecked") + public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { + if (isSelfMethod(method, args)) { + return invokeSelfMethod(method, args); + } else if (method.getName().startsWith("new")) { + final String getterName = method.getName().replaceFirst("new", "get"); + final Method getter = invokerHandler.getTypeRef().getMethod(getterName); + final Property property = ClassUtils.getAnnotation(Property.class, getter); + if (property == null) { + throw new UnsupportedOperationException("Unsupported method " + method.getName()); + } + + final ComplexTypeInvocationHandler complexTypeHandler = + ComplexTypeInvocationHandler.getInstance(client, property.name(), method.getReturnType(), entityHandler); + + return Proxy.newProxyInstance( + Thread.currentThread().getContextClassLoader(), + new Class[] {method.getReturnType()}, + complexTypeHandler); + } else { + throw new UnsupportedOperationException("Method not found: " + method); + } + } +} diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java index 1adeeb357..ea2832b33 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java @@ -19,6 +19,7 @@ package org.apache.olingo.ext.proxy.utils; import java.lang.annotation.Annotation; +import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; @@ -41,7 +42,7 @@ import org.apache.olingo.commons.api.domain.CommonODataProperty; import org.apache.olingo.commons.api.domain.ODataLink; import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; import org.apache.olingo.commons.api.domain.ODataValue; -import org.apache.olingo.commons.api.edm.Edm; +import org.apache.olingo.commons.api.edm.EdmElement; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.FullQualifiedName; @@ -51,6 +52,7 @@ import org.apache.olingo.ext.proxy.api.annotations.ComplexType; import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; import org.apache.olingo.ext.proxy.api.annotations.Key; import org.apache.olingo.ext.proxy.api.annotations.Property; +import org.apache.olingo.ext.proxy.commons.AbstractTypeInvocationHandler; import org.apache.olingo.ext.proxy.commons.ComplexTypeInvocationHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -97,13 +99,20 @@ public final class CoreUtils { } else if (type.isComplexType()) { value = client.getObjectFactory().newComplexValue(type.getFullQualifiedName().toString()); - if (obj instanceof ComplexTypeInvocationHandler) { - final Class typeRef = ((ComplexTypeInvocationHandler)obj).getTypeRef(); - final Object complex = Proxy.newProxyInstance( - Thread.currentThread().getContextClassLoader(), - new Class[] {typeRef}, - (ComplexTypeInvocationHandler)obj); - + final Object oo; + if (obj instanceof Proxy) { + oo = Proxy.getInvocationHandler(obj); + } else { + oo = obj; + } + + if (oo instanceof ComplexTypeInvocationHandler) { + final Class typeRef = ((ComplexTypeInvocationHandler) oo).getTypeRef(); + final Object complex = Proxy.newProxyInstance( + Thread.currentThread().getContextClassLoader(), + new Class[] {typeRef}, + (ComplexTypeInvocationHandler) oo); + for (Method method : typeRef.getMethods()) { final Property complexPropertyAnn = method.getAnnotation(Property.class); try { @@ -113,12 +122,13 @@ public final class CoreUtils { } } catch (Exception ignore) { // ignore value - LOG.warn("Error attaching complex field '{}'", complexPropertyAnn.name(), ignore); + LOG.warn("Error attaching complex {} for field '{}.{}'", + type.getFullQualifiedName(), typeRef.getName(), complexPropertyAnn.name(), ignore); } } } else { throw new IllegalArgumentException( - "Object '" + obj.getClass().getSimpleName() + "' is not a complex value"); + "Object '" + oo.getClass().getSimpleName() + "' is not a complex value"); } } else if (type.isEnumType()) { if (client.getServiceVersion().compareTo(ODataServiceVersion.V30) <= 0) { @@ -135,17 +145,14 @@ public final class CoreUtils { return value; } - private static CommonODataProperty getODataProperty( + private static CommonODataProperty getODataEntityProperty( final CommonEdmEnabledODataClient client, 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(); - - return getODataProperty(client, property, type, obj); + final EdmElement edmProperty = client.getCachedEdm().getEntityType(entity).getProperty(property); + return getODataProperty(client, edmProperty, property, obj); } private static CommonODataProperty getODataComplexProperty( @@ -154,9 +161,22 @@ public final class CoreUtils { 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(); + final EdmElement edmProperty = client.getCachedEdm().getComplexType(complex).getProperty(property); + return getODataProperty(client, edmProperty, property, obj); + } + + private static CommonODataProperty getODataProperty( + final CommonEdmEnabledODataClient client, + final EdmElement edmProperty, + final String property, + final Object obj) { + + final EdmType edmType = edmProperty.getType(); + + final EdmTypeInfo type = new EdmTypeInfo.Builder().setEdm(client.getCachedEdm()).setTypeExpression( + edmProperty.isCollection() + ? "Collection(" + edmType.getFullQualifiedName().toString() + ")" + : edmType.getFullQualifiedName().toString()).build(); return getODataProperty(client, property, type, obj); } @@ -184,8 +204,8 @@ public final class CoreUtils { } else { oprop = ((org.apache.olingo.commons.api.domain.v4.ODataObjectFactory) client.getObjectFactory()). newEnumProperty(name, - ((org.apache.olingo.commons.api.domain.v4.ODataValue) getODataValue(client, type, obj)). - asEnum()); + ((org.apache.olingo.commons.api.domain.v4.ODataValue) getODataValue(client, type, obj)). + asEnum()); } } else { throw new UnsupportedOperationException("Usupported object type " + type.getFullQualifiedName()); @@ -211,11 +231,11 @@ public final class CoreUtils { } ((List) entity.getProperties()).add( - getODataProperty(client, entity.getTypeName(), property.getKey(), property.getValue())); + getODataEntityProperty(client, entity.getTypeName(), property.getKey(), property.getValue())); } } - private static Object primitiveValueToObject(final ODataPrimitiveValue value) { + public static Object primitiveValueToObject(final ODataPrimitiveValue value) { Object obj; try { @@ -239,7 +259,7 @@ public final class CoreUtils { } public static Object getKey( - final Edm metadata, final Class entityTypeRef, final CommonODataEntity entity) { + final CommonEdmEnabledODataClient client, final Class entityTypeRef, final CommonODataEntity entity) { Object res = null; @@ -253,7 +273,7 @@ public final class CoreUtils { } else { try { res = keyRef.newInstance(); - populate(metadata, res, CompoundKeyElement.class, entity.getProperties().iterator()); + populate(client, res, CompoundKeyElement.class, entity.getProperties().iterator()); } catch (Exception e) { LOG.error("Error population compound key {}", keyRef.getSimpleName(), e); throw new IllegalArgumentException("Cannot populate compound key"); @@ -265,19 +285,30 @@ public final class CoreUtils { } public static void populate( - final Edm metadata, + final CommonEdmEnabledODataClient client, final Object bean, final Class getterAnn, final Iterator propItor) { if (bean != null) { - populate(metadata, bean, bean.getClass(), getterAnn, propItor); + final Class typeRef; + if (bean instanceof Proxy) { + final InvocationHandler handler = Proxy.getInvocationHandler(bean); + if (handler instanceof AbstractTypeInvocationHandler) { + typeRef = ((ComplexTypeInvocationHandler) handler).getTypeRef(); + } else { + throw new IllegalStateException("Invalid bean " + bean); + } + } else { + typeRef = bean.getClass(); + } + populate(client, bean, typeRef, getterAnn, propItor); } } @SuppressWarnings({"unchecked"}) public static void populate( - final Edm metadata, + final CommonEdmEnabledODataClient client, final Object bean, final Class reference, final Class getterAnn, @@ -296,16 +327,18 @@ public final class CoreUtils { try { if (property.hasNullValue()) { setPropertyValue(bean, getter, null); - } - if (property.hasPrimitiveValue()) { + } else if (property.hasPrimitiveValue()) { setPropertyValue(bean, getter, primitiveValueToObject(property.getPrimitiveValue())); - } - if (property.hasComplexValue()) { - final Object complex = getter.getReturnType().newInstance(); - populate(metadata, complex, Property.class, property.getValue().asComplex().iterator()); + } else if (property.hasComplexValue()) { + final Object complex = Proxy.newProxyInstance( + Thread.currentThread().getContextClassLoader(), + new Class[] {getter.getReturnType()}, + ComplexTypeInvocationHandler.getInstance( + client, property.getName(), getter.getReturnType(), null)); + + populate(client, complex, Property.class, property.getValue().asComplex().iterator()); setPropertyValue(bean, getter, complex); - } - if (property.hasCollectionValue()) { + } else if (property.hasCollectionValue()) { final ParameterizedType collType = (ParameterizedType) getter.getGenericReturnType(); final Class collItemClass = (Class) collType.getActualTypeArguments()[0]; @@ -320,10 +353,14 @@ public final class CoreUtils { final ODataValue value = collPropItor.next(); if (value.isPrimitive()) { collection.add(primitiveValueToObject(value.asPrimitive())); - } - if (value.isComplex()) { - final Object collItem = collItemClass.newInstance(); - populate(metadata, collItem, Property.class, value.asComplex().iterator()); + } else if (value.isComplex()) { + final Object collItem = Proxy.newProxyInstance( + Thread.currentThread().getContextClassLoader(), + new Class[] {collItemClass}, + ComplexTypeInvocationHandler.getInstance( + client, property.getName(), collItemClass, null)); + + populate(client, collItem, Property.class, value.asComplex().iterator()); collection.add(collItem); } } @@ -356,14 +393,14 @@ public final class CoreUtils { } if (odataValue.isComplex()) { final Object collItem = - buildComplexInstance(client.getCachedEdm(), property.getName(), odataValue.asComplex().iterator()); + buildComplexInstance(client, property.getName(), odataValue.asComplex().iterator()); ((Collection) value).add(collItem); } } } else if (property.hasPrimitiveValue()) { value = primitiveValueToObject(property.getPrimitiveValue()); } else if (property.hasComplexValue()) { - value = buildComplexInstance(client.getCachedEdm(), property.getValue().asComplex().getTypeName(), + value = buildComplexInstance(client, property.getValue().asComplex().getTypeName(), property.getValue().asComplex().iterator()); } else { throw new IllegalArgumentException("Invalid property " + property); @@ -374,14 +411,16 @@ public final class CoreUtils { @SuppressWarnings("unchecked") private static C buildComplexInstance( - final Edm metadata, final String name, final Iterator properties) { + final CommonEdmEnabledODataClient client, + final String name, + final Iterator properties) { for (C complex : (Iterable) ServiceLoader.load(AbstractComplexType.class)) { final ComplexType ann = complex.getClass().getAnnotation(ComplexType.class); final String fn = ann == null ? null : ClassUtils.getNamespace(complex.getClass()) + "." + ann.name(); if (name.equals(fn)) { - populate(metadata, complex, Property.class, properties); + populate(client, complex, Property.class, properties); return complex; } } @@ -391,7 +430,8 @@ public final class CoreUtils { @SuppressWarnings({"unchecked", "rawtypes"}) public static Object getValueFromProperty( - final CommonEdmEnabledODataClient client, final CommonODataProperty property, final Type type) + final CommonEdmEnabledODataClient client, + final CommonODataProperty property, final Type type) throws InstantiationException, IllegalAccessException { final Object value; @@ -415,7 +455,7 @@ public final class CoreUtils { Thread.currentThread().getContextClassLoader(), new Class[] {collItemClass}, new ComplexTypeInvocationHandler(client, odataValue.asComplex(), collItemClass, null)); - populate(client.getCachedEdm(), collItem, Property.class, odataValue.asComplex().iterator()); + populate(client, 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/AbstractUtility.java b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java index 052f41596..2930ace87 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 @@ -36,6 +36,7 @@ import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmFunction; import org.apache.olingo.commons.api.edm.EdmKeyPropertyRef; import org.apache.olingo.commons.api.edm.EdmNavigationProperty; +import org.apache.olingo.commons.api.edm.EdmOperation; import org.apache.olingo.commons.api.edm.EdmParameter; import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.edm.EdmSchema; @@ -205,6 +206,17 @@ public abstract class AbstractUtility { return result; } + + public List justInheritedOperationsBoundTo(final EdmEntityType entity){ + final List result = new ArrayList(); + if(entity.getBaseType()!=null){ + result.addAll(getFunctionsBoundTo(entity.getBaseType().getName(), false)); + result.addAll(getActionsBoundTo(entity.getBaseType().getName(), false)); + result.addAll(justInheritedOperationsBoundTo(entity.getBaseType())); + } + + return result; + } public List getActionsBoundTo(final String typeExpression, final boolean collection) { final List result = new ArrayList(); diff --git a/ext/pojogen-maven-plugin/src/main/resources/entityType.vm b/ext/pojogen-maven-plugin/src/main/resources/entityType.vm index 3386d6be6..82ef8213a 100644 --- a/ext/pojogen-maven-plugin/src/main/resources/entityType.vm +++ b/ext/pojogen-maven-plugin/src/main/resources/entityType.vm @@ -69,6 +69,7 @@ public interface $utility.capitalize($entityType.Name) #if(!$keys.add($key.KeyPropertyName)) #stop #end #end +#set( $complexProps = [] ) #foreach($propertyName in $entityType.PropertyNames) #set($property = $entityType.getProperty($propertyName)) #set($fcprops = $utility.getFcProperties($property) ) @@ -96,7 +97,7 @@ public interface $utility.capitalize($entityType.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)(); + *##set( $adding = $complexProps.add($property) ) #end #end @@ -125,10 +126,15 @@ public interface $utility.capitalize($entityType.Name) #set( $functions = $utility.getFunctionsBoundTo($entityType.Name, false) ) #set( $actions = $utility.getActionsBoundTo($entityType.Name, false) ) -#if( $functions.size() > 0 || $actions.size() > 0 ) +#set( $inherited = $utility.justInheritedOperationsBoundTo($entityType).size()) +#if( $inherited.size() > 0 || $functions.size() > 0 || $actions.size() > 0 ) + #if($inherited.size() > 0) + @Overide + #end Operations operations(); - public interface Operations { + interface Operations #if($inherited.size() > 0) + extends ${utility.getJavaType($entityType.getBaseType())}.Operations#end{ #foreach($operation in $functions) @Operation(name = "$operation.Name", type = OperationType.FUNCTION, @@ -169,4 +175,21 @@ public interface $utility.capitalize($entityType.Name) #end } #end + +#if( $complexProps.size() > 0 ) + #if( $entityType.baseType ) + @Override + #end + ComplexFactory factory(); + + interface ComplexFactory #if( $entityType.baseType ) + extends ${utility.getJavaType($entityType.getBaseType())}.ComplexFactory#end{ + #foreach($property in $complexProps) + @Property(name = "$property.Name", + type = "$property.Type.FullQualifiedName.toString()") + $utility.getJavaType($property.Type) new$utility.capitalize($property.Name)(); + + #end + } +#end } diff --git a/ext/pojogen-maven-plugin/src/main/resources/v30/complexType.vm b/ext/pojogen-maven-plugin/src/main/resources/v30/complexType.vm index 7a5c6cc18..4f0f86b3a 100644 --- a/ext/pojogen-maven-plugin/src/main/resources/v30/complexType.vm +++ b/ext/pojogen-maven-plugin/src/main/resources/v30/complexType.vm @@ -18,8 +18,10 @@ *# @Namespace("$namespace") @ComplexType(name = "$complexType.Name") -public interface $utility.capitalize($complexType.Name) extends Serializable { +public interface $utility.capitalize($complexType.Name) + extends #if($complexType.getBaseType())$utility.getJavaType($complexType.getBaseType().getFullQualifiedName().toString())#{else}Serializable#end { +#set( $complexProps = [] ) #foreach($propertyName in $complexType.PropertyNames) #set($property = $complexType.getProperty($propertyName)) @@ -29,7 +31,24 @@ public interface $utility.capitalize($complexType.Name) extends Serializable { 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)(); + *##set( $adding = $complexProps.add($property) ) #end #end + +#if( $complexProps.size() > 0 ) + #if( $complexType.baseType ) + @Override + #end + ComplexFactory factory(); + + interface ComplexFactory #if( $complexType.baseType ) + extends ${utility.getJavaType($complexType.getBaseType())}.ComplexFactory#end{ + #foreach($property in $complexProps) + @Property(name = "$property.Name", + type = "$property.Type.FullQualifiedName.toString()") + $utility.getJavaType($property.Type) new$utility.capitalize($property.Name)(); + + #end + } +#end diff --git a/ext/pojogen-maven-plugin/src/main/resources/v40/complexType.vm b/ext/pojogen-maven-plugin/src/main/resources/v40/complexType.vm index dd74ade20..e3d2a554e 100644 --- a/ext/pojogen-maven-plugin/src/main/resources/v40/complexType.vm +++ b/ext/pojogen-maven-plugin/src/main/resources/v40/complexType.vm @@ -21,8 +21,10 @@ isOpenType = $complexType.isOpenType(), isAbstract = $complexType.Abstract#if($complexType.getBaseType()), baseType = "$complexType.getBaseType().getFullQualifiedName().toString()"#end) -public interface $utility.capitalize($complexType.Name) extends #if($complexType.getBaseType())$utility.getJavaType($complexType.getBaseType().getFullQualifiedName().toString())#{else}Serializable#end { +public interface $utility.capitalize($complexType.Name) + extends #if($complexType.getBaseType())$utility.getJavaType($complexType.getBaseType().getFullQualifiedName().toString())#{else}Serializable#end { +#set( $complexProps = [] ) #foreach($propertyName in $complexType.PropertyNames) #set($property = $complexType.getProperty($propertyName)) @@ -42,7 +44,7 @@ public interface $utility.capitalize($complexType.Name) extends #if($complexType 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)(); + *##set( $adding = $complexProps.add($property) ) #end #end @@ -62,3 +64,20 @@ public interface $utility.capitalize($complexType.Name) extends #if($complexType void set$utility.capitalize($property.Name)(final $utility.getJavaType($type, $property.Collection) _$utility.uncapitalize($property.Name)); #end + +#if( $complexProps.size() > 0 ) + #if( $complexType.baseType ) + @Override + #end + ComplexFactory factory(); + + interface ComplexFactory #if( $complexType.baseType ) + extends ${utility.getJavaType($complexType.getBaseType())}.ComplexFactory#end{ + #foreach($property in $complexProps) + @Property(name = "$property.Name", + type = "$property.Type.FullQualifiedName.toString()") + $utility.getJavaType($property.Type) new$utility.capitalize($property.Name)(); + + #end + } +#end 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 05ec9f1df..bdaaf0ea2 100644 --- a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java +++ b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java @@ -233,31 +233,36 @@ public abstract class AbstractServices { final Response res; if (matcher.find()) { - String method = matcher.group(1); - if ("PATCH".equals(method) || "MERGE".equals(method)) { - headers.putSingle("X-HTTP-METHOD", method); - method = "POST"; - } - final String url = matcher.group(2); - final WebClient client = WebClient.create(url); client.headers(headers); - res = client.invoke(method, body.getDataHandler().getInputStream()); - client.close(); - } else if (matcherRef.find()) { - String method = matcherRef.group(1); - if ("PATCH".equals(method) || "MERGE".equals(method)) { - headers.putSingle("X-HTTP-METHOD", method); - method = "POST"; + + final String method = matcher.group(1); + if ("DELETE".equals(method)) { + res = client.delete(); + } else if ("PATCH".equals(method) || "MERGE".equals(method)) { + client.header("X-HTTP-METHOD", method); + res = client.invoke("POST", body.getDataHandler().getInputStream()); + } else { + res = client.invoke(method, body.getDataHandler().getInputStream()); } + client.close(); + } else if (matcherRef.find()) { final String url = matcherRef.group(2); - final WebClient client = WebClient.create(references.get(url)); client.headers(headers); - res = client.invoke(method, body.getDataHandler().getInputStream()); + String method = matcherRef.group(1); + if ("DELETE".equals(method)) { + res = client.delete(); + } else if ("PATCH".equals(method) || "MERGE".equals(method)) { + client.header("X-HTTP-METHOD", method); + res = client.invoke("POST", body.getDataHandler().getInputStream()); + } else { + res = client.invoke(method, body.getDataHandler().getInputStream()); + } + client.close(); } else { res = null; @@ -406,7 +411,7 @@ public abstract class AbstractServices { } else { final ResWrap jcont = mapper.readValue(IOUtils.toInputStream(changes, Constants.ENCODING), new TypeReference() { - }); + }); entryChanges = dataBinder.toAtomEntity(jcont.getPayload()); } @@ -593,8 +598,8 @@ public abstract class AbstractServices { } else { final ResWrap jcontainer = mapper.readValue(IOUtils.toInputStream(entity, Constants.ENCODING), - new TypeReference() { - }); + new TypeReference() { + }); entry = dataBinder.toAtomEntity(jcontainer.getPayload()); @@ -621,7 +626,7 @@ public abstract class AbstractServices { ResWrap result = atomDeserializer.read(serialization, AtomEntityImpl.class); result = new ResWrap( URI.create(Constants.get(version, ConstantKey.ODATA_METADATA_PREFIX) - + entitySetName + Constants.get(version, ConstantKey.ODATA_METADATA_ENTITY_SUFFIX)), + + entitySetName + Constants.get(version, ConstantKey.ODATA_METADATA_ENTITY_SUFFIX)), null, result.getPayload()); final String path = Commons.getEntityBasePath(entitySetName, entityKey); @@ -684,13 +689,13 @@ public abstract class AbstractServices { replaceAll("\"Salary\":[0-9]*,", "\"Salary\":0,"). replaceAll("\"Title\":\".*\"", "\"Title\":\"[Sacked]\""). replaceAll("\\.*\\", - "0"). + "0"). replaceAll("\\.*\\", "[Sacked]"); final FSManager fsManager = FSManager.instance(version); fsManager.putInMemory(IOUtils.toInputStream(newContent, Constants.ENCODING), fsManager.getAbsolutePath(Commons.getEntityBasePath("Person", entityId) + Constants.get(version, - ConstantKey.ENTITY), utils.getKey())); + ConstantKey.ENTITY), utils.getKey())); return utils.getValue().createResponse(null, null, null, utils.getKey(), Response.Status.NO_CONTENT); } catch (Exception e) { @@ -742,9 +747,9 @@ public abstract class AbstractServices { final Long newSalary = Long.valueOf(salaryMatcher.group(1)) + n; newContent = newContent. replaceAll("\"Salary\":" + salaryMatcher.group(1) + ",", - "\"Salary\":" + newSalary + ","). + "\"Salary\":" + newSalary + ","). replaceAll("\\" + salaryMatcher.group(1) + "", - "" + newSalary + ""); + "" + newSalary + ""); } FSManager.instance(version).putInMemory(IOUtils.toInputStream(newContent, Constants.ENCODING), @@ -893,7 +898,7 @@ public abstract class AbstractServices { } else { mapper.writeValue( writer, new JSONFeedContainer(container.getContextURL(), container.getMetadataETag(), - dataBinder.toJSONEntitySet(container.getPayload()))); + dataBinder.toJSONEntitySet(container.getPayload()))); } return xml.createResponse( @@ -1556,8 +1561,8 @@ public abstract class AbstractServices { mapper.writeValue( writer, new JSONFeedContainer(container.getContextURL(), - container.getMetadataETag(), - dataBinder.toJSONEntitySet((AtomEntitySetImpl) container.getPayload()))); + container.getMetadataETag(), + dataBinder.toJSONEntitySet((AtomEntitySetImpl) container.getPayload()))); } } else { final ResWrap container = @@ -1570,8 +1575,8 @@ public abstract class AbstractServices { mapper.writeValue( writer, new JSONEntryContainer(container.getContextURL(), - container.getMetadataETag(), - dataBinder.toJSONEntity((AtomEntityImpl) container.getPayload()))); + container.getMetadataETag(), + dataBinder.toJSONEntity((AtomEntityImpl) container.getPayload()))); } } @@ -1641,9 +1646,9 @@ public abstract class AbstractServices { final ResWrap container = new ResWrap( URI.create(Constants.get(version, ConstantKey.ODATA_METADATA_PREFIX) - + (version.compareTo(ODataServiceVersion.V40) >= 0 - ? entitySetName + "(" + entityId + ")/" + path - : property.getType())), + + (version.compareTo(ODataServiceVersion.V40) >= 0 + ? entitySetName + "(" + entityId + ")/" + path + : property.getType())), entryContainer.getMetadataETag(), property); @@ -1651,9 +1656,9 @@ public abstract class AbstractServices { null, searchForValue ? IOUtils.toInputStream( - container.getPayload().getValue() == null || container.getPayload().getValue().isNull() - ? StringUtils.EMPTY - : container.getPayload().getValue().asPrimitive().get(), Constants.ENCODING) + container.getPayload().getValue() == null || container.getPayload().getValue().isNull() + ? StringUtils.EMPTY + : container.getPayload().getValue().asPrimitive().get(), Constants.ENCODING) : utils.writeProperty(acceptType, container), Commons.getETag(Commons.getEntityBasePath(entitySetName, entityId), version), acceptType); 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 b7f2fd699..5f8a3454d 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 @@ -553,7 +553,7 @@ public abstract class AbstractUtilities { } else { final ResWrap container = mapper.readValue(entitySet, new TypeReference() { - }); + }); entry = dataBinder.toAtomEntitySet(container.getPayload()); } @@ -571,7 +571,7 @@ public abstract class AbstractUtilities { } else { mapper.writeValue( writer, new JSONFeedContainer(container.getContextURL(), - container.getMetadataETag(), dataBinder.toJSONEntitySet(container.getPayload()))); + container.getMetadataETag(), dataBinder.toJSONEntitySet(container.getPayload()))); } return IOUtils.toInputStream(writer.toString(), Constants.ENCODING); @@ -586,7 +586,7 @@ public abstract class AbstractUtilities { } else { final ResWrap jcontainer = mapper.readValue(entity, new TypeReference() { - }); + }); container = new ResWrap( jcontainer.getContextURL(), jcontainer.getMetadataETag(), @@ -611,7 +611,7 @@ public abstract class AbstractUtilities { } else { mapper.writeValue( writer, new JSONEntryContainer(container.getContextURL(), container.getMetadataETag(), - dataBinder.toJSONEntity(container.getPayload()))); + dataBinder.toJSONEntity(container.getPayload()))); } return IOUtils.toInputStream(writer.toString(), Constants.ENCODING); @@ -641,7 +641,7 @@ public abstract class AbstractUtilities { } else { final ResWrap jcontainer = mapper.readValue(property, new TypeReference() { - }); + }); atomProperty = dataBinder.toAtomProperty(jcontainer.getPayload(), entryType); } @@ -658,7 +658,7 @@ public abstract class AbstractUtilities { } else { mapper.writeValue( writer, new JSONPropertyContainer(container.getContextURL(), container.getMetadataETag(), - dataBinder.toJSONProperty(container.getPayload()))); + dataBinder.toJSONProperty(container.getPayload()))); } return IOUtils.toInputStream(writer.toString(), Constants.ENCODING); @@ -691,14 +691,14 @@ public abstract class AbstractUtilities { if (entity.getProperty("MessageId") == null || entity.getProperty("FromUsername") == null) { if (Commons.SEQUENCE.containsKey(entitySetName)) { messageId = Commons.SEQUENCE.get(entitySetName) + 1; - res = "MessageId=" + String.valueOf(messageId) + ",FromUsername=1"; + res = "FromUsername=1" + ",MessageId=" + String.valueOf(messageId); } else { throw new Exception(String.format("Unable to retrieve entity key value for %s", entitySetName)); } } else { messageId = Integer.valueOf(entity.getProperty("MessageId").getValue().asPrimitive().get()); - res = "MessageId=" + entity.getProperty("MessageId").getValue().asPrimitive().get() - + ",FromUsername=" + entity.getProperty("FromUsername").getValue().asPrimitive().get(); + res = "FromUsername=" + entity.getProperty("FromUsername").getValue().asPrimitive().get() + + ",MessageId=" + entity.getProperty("MessageId").getValue().asPrimitive().get(); } Commons.SEQUENCE.put(entitySetName, messageId); } else if ("Order".equals(entitySetName)) { diff --git a/fit/src/main/resources/V30/CustomerInfo/16/entity.full.json b/fit/src/main/resources/V30/CustomerInfo/16/entity.full.json new file mode 100644 index 000000000..4df06c0f5 --- /dev/null +++ b/fit/src/main/resources/V30/CustomerInfo/16/entity.full.json @@ -0,0 +1,11 @@ +{ + "odata.metadata": "http://localhost:8080/DefaultService.svc/$metadata#CustomerInfo/@Element", + "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo", + "odata.id": "http://localhost:8080/DefaultService.svc/CustomerInfo(16)", + "odata.editLink": "CustomerInfo(16)", + "odata.mediaEditLink": "CustomerInfo(16)/$value", + "odata.mediaReadLink": "CustomerInfo(16)/$value", + "odata.mediaContentType": "*/*", + "CustomerInfoId": 16, + "Information": "uuvoqobtxfgtnzugqjsocbhjkynsjafonxuxmcrnyldkxvpnuezalvpyhjpsmkgxacuruxtjruusxylndzxgefpscvk" +} \ No newline at end of file diff --git a/fit/src/main/resources/V30/CustomerInfo/16/entity.xml b/fit/src/main/resources/V30/CustomerInfo/16/entity.xml new file mode 100644 index 000000000..38f4fedb6 --- /dev/null +++ b/fit/src/main/resources/V30/CustomerInfo/16/entity.xml @@ -0,0 +1,37 @@ + + + + http://localhost:8080/DefaultService.svc/CustomerInfo(16) + + + + <updated>2014-05-11T15:46:20Z</updated> + <author> + <name /> + </author> + <link rel="edit-media" title="CustomerInfo" href="CustomerInfo(16)/$value" /> + <content type="*/*" src="CustomerInfo(16)/$value" /> + <m:properties> + <d:CustomerInfoId m:type="Edm.Int32">16</d:CustomerInfoId> + <d:Information>uuvoqobtxfgtnzugqjsocbhjkynsjafonxuxmcrnyldkxvpnuezalvpyhjpsmkgxacuruxtjruusxylndzxgefpscvk</d:Information> + </m:properties> +</entry> \ No newline at end of file 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 a3dfd330a..fbee68520 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 @@ -30,11 +30,14 @@ 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. DefaultContainer; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types. - ContactDetails; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice. + types.ContactDetails; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice. + types.Customer; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice. + types.Aliases; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice. + types.Phone; import org.junit.BeforeClass; import org.slf4j.Logger; @@ -94,18 +97,21 @@ public abstract class AbstractTest { // add key attribute customer.setCustomerId(id); - final ContactDetails cd = customer.newPrimaryContactInfo(); + final ContactDetails cd = customer.factory().newPrimaryContactInfo(); cd.setAlternativeNames(Arrays.asList("alternative1", "alternative2")); cd.setEmailBag(Collections.<String>singleton("myname@mydomain.org")); cd.setMobilePhoneBag(Collections.<Phone>emptySet()); + customer.setPrimaryContactInfo(cd); - final Aliases aliases = cd.newContactAlias(); + final Aliases aliases = cd.factory().newContactAlias(); aliases.setAlternativeNames(Collections.<String>singleton("myAlternativeName")); + cd.setContactAlias(aliases); - final ContactDetails bcd = customer.newBackupContactInfo(); + final ContactDetails bcd = customer.factory().newBackupContactInfo(); bcd.setAlternativeNames(Arrays.asList("alternative3", "alternative4")); bcd.setEmailBag(Collections.<String>emptySet()); bcd.setMobilePhoneBag(Collections.<Phone>emptySet()); + customer.setBackupContactInfo(Collections.<ContactDetails>singleton(bcd)); return customer; } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java new file mode 100644 index 000000000..3ef269123 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java @@ -0,0 +1,210 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.v3; + +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice. + types.Customer; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice. + types.Employee; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice. + types.Message; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice. + types.MessageKey; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice. + types.Order; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice. + types.OrderCollection; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import org.junit.Ignore; + +import org.junit.Test; + +/** + * This is the unit test class to check entity create operations. + */ +public class EntityCreateTestITCase extends AbstractTest { + + @Test + @Ignore + public void create() { + final String sampleName = "sample customer from proxy"; + final Integer id = 100; + + getSampleCustomerProfile(id, sampleName, container); + container.flush(); + + Customer actual = readCustomer(container, id); + checkSampleCustomerProfile(actual, id, sampleName); + + container.getCustomer().delete(actual.getCustomerId()); + actual = container.getCustomer().get(id); + assertNull(actual); + + entityContext.detachAll(); + actual = container.getCustomer().get(id); + assertNotNull(actual); + + container.getCustomer().delete(actual.getCustomerId()); + container.flush(); + + actual = container.getCustomer().get(id); + assertNull(actual); + + entityContext.detachAll(); + actual = container.getCustomer().get(id); + assertNull(actual); + } + + @Test + @Ignore + public void createEmployee() { + final Integer id = 101; + + final Employee employee = container.getPerson().newEmployee(); + employee.setPersonId(id); + employee.setName("sample employee from proxy"); + employee.setManagersPersonId(-9918); + employee.setSalary(2147483647); + employee.setTitle("CEO"); + + container.flush(); + + Employee actual = container.getPerson().get(id, Employee.class); + assertNotNull(actual); + assertEquals(id, actual.getPersonId()); + + entityContext.detachAll(); + actual = container.getPerson().get(id, Employee.class); + assertNotNull(actual); + + container.getPerson().delete(actual.getPersonId()); + container.flush(); + + actual = container.getPerson().get(id, Employee.class); + assertNull(actual); + + entityContext.detachAll(); + actual = container.getPerson().get(id, Employee.class); + assertNull(actual); + } + + @Test + @Ignore + public void createWithNavigation() { + final String sampleName = "sample customer from proxy with navigation"; + final Integer id = 101; + + final Customer original = getSampleCustomerProfile(id, sampleName, container); + original.setInfo(container.getCustomerInfo().get(16)); + container.flush(); + + Customer actual = readCustomer(container, id); + checkSampleCustomerProfile(actual, id, sampleName); + assertEquals(Integer.valueOf(16), actual.getInfo().getCustomerInfoId()); + + container.getCustomer().delete(actual.getCustomerId()); + container.flush(); + + actual = container.getCustomer().get(id); + assertNull(actual); + } + + @Test + @Ignore + public void createWithBackNavigation() { + final String sampleName = "sample customer from proxy with back navigation"; + final Integer id = 102; + + Order order = container.getOrder().newOrder(); + order.setCustomerId(id); + order.setOrderId(id); // same id ... + + final Customer customer = getSampleCustomerProfile(id, sampleName, container); + + final OrderCollection orders = container.getOrder().newOrderCollection(); + orders.add(order); + + customer.setOrders(orders); + order.setCustomer(customer); + container.flush(); + + assertEquals(id, order.getOrderId()); + assertEquals(id, order.getCustomerId()); + + Customer actual = readCustomer(container, id); + checkSampleCustomerProfile(actual, id, sampleName); + + assertEquals(1, actual.getOrders().size()); + assertEquals(id, actual.getOrders().iterator().next().getOrderId()); + assertEquals(id, actual.getOrders().iterator().next().getCustomerId()); + + order = container.getOrder().get(id); + assertNotNull(order); + assertEquals(id, order.getCustomer().getCustomerId()); + + container.getOrder().delete(actual.getOrders()); + container.flush(); + + order = container.getOrder().get(id); + assertNull(order); + + actual = readCustomer(container, id); + assertTrue(actual.getOrders().isEmpty()); + + container.getCustomer().delete(actual.getCustomerId()); + container.flush(); + + actual = container.getCustomer().get(id); + assertNull(actual); + } + + @Test + @Ignore + public void multiKey() { + Message message = container.getMessage().newMessage(); + message.setMessageId(100); + message.setFromUsername("fromusername"); + message.setToUsername("myusername"); + message.setIsRead(false); + message.setSubject("test message"); + message.setBody("test"); + + container.flush(); + + MessageKey key = new MessageKey(); + key.setFromUsername("fromusername"); + key.setMessageId(100); + + message = container.getMessage().get(key); + assertNotNull(message); + assertEquals(Integer.valueOf(100), message.getMessageId()); + assertEquals("fromusername", message.getFromUsername()); + assertEquals("myusername", message.getToUsername()); + assertEquals("test message", message.getSubject()); + assertEquals("test", message.getBody()); + + container.getMessage().delete(key); + container.flush(); + + assertNull(container.getMessage().get(key)); + } +} 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 ca332523c..92def5280 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 @@ -41,6 +41,8 @@ import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.service types.ComputerDetail; import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice. types.ConcurrencyInfo; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice. + types.ContactDetails; import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice. types.Contractor; import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice. @@ -71,6 +73,8 @@ import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.service types.Person; import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice. types.PersonCollection; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice. + types.Phone; import org.junit.Test; /** @@ -81,7 +85,7 @@ public class EntityRetrieveTestITCase extends AbstractTest { protected DefaultContainer getContainer() { return container; } - + @Test public void exists() { assertTrue(getContainer().getCar().exists(15)); @@ -109,7 +113,7 @@ public class EntityRetrieveTestITCase extends AbstractTest { assertNotNull(employee); } - final SpecialEmployeeCollection specialEmployees = + final SpecialEmployeeCollection specialEmployees = getContainer().getPerson().getAll(SpecialEmployeeCollection.class); assertNotNull(specialEmployees); assertFalse(specialEmployees.isEmpty()); @@ -210,4 +214,34 @@ public class EntityRetrieveTestITCase extends AbstractTest { assertTrue(StringUtils.isNotBlank( ((EntityTypeInvocationHandler) Proxy.getInvocationHandler(product)).getETag())); } + + @Test + public void collectionsAndComplexes() { + final Customer customer = readCustomer(getContainer(), -10); + boolean found = false; + + assertTrue(customer.getPrimaryContactInfo().getEmailBag().contains("psgdkmxamznjulzbsohqjytbxhnojbufe")); + + final Collection<ContactDetails> backupContactInfo = customer.getBackupContactInfo(); + assertEquals(9, backupContactInfo.size()); + + + for (ContactDetails contact : backupContactInfo) { + if (contact.getContactAlias() != null && contact.getContactAlias().getAlternativeNames() != null && contact. + getContactAlias().getAlternativeNames().contains("vxiefursgkqzptijhincpdm")) { + found = true; + } + } + assertTrue(found); + found = false; + + for (ContactDetails contact : backupContactInfo) { + for (Phone phone : contact.getMobilePhoneBag()) { + if ("gqvuusqrrriljkospoxbdod".equals(phone.getExtension())) { + found = true; + } + } + } + assertTrue(found); + } } 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 21f037a80..920320fbd 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 f6d6b14ec..0af2cd994 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 0e61b57a3..dd62c2204 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 9f5f00cfe..93fbfc35f 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 2ecb3625e..c8b64632d 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 8c2c84221..d2b649211 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 18f23ccc1..5dd315180 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 80eda13a3..b926510dc 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.client.api.http.HttpMethod; 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 b091269e9..fc5a9a249 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 f1948885f..8d627e532 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 9717fbb5b..94331be12 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 011106934..c3b400ab9 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 f7bec5251..6a544b2f5 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 0662bb217..00bee195a 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 e3d46c7e9..a90742b89 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 2f399e41b..56ca048bd 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 d0bb9ff19..5124fef1f 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 a2c9730d3..6b49a3aaf 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 ee88968b6..7afb90321 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 ac2d569ac..35fe069c0 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 6bda5af5d..ce63ac666 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 e8ee8f093..4877ce4b2 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 fd7acdc63..9c00c37d0 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 e3f0cae47..98dee3151 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 a97bfc987..5d5c9b153 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java index 132b14ec6..09db11037 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java @@ -16,5 +16,6 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; 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 f4a26df6d..e413f29de 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.ext.proxy.api.annotations.Namespace; @@ -44,8 +45,8 @@ import javax.xml.datatype.Duration; @Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @ComplexType(name = "Aliases") -public interface Aliases extends Serializable { - +public interface Aliases + extends Serializable { @Property(name = "AlternativeNames", type = "Edm.String", nullable = false) 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 e85ce7667..c3c8ca615 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface AllSpatialCollectionTypes extends Serializable { - @Key @Property(name = "Id", type = "Edm.Int32", @@ -88,5 +88,4 @@ public interface AllSpatialCollectionTypes - } 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 d192f52db..922fc0c52 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 ff486d07e..2a58052f6 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -61,7 +62,6 @@ 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", @@ -227,5 +227,4 @@ public interface AllSpatialCollectionTypes_Simple - } 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 5a7f81b20..c1f9517f4 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 3d18d0d45..500111d8a 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface AllSpatialTypes extends Serializable { - @Key @Property(name = "Id", type = "Edm.Int32", @@ -456,5 +456,4 @@ public interface AllSpatialTypes - } 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 df8edbc0a..6c8934283 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 56b63af61..1b74f9771 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.ext.proxy.api.annotations.Namespace; @@ -44,8 +45,8 @@ import javax.xml.datatype.Duration; @Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @ComplexType(name = "AuditInfo") -public interface AuditInfo extends Serializable { - +public interface AuditInfo + extends Serializable { @Property(name = "ModifiedDate", type = "Edm.DateTime", nullable = false) @@ -67,8 +68,14 @@ 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(); - - + + ComplexFactory factory(); + + interface ComplexFactory { + @Property(name = "Concurrency", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo") + 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 b257e4652..db9bb9ca3 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -61,7 +62,6 @@ public interface BackOrderLine extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine { - @Property(name = "OrderLineStream", type = "Edm.Stream", @@ -201,5 +201,4 @@ 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 6cad5a54a..4637c8bdf 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -61,7 +62,6 @@ public interface BackOrderLine2 extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine { - @Property(name = "OrderLineStream", type = "Edm.Stream", @@ -201,5 +201,4 @@ 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 1777b8611..706a202b7 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 d728be24a..d39673c98 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 91c9f3635..d598cf9b2 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface Car extends Serializable { - @Property(name = "Photo", type = "Edm.Stream", @@ -160,5 +160,4 @@ 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 52881136a..a8f8e0629 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 6f71b0c34..62cb22bee 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.ext.proxy.api.annotations.Namespace; @@ -44,8 +45,8 @@ import javax.xml.datatype.Duration; @Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @ComplexType(name = "ComplexToCategory") -public interface ComplexToCategory extends Serializable { - +public interface ComplexToCategory + extends Serializable { @Property(name = "Term", type = "Edm.String", nullable = true) 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 404db4ce6..92705322d 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.ext.proxy.api.annotations.Namespace; @@ -44,8 +45,8 @@ import javax.xml.datatype.Duration; @Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @ComplexType(name = "ComplexWithAllPrimitiveTypes") -public interface ComplexWithAllPrimitiveTypes extends Serializable { - +public interface ComplexWithAllPrimitiveTypes + extends Serializable { @Property(name = "Binary", type = "Edm.Binary", nullable = true) 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 e5bd861e3..f8b0bcb7d 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface Computer extends Serializable { - @Key @Property(name = "ComputerId", type = "Edm.Int32", @@ -120,9 +120,9 @@ public interface Computer - Operations operations(); + Operations operations(); - public interface Operations { + interface Operations { @Operation(name = "GetComputer", type = OperationType.ACTION, @@ -132,5 +132,4 @@ public interface Computer } - } 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 745542cde..5766948e7 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 d31a5825d..2d5df3bc0 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface ComputerDetail extends Serializable { - @Key @Property(name = "ComputerDetailId", type = "Edm.Int32", @@ -221,9 +221,7 @@ public interface ComputerDetail 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); - org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions(); - - + @NavigationProperty(name = "Computer", @@ -237,9 +235,9 @@ public interface ComputerDetail - Operations operations(); + Operations operations(); - public interface Operations { + interface Operations { @Operation(name = "ResetComputerDetailsSpecifications", type = OperationType.ACTION) @@ -250,5 +248,12 @@ public interface ComputerDetail } + ComplexFactory factory(); + interface ComplexFactory { + @Property(name = "Dimensions", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions") + org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions(); + + } } 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 940fd477d..1b0c2469c 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 2e76f758e..251f5addb 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.ext.proxy.api.annotations.Namespace; @@ -44,8 +45,8 @@ import javax.xml.datatype.Duration; @Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @ComplexType(name = "ConcurrencyInfo") -public interface ConcurrencyInfo extends Serializable { - +public interface ConcurrencyInfo + extends Serializable { @Property(name = "Token", type = "Edm.String", nullable = true) 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 0787db478..6d471b556 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.ext.proxy.api.annotations.Namespace; @@ -44,8 +45,8 @@ import javax.xml.datatype.Duration; @Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @ComplexType(name = "ContactDetails") -public interface ContactDetails extends Serializable { - +public interface ContactDetails + extends Serializable { @Property(name = "EmailBag", type = "Edm.String", nullable = false) @@ -67,35 +68,47 @@ 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) org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getHomePhone(); 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) org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getWorkPhone(); 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) Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone> getMobilePhoneBag(); void setMobilePhoneBag(final Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone> _mobilePhoneBag); - org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newMobilePhoneBag(); - - + + ComplexFactory factory(); + + interface ComplexFactory { + @Property(name = "ContactAlias", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases") + 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") + 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") + 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") + 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 72000fe4f..7ebdd6c0c 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -61,7 +62,6 @@ 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", @@ -214,5 +214,4 @@ 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 f9d2ac1c8..3322bdb65 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 75dc0cd69..db6bdff47 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface Customer extends Serializable { - @Property(name = "Thumbnail", type = "Edm.Stream", @@ -175,9 +175,7 @@ public interface Customer 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); - org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newPrimaryContactInfo(); - - + @Property(name = "BackupContactInfo", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails", @@ -200,9 +198,7 @@ public interface Customer Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> getBackupContactInfo(); void setBackupContactInfo(final Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> _backupContactInfo); - org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newBackupContactInfo(); - - + @Property(name = "Auditing", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo", @@ -225,9 +221,7 @@ public interface Customer 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); - org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newAuditing(); - - + @NavigationProperty(name = "Orders", @@ -282,5 +276,20 @@ public interface Customer + ComplexFactory factory(); + interface ComplexFactory { + @Property(name = "PrimaryContactInfo", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails") + org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newPrimaryContactInfo(); + + @Property(name = "BackupContactInfo", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails") + org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newBackupContactInfo(); + + @Property(name = "Auditing", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo") + org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newAuditing(); + + } } 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 87f44c204..09f760ff8 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 321487b5a..4051518a1 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface CustomerInfo extends Serializable { - @Key @Property(name = "CustomerInfoId", type = "Edm.Int32", @@ -114,5 +114,4 @@ 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 c3cb026d7..a69121073 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 5b4bbefb2..f3d8733c6 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.ext.proxy.api.annotations.Namespace; @@ -44,8 +45,8 @@ import javax.xml.datatype.Duration; @Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @ComplexType(name = "Dimensions") -public interface Dimensions extends Serializable { - +public interface Dimensions + extends Serializable { @Property(name = "Width", type = "Edm.Decimal", nullable = false) 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 9327cbb6e..f9d639225 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -61,7 +62,6 @@ public interface DiscontinuedProduct extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product { - @Property(name = "Picture", type = "Edm.Stream", @@ -153,9 +153,7 @@ public interface DiscontinuedProduct 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); - org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions(); - - + @Property(name = "BaseConcurrency", type = "Edm.String", @@ -201,9 +199,7 @@ public interface DiscontinuedProduct 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); - org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newComplexConcurrency(); - - + @Property(name = "NestedComplexConcurrency", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo", @@ -226,9 +222,7 @@ public interface DiscontinuedProduct 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); - org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newNestedComplexConcurrency(); - - + @Property(name = "Discontinued", type = "Edm.DateTime", @@ -297,9 +291,7 @@ public interface DiscontinuedProduct 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); - org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newDiscontinuedPhone(); - - + @Property(name = "ChildConcurrencyToken", type = "Edm.String", @@ -367,5 +359,25 @@ public interface DiscontinuedProduct + @Override + ComplexFactory factory(); + interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product.ComplexFactory{ + @Property(name = "Dimensions", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions") + org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions(); + + @Property(name = "ComplexConcurrency", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo") + org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newComplexConcurrency(); + + @Property(name = "NestedComplexConcurrency", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo") + org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newNestedComplexConcurrency(); + + @Property(name = "DiscontinuedPhone", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone") + org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newDiscontinuedPhone(); + + } } 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 0feb7515d..f1ed0f2be 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 fcdc8f56f..9a4a5838a 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface Driver extends Serializable { - @Key @Property(name = "Name", type = "Edm.String", @@ -121,5 +121,4 @@ 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 3673a0f78..f7ba14e0e 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 b2d2475a7..7ecd7c4ef 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -61,7 +62,6 @@ 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", @@ -200,9 +200,9 @@ public interface Employee - Operations operations(); + Operations operations(); - public interface Operations { + interface Operations { @Operation(name = "Sack", type = OperationType.ACTION) @@ -211,5 +211,4 @@ public interface Employee } - } 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 9c0c22f20..76d4ee4a3 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 4f7570ba0..482ba6627 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface LastLogin extends Serializable { - @Key @Property(name = "Username", type = "Edm.String", @@ -167,5 +167,4 @@ 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 ab132b250..6f18a59f4 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 c3ee9d904..fb84e53a8 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface License extends Serializable { - @Key @Property(name = "Name", type = "Edm.String", @@ -190,5 +190,4 @@ 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 c8cc61f48..3d4805352 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 e5f51bbff..1481f185e 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface Login extends Serializable { - @Key @Property(name = "Username", type = "Edm.String", @@ -161,5 +161,4 @@ 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 119e5e77c..9c6031cc8 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 82e3cce0d..175e2b0e5 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface MappedEntityType extends Serializable { - @Key @Property(name = "Id", type = "Edm.Int32", @@ -474,9 +474,7 @@ public interface MappedEntityType Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory> getBagOfComplexToCategories(); void setBagOfComplexToCategories(final Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory> _bagOfComplexToCategories); - org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory newBagOfComplexToCategories(); - - + @Property(name = "ComplexPhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", @@ -499,9 +497,7 @@ public interface MappedEntityType 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); - org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newComplexPhone(); - - + @Property(name = "ComplexContactDetails", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails", @@ -524,12 +520,25 @@ public interface MappedEntityType 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); - org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newComplexContactDetails(); - - + + ComplexFactory factory(); + interface ComplexFactory { + @Property(name = "BagOfComplexToCategories", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory") + org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory newBagOfComplexToCategories(); + + @Property(name = "ComplexPhone", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone") + org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newComplexPhone(); + + @Property(name = "ComplexContactDetails", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails") + 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 cc0b1c6ed..8981ccc61 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 642b1e763..9357035c5 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface Message extends Serializable { - @Key @Property(name = "MessageId", type = "Edm.Int32", @@ -256,5 +256,4 @@ 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 cbb06d6d3..3f6f59b5a 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface MessageAttachment extends Serializable { - @Key @Property(name = "AttachmentId", type = "Edm.Guid", @@ -111,5 +111,4 @@ public interface MessageAttachment - } 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 ea08cc011..67e7cd0fc 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 713fa783e..cc4d72652 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 e626b617f..03a370614 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.ext.proxy.api.annotations.EntityType; 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 c97b7308a..e4c1b2432 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface Order extends Serializable { - @Key @Property(name = "OrderId", type = "Edm.Int32", @@ -129,9 +129,7 @@ public interface Order 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); - org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newConcurrency(); - - + @NavigationProperty(name = "Login", @@ -156,5 +154,12 @@ public interface Order + ComplexFactory factory(); + interface ComplexFactory { + @Property(name = "Concurrency", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo") + 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/OrderCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java index 785f99518..2c74b4201 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 9b9f79632..8f4e88295 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface OrderLine extends Serializable { - @Property(name = "OrderLineStream", type = "Edm.Stream", @@ -200,5 +200,4 @@ 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 9be8a7d60..f099fb85b 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 ab33ea2e2..01ce42a1f 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.ext.proxy.api.annotations.EntityType; 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 42b7c42cc..ffb6f23e7 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface PageView extends Serializable { - @Key @Property(name = "PageViewId", type = "Edm.Int32", @@ -190,5 +190,4 @@ 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 ddfb43643..93fa4b816 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 728d0c3c8..5227f1e1b 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface Person extends Serializable { - @Key @Property(name = "PersonId", type = "Edm.Int32", @@ -121,5 +121,4 @@ 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 550573522..be1a9c4fb 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 22d7730fe..86032b4c9 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface PersonMetadata extends Serializable { - @Key @Property(name = "PersonMetadataId", type = "Edm.Int32", @@ -167,5 +167,4 @@ 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 2e7e596d1..e06f0e425 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 f2eff1b39..9f92009e4 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.ext.proxy.api.annotations.Namespace; @@ -44,8 +45,8 @@ import javax.xml.datatype.Duration; @Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @ComplexType(name = "Phone") -public interface Phone extends Serializable { - +public interface Phone + extends Serializable { @Property(name = "PhoneNumber", type = "Edm.String", nullable = true) 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 ad5a92ac7..ab0271ed9 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface Product extends Serializable { - @Property(name = "Picture", type = "Edm.Stream", @@ -152,9 +152,7 @@ public interface Product 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); - org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions(); - - + @Property(name = "BaseConcurrency", type = "Edm.String", @@ -200,9 +198,7 @@ public interface Product 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); - org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newComplexConcurrency(); - - + @Property(name = "NestedComplexConcurrency", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo", @@ -225,9 +221,7 @@ public interface Product 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); - org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newNestedComplexConcurrency(); - - + @NavigationProperty(name = "RelatedProducts", @@ -271,9 +265,9 @@ public interface Product - Operations operations(); + Operations operations(); - public interface Operations { + interface Operations { @Operation(name = "ChangeProductDimensions", type = OperationType.ACTION) @@ -283,5 +277,20 @@ public interface Product } + ComplexFactory factory(); + interface ComplexFactory { + @Property(name = "Dimensions", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions") + org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions(); + + @Property(name = "ComplexConcurrency", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo") + org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newComplexConcurrency(); + + @Property(name = "NestedComplexConcurrency", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo") + org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newNestedComplexConcurrency(); + + } } 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 3ff5b2bbd..5c6d3c287 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 8cbc68f1f..4d34093d5 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface ProductDetail extends Serializable { - @Key @Property(name = "ProductId", type = "Edm.Int32", @@ -121,5 +121,4 @@ 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 6045a0f81..1320754f9 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 a0d533f13..bbdab09bf 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -61,7 +62,6 @@ 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", @@ -237,5 +237,4 @@ 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 a88b64101..7dda48d52 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 928856722..1d2488935 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface ProductPhoto extends Serializable { - @Key @Property(name = "ProductId", type = "Edm.Int32", @@ -134,5 +134,4 @@ public interface ProductPhoto - } 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 7271057a6..479be7fab 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 5be493f38..0a90db375 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.ext.proxy.api.annotations.EntityType; 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 f88cc2e7c..f58bf4464 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface ProductReview extends Serializable { - @Key @Property(name = "ProductId", type = "Edm.Int32", @@ -167,5 +167,4 @@ 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 7fa44e28e..e52976567 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 2a4d312cb..58030235d 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.ext.proxy.api.annotations.EntityType; 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 66c7b8171..5d140338c 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface RSAToken extends Serializable { - @Key @Property(name = "Serial", type = "Edm.String", @@ -121,5 +121,4 @@ 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 f130e6afb..31f67ed08 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 c851d8322..7b2b0c57d 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -61,7 +62,6 @@ 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", @@ -280,5 +280,4 @@ 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 03765dffa..72177018f 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; import org.apache.olingo.client.api.http.HttpMethod; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java index ba1c67687..c6af5350f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java @@ -16,5 +16,6 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; 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 ad343c129..e503d059c 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 f73247c97..bc79d5e9c 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 0b985c503..c8d42be7d 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 4146de747..93057f440 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 85c781848..c24ecee77 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 68295bf8b..b0b217aaa 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 e4b8b2215..5c1c3af70 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 a0102d5bf..c1f4c4228 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.client.api.http.HttpMethod; 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 ff9be59d9..0e13ff8cf 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 c9e160a48..352e5fca9 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 d5b79cbb0..046ac8001 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 17fe0faf1..4a14f9011 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 9671d6cac..390100bcc 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 bddeb74e5..9939b4762 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 d86d4f5e6..d3cdde300 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 e75abd6ef..054a89779 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 35b43bb73..0d0d0662b 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 2c81494f9..31341d63f 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; 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 04808c42c..f2e68afb1 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java index e7fb1fc79..abf2d52f1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java @@ -16,5 +16,6 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java index 5055bde31..4b3c72384 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.ext.proxy.api.annotations.Namespace; 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 25d57c710..fe5b427db 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface Account extends Serializable { - @Key @Property(name = "AccountID", type = "Edm.Int32", @@ -129,9 +129,7 @@ public interface Account 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); - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo newAccountInfo(); - - + @NavigationProperty(name = "MyGiftCard", @@ -175,9 +173,9 @@ public interface Account - Operations operations(); + Operations operations(); - public interface Operations { + interface Operations { @Operation(name = "GetDefaultPI", type = OperationType.FUNCTION, isComposable = false, @@ -202,5 +200,12 @@ public interface Account } + ComplexFactory factory(); + interface ComplexFactory { + @Property(name = "AccountInfo", + type = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo") + org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo newAccountInfo(); + + } } 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 00ec845f6..c9159860d 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 da9f9bb77..9f5d34a10 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.ext.proxy.api.annotations.Namespace; @@ -46,8 +47,8 @@ import javax.xml.datatype.Duration; @ComplexType(name = "AccountInfo", isOpenType = true, isAbstract = false) -public interface AccountInfo extends Serializable { - +public interface AccountInfo + extends Serializable { @Property(name = "FirstName", 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 1e805cd4d..1aaed33ff 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.ext.proxy.api.annotations.Namespace; @@ -46,8 +47,8 @@ import javax.xml.datatype.Duration; @ComplexType(name = "Address", isOpenType = false, isAbstract = false) -public interface Address extends Serializable { - +public interface Address + extends Serializable { @Property(name = "Street", 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 5c1a55032..9ae476a23 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface Asset extends Serializable { - @Key @Property(name = "AssetID", type = "Edm.Int32", @@ -134,5 +134,4 @@ public interface Asset - } 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 12b8ef127..be1c6021c 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 84a46aac7..b66b1a249 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface Club extends Serializable { - @Key @Property(name = "ClubID", type = "Edm.Int32", @@ -111,5 +111,4 @@ public interface Club - } 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 4647fed33..2cf21287c 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java index 17a0a7d67..5432f9efe 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.ext.proxy.api.annotations.Namespace; 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 572a49277..f910d581f 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface Company extends Serializable { - @Key @Property(name = "CompanyID", type = "Edm.Int32", @@ -175,9 +175,7 @@ public interface Company 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); - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newAddress(); - - + @NavigationProperty(name = "Employees", @@ -221,9 +219,9 @@ public interface Company - Operations operations(); + Operations operations(); - public interface Operations { + interface Operations { @Operation(name = "GetEmployeesCount", type = OperationType.FUNCTION, isComposable = false, @@ -241,5 +239,12 @@ public interface Company } + ComplexFactory factory(); + interface ComplexFactory { + @Property(name = "Address", + type = "Microsoft.Test.OData.Services.ODataWCFService.Address") + org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newAddress(); + + } } 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 372f16da3..2a23fb724 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.ext.proxy.api.annotations.Namespace; @@ -47,8 +48,8 @@ import javax.xml.datatype.Duration; isOpenType = false, isAbstract = false, baseType = "Microsoft.Test.OData.Services.ODataWCFService.Address") -public interface CompanyAddress extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address { - +public interface CompanyAddress + extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address { @Property(name = "Street", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java index 47aa8eb6c..361f9128a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.ext.proxy.api.annotations.Namespace; 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 7eb03e441..27c79511c 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 a29b82d70..81e61cd27 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -61,7 +62,6 @@ 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", @@ -290,5 +290,4 @@ 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 d673c514c..9f528e301 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 9fdc7aab7..4a3900aa8 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface CreditRecord extends Serializable { - @Key @Property(name = "CreditRecordID", type = "Edm.Int32", @@ -157,5 +157,4 @@ public interface CreditRecord - } 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 24542010e..1c53c8df6 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 76efb579d..1a5f3930c 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -61,7 +62,6 @@ 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", @@ -176,9 +176,7 @@ public interface Customer 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); - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newHomeAddress(); - - + @Property(name = "Home", type = "Edm.GeographyPoint", @@ -351,5 +349,13 @@ public interface Customer + @Override + ComplexFactory factory(); + interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.ComplexFactory{ + @Property(name = "HomeAddress", + type = "Microsoft.Test.OData.Services.ODataWCFService.Address") + org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newHomeAddress(); + + } } 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 2b0ce94c0..e73f8bfb5 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 e970c94e3..0c10067d1 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface Department extends Serializable { - @Key @Property(name = "DepartmentID", type = "Edm.Int32", @@ -121,5 +121,4 @@ 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 27b40de0f..47cd2f2ef 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 8d2c61716..c9ebc57c7 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -61,7 +62,6 @@ 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", @@ -176,9 +176,7 @@ public interface Employee 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); - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newHomeAddress(); - - + @Property(name = "Home", type = "Edm.GeographyPoint", @@ -318,5 +316,13 @@ public interface Employee + @Override + ComplexFactory factory(); + interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.ComplexFactory{ + @Property(name = "HomeAddress", + type = "Microsoft.Test.OData.Services.ODataWCFService.Address") + org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newHomeAddress(); + + } } 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 9ed998727..4cf82d5e8 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 2ffb326da..649ff83ab 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface GiftCard extends Serializable { - @Key @Property(name = "GiftCardID", type = "Edm.Int32", @@ -156,9 +156,9 @@ public interface GiftCard - Operations operations(); + Operations operations(); - public interface Operations { + interface Operations { @Operation(name = "GetActualAmount", type = OperationType.FUNCTION, isComposable = false, @@ -170,5 +170,4 @@ 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 5ca4350d6..6ce3ce3f6 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 ed04d8b77..75b73c965 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.ext.proxy.api.annotations.Namespace; @@ -47,8 +48,8 @@ import javax.xml.datatype.Duration; isOpenType = false, isAbstract = false, baseType = "Microsoft.Test.OData.Services.ODataWCFService.Address") -public interface HomeAddress extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address { - +public interface HomeAddress + extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address { @Property(name = "Street", 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 0b39627be..6602aaa97 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface LabourUnion extends Serializable { - @Key @Property(name = "LabourUnionID", type = "Edm.Int32", @@ -111,5 +111,4 @@ public interface LabourUnion - } 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 644f6d865..c6ab1e7c0 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 40bbb2d7f..671a504db 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface Order extends Serializable { - @Key @Property(name = "OrderID", type = "Edm.Int32", @@ -187,5 +187,4 @@ 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 3e3712cdb..694eab50a 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 e753d9ddb..c412a87aa 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface OrderDetail extends Serializable { - @Key @Property(name = "OrderID", type = "Edm.Int32", @@ -200,5 +200,4 @@ 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 a0d2058f7..474af08d2 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 ba6b8b195..a6251dbcc 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.ext.proxy.api.annotations.EntityType; 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 b9318fcba..a8662285f 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface PaymentInstrument extends Serializable { - @Key @Property(name = "PaymentInstrumentID", type = "Edm.Int32", @@ -164,5 +164,4 @@ 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 878a3ffee..f093eb382 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 03c48d1f5..b175259da 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface Person extends Serializable { - @Key @Property(name = "PersonID", type = "Edm.Int32", @@ -175,9 +175,7 @@ public interface Person 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); - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newHomeAddress(); - - + @Property(name = "Home", type = "Edm.GeographyPoint", @@ -260,9 +258,9 @@ public interface Person - Operations operations(); + Operations operations(); - public interface Operations { + interface Operations { @Operation(name = "GetHomeAddress", type = OperationType.FUNCTION, isComposable = true, @@ -281,5 +279,12 @@ public interface Person } + ComplexFactory factory(); + interface ComplexFactory { + @Property(name = "HomeAddress", + type = "Microsoft.Test.OData.Services.ODataWCFService.Address") + org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newHomeAddress(); + + } } 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 778e8cc93..c34786dc4 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 043f9c522..271f97659 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface Product extends Serializable { - @Key @Property(name = "ProductID", type = "Edm.Int32", @@ -281,9 +281,9 @@ public interface Product - Operations operations(); + Operations operations(); - public interface Operations { + interface Operations { @Operation(name = "GetProductDetails", type = OperationType.FUNCTION, isComposable = true, @@ -302,5 +302,4 @@ 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 88cd63d34..39a23b543 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 8e847ea69..3a6432cf9 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface ProductDetail extends Serializable { - @Key @Property(name = "ProductID", type = "Edm.Int32", @@ -176,9 +176,9 @@ public interface ProductDetail - Operations operations(); + Operations operations(); - public interface Operations { + interface Operations { @Operation(name = "GetRelatedProduct", type = OperationType.FUNCTION, isComposable = true, @@ -189,5 +189,4 @@ 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 31b8c1b1e..26781026d 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 713ba99c5..fbe7632f8 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.ext.proxy.api.annotations.EntityType; 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 221cdf59e..2faa843af 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface ProductReview extends Serializable { - @Key @Property(name = "ProductID", type = "Edm.Int32", @@ -203,5 +203,4 @@ public interface ProductReview - } 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 9825a7005..745ce9cd3 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 601b57444..aad0cddaf 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.ext.proxy.api.annotations.EntityType; 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 f56fbd61d..02fd1e347 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -61,7 +62,6 @@ 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", @@ -176,9 +176,7 @@ public interface PublicCompany 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); - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newAddress(); - - + @Property(name = "StockExchange", type = "Edm.String", @@ -276,5 +274,13 @@ public interface PublicCompany + @Override + ComplexFactory factory(); + interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company.ComplexFactory{ + @Property(name = "Address", + type = "Microsoft.Test.OData.Services.ODataWCFService.Address") + org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newAddress(); + + } } 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 b90e82f90..f7a149d80 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 7f93e513f..ed3f6ee08 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface Statement extends Serializable { - @Key @Property(name = "StatementID", type = "Edm.Int32", @@ -157,5 +157,4 @@ public interface Statement - } 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 2f4c0a6de..7a52544c6 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 aed937b62..4035fed30 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface StoredPI extends Serializable { - @Key @Property(name = "StoredPIID", type = "Edm.Int32", @@ -157,5 +157,4 @@ public interface StoredPI - } 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 ba7ab8f6c..2435a26dd 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; 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 5c172cf0d..60345e8c7 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; @@ -60,7 +61,6 @@ public interface Subscription extends Serializable { - @Key @Property(name = "SubscriptionID", type = "Edm.Int32", @@ -180,5 +180,4 @@ public interface Subscription - } 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 08393e72e..17885bf1c 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 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.client.api.http.HttpMethod; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java index 4bc5702f9..1b20c6bcd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java @@ -16,5 +16,6 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java index 02a927380..1ed6d22b5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java @@ -36,11 +36,13 @@ import org.apache.olingo.client.api.communication.request.batch.ODataBatchRespon import org.apache.olingo.client.api.communication.request.batch.ODataChangeset; import org.apache.olingo.client.api.communication.request.batch.ODataRetrieve; import org.apache.olingo.client.api.communication.request.batch.v3.ODataBatchRequest; +import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest; import org.apache.olingo.client.api.communication.request.cud.v3.UpdateType; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataBatchResponse; +import org.apache.olingo.client.api.communication.response.ODataDeleteResponse; import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; import org.apache.olingo.client.api.communication.response.ODataResponse; @@ -55,6 +57,7 @@ import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.commons.api.domain.v3.ODataEntity; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.format.ODataPubFormat; +import static org.apache.olingo.fit.v3.AbstractTestITCase.client; import org.junit.Test; public class BatchTestITCase extends AbstractTestITCase { @@ -281,6 +284,12 @@ public class BatchTestITCase extends AbstractTestITCase { client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), original); createReq.setFormat(ODataPubFormat.ATOM); changeset.addRequest(createReq); + + // Delete customer created above + targetURI = + client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customer").appendKeySegment(1000); + final ODataDeleteRequest deleteReq = client.getCUDRequestFactory().getDeleteRequest(targetURI.build()); + changeset.addRequest(deleteReq); // ------------------------------------------- // ------------------------------------------- @@ -338,6 +347,10 @@ public class BatchTestITCase extends AbstractTestITCase { entity = createres.getBody(); assertEquals(new Integer(1000), entity.getProperty("CustomerId").getPrimitiveValue().toCastValue(Integer.class)); + res = chgitem.next(); + assertTrue(res instanceof ODataDeleteResponse); + assertEquals(204, res.getStatusCode()); + // retrive the third item (ODataRetrieve) item = iter.next(); assertTrue(item instanceof ODataRetrieveResponseItem);