You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by il...@apache.org on 2014/07/31 10:29:15 UTC
git commit: [OLINGO-365] Better handling of EntityType inheritance
hierachies
Repository: olingo-odata4
Updated Branches:
refs/heads/master 1d9b70c61 -> 82a73c577
[OLINGO-365] Better handling of EntityType inheritance hierachies
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/82a73c57
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/82a73c57
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/82a73c57
Branch: refs/heads/master
Commit: 82a73c5771f8225af18d615adebced3f2c8af0a5
Parents: 1d9b70c
Author: Francesco Chicchiriccò <--global>
Authored: Thu Jul 31 10:29:03 2014 +0200
Committer: Francesco Chicchiriccò <--global>
Committed: Thu Jul 31 10:29:03 2014 +0200
----------------------------------------------------------------------
.../org/apache/olingo/ext/proxy/api/CommonQuery.java | 2 --
.../apache/olingo/ext/proxy/api/StructuredType.java | 3 ++-
.../src/main/resources/entityType.vm | 13 +++++++++++++
.../apache/olingo/fit/proxy/v3/AbstractTestITCase.java | 4 ----
.../apache/olingo/fit/proxy/v3/AsyncTestITCase.java | 2 +-
.../types/AllSpatialCollectionTypes_Simple.java | 13 +++++++++++++
.../astoriadefaultservice/types/BackOrderLine.java | 13 +++++++++++++
.../astoriadefaultservice/types/BackOrderLine2.java | 13 +++++++++++++
.../astoriadefaultservice/types/Contractor.java | 13 +++++++++++++
.../types/DiscontinuedProduct.java | 13 +++++++++++++
.../services/astoriadefaultservice/types/Employee.java | 13 +++++++++++++
.../astoriadefaultservice/types/ProductPageView.java | 13 +++++++++++++
.../astoriadefaultservice/types/SpecialEmployee.java | 13 +++++++++++++
.../services/opentypesservicev3/types/IndexedRow.java | 13 +++++++++++++
.../types/AllSpatialCollectionTypes_Simple.java | 13 +++++++++++++
.../astoriadefaultservice/types/BackOrderLine.java | 13 +++++++++++++
.../astoriadefaultservice/types/BackOrderLine2.java | 13 +++++++++++++
.../astoriadefaultservice/types/Contractor.java | 13 +++++++++++++
.../types/DiscontinuedProduct.java | 13 +++++++++++++
.../services/astoriadefaultservice/types/Employee.java | 13 +++++++++++++
.../astoriadefaultservice/types/ProductPageView.java | 13 +++++++++++++
.../astoriadefaultservice/types/SpecialEmployee.java | 13 +++++++++++++
.../apache/olingo/fit/proxy/v4/AbstractTestITCase.java | 4 ----
.../apache/olingo/fit/proxy/v4/AsyncTestITCase.java | 2 +-
.../fit/proxy/v4/demo/odatademo/types/Customer.java | 13 +++++++++++++
.../fit/proxy/v4/demo/odatademo/types/Employee.java | 13 +++++++++++++
.../proxy/v4/demo/odatademo/types/FeaturedProduct.java | 13 +++++++++++++
.../services/opentypesservicev4/types/IndexedRow.java | 13 +++++++++++++
.../services/odatawcfservice/types/CreditCardPI.java | 13 +++++++++++++
.../odata/services/odatawcfservice/types/Customer.java | 13 +++++++++++++
.../odata/services/odatawcfservice/types/Employee.java | 13 +++++++++++++
.../services/odatawcfservice/types/PublicCompany.java | 13 +++++++++++++
32 files changed, 342 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/CommonQuery.java
----------------------------------------------------------------------
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 4caf3ca..ba8e5e2 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
@@ -22,8 +22,6 @@ public interface CommonQuery {
/**
* Remove all query options.
- *
- * @return the same query instance.
*/
void clearQueryOptions();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredType.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredType.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredType.java
index 106c53e..444bb80 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredType.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredType.java
@@ -34,7 +34,7 @@ public interface StructuredType<T> extends Serializable {
/**
* @return future handle on structured type instance
*/
- Future<T> loadAsync();
+ Future<? extends T> loadAsync();
/**
* Delete object.
@@ -43,6 +43,7 @@ public interface StructuredType<T> extends Serializable {
/**
* Delete a specific property.
+ * @param name property name
*/
void delete(String name);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/ext/pojogen-maven-plugin/src/main/resources/entityType.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/entityType.vm b/ext/pojogen-maven-plugin/src/main/resources/entityType.vm
index a18f5ac..c2dafa7 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/entityType.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/entityType.vm
@@ -48,6 +48,7 @@ import org.apache.olingo.commons.api.edm.geo.MultiPoint;
import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
import org.apache.olingo.commons.api.edm.geo.Point;
import org.apache.olingo.commons.api.edm.geo.Polygon;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
#if( $keyRef )@KeyRef(${keyRef}.class)#end
@@ -66,6 +67,18 @@ public interface $utility.capitalize($entityType.Name)
#if( $entityType.getBaseType() )
@Override
$utility.capitalize($entityType.Name) load();
+
+ @Override
+ Future<? extends $utility.capitalize($entityType.Name)> loadAsync();
+
+ @Override
+ $utility.capitalize($entityType.Name) refs();
+
+ @Override
+ $utility.capitalize($entityType.Name) expand(String... expand);
+
+ @Override
+ $utility.capitalize($entityType.Name) select(String... select);
#end
#set( $keys = [] )
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTestITCase.java
index fdc7593..951a4c6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTestITCase.java
@@ -41,11 +41,7 @@ import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.service
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PhoneCollection;
-import org.apache.olingo.fit.server.TomcatTestServer;
-import org.apache.olingo.server.tecsvc.TechnicalServlet;
import org.junit.BeforeClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
//CHECKSTYLE:ON (Maven checkstyle)
public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AsyncTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AsyncTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AsyncTestITCase.java
index 62c2a73..35775fb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AsyncTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AsyncTestITCase.java
@@ -70,7 +70,7 @@ public class AsyncTestITCase extends AbstractTestITCase {
Thread.sleep(1000L);
}
- final Future<Product> futureProd = container.getProduct().getByKey(-10).loadAsync();
+ final Future<? extends Product> futureProd = container.getProduct().getByKey(-10).loadAsync();
assertEquals("AsyncTest#updateEntity " + random, futureProd.get().load().getDescription());
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
index 6908273..a421bfd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.se
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -37,6 +38,18 @@ public interface AllSpatialCollectionTypes_Simple
@Override
AllSpatialCollectionTypes_Simple load();
+ @Override
+ Future<? extends AllSpatialCollectionTypes_Simple> loadAsync();
+
+ @Override
+ AllSpatialCollectionTypes_Simple refs();
+
+ @Override
+ AllSpatialCollectionTypes_Simple expand(String... expand);
+
+ @Override
+ AllSpatialCollectionTypes_Simple select(String... select);
+
@Key
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
index bdd4a75..550d637 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
@@ -22,6 +22,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@KeyRef(OrderLineKey.class)
@@ -38,6 +39,18 @@ public interface BackOrderLine
@Override
BackOrderLine load();
+ @Override
+ Future<? extends BackOrderLine> loadAsync();
+
+ @Override
+ BackOrderLine refs();
+
+ @Override
+ BackOrderLine expand(String... expand);
+
+ @Override
+ BackOrderLine select(String... select);
+
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
index 250a0f2..7c8c77d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
@@ -22,6 +22,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@KeyRef(OrderLineKey.class)
@@ -38,6 +39,18 @@ public interface BackOrderLine2
@Override
BackOrderLine2 load();
+ @Override
+ Future<? extends BackOrderLine2> loadAsync();
+
+ @Override
+ BackOrderLine2 refs();
+
+ @Override
+ BackOrderLine2 expand(String... expand);
+
+ @Override
+ BackOrderLine2 select(String... select);
+
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
index 6f3c2ec..830c168 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
@@ -22,6 +22,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -38,6 +39,18 @@ public interface Contractor
@Override
Contractor load();
+ @Override
+ Future<? extends Contractor> loadAsync();
+
+ @Override
+ Contractor refs();
+
+ @Override
+ Contractor expand(String... expand);
+
+ @Override
+ Contractor select(String... select);
+
@Key
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
index d8b76c1..2ca55ee 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.se
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -37,6 +38,18 @@ public interface DiscontinuedProduct
@Override
DiscontinuedProduct load();
+ @Override
+ Future<? extends DiscontinuedProduct> loadAsync();
+
+ @Override
+ DiscontinuedProduct refs();
+
+ @Override
+ DiscontinuedProduct expand(String... expand);
+
+ @Override
+ DiscontinuedProduct select(String... select);
+
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
index 7f46f1f..109c0b3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
@@ -23,6 +23,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -39,6 +40,18 @@ public interface Employee
@Override
Employee load();
+ @Override
+ Future<? extends Employee> loadAsync();
+
+ @Override
+ Employee refs();
+
+ @Override
+ Employee expand(String... expand);
+
+ @Override
+ Employee select(String... select);
+
@Key
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
index 6aa327d..c1b0142 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.se
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -37,6 +38,18 @@ public interface ProductPageView
@Override
ProductPageView load();
+ @Override
+ Future<? extends ProductPageView> loadAsync();
+
+ @Override
+ ProductPageView refs();
+
+ @Override
+ ProductPageView expand(String... expand);
+
+ @Override
+ ProductPageView select(String... select);
+
@Key
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
index 64f0c3b..effeada 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
@@ -22,6 +22,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -38,6 +39,18 @@ public interface SpecialEmployee
@Override
SpecialEmployee load();
+ @Override
+ Future<? extends SpecialEmployee> loadAsync();
+
+ @Override
+ SpecialEmployee refs();
+
+ @Override
+ SpecialEmployee expand(String... expand);
+
+ @Override
+ SpecialEmployee select(String... select);
+
@Key
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRow.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRow.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRow.java
index 095cef7..3c1789e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRow.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRow.java
@@ -22,6 +22,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -38,6 +39,18 @@ public interface IndexedRow
@Override
IndexedRow load();
+ @Override
+ Future<? extends IndexedRow> loadAsync();
+
+ @Override
+ IndexedRow refs();
+
+ @Override
+ IndexedRow expand(String... expand);
+
+ @Override
+ IndexedRow select(String... select);
+
@Key
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
index 966131a..cf7faeb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -37,6 +38,18 @@ public interface AllSpatialCollectionTypes_Simple
@Override
AllSpatialCollectionTypes_Simple load();
+ @Override
+ Future<? extends AllSpatialCollectionTypes_Simple> loadAsync();
+
+ @Override
+ AllSpatialCollectionTypes_Simple refs();
+
+ @Override
+ AllSpatialCollectionTypes_Simple expand(String... expand);
+
+ @Override
+ AllSpatialCollectionTypes_Simple select(String... select);
+
@Key
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
index 90615bf..0e221e9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
@@ -22,6 +22,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@KeyRef(OrderLineKey.class)
@@ -38,6 +39,18 @@ public interface BackOrderLine
@Override
BackOrderLine load();
+ @Override
+ Future<? extends BackOrderLine> loadAsync();
+
+ @Override
+ BackOrderLine refs();
+
+ @Override
+ BackOrderLine expand(String... expand);
+
+ @Override
+ BackOrderLine select(String... select);
+
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
index 25caed5..73d67e9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
@@ -22,6 +22,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@KeyRef(OrderLineKey.class)
@@ -38,6 +39,18 @@ public interface BackOrderLine2
@Override
BackOrderLine2 load();
+ @Override
+ Future<? extends BackOrderLine2> loadAsync();
+
+ @Override
+ BackOrderLine2 refs();
+
+ @Override
+ BackOrderLine2 expand(String... expand);
+
+ @Override
+ BackOrderLine2 select(String... select);
+
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
index cbec48f..aad82bc 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -37,6 +38,18 @@ public interface Contractor
@Override
Contractor load();
+ @Override
+ Future<? extends Contractor> loadAsync();
+
+ @Override
+ Contractor refs();
+
+ @Override
+ Contractor expand(String... expand);
+
+ @Override
+ Contractor select(String... select);
+
@Key
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
index f8b24ba..327c8c4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -37,6 +38,18 @@ public interface DiscontinuedProduct
@Override
DiscontinuedProduct load();
+ @Override
+ Future<? extends DiscontinuedProduct> loadAsync();
+
+ @Override
+ DiscontinuedProduct refs();
+
+ @Override
+ DiscontinuedProduct expand(String... expand);
+
+ @Override
+ DiscontinuedProduct select(String... select);
+
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
index e0bd86e..a797ed1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
@@ -22,6 +22,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -38,6 +39,18 @@ public interface Employee
@Override
Employee load();
+ @Override
+ Future<? extends Employee> loadAsync();
+
+ @Override
+ Employee refs();
+
+ @Override
+ Employee expand(String... expand);
+
+ @Override
+ Employee select(String... select);
+
@Key
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
index 259867c..ef38e89 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -37,6 +38,18 @@ public interface ProductPageView
@Override
ProductPageView load();
+ @Override
+ Future<? extends ProductPageView> loadAsync();
+
+ @Override
+ ProductPageView refs();
+
+ @Override
+ ProductPageView expand(String... expand);
+
+ @Override
+ ProductPageView select(String... select);
+
@Key
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
index 3954537..ca5abef 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -37,6 +38,18 @@ public interface SpecialEmployee
@Override
SpecialEmployee load();
+ @Override
+ Future<? extends SpecialEmployee> loadAsync();
+
+ @Override
+ SpecialEmployee refs();
+
+ @Override
+ SpecialEmployee expand(String... expand);
+
+ @Override
+ SpecialEmployee select(String... select);
+
@Key
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java
index 90be1b6..4813ee2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java
@@ -39,11 +39,7 @@ import org.apache.olingo.fit.proxy.v4.staticservice.Service;
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.server.TomcatTestServer;
-import org.apache.olingo.server.tecsvc.TechnicalServlet;
import org.junit.BeforeClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AsyncTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AsyncTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AsyncTestITCase.java
index dad1eaa..b9051af 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AsyncTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AsyncTestITCase.java
@@ -71,7 +71,7 @@ public class AsyncTestITCase extends AbstractTestITCase {
Thread.sleep(1000L);
}
- final Future<Person> futurePerson = container.getPeople().getByKey(1).loadAsync();
+ final Future<? extends Person> futurePerson = container.getPeople().getByKey(1).loadAsync();
assertEquals(randomFirstName, futurePerson.get().getFirstName());
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java
index 4ffe620..ec046d1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -37,6 +38,18 @@ public interface Customer
@Override
Customer load();
+ @Override
+ Future<? extends Customer> loadAsync();
+
+ @Override
+ Customer refs();
+
+ @Override
+ Customer expand(String... expand);
+
+ @Override
+ Customer select(String... select);
+
@Key
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java
index e0d1e44..1bf9ca0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -37,6 +38,18 @@ public interface Employee
@Override
Employee load();
+ @Override
+ Future<? extends Employee> loadAsync();
+
+ @Override
+ Employee refs();
+
+ @Override
+ Employee expand(String... expand);
+
+ @Override
+ Employee select(String... select);
+
@Key
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java
index e1e2dcf..c8e8c9a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -37,6 +38,18 @@ public interface FeaturedProduct
@Override
FeaturedProduct load();
+ @Override
+ Future<? extends FeaturedProduct> loadAsync();
+
+ @Override
+ FeaturedProduct refs();
+
+ @Override
+ FeaturedProduct expand(String... expand);
+
+ @Override
+ FeaturedProduct select(String... select);
+
@Key
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRow.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRow.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRow.java
index 53b5a2d..74a9ca4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRow.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRow.java
@@ -22,6 +22,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -38,6 +39,18 @@ public interface IndexedRow
@Override
IndexedRow load();
+ @Override
+ Future<? extends IndexedRow> loadAsync();
+
+ @Override
+ IndexedRow refs();
+
+ @Override
+ IndexedRow expand(String... expand);
+
+ @Override
+ IndexedRow select(String... select);
+
@Key
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java
----------------------------------------------------------------------
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 03beb3e..ac77f31 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
@@ -22,6 +22,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -38,6 +39,18 @@ public interface CreditCardPI
@Override
CreditCardPI load();
+ @Override
+ Future<? extends CreditCardPI> loadAsync();
+
+ @Override
+ CreditCardPI refs();
+
+ @Override
+ CreditCardPI expand(String... expand);
+
+ @Override
+ CreditCardPI select(String... select);
+
@Key
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java
index 217e523..ac9f35d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.servic
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -37,6 +38,18 @@ public interface Customer
@Override
Customer load();
+ @Override
+ Future<? extends Customer> loadAsync();
+
+ @Override
+ Customer refs();
+
+ @Override
+ Customer expand(String... expand);
+
+ @Override
+ Customer select(String... select);
+
@Key
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java
index b04b7d3..024bf5d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.servic
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -37,6 +38,18 @@ public interface Employee
@Override
Employee load();
+ @Override
+ Future<? extends Employee> loadAsync();
+
+ @Override
+ Employee refs();
+
+ @Override
+ Employee expand(String... expand);
+
+ @Override
+ Employee select(String... select);
+
@Key
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/82a73c57/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java
----------------------------------------------------------------------
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 066961d..f1212da 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
@@ -23,6 +23,7 @@ import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import java.util.concurrent.Future;
//CHECKSTYLE:ON (Maven checkstyle)
@@ -39,6 +40,18 @@ public interface PublicCompany
@Override
PublicCompany load();
+ @Override
+ Future<? extends PublicCompany> loadAsync();
+
+ @Override
+ PublicCompany refs();
+
+ @Override
+ PublicCompany expand(String... expand);
+
+ @Override
+ PublicCompany select(String... select);
+
@Key