From 87c87cb872923743f63d44cdf91c5409a4a87712 Mon Sep 17 00:00:00 2001 From: fmartelli Date: Wed, 16 Jul 2014 11:02:48 +0200 Subject: [PATCH] [OLINGO-366,OLINGO-365] working on API review, explicit next link handling and delayed http requests --- .../olingo/ext/proxy/api/CollectionQuery.java | 27 +- .../olingo/ext/proxy/api/CommonQuery.java | 2 +- .../ext/proxy/api/EntityCollectionQuery.java | 38 +++ .../olingo/ext/proxy/api/EntitySetQuery.java | 34 +++ .../proxy/api/annotations/CollectionRef.java | 34 +++ ...ractEntityCollectionInvocationHandler.java | 224 +++++++++++++++++ .../commons/AbstractInvocationHandler.java | 3 +- .../EntityCollectionInvocationHandler.java | 79 ++++-- .../EntityContainerInvocationHandler.java | 2 +- .../commons/EntityInvocationHandler.java | 6 +- .../commons/EntitySetInvocationHandler.java | 237 +++++------------- .../commons/OperationInvocationHandler.java | 6 +- .../olingo/ext/proxy/commons/SearchImpl.java | 5 +- .../olingo/ext/proxy/context/EntityUUID.java | 4 +- .../src/main/resources/container.vm | 1 + .../src/main/resources/entityCollection.vm | 5 +- .../src/main/resources/entitySet.vm | 2 +- .../src/main/resources/entityType.vm | 2 +- .../fit/proxy/v3/EntitySetTestITCase.java | 8 +- .../olingo/fit/proxy/v3/FilterTestITCase.java | 2 +- .../olingo/fit/proxy/v3/InvokeTestITCase.java | 2 +- .../AllGeoCollectionTypesSet.java | 2 +- .../astoriadefaultservice/AllGeoTypesSet.java | 2 +- .../services/astoriadefaultservice/Car.java | 2 +- .../astoriadefaultservice/Computer.java | 2 +- .../astoriadefaultservice/ComputerDetail.java | 2 +- .../astoriadefaultservice/Customer.java | 2 +- .../astoriadefaultservice/CustomerInfo.java | 2 +- .../DefaultContainer.java | 24 ++ .../astoriadefaultservice/Driver.java | 2 +- .../astoriadefaultservice/LastLogin.java | 2 +- .../astoriadefaultservice/License.java | 2 +- .../services/astoriadefaultservice/Login.java | 2 +- .../MappedEntityType.java | 2 +- .../astoriadefaultservice/Message.java | 2 +- .../MessageAttachment.java | 2 +- .../services/astoriadefaultservice/Order.java | 2 +- .../astoriadefaultservice/OrderLine.java | 2 +- .../astoriadefaultservice/PageView.java | 2 +- .../astoriadefaultservice/Person.java | 2 +- .../astoriadefaultservice/PersonMetadata.java | 2 +- .../astoriadefaultservice/Product.java | 2 +- .../astoriadefaultservice/ProductDetail.java | 2 +- .../astoriadefaultservice/ProductPhoto.java | 2 +- .../astoriadefaultservice/ProductReview.java | 2 +- .../astoriadefaultservice/RSAToken.java | 2 +- .../AllSpatialCollectionTypesCollection.java | 4 +- ...atialCollectionTypes_SimpleCollection.java | 4 +- .../types/AllSpatialTypesCollection.java | 4 +- .../types/BackOrderLine2Collection.java | 4 +- .../types/BackOrderLineCollection.java | 4 +- .../types/CarCollection.java | 4 +- .../types/ComputerCollection.java | 4 +- .../types/ComputerDetailCollection.java | 4 +- .../types/ContractorCollection.java | 4 +- .../types/CustomerCollection.java | 4 +- .../types/CustomerInfoCollection.java | 4 +- .../types/DiscontinuedProductCollection.java | 4 +- .../types/DriverCollection.java | 4 +- .../types/EmployeeCollection.java | 4 +- .../types/LastLoginCollection.java | 4 +- .../types/LicenseCollection.java | 4 +- .../types/LoginCollection.java | 4 +- .../types/MappedEntityTypeCollection.java | 4 +- .../types/MessageAttachmentCollection.java | 4 +- .../types/MessageCollection.java | 4 +- .../types/OrderCollection.java | 4 +- .../types/OrderLineCollection.java | 4 +- .../types/PageViewCollection.java | 4 +- .../types/PersonCollection.java | 4 +- .../types/PersonMetadataCollection.java | 4 +- .../types/ProductCollection.java | 4 +- .../types/ProductDetailCollection.java | 4 +- .../types/ProductPageViewCollection.java | 4 +- .../types/ProductPhotoCollection.java | 4 +- .../types/ProductReviewCollection.java | 4 +- .../types/RSATokenCollection.java | 4 +- .../types/SpecialEmployeeCollection.java | 4 +- .../opentypesservicev3/DefaultContainer.java | 2 + .../services/opentypesservicev3/Row.java | 2 +- .../services/opentypesservicev3/RowIndex.java | 2 +- .../types/IndexedRowCollection.java | 4 +- .../types/RowCollection.java | 4 +- .../types/RowIndexCollection.java | 4 +- .../primitivekeysservice/EdmBinarySet.java | 2 +- .../primitivekeysservice/EdmBooleanSet.java | 2 +- .../primitivekeysservice/EdmByteSet.java | 2 +- .../EdmDateTimeOffsetSet.java | 2 +- .../primitivekeysservice/EdmDateTimeSet.java | 2 +- .../primitivekeysservice/EdmDecimalSet.java | 2 +- .../primitivekeysservice/EdmDoubleSet.java | 2 +- .../primitivekeysservice/EdmGuidSet.java | 2 +- .../primitivekeysservice/EdmInt16Set.java | 2 +- .../primitivekeysservice/EdmInt32Set.java | 2 +- .../primitivekeysservice/EdmInt64Set.java | 2 +- .../primitivekeysservice/EdmSingleSet.java | 2 +- .../primitivekeysservice/EdmStringSet.java | 2 +- .../primitivekeysservice/EdmTimeSet.java | 2 +- .../primitivekeysservice/Folders.java | 2 +- .../primitivekeysservice/TestContext.java | 15 ++ .../types/EdmBinaryCollection.java | 4 +- .../types/EdmBooleanCollection.java | 4 +- .../types/EdmByteCollection.java | 4 +- .../types/EdmDateTimeCollection.java | 4 +- .../types/EdmDateTimeOffsetCollection.java | 4 +- .../types/EdmDecimalCollection.java | 4 +- .../types/EdmDoubleCollection.java | 4 +- .../types/EdmGuidCollection.java | 4 +- .../types/EdmInt16Collection.java | 4 +- .../types/EdmInt32Collection.java | 4 +- .../types/EdmInt64Collection.java | 4 +- .../types/EdmSingleCollection.java | 4 +- .../types/EdmStringCollection.java | 4 +- .../types/EdmTimeCollection.java | 4 +- .../types/FolderCollection.java | 4 +- .../AllGeoCollectionTypesSet.java | 2 +- .../astoriadefaultservice/AllGeoTypesSet.java | 2 +- .../services/astoriadefaultservice/Car.java | 2 +- .../astoriadefaultservice/Computer.java | 2 +- .../astoriadefaultservice/ComputerDetail.java | 2 +- .../astoriadefaultservice/Customer.java | 2 +- .../astoriadefaultservice/CustomerInfo.java | 2 +- .../DefaultContainer.java | 24 ++ .../astoriadefaultservice/Driver.java | 2 +- .../astoriadefaultservice/LastLogin.java | 2 +- .../astoriadefaultservice/License.java | 2 +- .../services/astoriadefaultservice/Login.java | 2 +- .../MappedEntityType.java | 2 +- .../astoriadefaultservice/Message.java | 2 +- .../MessageAttachment.java | 2 +- .../services/astoriadefaultservice/Order.java | 2 +- .../astoriadefaultservice/OrderLine.java | 2 +- .../astoriadefaultservice/PageView.java | 2 +- .../astoriadefaultservice/Person.java | 2 +- .../astoriadefaultservice/PersonMetadata.java | 2 +- .../astoriadefaultservice/Product.java | 2 +- .../astoriadefaultservice/ProductDetail.java | 2 +- .../astoriadefaultservice/ProductPhoto.java | 2 +- .../astoriadefaultservice/ProductReview.java | 2 +- .../astoriadefaultservice/RSAToken.java | 2 +- .../AllSpatialCollectionTypesCollection.java | 4 +- ...atialCollectionTypes_SimpleCollection.java | 4 +- .../types/AllSpatialTypesCollection.java | 4 +- .../types/BackOrderLine2Collection.java | 4 +- .../types/BackOrderLineCollection.java | 4 +- .../types/CarCollection.java | 4 +- .../types/ComputerCollection.java | 4 +- .../types/ComputerDetailCollection.java | 4 +- .../types/ContractorCollection.java | 4 +- .../types/CustomerCollection.java | 4 +- .../types/CustomerInfoCollection.java | 4 +- .../types/DiscontinuedProductCollection.java | 4 +- .../types/DriverCollection.java | 4 +- .../types/EmployeeCollection.java | 4 +- .../types/LastLoginCollection.java | 4 +- .../types/LicenseCollection.java | 4 +- .../types/LoginCollection.java | 4 +- .../types/MappedEntityTypeCollection.java | 4 +- .../types/MessageAttachmentCollection.java | 4 +- .../types/MessageCollection.java | 4 +- .../types/OrderCollection.java | 4 +- .../types/OrderLineCollection.java | 4 +- .../types/PageViewCollection.java | 4 +- .../types/PersonCollection.java | 4 +- .../types/PersonMetadataCollection.java | 4 +- .../types/ProductCollection.java | 4 +- .../types/ProductDetailCollection.java | 4 +- .../types/ProductPageViewCollection.java | 4 +- .../types/ProductPhotoCollection.java | 4 +- .../types/ProductReviewCollection.java | 4 +- .../types/RSATokenCollection.java | 4 +- .../types/SpecialEmployeeCollection.java | 4 +- .../proxy/v4/APIBasicDesignTestITCase.java | 18 +- .../fit/proxy/v4/EntitySetTestITCase.java | 4 +- .../v4/demo/odatademo/Advertisements.java | 2 +- .../proxy/v4/demo/odatademo/Categories.java | 2 +- .../proxy/v4/demo/odatademo/DemoService.java | 7 + .../v4/demo/odatademo/PersonDetails.java | 2 +- .../fit/proxy/v4/demo/odatademo/Persons.java | 2 +- .../v4/demo/odatademo/ProductDetails.java | 2 +- .../fit/proxy/v4/demo/odatademo/Products.java | 2 +- .../proxy/v4/demo/odatademo/Suppliers.java | 2 +- .../types/AdvertisementCollection.java | 4 +- .../odatademo/types/CategoryCollection.java | 4 +- .../odatademo/types/CustomerCollection.java | 4 +- .../odatademo/types/EmployeeCollection.java | 4 +- .../types/FeaturedProductCollection.java | 4 +- .../odatademo/types/PersonCollection.java | 4 +- .../types/PersonDetailCollection.java | 4 +- .../odatademo/types/ProductCollection.java | 4 +- .../types/ProductDetailCollection.java | 4 +- .../odatademo/types/SupplierCollection.java | 4 +- .../opentypesservicev4/DefaultContainer.java | 2 + .../services/opentypesservicev4/Row.java | 2 +- .../services/opentypesservicev4/RowIndex.java | 2 +- .../types/IndexedRowCollection.java | 4 +- .../types/RowCollection.java | 4 +- .../types/RowIndexCollection.java | 4 +- .../services/odatawcfservice/Accounts.java | 2 +- .../services/odatawcfservice/Customers.java | 2 +- .../services/odatawcfservice/Departments.java | 2 +- .../services/odatawcfservice/Employees.java | 2 +- .../odatawcfservice/InMemoryEntities.java | 12 + .../odatawcfservice/OrderDetails.java | 2 +- .../services/odatawcfservice/Orders.java | 2 +- .../services/odatawcfservice/People.java | 2 +- .../odatawcfservice/ProductDetails.java | 2 +- .../odatawcfservice/ProductReviews.java | 2 +- .../services/odatawcfservice/Products.java | 2 +- .../services/odatawcfservice/StoredPIs.java | 2 +- .../SubscriptionTemplates.java | 2 +- .../odatawcfservice/types/Account.java | 4 +- .../types/AccountCollection.java | 4 +- .../types/AssetCollection.java | 4 +- .../odatawcfservice/types/ClubCollection.java | 4 +- .../types/CompanyCollection.java | 4 +- .../odatawcfservice/types/CreditCardPI.java | 2 +- .../types/CreditCardPICollection.java | 4 +- .../types/CreditRecordCollection.java | 4 +- .../types/CustomerCollection.java | 4 +- .../types/DepartmentCollection.java | 4 +- .../types/EmployeeCollection.java | 4 +- .../types/GiftCardCollection.java | 4 +- .../types/LabourUnionCollection.java | 4 +- .../types/OrderCollection.java | 4 +- .../types/OrderDetailCollection.java | 4 +- .../types/PaymentInstrument.java | 2 +- .../types/PaymentInstrumentCollection.java | 4 +- .../types/PersonCollection.java | 4 +- .../types/ProductCollection.java | 4 +- .../types/ProductDetailCollection.java | 4 +- .../types/ProductReviewCollection.java | 4 +- .../odatawcfservice/types/PublicCompany.java | 2 +- .../types/PublicCompanyCollection.java | 4 +- .../types/StatementCollection.java | 4 +- .../types/StoredPICollection.java | 4 +- .../types/SubscriptionCollection.java | 4 +- 237 files changed, 1040 insertions(+), 441 deletions(-) create mode 100644 ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/EntityCollectionQuery.java create mode 100644 ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/EntitySetQuery.java create mode 100644 ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/CollectionRef.java create mode 100644 ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/CollectionQuery.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/CollectionQuery.java index 9be70209f..da44495ba 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/CollectionQuery.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/CollectionQuery.java @@ -20,8 +20,9 @@ package org.apache.olingo.ext.proxy.api; import org.apache.olingo.client.api.uri.URIFilter; -public interface CollectionQuery> - extends CommonQuery> { +public interface CollectionQuery< + T extends StructuredType, EC extends AbstractEntityCollection, CT extends CollectionQuery> + extends CommonQuery> { /** * Returns all instances. @@ -30,16 +31,6 @@ public interface CollectionQuery - * @param - * @param reference entity collection class to be returned - * @return all entities of the given subtype - */ - > SEC execute(Class reference); - /** * Sets the $filter expression. *
@@ -48,7 +39,7 @@ public interface CollectionQuery$filter expression. * @return the same query instance. */ - CollectionQuery filter(String filter); + CT filter(String filter); /** * Sets the filter generating the $filter expression. @@ -57,7 +48,7 @@ public interface CollectionQuery filter(URIFilter filter); + CT filter(URIFilter filter); /** * Sets the $orderBy expression. @@ -65,7 +56,7 @@ public interface CollectionQuery orderBy(Sort... sort); + CT orderBy(Sort... sort); /** * Sets the $orderBy expression. @@ -73,7 +64,7 @@ public interface CollectionQuery$orderBy expression. * @return the same query instance. */ - CollectionQuery orderBy(String orderBy); + CT orderBy(String orderBy); /** * Sets the maximum number of results to retrieve ($top). @@ -82,7 +73,7 @@ public interface CollectionQuery top(int top) throws IllegalArgumentException; + CT top(int top) throws IllegalArgumentException; /** * Sets the position of the first result to retrieve ($skip). @@ -91,5 +82,5 @@ public interface CollectionQuery skip(int skip) throws IllegalArgumentException; + CT skip(int skip) throws IllegalArgumentException; } diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/CommonQuery.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/CommonQuery.java index 4c24bc45e..939d34bff 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/CommonQuery.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/CommonQuery.java @@ -41,5 +41,5 @@ public interface CommonQuery { * * @return the same query instance. */ - T clear(); + T clearQueryOptions(); } diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/EntityCollectionQuery.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/EntityCollectionQuery.java new file mode 100644 index 000000000..09f22cb84 --- /dev/null +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/EntityCollectionQuery.java @@ -0,0 +1,38 @@ +/* + * 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.api; + +public interface EntityCollectionQuery< + T extends StructuredType, EC extends AbstractEntityCollection, CT extends EntityCollectionQuery> + extends CollectionQuery { + + /** + * Explicit paging result handling. + * + * @return next page. + */ + CT nextPage(); + + /** + * Checks for next page existence. + * + * @return <TRUE whether a next page exist; FALSE otherwise. + */ + boolean hasNextPage(); +} diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/EntitySetQuery.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/EntitySetQuery.java new file mode 100644 index 000000000..e635eca2a --- /dev/null +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/EntitySetQuery.java @@ -0,0 +1,34 @@ +/* + * 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.api; + +public interface EntitySetQuery< + T extends StructuredType, EC extends AbstractEntityCollection, CT extends EntitySetQuery> + extends CollectionQuery { + + /** + * Returns all instances of the given subtype. + * + * @param + * @param + * @param reference entity collection class to be returned + * @return all entities of the given subtype + */ + > SEC execute(Class reference); +} diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/CollectionRef.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/CollectionRef.java new file mode 100644 index 000000000..77b4ce428 --- /dev/null +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/CollectionRef.java @@ -0,0 +1,34 @@ +/* + * 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.api.annotations; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Associate EntityType Java object with its collection. + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface CollectionRef { + + Class value(); +} diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java new file mode 100644 index 000000000..5120b1861 --- /dev/null +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java @@ -0,0 +1,224 @@ +/* + * 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.Proxy; +import java.lang.reflect.Type; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; +import org.apache.commons.lang3.tuple.ImmutableTriple; +import org.apache.commons.lang3.tuple.Triple; +import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; +import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; +import org.apache.olingo.client.api.uri.CommonURIBuilder; +import org.apache.olingo.client.api.uri.URIFilter; +import org.apache.olingo.client.api.v4.ODataClient; +import org.apache.olingo.commons.api.domain.CommonODataEntity; +import org.apache.olingo.commons.api.domain.CommonODataEntitySet; +import org.apache.olingo.commons.api.domain.v4.ODataAnnotation; +import org.apache.olingo.commons.api.domain.v4.ODataEntitySet; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; +import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.ext.proxy.api.AbstractSingleton; +import org.apache.olingo.ext.proxy.api.Sort; +import org.apache.olingo.ext.proxy.api.StructuredType; +import org.apache.olingo.ext.proxy.utils.ClassUtils; + +public abstract class AbstractEntityCollectionInvocationHandler< + T extends StructuredType, EC extends AbstractEntityCollection> + extends AbstractInvocationHandler { + + private static final long serialVersionUID = 98078202642671727L; + + protected final Class itemRef; + + protected final Class collItemRef; + + protected final URI baseURI; + + protected CommonURIBuilder uri; + + private boolean isSingleton = false; + + @SuppressWarnings("unchecked") + public AbstractEntityCollectionInvocationHandler( + final Class ref, + final EntityContainerInvocationHandler containerHandler, + final CommonURIBuilder uri) { + super(containerHandler); + + this.uri = uri; + this.baseURI = uri.build(); + this.isSingleton = AbstractSingleton.class.isAssignableFrom(ref); + + final Type[] entitySetParams = + ClassUtils.extractGenericType(ref, AbstractEntitySet.class, AbstractSingleton.class); + + this.itemRef = (Class) entitySetParams[0]; + this.collItemRef = (Class) entitySetParams[2]; + } + + @SuppressWarnings("unchecked") + public AbstractEntityCollectionInvocationHandler( + final Class itemRef, + final Class collItemRef, + final EntityContainerInvocationHandler containerHandler, + final CommonURIBuilder uri) { + super(containerHandler); + + this.uri = uri; + this.baseURI = uri == null ? null : uri.build(); + this.itemRef = (Class) itemRef; + this.collItemRef = collItemRef; + } + + protected Class getTypeRef() { + return this.itemRef; + } + + protected URI getURI() { + return this.baseURI; + } + + @SuppressWarnings("unchecked") + public > SEC fetchWholeEntitySet( + final CommonURIBuilder uriBuilder, final Class typeRef, final Class collTypeRef) { + + final List items = new ArrayList(); + final List annotations = new ArrayList(); + + URI nextURI = uriBuilder.build(); + while (nextURI != null) { + final Triple, URI, List> entitySet = fetchPartialEntitySet(nextURI, typeRef); + items.addAll(entitySet.getLeft()); + nextURI = entitySet.getMiddle(); + annotations.addAll(entitySet.getRight()); + } + + final EntityCollectionInvocationHandler entityCollectionHandler = + new EntityCollectionInvocationHandler(containerHandler, items, typeRef, uriBuilder); + entityCollectionHandler.setAnnotations(annotations); + + return (SEC) Proxy.newProxyInstance( + Thread.currentThread().getContextClassLoader(), + new Class[] {collTypeRef}, + entityCollectionHandler); + } + + @SuppressWarnings("unchecked") + public Triple, URI, List> fetchPartialEntitySet( + final URI uri, final Class typeRef) { + + final List entities = new ArrayList(); + final URI next; + final List annotations = new ArrayList(); + + if (isSingleton) { + final ODataRetrieveResponse res = + ((ODataClient) getClient()).getRetrieveRequestFactory().getSingletonRequest(uri).execute(); + + entities.add(res.getBody()); + next = null; + } else { + final ODataEntitySetRequest req = + getClient().getRetrieveRequestFactory().getEntitySetRequest(uri); + if (getClient().getServiceVersion().compareTo(ODataServiceVersion.V30) > 0) { + req.setPrefer(getClient().newPreferences().includeAnnotations("*")); + } + + final ODataRetrieveResponse res = req.execute(); + + final CommonODataEntitySet entitySet = res.getBody(); + entities.addAll(entitySet.getEntities()); + next = entitySet.getNext(); + if (entitySet instanceof ODataEntitySet) { + annotations.addAll(((ODataEntitySet) entitySet).getAnnotations()); + } + } + + final List items = new ArrayList(entities.size()); + + for (CommonODataEntity entity : entities) { + final EntityInvocationHandler handler = + this instanceof EntitySetInvocationHandler + ? EntityInvocationHandler.getInstance( + entity, + EntitySetInvocationHandler.class.cast(this), + typeRef) + : EntityInvocationHandler.getInstance( + entity, + null, + typeRef, + containerHandler); + + final EntityInvocationHandler handlerInTheContext = getContext().entityContext().getEntity(handler.getUUID()); + + items.add((S) Proxy.newProxyInstance( + Thread.currentThread().getContextClassLoader(), + new Class[] {typeRef}, + handlerInTheContext == null ? handler : handlerInTheContext)); + } + + return new ImmutableTriple, URI, List>(items, next, annotations); + } + + public void filter(final String filter) { + this.uri.filter(filter); + } + + public void filter(final URIFilter filter) { + this.uri.filter(filter); + } + + public void orderBy(final Sort... sort) { + final StringBuilder builder = new StringBuilder(); + for (Sort sortClause : sort) { + builder.append(sortClause.getKey()).append(' ').append(sortClause.getValue()).append(','); + } + builder.deleteCharAt(builder.length() - 1); + + this.uri.orderBy(builder.toString()); + } + + public void orderBy(final String orderBy) { + this.uri.orderBy(orderBy); + } + + public void top(final int top) throws IllegalArgumentException { + this.uri.top(top); + } + + public void skip(final int skip) throws IllegalArgumentException { + this.uri.skip(skip); + } + + public void expand(final String... expand) { + this.uri.expand(expand); + } + + public void select(final String... select) { + this.uri.select(select); + } + + public void clearQueryOptions() { + this.uri = this.baseURI == null ? null : getClient().newURIBuilder(baseURI.toASCIIString()); + } +} diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java index 52e356ad9..83f53b96f 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java @@ -116,7 +116,8 @@ abstract class AbstractInvocationHandler implements InvocationHandler { return Proxy.newProxyInstance( Thread.currentThread().getContextClassLoader(), new Class[] {typeCollectionRef}, - new EntityCollectionInvocationHandler(containerHandler, items, typeRef, uri)); + new EntityCollectionInvocationHandler(containerHandler, items, typeRef, + uri == null ? null : getClient().newURIBuilder(uri.toASCIIString()))); } protected Object getEntitySetProxy( diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityCollectionInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityCollectionInvocationHandler.java index 1d1d13681..4c4c16b51 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityCollectionInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityCollectionInvocationHandler.java @@ -18,7 +18,6 @@ */ package org.apache.olingo.ext.proxy.commons; -import java.io.Serializable; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.net.URI; @@ -29,23 +28,25 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.tuple.Triple; +import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.commons.api.domain.v4.ODataAnnotation; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; +import org.apache.olingo.ext.proxy.api.StructuredType; import org.apache.olingo.ext.proxy.api.annotations.Namespace; import org.apache.olingo.ext.proxy.api.annotations.Term; import org.apache.olingo.ext.proxy.utils.CoreUtils; -public class EntityCollectionInvocationHandler - extends AbstractInvocationHandler implements AbstractEntityCollection { +public class EntityCollectionInvocationHandler + extends AbstractEntityCollectionInvocationHandler> + implements AbstractEntityCollection { private static final long serialVersionUID = 98078202642671726L; - private final Collection items; + protected URI nextPageURI = null; - private final Class itemRef; - - private final URI uri; + private Collection items; private final List annotations = new ArrayList(); @@ -53,19 +54,16 @@ public class EntityCollectionInvocationHandler new HashMap, Object>(); public EntityCollectionInvocationHandler(final EntityContainerInvocationHandler containerHandler, - final Collection items, final Class itemRef) { + final Collection items, final Class itemRef) { this(containerHandler, items, itemRef, null); } public EntityCollectionInvocationHandler(final EntityContainerInvocationHandler containerHandler, - final Collection items, final Class itemRef, final URI uri) { - - super(containerHandler); + final Collection items, final Class itemRef, final CommonURIBuilder uri) { + super(itemRef, null, containerHandler, uri); this.items = items; - this.itemRef = itemRef; - this.uri = uri; } public void setAnnotations(final List annotations) { @@ -78,13 +76,19 @@ public class EntityCollectionInvocationHandler return itemRef; } - public URI getURI() { - return uri; - } - @Override public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { - if (isSelfMethod(method, args)) { + if ("filter".equals(method.getName()) + || "orderBy".equals(method.getName()) + || "top".equals(method.getName()) + || "skip".equals(method.getName()) + || "expand".equals(method.getName()) + || "select".equals(method.getName()) + || "nextPage".equals(method.getName()) + || "execute".equals(method.getName())) { + invokeSelfMethod(method, args); + return proxy; + } else if (isSelfMethod(method, args)) { return invokeSelfMethod(method, args); } else if ("operations".equals(method.getName()) && ArrayUtils.isEmpty(args)) { final Class returnType = method.getReturnType(); @@ -98,6 +102,39 @@ public class EntityCollectionInvocationHandler } } + public void nextPage() { + if (!hasNextPage()) { + throw new IllegalStateException("Next page URI not found"); + } + this.uri = getClient().newURIBuilder(nextPageURI.toASCIIString()); + } + + public boolean hasNextPage() { + return this.nextPageURI != null; + } + + void setNextPage(final URI next) { + this.nextPageURI = next; + } + + @SuppressWarnings("unchecked") + public AbstractEntityCollection execute() { + final Triple, URI, List> entitySet = fetchPartialEntitySet(this.uri.build(), itemRef); + this.nextPageURI = entitySet.getMiddle(); + + if (items == null) { + items = entitySet.getLeft(); + } else { + items.clear(); + items.addAll(entitySet.getLeft()); + } + + annotations.clear(); + annotations.addAll(entitySet.getRight()); + + return this; + } + @Override public int size() { return items.size(); @@ -195,4 +232,10 @@ public class EntityCollectionInvocationHandler public Collection> getAnnotationTerms() { return CoreUtils.getAnnotationTerms(annotations); } + + @Override + public void clearQueryOptions() { + super.clearQueryOptions(); + this.nextPageURI = null; + } } diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java index 80d3ac37a..5a42f3441 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java @@ -54,7 +54,7 @@ public final class EntityContainerInvocationHandler extends AbstractInvocationHa throw new IllegalArgumentException( ref.getName() + " is not annotated as @" + EntityContainer.class.getSimpleName()); } - + this.name = ((EntityContainer) annotation).name(); this.defaultEC = ((EntityContainer) annotation).isDefaultEntityContainer(); this.namespace = ((EntityContainer) annotation).namespace(); diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java index cd9c9360a..904080402 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java @@ -96,7 +96,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler return new EntityInvocationHandler( null, entity, - entitySet.getEntitySetURI(), + entitySet.getURI(), typeRef, entitySet.containerHandler); } @@ -128,7 +128,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler final EntityContainerInvocationHandler containerHandler) { super(typeRef, entity, containerHandler); - + final Object key = entityKey == null ? CoreUtils.getKey(getClient(), this, typeRef, entity) : entityKey; if (entity.getEditLink() != null) { @@ -584,7 +584,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler this.uri.select(select); } - public void clear() { + public void clearQueryOptions() { this.uri = getClient().newURIBuilder(baseURI.toASCIIString()); } diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java index 434dfdb8e..412c312f1 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java @@ -21,26 +21,18 @@ package org.apache.olingo.ext.proxy.commons; import java.io.Serializable; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import java.lang.reflect.Type; import java.net.URI; import java.util.ArrayList; import java.util.List; import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.tuple.ImmutableTriple; import org.apache.commons.lang3.tuple.Triple; -import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataValueRequest; -import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.uri.CommonURIBuilder; -import org.apache.olingo.client.api.uri.URIFilter; import org.apache.olingo.client.api.v3.UnsupportedInV3Exception; import org.apache.olingo.client.api.v4.EdmEnabledODataClient; -import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.commons.api.domain.CommonODataEntity; -import org.apache.olingo.commons.api.domain.CommonODataEntitySet; import org.apache.olingo.commons.api.domain.v4.ODataAnnotation; -import org.apache.olingo.commons.api.domain.v4.ODataEntitySet; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.api.format.ODataFormat; @@ -49,7 +41,6 @@ import org.apache.olingo.ext.proxy.api.AbstractEntitySet; import org.apache.olingo.ext.proxy.api.AbstractSingleton; import org.apache.olingo.ext.proxy.api.Search; import org.apache.olingo.ext.proxy.api.SingleQuery; -import org.apache.olingo.ext.proxy.api.Sort; import org.apache.olingo.ext.proxy.api.StructuredType; import org.apache.olingo.ext.proxy.api.annotations.EntitySet; import org.apache.olingo.ext.proxy.context.AttachedEntityStatus; @@ -61,7 +52,7 @@ import org.slf4j.LoggerFactory; class EntitySetInvocationHandler< T extends StructuredType, KEY extends Serializable, EC extends AbstractEntityCollection> - extends AbstractInvocationHandler + extends AbstractEntityCollectionInvocationHandler implements AbstractEntitySet { private static final long serialVersionUID = 2629912294765040027L; @@ -71,31 +62,29 @@ class EntitySetInvocationHandler< */ private static final Logger LOG = LoggerFactory.getLogger(EntitySetInvocationHandler.class); - private final boolean isSingleton; + @SuppressWarnings("unchecked") + static EntitySetInvocationHandler getInstance( + final Class itemRef, + final Class collItemRef, + final EntityContainerInvocationHandler containerHandler, + final String entitySetName) { - private Class typeRef = null; + final CommonURIBuilder uriBuilder = buildURI(containerHandler, entitySetName); - private Class collTypeRef = null; + uriBuilder.appendDerivedEntityTypeSegment(new FullQualifiedName( + ClassUtils.getNamespace(itemRef), ClassUtils.getEntityTypeName(itemRef)).toString()); - private final URI baseURI; - - private CommonURIBuilder uri; + return new EntitySetInvocationHandler(itemRef, collItemRef, containerHandler, entitySetName, uriBuilder); + } @SuppressWarnings({"rawtypes", "unchecked"}) static EntitySetInvocationHandler getInstance( - final Class ref, final EntityContainerInvocationHandler containerHandler, final String entitySetName) { + final Class ref, + final EntityContainerInvocationHandler containerHandler, + final String entitySetName) { - final CommonURIBuilder uriBuilder = containerHandler.getClient().newURIBuilder(); - - final StringBuilder entitySetSegment = new StringBuilder(); - if (!containerHandler.isDefaultEntityContainer()) { - entitySetSegment.append(containerHandler.getEntityContainerName()).append('.'); - } - entitySetSegment.append(entitySetName); - - uriBuilder.appendEntitySetSegment(entitySetSegment.toString()); - - return new EntitySetInvocationHandler(ref, containerHandler, entitySetName, uriBuilder); + return new EntitySetInvocationHandler( + ref, containerHandler, entitySetName, buildURI(containerHandler, entitySetName)); } @SuppressWarnings({"rawtypes", "unchecked"}) @@ -106,6 +95,22 @@ class EntitySetInvocationHandler< containerHandler.getClient().newURIBuilder(uri.toASCIIString())); } + private static CommonURIBuilder buildURI( + final EntityContainerInvocationHandler containerHandler, + final String entitySetName) { + final CommonURIBuilder uriBuilder = containerHandler.getClient().newURIBuilder(); + + final StringBuilder entitySetSegment = new StringBuilder(); + if (!containerHandler.isDefaultEntityContainer()) { + entitySetSegment.append(containerHandler.getEntityContainerName()).append('.'); + } + entitySetSegment.append(entitySetName); + + uriBuilder.appendEntitySetSegment(entitySetSegment.toString()); + + return uriBuilder; + } + @SuppressWarnings("unchecked") protected EntitySetInvocationHandler( final Class ref, @@ -113,28 +118,18 @@ class EntitySetInvocationHandler< final String entitySetName, final CommonURIBuilder uri) { - super(containerHandler); - - this.uri = uri; - this.baseURI = uri.build(); - - this.isSingleton = AbstractSingleton.class.isAssignableFrom(ref); - - final Type[] entitySetParams = ClassUtils.extractGenericType(ref, AbstractEntitySet.class, AbstractSingleton.class); - this.typeRef = (Class) entitySetParams[0]; - this.collTypeRef = (Class) entitySetParams[2]; + super(ref, containerHandler, uri); } - protected Class getTypeRef() { - return typeRef; - } + @SuppressWarnings("unchecked") + protected EntitySetInvocationHandler( + final Class itemRef, + final Class collItemRef, + final EntityContainerInvocationHandler containerHandler, + final String entitySetName, + final CommonURIBuilder uri) { - protected Class getCollTypeRef() { - return collTypeRef; - } - - protected URI getEntitySetURI() { - return this.baseURI; + super(itemRef, collItemRef, containerHandler, uri); } @Override @@ -180,7 +175,7 @@ class EntitySetInvocationHandler< return (NEC) Proxy.newProxyInstance( Thread.currentThread().getContextClassLoader(), new Class[] {reference}, - new EntityCollectionInvocationHandler(containerHandler, new ArrayList(), typeRef)); + new EntityCollectionInvocationHandler(containerHandler, new ArrayList(), itemRef)); } @Override @@ -204,7 +199,7 @@ class EntitySetInvocationHandler< @Override public T getByKey(final KEY key) throws IllegalArgumentException { - return getByKey(key, typeRef); + return getByKey(key, itemRef); } @Override @@ -237,107 +232,47 @@ class EntitySetInvocationHandler< handler); } - @SuppressWarnings("unchecked") - public Triple, URI, List> fetchPartialEntitySet( - final URI uri, final Class typeRef) { - - final List entities = new ArrayList(); - final URI next; - final List annotations = new ArrayList(); - - if (isSingleton) { - final ODataRetrieveResponse res = - ((ODataClient) getClient()).getRetrieveRequestFactory().getSingletonRequest(uri).execute(); - - entities.add(res.getBody()); - next = null; - } else { - final ODataEntitySetRequest req = - getClient().getRetrieveRequestFactory().getEntitySetRequest(uri); - if (getClient().getServiceVersion().compareTo(ODataServiceVersion.V30) > 0) { - req.setPrefer(getClient().newPreferences().includeAnnotations("*")); - } - - final ODataRetrieveResponse res = req.execute(); - - final CommonODataEntitySet entitySet = res.getBody(); - entities.addAll(entitySet.getEntities()); - next = entitySet.getNext(); - if (entitySet instanceof ODataEntitySet) { - annotations.addAll(((ODataEntitySet) entitySet).getAnnotations()); - } - } - - final List items = new ArrayList(entities.size()); - - for (CommonODataEntity entity : entities) { - final EntityInvocationHandler handler = EntityInvocationHandler.getInstance(entity, this, typeRef); - - final EntityInvocationHandler handlerInTheContext = getContext().entityContext().getEntity(handler.getUUID()); - - items.add((S) Proxy.newProxyInstance( - Thread.currentThread().getContextClassLoader(), - new Class[] {typeRef}, - handlerInTheContext == null ? handler : handlerInTheContext)); - } - - return new ImmutableTriple, URI, List>(items, next, annotations); + public EC execute() { + return execute(collItemRef); } @SuppressWarnings("unchecked") - public > SEC fetchWholeEntitySet( - final URI entitySetURI, final Class typeRef, final Class collTypeRef) { + public > SEC execute(final Class collTypeRef) { + final Class ref = (Class) ClassUtils.extractTypeArg(collTypeRef, + AbstractEntitySet.class, AbstractSingleton.class, AbstractEntityCollection.class); + final Class oref = (Class) ClassUtils.extractTypeArg(this.collItemRef, + AbstractEntitySet.class, AbstractSingleton.class, AbstractEntityCollection.class); - final List items = new ArrayList(); - final List annotations = new ArrayList(); + final CommonURIBuilder uriBuilder = getClient().newURIBuilder(this.uri.build().toASCIIString()); - URI nextURI = entitySetURI; - while (nextURI != null) { - final Triple, URI, List> entitySet = fetchPartialEntitySet(nextURI, typeRef); - items.addAll(entitySet.getLeft()); - nextURI = entitySet.getMiddle(); - annotations.addAll(entitySet.getRight()); + if (!oref.equals(ref)) { + uriBuilder.appendDerivedEntityTypeSegment(new FullQualifiedName( + ClassUtils.getNamespace(ref), ClassUtils.getEntityTypeName(ref)).toString()); } + final List annotations = new ArrayList(); + + final Triple, URI, List> entitySet = fetchPartialEntitySet(uriBuilder.build(), ref); + annotations.addAll(entitySet.getRight()); + final EntityCollectionInvocationHandler entityCollectionHandler = - new EntityCollectionInvocationHandler(containerHandler, items, typeRef, entitySetURI); + new EntityCollectionInvocationHandler(containerHandler, entitySet.getLeft(), ref, uriBuilder); entityCollectionHandler.setAnnotations(annotations); + entityCollectionHandler.setNextPage(entitySet.getMiddle()); + return (SEC) Proxy.newProxyInstance( Thread.currentThread().getContextClassLoader(), new Class[] {collTypeRef}, entityCollectionHandler); } - public EC execute() { - return execute(collTypeRef); - } - - @SuppressWarnings("unchecked") - public > SEC execute(final Class collTypeRef) { - final Class ref = (Class) ClassUtils.extractTypeArg(collTypeRef, - AbstractEntitySet.class, AbstractSingleton.class, AbstractEntityCollection.class); - final Class oref = (Class) ClassUtils.extractTypeArg(this.collTypeRef); - - final CommonURIBuilder uriBuilder = getClient().newURIBuilder(this.uri.build().toASCIIString()); - - final URI entitySetURI; - if (oref.equals(ref)) { - entitySetURI = uriBuilder.build(); - } else { - entitySetURI = uriBuilder.appendDerivedEntityTypeSegment(new FullQualifiedName( - ClassUtils.getNamespace(ref), ClassUtils.getEntityTypeName(ref)).toString()).build(); - } - - return fetchWholeEntitySet(entitySetURI, ref, collTypeRef); - } - @Override public Search createSearch() { if (getClient().getServiceVersion().compareTo(ODataServiceVersion.V30) <= 0) { throw new UnsupportedInV3Exception(); } - return new SearchImpl((EdmEnabledODataClient) getClient(), this.collTypeRef, this.baseURI, this); + return new SearchImpl((EdmEnabledODataClient) getClient(), this.collItemRef, this.baseURI, this); } @Override @@ -362,7 +297,7 @@ class EntitySetInvocationHandler< EntityInvocationHandler entity = entityContext.getEntity(new EntityUUID( containerHandler.getEntityContainerName(), baseURI, - typeRef, + itemRef, key)); if (entity == null) { @@ -402,46 +337,4 @@ class EntitySetInvocationHandler< public EntitySetIterator iterator() { return new EntitySetIterator(getClient().newURIBuilder(this.uri.build().toASCIIString()).build(), this); } - - public void filter(final String filter) { - this.uri.filter(filter); - } - - public void filter(final URIFilter filter) { - this.uri.filter(filter); - } - - public void orderBy(final Sort... sort) { - final StringBuilder builder = new StringBuilder(); - for (Sort sortClause : sort) { - builder.append(sortClause.getKey()).append(' ').append(sortClause.getValue()).append(','); - } - builder.deleteCharAt(builder.length() - 1); - - this.uri.orderBy(builder.toString()); - } - - public void orderBy(final String orderBy) { - this.uri.orderBy(orderBy); - } - - public void top(final int top) throws IllegalArgumentException { - this.uri.top(top); - } - - public void skip(final int skip) throws IllegalArgumentException { - this.uri.skip(skip); - } - - public void expand(final String... expand) { - this.uri.expand(expand); - } - - public void select(final String... select) { - this.uri.select(select); - } - - public void clear() { - this.uri = getClient().newURIBuilder(baseURI.toASCIIString()); - } } diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java index 77413c8a8..bfd3f224f 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java @@ -169,8 +169,8 @@ final class OperationInvocationHandler extends AbstractInvocationHandler impleme while (boundOp == null && baseType != null) { // json minimal/none metadata doesn't return operations for entity, so here try creating it from Edm: EdmAction action = this.getClient().getCachedEdm().getBoundAction( - new FullQualifiedName(targetFQN.getNamespace(), operation.name()), - baseType.getFullQualifiedName(), + new FullQualifiedName(targetFQN.getNamespace(), operation.name()), + baseType.getFullQualifiedName(), false); if (action != null) { @@ -221,7 +221,7 @@ final class OperationInvocationHandler extends AbstractInvocationHandler impleme entityType = entityType.getBaseType(); } } - + if (edmOperation == null) { throw new IllegalArgumentException(String.format("Could not find any matching operation '%s' bound to %s", operation.name(), entity.getTypeName())); diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/SearchImpl.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/SearchImpl.java index b36e4d179..a7139e3ca 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/SearchImpl.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/SearchImpl.java @@ -77,13 +77,12 @@ public class SearchImpl clazz : ClassUtils.hierarchy(type, ClassUtils.Interfaces.INCLUDE)) { if (this.type == null && (clazz.getInterfaces().length == 0 - || ArrayUtils.contains(clazz.getInterfaces(), Serializable.class))) { + || ArrayUtils.contains(clazz.getInterfaces(), Serializable.class) + || ArrayUtils.contains(clazz.getInterfaces(), StructuredType.class))) { this.type = clazz; } diff --git a/ext/pojogen-maven-plugin/src/main/resources/container.vm b/ext/pojogen-maven-plugin/src/main/resources/container.vm index 92255376d..87e89b0cb 100644 --- a/ext/pojogen-maven-plugin/src/main/resources/container.vm +++ b/ext/pojogen-maven-plugin/src/main/resources/container.vm @@ -54,6 +54,7 @@ public interface $utility.capitalize($container.Name) extends PersistenceManager #foreach($entitySet in $container.EntitySets) $utility.capitalize($entitySet.Name) get$utility.capitalize($entitySet.Name)(); + #end #parse( "${odataVersion}/container.vm" ) diff --git a/ext/pojogen-maven-plugin/src/main/resources/entityCollection.vm b/ext/pojogen-maven-plugin/src/main/resources/entityCollection.vm index 987b0a706..0f46ece41 100644 --- a/ext/pojogen-maven-plugin/src/main/resources/entityCollection.vm +++ b/ext/pojogen-maven-plugin/src/main/resources/entityCollection.vm @@ -45,7 +45,10 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface $utility.capitalize($entityType.Name)Collection extends AbstractEntityCollection<$utility.getJavaType($entityType)> { +#set ( $javaEntityType = $utility.getJavaType($entityType) ) + +public interface $utility.capitalize($entityType.Name)Collection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery<$javaEntityType, ${javaEntityType}Collection, ${javaEntityType}Collection>, AbstractEntityCollection<$javaEntityType> { #set( $functions = $utility.getFunctionsBoundTo($entityType.Name, true) ) #set( $actions = $utility.getActionsBoundTo($entityType.Name, true) ) #if( $functions.size() > 0 || $actions.size() > 0 ) diff --git a/ext/pojogen-maven-plugin/src/main/resources/entitySet.vm b/ext/pojogen-maven-plugin/src/main/resources/entitySet.vm index 3bde5fa10..f4fc556ec 100644 --- a/ext/pojogen-maven-plugin/src/main/resources/entitySet.vm +++ b/ext/pojogen-maven-plugin/src/main/resources/entitySet.vm @@ -56,7 +56,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "$entitySet.Name") public interface $utility.capitalize($entitySet.Name) - extends org.apache.olingo.ext.proxy.api.CollectionQuery<$javaEntityType, ${javaEntityType}Collection>, AbstractEntitySet<$javaEntityType, $type, ${javaEntityType}Collection> { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery<$javaEntityType, ${javaEntityType}Collection, $utility.capitalize($entitySet.Name)>, AbstractEntitySet<$javaEntityType, $type, ${javaEntityType}Collection> { #foreach( $dos in $utility.getDescendantsOrSelf($utility.getEdmType($entitySet)) ) #set( $djt = $utility.getJavaType($dos) ) diff --git a/ext/pojogen-maven-plugin/src/main/resources/entityType.vm b/ext/pojogen-maven-plugin/src/main/resources/entityType.vm index 70d7cbd06..65dac554b 100644 --- a/ext/pojogen-maven-plugin/src/main/resources/entityType.vm +++ b/ext/pojogen-maven-plugin/src/main/resources/entityType.vm @@ -243,7 +243,7 @@ public interface $utility.capitalize($entityType.Name) @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "$property.Name", contained = true) interface $utility.capitalize($property.Name) - extends org.apache.olingo.ext.proxy.api.CollectionQuery<$javaEntityType, ${javaEntityType}Collection>, AbstractEntitySet<$javaEntityType, $type, ${javaEntityType}Collection> { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery<$javaEntityType, ${javaEntityType}Collection, $utility.capitalize($property.Name)>, AbstractEntitySet<$javaEntityType, $type, ${javaEntityType}Collection> { #foreach( $dos in $utility.getDescendantsOrSelf($utility.getEdmType($property)) ) #set( $djt = $utility.getJavaType($dos) ) diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntitySetTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntitySetTestITCase.java index c31d6efbf..d22f25fe4 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntitySetTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntitySetTestITCase.java @@ -44,13 +44,13 @@ public class EntitySetTestITCase extends AbstractTestITCase { } @Test - public void getAll() { + public void execute() { int count = 0; for (Customer customer : container.getCustomer().execute()) { assertNotNull(customer); count++; } - assertTrue(count >= 10); + assertTrue(count < 10); } @Test @@ -60,14 +60,14 @@ public class EntitySetTestITCase extends AbstractTestITCase { assertNotNull(customer); count++; } - assertTrue(count >= 10); + assertEquals(2, count); int iterating = 0; for (Customer customer : container.getCustomer()) { assertNotNull(customer); iterating++; } - assertEquals(count, iterating); + assertTrue(count < iterating); } @Test diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/FilterTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/FilterTestITCase.java index 98c2f6f73..91438bc71 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/FilterTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/FilterTestITCase.java @@ -107,7 +107,7 @@ public class FilterTestITCase extends AbstractTestITCase { assertNull(order.getCustomerId()); assertNotNull(order.getOrderId()); - order.clear(); + order.clearQueryOptions(); order.load(); assertNotNull(order.getCustomerId()); assertNotNull(order.getOrderId()); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/InvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/InvokeTestITCase.java index 09145e1d7..6dd816b72 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/InvokeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/InvokeTestITCase.java @@ -211,7 +211,7 @@ public class InvokeTestITCase extends AbstractTestITCase { try { // 1. invoke action bound to the computer detail just created computerDetail.operations().resetComputerDetailsSpecifications( - Collections.singleton("Second spec"), new Timestamp(Calendar.getInstance().getTimeInMillis())); + Collections.singleton("Second spec"), new Timestamp(Calendar.getInstance().getTimeInMillis())); // 2. check that invoked action has effectively run computerDetail = container.getComputerDetail().getByKey(id).load(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java index 22f1fa87a..c3ed03348 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "AllGeoCollectionTypesSet") public interface AllGeoCollectionTypesSet - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes newAllSpatialCollectionTypes(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection newAllSpatialCollectionTypesCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java index a1c413391..2170e7a05 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "AllGeoTypesSet") public interface AllGeoTypesSet - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes newAllSpatialTypes(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection newAllSpatialTypesCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java index 3edd69a61..cf2094479 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Car") public interface Car - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car newCar(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection newCarCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java index db96f349c..e2377ac9f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Computer") public interface Computer - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer newComputer(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection newComputerCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java index a1a415a1c..0629bd48d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ComputerDetail") public interface ComputerDetail - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail newComputerDetail(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection newComputerDetailCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java index 2ccb82a0f..a7df35d75 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Customer") public interface Customer - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer newCustomer(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection newCustomerCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java index d84a7ad56..b7e9b3909 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "CustomerInfo") public interface CustomerInfo - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo newCustomerInfo(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection newCustomerInfoCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java index 13d370ced..41e00d036 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java @@ -51,33 +51,57 @@ import javax.xml.datatype.Duration; public interface DefaultContainer extends PersistenceManager { Customer getCustomer(); + Login getLogin(); + OrderLine getOrderLine(); + ComputerDetail getComputerDetail(); + Product getProduct(); + Message getMessage(); + ProductDetail getProductDetail(); + ProductPhoto getProductPhoto(); + Order getOrder(); + Computer getComputer(); + MappedEntityType getMappedEntityType(); + PageView getPageView(); + Driver getDriver(); + AllGeoCollectionTypesSet getAllGeoCollectionTypesSet(); + Car getCar(); + CustomerInfo getCustomerInfo(); + License getLicense(); + ProductReview getProductReview(); + LastLogin getLastLogin(); + MessageAttachment getMessageAttachment(); + AllGeoTypesSet getAllGeoTypesSet(); + PersonMetadata getPersonMetadata(); + RSAToken getRSAToken(); + Person getPerson(); + Operations operations(); public interface Operations { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java index aa4f6cf02..79e22b6da 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Driver") public interface Driver - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver newDriver(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection newDriverCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java index f7bebc71a..800a80363 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "LastLogin") public interface LastLogin - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin newLastLogin(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection newLastLoginCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java index 9a6a3bcb0..6fb13dacd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "License") public interface License - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License newLicense(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection newLicenseCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java index 2773a465e..5c73853ab 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Login") public interface Login - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login newLogin(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection newLoginCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java index 833ed5a08..6d48e0a5b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "MappedEntityType") public interface MappedEntityType - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType newMappedEntityType(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection newMappedEntityTypeCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java index 244c17002..922f2d18e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Message") public interface Message - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Message newMessage(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection newMessageCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java index 7f888c9b7..66541e8c3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "MessageAttachment") public interface MessageAttachment - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment newMessageAttachment(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection newMessageAttachmentCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java index c2f9be109..8c3ca63e9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Order") public interface Order - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order newOrder(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection newOrderCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java index b8cca3008..059748781 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "OrderLine") public interface OrderLine - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine newOrderLine(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineCollection newOrderLineCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java index e818ae6d7..ed1bdf084 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "PageView") public interface PageView - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView newPageView(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection newPageViewCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java index 6fef2f8f2..a52873ac1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Person") public interface Person - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person newPerson(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection newPersonCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java index ae384848a..06e8cc5bd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "PersonMetadata") public interface PersonMetadata - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata newPersonMetadata(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection newPersonMetadataCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Product.java index 7dd568f19..15f018b44 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Product.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Product.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Product") public interface Product - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product newProduct(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection newProductCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java index cf16c8e88..931c9045b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductDetail") public interface ProductDetail - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail newProductDetail(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetailCollection newProductDetailCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java index 971d5fe9f..ee097616b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductPhoto") public interface ProductPhoto - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto newProductPhoto(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection newProductPhotoCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java index e6b0ea30d..d1db4b4e9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductReview") public interface ProductReview - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview newProductReview(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection newProductReviewCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java index 9ef51a34f..d48fd5e2d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "RSAToken") public interface RSAToken - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken newRSAToken(); org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.RSATokenCollection newRSATokenCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java index 7c4e9525d..896667729 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface AllSpatialCollectionTypesCollection extends AbstractEntityCollection { + +public interface AllSpatialCollectionTypesCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java index f3e246729..93a10988a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface AllSpatialCollectionTypes_SimpleCollection extends AbstractEntityCollection { + +public interface AllSpatialCollectionTypes_SimpleCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java index 0d3165082..3bf95e605 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface AllSpatialTypesCollection extends AbstractEntityCollection { + +public interface AllSpatialTypesCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java index 1c38805d3..05eb4ff3e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface BackOrderLine2Collection extends AbstractEntityCollection { + +public interface BackOrderLine2Collection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java index b3703e498..c0ee3c0ac 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface BackOrderLineCollection extends AbstractEntityCollection { + +public interface BackOrderLineCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java index 3a764686f..c3e8d07bd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface CarCollection extends AbstractEntityCollection { + +public interface CarCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java index 4e0e1bed4..45644ce1a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ComputerCollection extends AbstractEntityCollection { + +public interface ComputerCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java index db2cf21d4..143055819 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ComputerDetailCollection extends AbstractEntityCollection { + +public interface ComputerDetailCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java index 761b0fe22..b7dda7f12 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ContractorCollection extends AbstractEntityCollection { + +public interface ContractorCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java index 04b239126..8c4a2bba2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface CustomerCollection extends AbstractEntityCollection { + +public interface CustomerCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java index 4071f42cc..d249217fa 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface CustomerInfoCollection extends AbstractEntityCollection { + +public interface CustomerInfoCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java index 3862b802b..789e59253 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface DiscontinuedProductCollection extends AbstractEntityCollection { + +public interface DiscontinuedProductCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java index d6d953e33..3a2646d90 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface DriverCollection extends AbstractEntityCollection { + +public interface DriverCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java index e32844504..9c1b99a62 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface EmployeeCollection extends AbstractEntityCollection { + +public interface EmployeeCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Operations operations(); public interface Operations { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java index ee129988f..ade8e0c44 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface LastLoginCollection extends AbstractEntityCollection { + +public interface LastLoginCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java index 38a0efa67..d9936d620 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface LicenseCollection extends AbstractEntityCollection { + +public interface LicenseCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java index eed092784..7e6c069ff 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface LoginCollection extends AbstractEntityCollection { + +public interface LoginCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java index 0058d91bb..c57680309 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface MappedEntityTypeCollection extends AbstractEntityCollection { + +public interface MappedEntityTypeCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java index 0f00e36e9..973917a2d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface MessageAttachmentCollection extends AbstractEntityCollection { + +public interface MessageAttachmentCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java index 35922301c..b6dc3b388 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface MessageCollection extends AbstractEntityCollection { + +public interface MessageCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java index 8ce0c46e7..af3db2790 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface OrderCollection extends AbstractEntityCollection { + +public interface OrderCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java index 3ae9edb8e..3f40d3750 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface OrderLineCollection extends AbstractEntityCollection { + +public interface OrderLineCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java index 7c5459f9c..d8284344c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface PageViewCollection extends AbstractEntityCollection { + +public interface PageViewCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java index 8f703628f..c07fa42ec 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface PersonCollection extends AbstractEntityCollection { + +public interface PersonCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java index bc5084f50..43a2ecb75 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface PersonMetadataCollection extends AbstractEntityCollection { + +public interface PersonMetadataCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java index 4002f3d2a..570452f17 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ProductCollection extends AbstractEntityCollection { + +public interface ProductCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java index c92fd75df..0048515ca 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ProductDetailCollection extends AbstractEntityCollection { + +public interface ProductDetailCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java index fe70955f5..5b90b3e4e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ProductPageViewCollection extends AbstractEntityCollection { + +public interface ProductPageViewCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java index 8015f2d48..35380c18a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ProductPhotoCollection extends AbstractEntityCollection { + +public interface ProductPhotoCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java index 5280441b7..384ca89cb 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ProductReviewCollection extends AbstractEntityCollection { + +public interface ProductReviewCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java index 063932264..4ba40bb9b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface RSATokenCollection extends AbstractEntityCollection { + +public interface RSATokenCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java index 2fd0e5ade..0c499a25d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface SpecialEmployeeCollection extends AbstractEntityCollection { + +public interface SpecialEmployeeCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Operations operations(); public interface Operations { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java index 117a28e0c..787d32833 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java @@ -51,11 +51,13 @@ import javax.xml.datatype.Duration; public interface DefaultContainer extends PersistenceManager { Row getRow(); + RowIndex getRowIndex(); + Operations operations(); public interface Operations { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/Row.java index 5b01a55ec..a0f73cc95 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/Row.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/Row.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Row") public interface Row - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row newRow(); org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowCollection newRowCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/RowIndex.java index 24b70583a..8c8092136 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/RowIndex.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/RowIndex.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "RowIndex") public interface RowIndex - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowIndex newRowIndex(); org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowIndexCollection newRowIndexCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRowCollection.java index 3d97e429b..37f01e4b7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRowCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRowCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface IndexedRowCollection extends AbstractEntityCollection { + +public interface IndexedRowCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowCollection.java index bb08b6aee..fdfabba55 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface RowCollection extends AbstractEntityCollection { + +public interface RowCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndexCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndexCollection.java index e66cd9673..e59ac0d61 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndexCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndexCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface RowIndexCollection extends AbstractEntityCollection { + +public interface RowIndexCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBinarySet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBinarySet.java index 29e4c532a..d4f5a5264 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBinarySet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBinarySet.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmBinarySet") public interface EdmBinarySet - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBinary newEdmBinary(); org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBinaryCollection newEdmBinaryCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBooleanSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBooleanSet.java index 232f23d38..1d3acaeef 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBooleanSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBooleanSet.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmBooleanSet") public interface EdmBooleanSet - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBoolean newEdmBoolean(); org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBooleanCollection newEdmBooleanCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmByteSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmByteSet.java index 0ce793faf..3b1002b20 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmByteSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmByteSet.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmByteSet") public interface EdmByteSet - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmByte newEdmByte(); org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmByteCollection newEdmByteCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeOffsetSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeOffsetSet.java index 7095ce87b..c1025d7bf 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeOffsetSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeOffsetSet.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmDateTimeOffsetSet") public interface EdmDateTimeOffsetSet - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeOffset newEdmDateTimeOffset(); org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeOffsetCollection newEdmDateTimeOffsetCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeSet.java index 243dce7bc..d6624fa4a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeSet.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmDateTimeSet") public interface EdmDateTimeSet - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTime newEdmDateTime(); org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeCollection newEdmDateTimeCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDecimalSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDecimalSet.java index 3a761073b..d1b8cd3f2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDecimalSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDecimalSet.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmDecimalSet") public interface EdmDecimalSet - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDecimal newEdmDecimal(); org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDecimalCollection newEdmDecimalCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDoubleSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDoubleSet.java index 601b79175..006ca4b71 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDoubleSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDoubleSet.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmDoubleSet") public interface EdmDoubleSet - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDouble newEdmDouble(); org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDoubleCollection newEdmDoubleCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmGuidSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmGuidSet.java index 3a80ab998..709924c5b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmGuidSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmGuidSet.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmGuidSet") public interface EdmGuidSet - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmGuid newEdmGuid(); org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmGuidCollection newEdmGuidCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt16Set.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt16Set.java index 3527b9199..8efa8ca50 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt16Set.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt16Set.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmInt16Set") public interface EdmInt16Set - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt16 newEdmInt16(); org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt16Collection newEdmInt16Collection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt32Set.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt32Set.java index 209b03d41..ff4636472 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt32Set.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt32Set.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmInt32Set") public interface EdmInt32Set - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt32 newEdmInt32(); org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt32Collection newEdmInt32Collection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt64Set.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt64Set.java index c307afe84..4fc0a34c2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt64Set.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt64Set.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmInt64Set") public interface EdmInt64Set - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt64 newEdmInt64(); org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt64Collection newEdmInt64Collection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmSingleSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmSingleSet.java index 10d2ec62a..5ea2838f8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmSingleSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmSingleSet.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmSingleSet") public interface EdmSingleSet - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmSingle newEdmSingle(); org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmSingleCollection newEdmSingleCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmStringSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmStringSet.java index 55f78d971..f256ba647 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmStringSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmStringSet.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmStringSet") public interface EdmStringSet - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmString newEdmString(); org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmStringCollection newEdmStringCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmTimeSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmTimeSet.java index 5cbece9c7..5bb405c2f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmTimeSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmTimeSet.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmTimeSet") public interface EdmTimeSet - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmTime newEdmTime(); org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmTimeCollection newEdmTimeCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/Folders.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/Folders.java index 3d4e687a8..828c702c2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/Folders.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/Folders.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Folders") public interface Folders - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.Folder newFolder(); org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.FolderCollection newFolderCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java index aee449092..35c7953f8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java @@ -51,24 +51,39 @@ import javax.xml.datatype.Duration; public interface TestContext extends PersistenceManager { EdmTimeSet getEdmTimeSet(); + EdmDoubleSet getEdmDoubleSet(); + EdmStringSet getEdmStringSet(); + EdmBooleanSet getEdmBooleanSet(); + EdmBinarySet getEdmBinarySet(); + EdmDecimalSet getEdmDecimalSet(); + EdmGuidSet getEdmGuidSet(); + EdmInt32Set getEdmInt32Set(); + EdmInt64Set getEdmInt64Set(); + EdmInt16Set getEdmInt16Set(); + EdmByteSet getEdmByteSet(); + EdmDateTimeSet getEdmDateTimeSet(); + Folders getFolders(); + EdmSingleSet getEdmSingleSet(); + EdmDateTimeOffsetSet getEdmDateTimeOffsetSet(); + Operations operations(); public interface Operations { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinaryCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinaryCollection.java index b3031aa84..3ed9f2f92 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinaryCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinaryCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface EdmBinaryCollection extends AbstractEntityCollection { + +public interface EdmBinaryCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBooleanCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBooleanCollection.java index c900191d9..a53bad850 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBooleanCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBooleanCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface EdmBooleanCollection extends AbstractEntityCollection { + +public interface EdmBooleanCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByteCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByteCollection.java index c69e74231..b3d6a2444 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByteCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByteCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface EdmByteCollection extends AbstractEntityCollection { + +public interface EdmByteCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeCollection.java index 8faa93abe..263018b7a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface EdmDateTimeCollection extends AbstractEntityCollection { + +public interface EdmDateTimeCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffsetCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffsetCollection.java index 65ca0a5cf..6a73014ec 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffsetCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffsetCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface EdmDateTimeOffsetCollection extends AbstractEntityCollection { + +public interface EdmDateTimeOffsetCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimalCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimalCollection.java index 35eecd206..c55c92ed3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimalCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimalCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface EdmDecimalCollection extends AbstractEntityCollection { + +public interface EdmDecimalCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDoubleCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDoubleCollection.java index 1f6d7d322..d63ed3a63 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDoubleCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDoubleCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface EdmDoubleCollection extends AbstractEntityCollection { + +public interface EdmDoubleCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuidCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuidCollection.java index e98e32e8b..c84233b1c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuidCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuidCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface EdmGuidCollection extends AbstractEntityCollection { + +public interface EdmGuidCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16Collection.java index 82c20f9f0..fb244cd47 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16Collection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16Collection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface EdmInt16Collection extends AbstractEntityCollection { + +public interface EdmInt16Collection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32Collection.java index 6b169d8d5..93f5d07b8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32Collection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32Collection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface EdmInt32Collection extends AbstractEntityCollection { + +public interface EdmInt32Collection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64Collection.java index d2c712bda..e40038e6d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64Collection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64Collection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface EdmInt64Collection extends AbstractEntityCollection { + +public interface EdmInt64Collection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingleCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingleCollection.java index b82b87fb3..4e15a20df 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingleCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingleCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface EdmSingleCollection extends AbstractEntityCollection { + +public interface EdmSingleCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmStringCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmStringCollection.java index f114c7578..74d2d5df0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmStringCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmStringCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface EdmStringCollection extends AbstractEntityCollection { + +public interface EdmStringCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTimeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTimeCollection.java index 2b4604c74..5affcb9a7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTimeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTimeCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface EdmTimeCollection extends AbstractEntityCollection { + +public interface EdmTimeCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/FolderCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/FolderCollection.java index 02e7e3181..69755e5de 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/FolderCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/FolderCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface FolderCollection extends AbstractEntityCollection { + +public interface FolderCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 bd5b40c87..09747279c 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "AllGeoCollectionTypesSet") public interface AllGeoCollectionTypesSet - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes newAllSpatialCollectionTypes(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection newAllSpatialCollectionTypesCollection(); 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 b758389e2..6708441e9 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "AllGeoTypesSet") public interface AllGeoTypesSet - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes newAllSpatialTypes(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection newAllSpatialTypesCollection(); 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 16b31549b..1f20c150e 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Car") public interface Car - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car newCar(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection newCarCollection(); 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 e0cc8fa71..228c5305e 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Computer") public interface Computer - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer newComputer(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection newComputerCollection(); 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 0f190c813..554453968 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ComputerDetail") public interface ComputerDetail - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail newComputerDetail(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection newComputerDetailCollection(); 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 75ac4c490..cf5fa72a1 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Customer") public interface Customer - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer newCustomer(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection newCustomerCollection(); 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 48416acca..4b7465a27 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "CustomerInfo") public interface CustomerInfo - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo newCustomerInfo(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection newCustomerInfoCollection(); 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 16f8502ee..7ab4b4588 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 @@ -51,33 +51,57 @@ import javax.xml.datatype.Duration; public interface DefaultContainer extends PersistenceManager { Customer getCustomer(); + Login getLogin(); + OrderLine getOrderLine(); + ComputerDetail getComputerDetail(); + Product getProduct(); + Message getMessage(); + ProductDetail getProductDetail(); + ProductPhoto getProductPhoto(); + Order getOrder(); + Computer getComputer(); + MappedEntityType getMappedEntityType(); + PageView getPageView(); + Driver getDriver(); + AllGeoCollectionTypesSet getAllGeoCollectionTypesSet(); + Car getCar(); + CustomerInfo getCustomerInfo(); + License getLicense(); + ProductReview getProductReview(); + LastLogin getLastLogin(); + MessageAttachment getMessageAttachment(); + AllGeoTypesSet getAllGeoTypesSet(); + PersonMetadata getPersonMetadata(); + RSAToken getRSAToken(); + Person getPerson(); + Operations operations(); public interface Operations { 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 c8fb1fafc..0b5ecd05c 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Driver") public interface Driver - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver newDriver(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection newDriverCollection(); 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 57412e5c7..92a63d025 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "LastLogin") public interface LastLogin - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin newLastLogin(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection newLastLoginCollection(); 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 149bb0e2b..bc310e5a9 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "License") public interface License - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.License newLicense(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection newLicenseCollection(); 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 76c37d13e..16a093e7b 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Login") public interface Login - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login newLogin(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection newLoginCollection(); 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 b5eae3e6b..e8c33e889 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "MappedEntityType") public interface MappedEntityType - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType newMappedEntityType(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection newMappedEntityTypeCollection(); 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 1596c314d..76c752c00 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Message") public interface Message - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Message newMessage(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection newMessageCollection(); 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 cbf4a3a6b..66785d41c 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "MessageAttachment") public interface MessageAttachment - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment newMessageAttachment(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection newMessageAttachmentCollection(); 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 2dfee66c8..af6162f6f 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Order") public interface Order - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order newOrder(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection newOrderCollection(); 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 b970e91c7..d9537bf4f 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "OrderLine") public interface OrderLine - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine newOrderLine(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineCollection newOrderLineCollection(); 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 dd158f884..cad66dbc2 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "PageView") public interface PageView - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView newPageView(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection newPageViewCollection(); 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 d84d6ca51..fe0d82052 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Person") public interface Person - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person newPerson(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection newPersonCollection(); 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 f4f4fcbbd..42c112c97 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "PersonMetadata") public interface PersonMetadata - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata newPersonMetadata(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection newPersonMetadataCollection(); 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 276f61c34..c75a7fb1d 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Product") public interface Product - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product newProduct(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection newProductCollection(); 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 c47fdab9b..76c6302ba 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductDetail") public interface ProductDetail - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail newProductDetail(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetailCollection newProductDetailCollection(); 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 37047a499..334252878 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductPhoto") public interface ProductPhoto - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto newProductPhoto(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection newProductPhotoCollection(); 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 67aa7d5dc..0a8bbedae 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductReview") public interface ProductReview - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview newProductReview(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection newProductReviewCollection(); 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 e30deeab7..8441bbc45 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "RSAToken") public interface RSAToken - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken newRSAToken(); org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.RSATokenCollection newRSATokenCollection(); 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 15bc2c0c5..935be8c69 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface AllSpatialCollectionTypesCollection extends AbstractEntityCollection { + +public interface AllSpatialCollectionTypesCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 180cb85e0..b97514ead 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface AllSpatialCollectionTypes_SimpleCollection extends AbstractEntityCollection { + +public interface AllSpatialCollectionTypes_SimpleCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 b63cae6ee..a706f0dc6 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface AllSpatialTypesCollection extends AbstractEntityCollection { + +public interface AllSpatialTypesCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 3d94ec024..242e28a74 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface BackOrderLine2Collection extends AbstractEntityCollection { + +public interface BackOrderLine2Collection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 cf9a4f952..eda7cdd0f 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface BackOrderLineCollection extends AbstractEntityCollection { + +public interface BackOrderLineCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 7c4293438..09ae161ef 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface CarCollection extends AbstractEntityCollection { + +public interface CarCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 577e16ec7..a2b37550f 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ComputerCollection extends AbstractEntityCollection { + +public interface ComputerCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 d717ecf51..11e453be2 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ComputerDetailCollection extends AbstractEntityCollection { + +public interface ComputerDetailCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 122bcb60c..4a6046e4e 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ContractorCollection extends AbstractEntityCollection { + +public interface ContractorCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 38cf43cb6..480de7ff2 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface CustomerCollection extends AbstractEntityCollection { + +public interface CustomerCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 b7ee55fb3..9ff4b0695 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface CustomerInfoCollection extends AbstractEntityCollection { + +public interface CustomerInfoCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 943899e38..61aa89828 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface DiscontinuedProductCollection extends AbstractEntityCollection { + +public interface DiscontinuedProductCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 fc5aea407..ec7ec0992 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface DriverCollection extends AbstractEntityCollection { + +public interface DriverCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 089ca2e2d..ed5df919f 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface EmployeeCollection extends AbstractEntityCollection { + +public interface EmployeeCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Operations operations(); public interface Operations { 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 f6277ccae..35619688b 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface LastLoginCollection extends AbstractEntityCollection { + +public interface LastLoginCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 64ebeb092..47b421a96 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface LicenseCollection extends AbstractEntityCollection { + +public interface LicenseCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 afc5dd6df..9920877fb 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface LoginCollection extends AbstractEntityCollection { + +public interface LoginCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 ecc3a3e9a..616d09a27 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface MappedEntityTypeCollection extends AbstractEntityCollection { + +public interface MappedEntityTypeCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 0f1c69c50..d78c3ff75 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface MessageAttachmentCollection extends AbstractEntityCollection { + +public interface MessageAttachmentCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 71c8e7e9b..4bc4b888e 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface MessageCollection extends AbstractEntityCollection { + +public interface MessageCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 04fb16f96..8a60cdc9b 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface OrderCollection extends AbstractEntityCollection { + +public interface OrderCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 56daf2bec..5bb869021 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface OrderLineCollection extends AbstractEntityCollection { + +public interface OrderLineCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 2f0aa84fc..582c5e6cb 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface PageViewCollection extends AbstractEntityCollection { + +public interface PageViewCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 79b80ea80..8b4e00bfa 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface PersonCollection extends AbstractEntityCollection { + +public interface PersonCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 c73a84d81..e9c783a2d 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface PersonMetadataCollection extends AbstractEntityCollection { + +public interface PersonMetadataCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 2b447d5b6..84e336201 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ProductCollection extends AbstractEntityCollection { + +public interface ProductCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 97797038a..c52305577 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ProductDetailCollection extends AbstractEntityCollection { + +public interface ProductDetailCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 2e792a697..905fdf155 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ProductPageViewCollection extends AbstractEntityCollection { + +public interface ProductPageViewCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 ab1495942..933fdd7fc 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ProductPhotoCollection extends AbstractEntityCollection { + +public interface ProductPhotoCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 055b0658f..b328f68cf 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ProductReviewCollection extends AbstractEntityCollection { + +public interface ProductReviewCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 3baa19dc0..b874d93fb 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface RSATokenCollection extends AbstractEntityCollection { + +public interface RSATokenCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 6a020640e..7e622545c 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface SpecialEmployeeCollection extends AbstractEntityCollection { + +public interface SpecialEmployeeCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java index e7a020a7e..2c7f22cce 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java @@ -18,6 +18,7 @@ */ package org.apache.olingo.fit.proxy.v4; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNotNull; @@ -36,6 +37,7 @@ import static org.apache.olingo.fit.proxy.v4.AbstractTestITCase.container; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection; //CHECKSTYLE:ON (Maven checkstyle) import org.junit.Test; @@ -61,6 +63,20 @@ public class APIBasicDesignTestITCase extends AbstractTestITCase { assertEquals(1, customer.load().getPersonID(), 0); } + @Test + public void readWholeEntitySet() { + PersonCollection person = container.getPeople().execute(); + assertEquals(5, person.size(), 0); + + int pageCount = 1; + while (person.hasNextPage()) { + pageCount++; + assertFalse(person.nextPage().execute().isEmpty()); + } + + assertEquals(2, pageCount); + } + @Test public void loadWithSelect() { org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order order = @@ -74,7 +90,7 @@ public class APIBasicDesignTestITCase extends AbstractTestITCase { assertNull(order.getOrderDate()); assertNotNull(order.getOrderID()); - order.clear(); + order.clearQueryOptions(); order.load(); assertNotNull(order.getOrderDate()); assertNotNull(order.getOrderID()); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntitySetTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntitySetTestITCase.java index 141a3ac59..37c2d0ca2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntitySetTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntitySetTestITCase.java @@ -63,13 +63,13 @@ public class EntitySetTestITCase extends AbstractTestITCase { assertNotNull(people); count++; } - assertEquals(6, count); + assertEquals(5, count); int iterating = 0; for (Person person : container.getPeople()) { assertNotNull(person); iterating++; } - assertEquals(count, iterating); + assertEquals(count + 1, iterating); } } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Advertisements.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Advertisements.java index a69feac71..74718d444 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Advertisements.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Advertisements.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Advertisements") public interface Advertisements - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement newAdvertisement(); org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection newAdvertisementCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Categories.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Categories.java index ef1471bde..e7aa12054 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Categories.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Categories.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Categories") public interface Categories - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Category newCategory(); org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection newCategoryCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java index 920e0223c..0241270f4 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java @@ -51,15 +51,22 @@ import javax.xml.datatype.Duration; public interface DemoService extends PersistenceManager { Products getProducts(); + Advertisements getAdvertisements(); + Persons getPersons(); + Categories getCategories(); + PersonDetails getPersonDetails(); + Suppliers getSuppliers(); + ProductDetails getProductDetails(); + Operations operations(); public interface Operations { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java index d714340c1..0aae1ef40 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "PersonDetails") public interface PersonDetails - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail newPersonDetail(); org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetailCollection newPersonDetailCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java index c90caf9e2..f611174b1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Persons") public interface Persons - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person newPerson(); org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonCollection newPersonCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java index 042e88bd9..b8bca01cd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductDetails") public interface ProductDetails - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail newProductDetail(); org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetailCollection newProductDetailCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java index 2c441e5c0..1abbd0b17 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Products") public interface Products - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product newProduct(); org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection newProductCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java index 8988335c4..d9712f1c8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Suppliers") public interface Suppliers - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier newSupplier(); org.apache.olingo.fit.proxy.v4.demo.odatademo.types.SupplierCollection newSupplierCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java index cb5c6ad73..3e600c113 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface AdvertisementCollection extends AbstractEntityCollection { + +public interface AdvertisementCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java index cb532b0f5..3abe568ed 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface CategoryCollection extends AbstractEntityCollection { + +public interface CategoryCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java index ea397c8c7..aa9236571 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface CustomerCollection extends AbstractEntityCollection { + +public interface CustomerCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java index f619ee5a6..82b42908a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface EmployeeCollection extends AbstractEntityCollection { + +public interface EmployeeCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java index e3c0a70ab..ac0a17439 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface FeaturedProductCollection extends AbstractEntityCollection { + +public interface FeaturedProductCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java index c397f29f4..0b9566816 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface PersonCollection extends AbstractEntityCollection { + +public interface PersonCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java index bb4dfd174..52aa39046 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface PersonDetailCollection extends AbstractEntityCollection { + +public interface PersonDetailCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java index c65cef7ff..18fb60ea1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ProductCollection extends AbstractEntityCollection { + +public interface ProductCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollection.java index a90c3fa55..454a79c4a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ProductDetailCollection extends AbstractEntityCollection { + +public interface ProductDetailCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollection.java index 47792b9ef..0c6541748 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface SupplierCollection extends AbstractEntityCollection { + +public interface SupplierCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java index a391c3e99..5842df9cb 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java @@ -51,10 +51,12 @@ import javax.xml.datatype.Duration; public interface DefaultContainer extends PersistenceManager { Row getRow(); + RowIndex getRowIndex(); + Operations operations(); public interface Operations { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java index 0e50cfe81..6494a5641 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Row") public interface Row - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row newRow(); org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowCollection newRowCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java index 2cc8b78cc..7c7c64ff7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "RowIndex") public interface RowIndex - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndex newRowIndex(); org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndexCollection newRowIndexCollection(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollection.java index 36382b56d..33cf62ddc 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface IndexedRowCollection extends AbstractEntityCollection { + +public interface IndexedRowCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollection.java index aa4f64163..6e42f78c2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface RowCollection extends AbstractEntityCollection { + +public interface RowCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollection.java index 08c3be0ea..c689aad44 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollection.java @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface RowIndexCollection extends AbstractEntityCollection { + +public interface RowIndexCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 80917bfcb..117faf33b 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Accounts") public interface Accounts - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account newAccount(); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountCollection newAccountCollection(); 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 7576ef812..868aa77fc 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Customers") public interface Customers - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer newCustomer(); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection newCustomerCollection(); 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 082271143..515ba96a3 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Departments") public interface Departments - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department newDepartment(); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection newDepartmentCollection(); 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 1cd65c4c7..9068a3325 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Employees") public interface Employees - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee newEmployee(); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection newEmployeeCollection(); 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 dad0585ab..1ae8e0de2 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 @@ -51,19 +51,31 @@ import javax.xml.datatype.Duration; public interface InMemoryEntities extends PersistenceManager { Accounts getAccounts(); + StoredPIs getStoredPIs(); + Customers getCustomers(); + Products getProducts(); + OrderDetails getOrderDetails(); + Departments getDepartments(); + Employees getEmployees(); + Orders getOrders(); + People getPeople(); + SubscriptionTemplates getSubscriptionTemplates(); + ProductReviews getProductReviews(); + ProductDetails getProductDetails(); + PublicCompany getPublicCompany(); DefaultStoredPI getDefaultStoredPI(); 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 897a6aa2e..616ee08e7 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "OrderDetails") public interface OrderDetails - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail newOrderDetail(); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection newOrderDetailCollection(); 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 1d539b055..12c556fac 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Orders") public interface Orders - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order newOrder(); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection newOrderCollection(); 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 e109a9393..596a53be6 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "People") public interface People - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person newPerson(); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection newPersonCollection(); 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 400665fcd..25c2291f6 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductDetails") public interface ProductDetails - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail newProductDetail(); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection newProductDetailCollection(); 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 8c05298d7..f16173a4b 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductReviews") public interface ProductReviews - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReview newProductReview(); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReviewCollection newProductReviewCollection(); 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 422bfae74..e7376dc9c 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Products") public interface Products - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product newProduct(); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection newProductCollection(); 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 9fd84066b..d5a4569fd 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "StoredPIs") public interface StoredPIs - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI newStoredPI(); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPICollection newStoredPICollection(); 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 b6aa0a7bb..ad374fe7f 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 @@ -46,7 +46,7 @@ import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "SubscriptionTemplates") public interface SubscriptionTemplates - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription newSubscription(); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection newSubscriptionCollection(); 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 bd50a2a43..6a2ee3b09 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 @@ -237,7 +237,7 @@ public interface Account @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "MyPaymentInstruments", contained = true) interface MyPaymentInstruments - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument newPaymentInstrument(); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection newPaymentInstrumentCollection(); @@ -258,7 +258,7 @@ public interface Account @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ActiveSubscriptions", contained = true) interface ActiveSubscriptions - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription newSubscription(); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection newSubscriptionCollection(); 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 a78767b07..0f9aefea0 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface AccountCollection extends AbstractEntityCollection { + +public interface AccountCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 5a48400a6..899a868c3 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface AssetCollection extends AbstractEntityCollection { + +public interface AssetCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 61b6e8206..326c0698b 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ClubCollection extends AbstractEntityCollection { + +public interface ClubCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 888bd00f3..89a83c1ba 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface CompanyCollection extends AbstractEntityCollection { + +public interface CompanyCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 985e61467..40302556d 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 @@ -345,7 +345,7 @@ public interface CreditCardPI @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "CreditRecords", contained = true) interface CreditRecords - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecord newCreditRecord(); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecordCollection newCreditRecordCollection(); 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 dd88a1473..e3ab4d608 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface CreditCardPICollection extends AbstractEntityCollection { + +public interface CreditCardPICollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 552fa511a..3061573a9 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface CreditRecordCollection extends AbstractEntityCollection { + +public interface CreditRecordCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 61c96c418..059f80910 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface CustomerCollection extends AbstractEntityCollection { + +public interface CustomerCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 4da5e12fe..83bd36d9a 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface DepartmentCollection extends AbstractEntityCollection { + +public interface DepartmentCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 a04718cbb..eb7244905 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface EmployeeCollection extends AbstractEntityCollection { + +public interface EmployeeCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 9dd828b59..ef0a281fe 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface GiftCardCollection extends AbstractEntityCollection { + +public interface GiftCardCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 0343f3a9b..06ea15350 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface LabourUnionCollection extends AbstractEntityCollection { + +public interface LabourUnionCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 9b0210a0d..16402af7f 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface OrderCollection extends AbstractEntityCollection { + +public interface OrderCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 ece3be92a..3d710d250 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface OrderDetailCollection extends AbstractEntityCollection { + +public interface OrderDetailCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 5d9ae4cfa..62cda3514 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 @@ -202,7 +202,7 @@ public interface PaymentInstrument @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "BillingStatements", contained = true) interface BillingStatements - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Statement newStatement(); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StatementCollection newStatementCollection(); 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 b30e7c5fe..b7d33c34a 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface PaymentInstrumentCollection extends AbstractEntityCollection { + +public interface PaymentInstrumentCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 2642070dc..4d5e5db26 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface PersonCollection extends AbstractEntityCollection { + +public interface PersonCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 3aa96fcfe..59b1d4835 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ProductCollection extends AbstractEntityCollection { + +public interface ProductCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Operations operations(); public interface Operations { 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 44a68a91a..d0a5cd921 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ProductDetailCollection extends AbstractEntityCollection { + +public interface ProductDetailCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 28e9234ee..e21e969dc 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface ProductReviewCollection extends AbstractEntityCollection { + +public interface ProductReviewCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 fb6eeed9b..0052eded1 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 @@ -352,7 +352,7 @@ public interface PublicCompany @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Assets", contained = true) interface Assets - extends org.apache.olingo.ext.proxy.api.CollectionQuery, AbstractEntitySet { + extends org.apache.olingo.ext.proxy.api.EntitySetQuery, AbstractEntitySet { org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Asset newAsset(); org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AssetCollection newAssetCollection(); 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 8ebe7ef6a..33b1eec7e 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface PublicCompanyCollection extends AbstractEntityCollection { + +public interface PublicCompanyCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 fb9b0a98e..f5fb2c609 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface StatementCollection extends AbstractEntityCollection { + +public interface StatementCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 e4d71dcdc..f29195b37 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface StoredPICollection extends AbstractEntityCollection { + +public interface StoredPICollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term); 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 41bfc0b14..3c6a85184 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 @@ -44,7 +44,9 @@ import java.util.Collection; import java.util.Calendar; import javax.xml.datatype.Duration; -public interface SubscriptionCollection extends AbstractEntityCollection { + +public interface SubscriptionCollection extends + org.apache.olingo.ext.proxy.api.EntityCollectionQuery, AbstractEntityCollection { Object getAnnotation(Class term);