You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by fm...@apache.org on 2014/07/16 11:27:09 UTC
[46/58] [abbrv] provided the possibility to specify query options at
proxy layer
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/baf2cd10/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityRetrieveTestITCase.java
index 2007b81..7ebed37 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityRetrieveTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityRetrieveTestITCase.java
@@ -73,21 +73,21 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
@Test
public void getAll() {
- final PersonCollection all = getContainer().getPeople().getAll();
+ final PersonCollection all = getContainer().getPeople().execute();
assertNotNull(all);
assertFalse(all.isEmpty());
for (Person person : all) {
assertNotNull(person);
}
- final EmployeeCollection employees = getContainer().getPeople().getAll(EmployeeCollection.class);
+ final EmployeeCollection employees = getContainer().getPeople().execute(EmployeeCollection.class);
assertNotNull(employees);
assertFalse(employees.isEmpty());
for (Employee employee : employees) {
assertNotNull(employee);
}
- final CustomerCollection customers = getContainer().getPeople().getAll(CustomerCollection.class);
+ final CustomerCollection customers = getContainer().getPeople().execute(CustomerCollection.class);
assertNotNull(customers);
assertFalse(customers.isEmpty());
for (Customer customer : customers) {
@@ -99,7 +99,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
@Test
public void navigate() {
- final Order order = getContainer().getOrders().get(8).load();
+ final Order order = getContainer().getOrders().getByKey(8).load();
assertNotNull(order);
assertEquals(8, order.getOrderID(), 0);
@@ -110,7 +110,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
actual.set(2011, 2, 4, 16, 3, 57);
assertEquals(actual.getTimeInMillis(), date.getTime());
- final Customer customer = getContainer().getCustomers().get(1).load();
+ final Customer customer = getContainer().getCustomers().getByKey(1).load();
assertNotNull(customer);
assertEquals(1, customer.getPersonID(), 0);
final Address address = customer.getHomeAddress();
@@ -135,7 +135,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
@Test
public void withActions() {
- final Product product = getContainer().getProducts().get(5).load();
+ final Product product = getContainer().getProducts().getByKey(5).load();
assertEquals(5, product.getProductID(), 0);
try {
@@ -151,7 +151,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
orderDetailKey.setOrderID(7);
orderDetailKey.setProductID(5);
- final OrderDetail orderDetail = getContainer().getOrderDetails().get(orderDetailKey).load();
+ final OrderDetail orderDetail = getContainer().getOrderDetails().getByKey(orderDetailKey).load();
assertNotNull(orderDetail);
assertEquals(7, orderDetail.getOrderID(), 0);
assertEquals(5, orderDetail.getProductID(), 0);
@@ -159,14 +159,14 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
@Test
public void checkForETag() {
- final Order order = getContainer().getOrders().get(8).load();
+ final Order order = getContainer().getOrders().getByKey(8).load();
assertTrue(StringUtils.isNotBlank(((EntityInvocationHandler) Proxy.getInvocationHandler(order)).getETag()));
}
@Test
public void contained() {
final PaymentInstrument instrument =
- getContainer().getAccounts().get(101).getMyPaymentInstruments().get(101901).load();
+ getContainer().getAccounts().getByKey(101).getMyPaymentInstruments().getByKey(101901).load();
assertEquals(101901, instrument.getPaymentInstrumentID(), 0);
assertNotNull(instrument.getCreatedDate());
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/baf2cd10/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntitySetTestITCase.java
----------------------------------------------------------------------
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 ef537ee..141a3ac 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
@@ -39,7 +39,7 @@ public class EntitySetTestITCase extends AbstractTestITCase {
@Test
public void getAll() {
int count = 0;
- for (Customer customer : container.getCustomers().getAll()) {
+ for (Customer customer : container.getCustomers().execute()) {
assertNotNull(customer);
count++;
}
@@ -59,7 +59,7 @@ public class EntitySetTestITCase extends AbstractTestITCase {
@Test
public void readEntitySetWithNextLink() {
int count = 0;
- for (Person people : container.getPeople().getAll()) {
+ for (Person people : container.getPeople().execute()) {
assertNotNull(people);
count++;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/baf2cd10/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java
index b156d31..cb7ed46 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java
@@ -32,7 +32,7 @@ import java.util.UUID;
import org.apache.commons.lang3.RandomUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
-import org.apache.olingo.ext.proxy.EntityContainerFactory;
+import org.apache.olingo.ext.proxy.Service;
import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler;
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
@@ -52,7 +52,7 @@ import org.junit.Test;
*/
public class EntityUpdateTestITCase extends AbstractTestITCase {
- protected EntityContainerFactory<EdmEnabledODataClient> getContainerFactory() {
+ protected Service<EdmEnabledODataClient> getContainerFactory() {
return containerFactory;
}
@@ -62,14 +62,14 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
@Test
public void update() {
- Person person = getContainer().getPeople().get(1).load();
+ Person person = getContainer().getPeople().getByKey(1).load();
final Address address = person.getHomeAddress();
address.setCity("XXX");
getContainer().flush();
- person = getContainer().getPeople().get(1).load();
+ person = getContainer().getPeople().getByKey(1).load();
assertEquals("XXX", person.getHomeAddress().getCity());
}
@@ -79,7 +79,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
orderDetailKey.setOrderID(7);
orderDetailKey.setProductID(5);
- OrderDetail orderDetail = getContainer().getOrderDetails().get(orderDetailKey).load();
+ OrderDetail orderDetail = getContainer().getOrderDetails().getByKey(orderDetailKey).load();
assertNotNull(orderDetail);
assertEquals(7, orderDetail.getOrderID(), 0);
assertEquals(5, orderDetail.getProductID(), 0);
@@ -88,7 +88,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
getContainer().flush();
- orderDetail = getContainer().getOrderDetails().get(orderDetailKey).load();
+ orderDetail = getContainer().getOrderDetails().getByKey(orderDetailKey).load();
assertEquals(5, orderDetail.getQuantity(), 0);
}
@@ -132,10 +132,10 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
getContainer().flush();
// 3. check everything after flush
- order = getContainer().getOrders().get(orderId).load();
+ order = getContainer().getOrders().getByKey(orderId).load();
assertEquals(orderId, order.getOrderID(), 0);
- customer = getContainer().getCustomers().get(977);
+ customer = getContainer().getCustomers().getByKey(977);
// assertEquals(1, customer.getOrders().size());
@@ -157,7 +157,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
@Test
public void concurrentModification() {
- Order order = getContainer().getOrders().get(8).load();
+ Order order = getContainer().getOrders().getByKey(8).load();
final String etag = ((EntityInvocationHandler) Proxy.getInvocationHandler(order)).getETag();
assertTrue(StringUtils.isNotBlank(etag));
@@ -165,20 +165,21 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
getContainer().flush();
- order = getContainer().getOrders().get(8).load();
+ order = getContainer().getOrders().getByKey(8).load();
assertEquals(BigDecimal.TEN, order.getShelfLife());
}
@Test
public void contained() {
- PaymentInstrument instrument = getContainer().getAccounts().get(101).getMyPaymentInstruments().get(101901);
+ PaymentInstrument instrument =
+ getContainer().getAccounts().getByKey(101).getMyPaymentInstruments().getByKey(101901);
final String newName = UUID.randomUUID().toString();
instrument.setFriendlyName(newName);
getContainer().flush();
- instrument = getContainer().getAccounts().get(101).getMyPaymentInstruments().get(101901).load();
+ instrument = getContainer().getAccounts().getByKey(101).getMyPaymentInstruments().getByKey(101901).load();
assertEquals(newName, instrument.getFriendlyName());
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/baf2cd10/fit/src/test/java/org/apache/olingo/fit/proxy/v4/FilterTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/FilterTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/FilterTestITCase.java
index 3b2d0b3..7876315 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/FilterTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/FilterTestITCase.java
@@ -18,17 +18,20 @@
*/
package org.apache.olingo.fit.proxy.v4;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.olingo.ext.proxy.api.Filter;
import org.apache.olingo.ext.proxy.api.Search;
import org.apache.olingo.ext.proxy.api.Sort;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.People;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection;
@@ -39,11 +42,12 @@ public class FilterTestITCase extends AbstractTestITCase {
@Test
public void filterOrderby() {
- final Filter<Person, PersonCollection> filter = container.getPeople().createFilter().setFilter(
- containerFactory.getClient().getFilterFactory().lt("PersonID", 3));
+ final People people = container.getPeople();
+
+ PersonCollection result =
+ people.filter(containerFactory.getClient().getFilterFactory().lt("PersonID", 3)).execute();
// 1. check that result looks as expected
- PersonCollection result = filter.getResult();
assertEquals(2, result.size());
// 2. extract PersonID values - sorted ASC by default
@@ -55,7 +59,7 @@ public class FilterTestITCase extends AbstractTestITCase {
}
// 3. add orderby clause to filter above
- result = filter.setOrderBy(new Sort("PersonID", Sort.Direction.DESC)).getResult();
+ result = people.orderBy(new Sort("PersonID", Sort.Direction.DESC)).execute();
assertEquals(2, result.size());
// 4. extract again VIN value - now they were required to be sorted DESC
@@ -74,11 +78,41 @@ public class FilterTestITCase extends AbstractTestITCase {
@Test
public void search() {
final Search<Person, PersonCollection> search = container.getPeople().createSearch().setSearch(
- containerFactory.getClient().getSearchFactory().or(
+ containerFactory.getClient().getSearchFactory().or(
containerFactory.getClient().getSearchFactory().literal("Bob"),
containerFactory.getClient().getSearchFactory().literal("Jill")));
final PersonCollection result = search.getResult();
assertFalse(result.isEmpty());
}
+
+ @Test
+ public void loadWithSelect() {
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order order =
+ container.getOrders().getByKey(8);
+ assertNull(order.getOrderID());
+ assertNull(order.getOrderDate());
+
+ order.select("OrderID");
+ order.load();
+
+ assertNull(order.getOrderDate());
+ assertNotNull(order.getOrderID());
+
+ order.clear();
+ order.load();
+ assertNotNull(order.getOrderDate());
+ assertNotNull(order.getOrderID());
+ }
+
+ @Test
+ public void loadWithSelectAndExpand() {
+ final Customer customer = container.getCustomers().getByKey(1);
+
+// customer.expand("Orders");
+ customer.select("Orders", "PersonID");
+
+ customer.load();
+ assertEquals(1, customer.getOrders().size());
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/baf2cd10/fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java
index b5bd7d2..c1c5da4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java
@@ -23,20 +23,20 @@ import static org.junit.Assert.assertNotNull;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.ext.proxy.EntityContainerFactory;
+import org.apache.olingo.ext.proxy.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.Person;
import org.junit.Test;
public class KeyAsSegmentTestITCase extends AbstractTestITCase {
- private EntityContainerFactory<EdmEnabledODataClient> ecf;
+ private Service<EdmEnabledODataClient> ecf;
private InMemoryEntities ime;
- protected EntityContainerFactory<EdmEnabledODataClient> getContainerFactory() {
+ protected Service<EdmEnabledODataClient> getContainerFactory() {
if (ecf == null) {
- ecf = EntityContainerFactory.getV4(testKeyAsSegmentServiceRootURL);
+ ecf = Service.getV4(testKeyAsSegmentServiceRootURL);
ecf.getClient().getConfiguration().setKeyAsSegment(true);
ecf.getClient().getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
}
@@ -52,7 +52,7 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase {
@Test
public void read() {
- assertNotNull(getContainer().getAccounts().get(101));
+ assertNotNull(getContainer().getAccounts().getByKey(101));
}
@Test
@@ -62,12 +62,12 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase {
@Test
public void update() {
- Person person = getContainer().getPeople().get(5);
+ Person person = getContainer().getPeople().getByKey(5);
person.setMiddleName("middleN");
container.flush();
- person = getContainer().getPeople().get(5);
+ person = getContainer().getPeople().getByKey(5);
assertEquals("middleN", person.getMiddleName());
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/baf2cd10/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java
index bacdb57..cdfe5ff 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java
@@ -32,7 +32,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.ext.proxy.EntityContainerFactory;
+import org.apache.olingo.ext.proxy.Service;
import org.apache.olingo.fit.proxy.v4.demo.odatademo.DemoService;
import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement;
import org.junit.Test;
@@ -42,13 +42,13 @@ import org.junit.Test;
*/
public class MediaEntityTestITCase extends AbstractTestITCase {
- private EntityContainerFactory<EdmEnabledODataClient> ecf;
+ private Service<EdmEnabledODataClient> ecf;
private DemoService ime;
- protected EntityContainerFactory<EdmEnabledODataClient> getContainerFactory() {
+ protected Service<EdmEnabledODataClient> getContainerFactory() {
if (ecf == null) {
- ecf = EntityContainerFactory.getV4(testDemoServiceRootURL);
+ ecf = Service.getV4(testDemoServiceRootURL);
ecf.getClient().getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
}
return ecf;
@@ -65,7 +65,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
public void read() throws IOException {
final UUID uuid = UUID.fromString("f89dee73-af9f-4cd4-b330-db93c25ff3c7");
- final Advertisement adv = getContainer().getAdvertisements().get(uuid).load();
+ final Advertisement adv = getContainer().getAdvertisements().getByKey(uuid).load();
assertNotNull(adv.getAirDate());
final InputStream is = adv.getStream();
@@ -77,7 +77,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
public void update() throws IOException {
final UUID uuid = UUID.fromString("f89dee73-af9f-4cd4-b330-db93c25ff3c7");
- final Advertisement adv = getContainer().getAdvertisements().get(uuid).load();
+ final Advertisement adv = getContainer().getAdvertisements().getByKey(uuid).load();
final String random = RandomStringUtils.random(124, "abcdefghijklmnopqrstuvwxyz");
@@ -85,7 +85,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
getContainer().flush();
- assertEquals(random, IOUtils.toString(getContainer().getAdvertisements().get(uuid).load().getStream()));
+ assertEquals(random, IOUtils.toString(getContainer().getAdvertisements().getByKey(uuid).load().getStream()));
}
@Test
@@ -101,7 +101,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
final UUID uuid = adv.getID();
getContainerFactory().getContext().detachAll();
- assertEquals(random, IOUtils.toString(getContainer().getAdvertisements().get(uuid).load().getStream()));
+ assertEquals(random, IOUtils.toString(getContainer().getAdvertisements().getByKey(uuid).load().getStream()));
getContainerFactory().getContext().detachAll();
@@ -109,7 +109,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
getContainer().flush();
try {
- getContainer().getAdvertisements().get(uuid).load();
+ getContainer().getAdvertisements().getByKey(uuid).load();
fail();
} catch (IllegalArgumentException e) {
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/baf2cd10/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalAuthEntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalAuthEntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalAuthEntityCreateTestITCase.java
index 4a56853..65c53ae 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalAuthEntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalAuthEntityCreateTestITCase.java
@@ -21,19 +21,19 @@ package org.apache.olingo.fit.proxy.v4;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.ext.proxy.EntityContainerFactory;
+import org.apache.olingo.ext.proxy.Service;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
public class NonTransactionalAuthEntityCreateTestITCase extends EntityCreateTestITCase {
- private EntityContainerFactory<EdmEnabledODataClient> ecf;
+ private Service<EdmEnabledODataClient> ecf;
private InMemoryEntities ime;
@Override
- protected EntityContainerFactory<EdmEnabledODataClient> getContainerFactory() {
+ protected Service<EdmEnabledODataClient> getContainerFactory() {
if (ecf == null) {
- ecf = EntityContainerFactory.getV4(testAuthServiceRootURL, false);
+ ecf = Service.getV4(testAuthServiceRootURL, false);
ecf.getClient().getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
ecf.getClient().getConfiguration().
setHttpClientFactory(new BasicAuthHttpClientFactory("odatajclient", "odatajclient"));
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/baf2cd10/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityCreateTestITCase.java
index 8041486..091adef 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityCreateTestITCase.java
@@ -20,19 +20,19 @@ package org.apache.olingo.fit.proxy.v4;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.ext.proxy.EntityContainerFactory;
+import org.apache.olingo.ext.proxy.Service;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
public class NonTransactionalEntityCreateTestITCase extends EntityCreateTestITCase {
- private EntityContainerFactory<EdmEnabledODataClient> ecf;
+ private Service<EdmEnabledODataClient> ecf;
private InMemoryEntities ime;
@Override
- protected EntityContainerFactory<EdmEnabledODataClient> getContainerFactory() {
+ protected Service<EdmEnabledODataClient> getContainerFactory() {
if (ecf == null) {
- ecf = EntityContainerFactory.getV4(testStaticServiceRootURL, false);
+ ecf = Service.getV4(testStaticServiceRootURL, false);
ecf.getClient().getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
}
return ecf;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/baf2cd10/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityUpdateTestITCase.java
index cfc3a4f..e789f90 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityUpdateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityUpdateTestITCase.java
@@ -20,19 +20,19 @@ package org.apache.olingo.fit.proxy.v4;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.ext.proxy.EntityContainerFactory;
+import org.apache.olingo.ext.proxy.Service;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
public class NonTransactionalEntityUpdateTestITCase extends EntityUpdateTestITCase {
- private EntityContainerFactory<EdmEnabledODataClient> ecf;
+ private Service<EdmEnabledODataClient> ecf;
private InMemoryEntities ime;
@Override
- protected EntityContainerFactory<EdmEnabledODataClient> getContainerFactory() {
+ protected Service<EdmEnabledODataClient> getContainerFactory() {
if (ecf == null) {
- ecf = EntityContainerFactory.getV4(testStaticServiceRootURL, false);
+ ecf = Service.getV4(testStaticServiceRootURL, false);
ecf.getClient().getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
}
return ecf;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/baf2cd10/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalMediaEntityTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalMediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalMediaEntityTestITCase.java
index 53d1c89..4877633 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalMediaEntityTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalMediaEntityTestITCase.java
@@ -20,19 +20,19 @@ package org.apache.olingo.fit.proxy.v4;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.ext.proxy.EntityContainerFactory;
+import org.apache.olingo.ext.proxy.Service;
import org.apache.olingo.fit.proxy.v4.demo.odatademo.DemoService;
public class NonTransactionalMediaEntityTestITCase extends MediaEntityTestITCase {
- private EntityContainerFactory<EdmEnabledODataClient> ecf;
+ private Service<EdmEnabledODataClient> ecf;
private DemoService ime;
@Override
- protected EntityContainerFactory<EdmEnabledODataClient> getContainerFactory() {
+ protected Service<EdmEnabledODataClient> getContainerFactory() {
if (ecf == null) {
- ecf = EntityContainerFactory.getV4(testDemoServiceRootURL, false);
+ ecf = Service.getV4(testDemoServiceRootURL, false);
ecf.getClient().getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
}
return ecf;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/baf2cd10/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java
index b88de49..6c3bdec 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java
@@ -32,7 +32,7 @@ import java.util.UUID;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.ext.proxy.EntityContainerFactory;
+import org.apache.olingo.ext.proxy.Service;
import org.apache.olingo.ext.proxy.api.annotations.EntityType;
import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.DefaultContainer;
import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.AccountInfo;
@@ -48,13 +48,13 @@ import org.junit.Test;
*/
public class OpenTypeTestITCase extends AbstractTestITCase {
- private static EntityContainerFactory<EdmEnabledODataClient> otcontainerFactory;
+ private static Service<EdmEnabledODataClient> otcontainerFactory;
private static DefaultContainer otcontainer;
@BeforeClass
public static void initContainer() {
- otcontainerFactory = EntityContainerFactory.getV4(testOpenTypeServiceRootURL);
+ otcontainerFactory = Service.getV4(testOpenTypeServiceRootURL);
otcontainerFactory.getClient().getConfiguration().
setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
otcontainer = otcontainerFactory.getEntityContainer(DefaultContainer.class);
@@ -74,11 +74,11 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
@Test
public void read() {
- Row row = otcontainer.getRow().get(UUID.fromString("71f7d0dc-ede4-45eb-b421-555a2aa1e58f")).load();
+ Row row = otcontainer.getRow().getByKey(UUID.fromString("71f7d0dc-ede4-45eb-b421-555a2aa1e58f")).load();
assertEquals(Double.class, row.getAdditionalProperty("Double").getClass());
assertEquals("71f7d0dc-ede4-45eb-b421-555a2aa1e58f", row.getId().toString());
- row = otcontainer.getRow().get(UUID.fromString("672b8250-1e6e-4785-80cf-b94b572e42b3")).load();
+ row = otcontainer.getRow().getByKey(UUID.fromString("672b8250-1e6e-4785-80cf-b94b572e42b3")).load();
assertEquals(BigDecimal.class, row.getAdditionalProperty("Decimal").getClass());
}
@@ -127,7 +127,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
otcontainer.flush();
- rowIndex = otcontainer.getRowIndex().get(id).load();
+ rowIndex = otcontainer.getRowIndex().getByKey(id).load();
assertEquals(String.class, rowIndex.getAdditionalProperty("aString").getClass());
assertEquals(Boolean.class, rowIndex.getAdditionalProperty("aBoolean").getClass());
assertEquals(Double.class, rowIndex.getAdditionalProperty("aDouble").getClass());
@@ -148,7 +148,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
otcontainer.flush();
try {
- otcontainer.getRowIndex().get(id).load();
+ otcontainer.getRowIndex().getByKey(id).load();
fail();
} catch (IllegalArgumentException e) {
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/baf2cd10/fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java
index 3c39b68..b15f985 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java
@@ -32,16 +32,16 @@ public class PropertyTestITCase extends AbstractTestITCase {
@Test
public void nullNullableProperty() {
- final Customer customer = container.getCustomers().get(1);
+ final Customer customer = container.getCustomers().getByKey(1);
customer.setFirstName(null);
container.flush();
- assertNull(container.getCustomers().get(1).getFirstName());
+ assertNull(container.getCustomers().getByKey(1).getFirstName());
}
@Test
public void nullNonNullableProperty() {
- final StoredPI storedPI = container.getStoredPIs().get(1000);
+ final StoredPI storedPI = container.getStoredPIs().getByKey(1000);
storedPI.setPIName(null);
try {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/baf2cd10/fit/src/test/java/org/apache/olingo/fit/proxy/v4/SingletonTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/SingletonTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/SingletonTestITCase.java
index 91b32f3..2388ff5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/SingletonTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/SingletonTestITCase.java
@@ -33,27 +33,27 @@ public class SingletonTestITCase extends AbstractTestITCase {
@Test
public void read() {
- final Company company = container.getCompany().get();
+ final Company company = container.getCompany().load();
assertEquals(0, company.getCompanyID(), 0);
assertEquals(CompanyCategory.IT, company.getCompanyCategory());
}
@Test
public void update() {
- final Company company = container.getCompany().get();
+ final Company company = container.getCompany().load();
company.setRevenue(132520L);
container.flush();
- assertEquals(132520L, container.getCompany().get().getRevenue(), 0);
+ assertEquals(132520L, container.getCompany().load().getRevenue(), 0);
}
@Test
public void readWithAnnotations() {
- final Company company = container.getCompany().get();
+ final Company company = container.getCompany().load();
assertTrue(company.getAnnotationTerms().isEmpty());
- final Person boss = container.getBoss().get();
+ final Person boss = container.getBoss().load();
assertEquals(2, boss.getPersonID(), 0);
assertEquals(1, boss.getAnnotationTerms().size());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/baf2cd10/fit/src/test/java/org/apache/olingo/fit/proxy/v4/UnauthorizedEntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/UnauthorizedEntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/UnauthorizedEntityCreateTestITCase.java
index ef47e02..b4ca657 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/UnauthorizedEntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/UnauthorizedEntityCreateTestITCase.java
@@ -22,19 +22,19 @@ import org.apache.olingo.client.api.http.HttpClientException;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.ext.proxy.EntityContainerFactory;
+import org.apache.olingo.ext.proxy.Service;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
import org.junit.Test;
public class UnauthorizedEntityCreateTestITCase extends AbstractTestITCase {
- private EntityContainerFactory<EdmEnabledODataClient> ecf;
+ private Service<EdmEnabledODataClient> ecf;
private InMemoryEntities ime;
- public EntityContainerFactory<EdmEnabledODataClient> getContainerFactory() {
+ public Service<EdmEnabledODataClient> getContainerFactory() {
if (ecf == null) {
- ecf = EntityContainerFactory.getV4(testAuthServiceRootURL);
+ ecf = Service.getV4(testAuthServiceRootURL);
ecf.getClient().getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
ecf.getClient().getConfiguration().
setHttpClientFactory(new BasicAuthHttpClientFactory("not_auth", "not_auth"));
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/baf2cd10/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java
----------------------------------------------------------------------
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 ad433df..bd50a2a 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
@@ -234,9 +234,10 @@ public interface Account
void setMyPaymentInstruments(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.MyPaymentInstruments _myPaymentInstruments);
+
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "MyPaymentInstruments", contained = true)
interface MyPaymentInstruments
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection> {
+ extends org.apache.olingo.ext.proxy.api.CollectionQuery<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection>, AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection> {
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();
@@ -254,9 +255,10 @@ public interface Account
void setActiveSubscriptions(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.ActiveSubscriptions _activeSubscriptions);
+
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ActiveSubscriptions", contained = true)
interface ActiveSubscriptions
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection> {
+ extends org.apache.olingo.ext.proxy.api.CollectionQuery<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection>, AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection> {
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();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/baf2cd10/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 06a6b6c..985e614 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
@@ -342,9 +342,10 @@ public interface CreditCardPI
void setCreditRecords(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI.CreditRecords _creditRecords);
+
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "CreditRecords", contained = true)
interface CreditRecords
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecord, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecordCollection> {
+ extends org.apache.olingo.ext.proxy.api.CollectionQuery<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecord, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecordCollection>, AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecord, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecordCollection> {
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();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/baf2cd10/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java
----------------------------------------------------------------------
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 42d474a..5d9ae4c 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
@@ -199,9 +199,10 @@ public interface PaymentInstrument
void setBillingStatements(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.BillingStatements _billingStatements);
+
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "BillingStatements", contained = true)
interface BillingStatements
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Statement, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StatementCollection> {
+ extends org.apache.olingo.ext.proxy.api.CollectionQuery<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Statement, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StatementCollection>, AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Statement, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StatementCollection> {
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();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/baf2cd10/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 1c8c6d4..fb6eeed 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
@@ -349,9 +349,10 @@ public interface PublicCompany
void setAssets(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PublicCompany.Assets _assets);
+
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Assets", contained = true)
interface Assets
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Asset, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AssetCollection> {
+ extends org.apache.olingo.ext.proxy.api.CollectionQuery<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Asset, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AssetCollection>, AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Asset, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AssetCollection> {
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();