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/05/21 13:41:09 UTC
[3/4] Invoke request factory re-factoring
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/35e89699/fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java
index db26eee..0d9730e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java
@@ -227,7 +227,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", false);
final ODataEntityCreateRequest<ODataEntity> createReq = client.getCUDRequestFactory().getEntityCreateRequest(
- client.getURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer").build(), original);
+ client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer").build(), original);
createReq.setPrefer(client.newPreferences().returnNoContent());
final ODataEntityCreateResponse<ODataEntity> createRes = createReq.execute();
@@ -243,7 +243,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
}
final ODataDeleteResponse deleteRes = client.getCUDRequestFactory().getDeleteRequest(
- client.getURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer").appendKeySegment(id).build()).
+ client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer").appendKeySegment(id).build()).
execute();
assertEquals(204, deleteRes.getStatusCode());
}
@@ -253,7 +253,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
final int id = 2;
final ODataEntity original = getSampleCustomerProfile(id, "Sample customer for issue 135", false);
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer");
+ final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer");
final ODataEntityCreateRequest<ODataEntity> createReq =
client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), original);
createReq.setFormat(ODataPubFormat.JSON_FULL_METADATA);
@@ -267,7 +267,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
fail(e.getMessage());
} finally {
final ODataDeleteResponse deleteRes = client.getCUDRequestFactory().getDeleteRequest(
- client.getURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer").appendKeySegment(id).
+ client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer").appendKeySegment(id).
build()).
execute();
assertEquals(204, deleteRes.getStatusCode());
@@ -294,7 +294,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
client.getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
final ODataEntityCreateRequest<ODataEntity> createReq = client.getCUDRequestFactory().getEntityCreateRequest(
- client.getURIBuilder(getServiceRoot()).appendEntitySetSegment("Order").build(), order);
+ client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Order").build(), order);
createReq.setFormat(format);
original.addLink(client.getObjectFactory().newEntitySetNavigationLink(
@@ -306,7 +306,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
// now, compare the created one with the actual one and go deeply into the associated customer info.....
final ODataEntity actual = compareEntities(getServiceRoot(), format, created, id, null);
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot());
+ final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot());
uriBuilder.appendEntitySetSegment("Customer").appendKeySegment(id).appendEntitySetSegment("Orders");
final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
@@ -348,7 +348,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
// now, compare the created one with the actual one and go deeply into the associated customer info.....
final ODataEntity actual = compareEntities(getServiceRoot(), format, created, id, null);
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot());
+ final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot());
uriBuilder.appendEntitySetSegment("Customer").appendKeySegment(id).appendEntitySetSegment("Info");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
@@ -464,7 +464,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
client.getObjectFactory().newPrimitiveValueBuilder().buildBoolean(false)));
final URIBuilder builder =
- client.getURIBuilder(getServiceRoot()).appendEntitySetSegment("Message");
+ client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Message");
final ODataEntityCreateRequest<ODataEntity> req = client.getCUDRequestFactory().
getEntityCreateRequest(builder.build(), message);
req.setFormat(format);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/35e89699/fit/src/test/java/org/apache/olingo/fit/v3/EntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/EntityRetrieveTestITCase.java
index b6943aa..9314d2a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/EntityRetrieveTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/EntityRetrieveTestITCase.java
@@ -56,7 +56,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
}
private void withInlineEntry(final ODataPubFormat format) {
- final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(getServiceRoot()).
+ final CommonURIBuilder<?> uriBuilder = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Customer").appendKeySegment(-10).expand("Info");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
@@ -109,7 +109,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
}
private void withInlineFeed(final ODataPubFormat format) {
- final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(getServiceRoot()).
+ final CommonURIBuilder<?> uriBuilder = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Customer").appendKeySegment(-10).expand("Orders");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
@@ -148,7 +148,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
}
private void rawRequest(final ODataPubFormat format) {
- final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(getServiceRoot()).
+ final CommonURIBuilder<?> uriBuilder = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Car").appendKeySegment(16);
final ODataRawRequest req = client.getRetrieveRequestFactory().getRawRequest(uriBuilder.build());
@@ -180,7 +180,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
multiKey.put("FromUsername", "1");
multiKey.put("MessageId", -10);
- final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(getServiceRoot()).
+ final CommonURIBuilder<?> uriBuilder = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Message").appendKeySegment(multiKey);
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
@@ -214,7 +214,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
private void checkForETag(final ODataPubFormat format) {
final CommonURIBuilder<?> uriBuilder =
- client.getURIBuilder(getServiceRoot()).appendEntitySetSegment("Product").appendKeySegment(-10);
+ client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Product").appendKeySegment(-10);
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setFormat(format);
@@ -231,7 +231,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
@Test(expected = IllegalArgumentException.class)
public void issue99() {
- final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(getServiceRoot()).appendEntitySetSegment("Car");
+ final CommonURIBuilder<?> uriBuilder = client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Car");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setFormat(ODataPubFormat.JSON);
@@ -242,7 +242,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
}
private void geospatial(final ODataPubFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()).
+ final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("AllGeoTypesSet").appendKeySegment(-10);
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/35e89699/fit/src/test/java/org/apache/olingo/fit/v3/EntitySetTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/EntitySetTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/EntitySetTestITCase.java
index 6bcd248..68fb07d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/EntitySetTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/EntitySetTestITCase.java
@@ -99,7 +99,7 @@ public class EntitySetTestITCase extends AbstractTestITCase {
}
private void readEntitySetWithNextLink(final ODataPubFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot());
+ final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot());
uriBuilder.appendEntitySetSegment("Customer");
final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
@@ -124,7 +124,7 @@ public class EntitySetTestITCase extends AbstractTestITCase {
}
private void readODataEntitySetIterator(final ODataPubFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot());
+ final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot());
uriBuilder.appendEntitySetSegment("Customer");
final ODataEntitySetIteratorRequest<ODataEntitySet, ODataEntity> req =
@@ -147,7 +147,7 @@ public class EntitySetTestITCase extends AbstractTestITCase {
}
private void readWithInlineCount(final ODataPubFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot());
+ final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot());
uriBuilder.appendEntitySetSegment("Product").inlineCount(URIBuilder.InlineCount.allpages);
final ODataRawRequest req = client.getRetrieveRequestFactory().getRawRequest(uriBuilder.build());
@@ -161,7 +161,7 @@ public class EntitySetTestITCase extends AbstractTestITCase {
}
private void rawRequest(final ODataPubFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot());
+ final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot());
uriBuilder.appendEntitySetSegment("Car");
final ODataRawRequest req = client.getRetrieveRequestFactory().getRawRequest(uriBuilder.build());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/35e89699/fit/src/test/java/org/apache/olingo/fit/v3/EntityUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/EntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/EntityUpdateTestITCase.java
index 3e78f60..413dae8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/EntityUpdateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/EntityUpdateTestITCase.java
@@ -49,7 +49,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
@Test
public void mergeAsAtom() {
final ODataPubFormat format = ODataPubFormat.ATOM;
- final URI uri = client.getURIBuilder(getServiceRoot()).
+ final URI uri = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Product").appendKeySegment(-10).build();
final String etag = getETag(uri);
final ODataEntity merge = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
@@ -60,7 +60,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
@Test
public void mergeAsJSON() {
final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final URI uri = client.getURIBuilder(getServiceRoot()).
+ final URI uri = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Product").appendKeySegment(-10).build();
final String etag = getETag(uri);
final ODataEntity merge = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
@@ -71,7 +71,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
@Test
public void patchAsAtom() {
final ODataPubFormat format = ODataPubFormat.ATOM;
- final URI uri = client.getURIBuilder(getServiceRoot()).
+ final URI uri = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Product").appendKeySegment(-10).build();
final String etag = getETag(uri);
final ODataEntity patch = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
@@ -82,7 +82,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
@Test
public void patchAsJSON() {
final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final URI uri = client.getURIBuilder(getServiceRoot()).
+ final URI uri = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Product").appendKeySegment(-10).build();
final String etag = getETag(uri);
final ODataEntity patch = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
@@ -93,7 +93,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
@Test
public void replaceAsAtom() {
final ODataPubFormat format = ODataPubFormat.ATOM;
- final ODataEntity changes = read(format, client.getURIBuilder(getServiceRoot()).
+ final ODataEntity changes = read(format, client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Car").appendKeySegment(14).build());
updateEntityDescription(format, changes, UpdateType.REPLACE);
}
@@ -101,7 +101,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
@Test
public void replaceAsJSON() {
final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final ODataEntity changes = read(format, client.getURIBuilder(getServiceRoot()).
+ final ODataEntity changes = read(format, client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Car").appendKeySegment(14).build());
updateEntityDescription(format, changes, UpdateType.REPLACE);
}
@@ -117,7 +117,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
}
public void patchLink(final ODataPubFormat format) throws EdmPrimitiveTypeException {
- final URI uri = client.getURIBuilder(getServiceRoot()).
+ final URI uri = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Customer").appendKeySegment(-10).build();
final ODataEntity patch = client.getObjectFactory().
@@ -127,14 +127,14 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
// ---------------------------------------
// Update to CustomerInfo(12)
// ---------------------------------------
- URI customerInfoURI = client.getURIBuilder(getServiceRoot()).
+ URI customerInfoURI = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("CustomerInfo").appendKeySegment(12).build();
patch.addLink(client.getObjectFactory().newEntityNavigationLink("Info", customerInfoURI));
update(UpdateType.PATCH, patch, format, null);
- customerInfoURI = client.getURIBuilder(getServiceRoot()).
+ customerInfoURI = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Customer").appendKeySegment(-10).appendNavigationSegment("Info").build();
ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(customerInfoURI);
@@ -151,7 +151,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
// ---------------------------------------
patch.getNavigationLinks().clear();
- customerInfoURI = client.getURIBuilder(getServiceRoot()).
+ customerInfoURI = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("CustomerInfo").appendKeySegment(11).build();
read(format, customerInfoURI);
@@ -159,7 +159,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
update(UpdateType.PATCH, patch, format, null);
- customerInfoURI = client.getURIBuilder(getServiceRoot()).
+ customerInfoURI = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Customer").appendKeySegment(-10).appendNavigationSegment("Info").build();
req = client.getRetrieveRequestFactory().getEntityRequest(customerInfoURI);
@@ -178,7 +178,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
final LinkedHashMap<String, Object> multiKey = new LinkedHashMap<String, Object>();
multiKey.put("FromUsername", "1");
multiKey.put("MessageId", -10);
- final ODataEntity message = read(format, client.getURIBuilder(getServiceRoot()).
+ final ODataEntity message = read(format, client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Message").appendKeySegment(multiKey).build());
message.getAssociationLinks().clear();
message.getNavigationLinks().clear();
@@ -222,7 +222,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
@Test
public void concurrentModification() {
- final URI uri = client.getURIBuilder(getServiceRoot()).
+ final URI uri = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Product").appendKeySegment(-10).build();
String etag = getETag(uri);
final ODataEntity product = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/35e89699/fit/src/test/java/org/apache/olingo/fit/v3/ErrorTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/ErrorTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/ErrorTestITCase.java
index 21fb8f8..fe8ef61 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/ErrorTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/ErrorTestITCase.java
@@ -38,12 +38,8 @@ import org.apache.olingo.client.api.uri.v3.URIBuilder;
import org.apache.olingo.client.api.v3.ODataClient;
import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
import org.apache.olingo.client.core.communication.response.AbstractODataResponse;
-import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.domain.v3.ODataEntity;
import org.apache.olingo.commons.api.domain.v3.ODataEntitySet;
-import org.apache.olingo.commons.api.edm.Edm;
-import org.apache.olingo.commons.api.edm.EdmEntityContainer;
-import org.apache.olingo.commons.api.edm.EdmFunctionImport;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.format.ODataPubFormat;
import org.junit.Test;
@@ -88,7 +84,7 @@ public class ErrorTestITCase extends AbstractTestITCase {
}
private void stacktraceError(final ODataPubFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL);
+ final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL);
uriBuilder.appendEntitySetSegment("Customer");
final ErrorGeneratingRequest errorReq = new ErrorGeneratingRequest(HttpMethod.POST, uriBuilder.build());
@@ -115,7 +111,7 @@ public class ErrorTestITCase extends AbstractTestITCase {
}
private void notfoundError(final ODataPubFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL);
+ final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL);
uriBuilder.appendEntitySetSegment("Customer(154)");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
@@ -143,16 +139,10 @@ public class ErrorTestITCase extends AbstractTestITCase {
}
private void instreamError(final ODataPubFormat format) {
- final Edm metadata =
- client.getRetrieveRequestFactory().getMetadataRequest(testStaticServiceRootURL).execute().getBody();
- assertNotNull(metadata);
-
- final EdmEntityContainer container = metadata.getSchemas().get(0).getEntityContainer();
- final EdmFunctionImport funcImp = container.getFunctionImport("InStreamErrorGetCustomer");
- final URIBuilder builder = client.getURIBuilder(testStaticServiceRootURL).
- appendOperationCallSegment(URIUtils.operationImportURISegment(container, funcImp.getName()));
+ final URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).
+ appendOperationCallSegment("InStreamErrorGetCustomer");
final ODataInvokeRequest<ODataEntitySet> req =
- client.getInvokeRequestFactory().getInvokeRequest(builder.build(), funcImp.getUnboundFunction(null));
+ client.getInvokeRequestFactory().getFunctionInvokeRequest(builder.build(), ODataEntitySet.class);
req.setFormat(format);
final ODataInvokeResponse<ODataEntitySet> res = req.execute();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/35e89699/fit/src/test/java/org/apache/olingo/fit/v3/FilterFactoryTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/FilterFactoryTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/FilterFactoryTestITCase.java
index 2b447ad..3f00d2c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/FilterFactoryTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/FilterFactoryTestITCase.java
@@ -39,7 +39,7 @@ public class FilterFactoryTestITCase extends AbstractTestITCase {
}
private void match(final String entitySet, final URIFilter filter, final int expected) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment(entitySet).filter(filter);
final CommonODataEntitySet feed = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build()).
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/35e89699/fit/src/test/java/org/apache/olingo/fit/v3/FilterTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/FilterTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/FilterTestITCase.java
index 7d3bbdb..d14f9e4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/FilterTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/FilterTestITCase.java
@@ -28,7 +28,7 @@ import org.junit.Test;
public class FilterTestITCase extends AbstractTestITCase {
private void filterQueryTest(final String entity, final String filter, final int expected) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment(entity).filter(filter);
final ODataEntitySet entitySet = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build()).
execute().getBody();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/35e89699/fit/src/test/java/org/apache/olingo/fit/v3/InvokeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/InvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/InvokeTestITCase.java
index 02edf6e..6b8742f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/InvokeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/InvokeTestITCase.java
@@ -39,43 +39,25 @@ import org.apache.olingo.client.api.communication.response.ODataDeleteResponse;
import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse;
import org.apache.olingo.client.api.communication.response.ODataInvokeResponse;
import org.apache.olingo.client.api.uri.v3.URIBuilder;
-import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.domain.ODataOperation;
-import org.apache.olingo.commons.api.domain.ODataPrimitiveValue;
import org.apache.olingo.commons.api.domain.ODataValue;
import org.apache.olingo.commons.api.domain.v3.ODataEntity;
import org.apache.olingo.commons.api.domain.v3.ODataEntitySet;
import org.apache.olingo.commons.api.domain.v3.ODataProperty;
-import org.apache.olingo.commons.api.edm.Edm;
-import org.apache.olingo.commons.api.edm.EdmAction;
-import org.apache.olingo.commons.api.edm.EdmEntityContainer;
-import org.apache.olingo.commons.api.edm.EdmFunction;
-import org.apache.olingo.commons.api.edm.EdmFunctionImport;
-import org.apache.olingo.commons.api.edm.EdmParameter;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.format.ODataPubFormat;
-import org.apache.olingo.commons.core.edm.EdmTypeInfo;
import org.junit.Test;
public class InvokeTestITCase extends AbstractTestITCase {
private void getWithNoParams(final ODataPubFormat format) {
- final Edm edm = getClient().getRetrieveRequestFactory().
- getMetadataRequest(testStaticServiceRootURL).execute().getBody();
- assertNotNull(edm);
-
- final EdmEntityContainer container = edm.getSchemas().get(0).getEntityContainer();
-
// 1. get primitive value property
- EdmFunctionImport funcImp = container.getFunctionImport("GetPrimitiveString");
- EdmFunction func = funcImp.getUnboundFunction(null);
-
- URIBuilder builder = getClient().getURIBuilder(testStaticServiceRootURL).
- appendOperationCallSegment(URIUtils.operationImportURISegment(container, funcImp.getName()));
+ URIBuilder builder = getClient().newURIBuilder(testStaticServiceRootURL).
+ appendOperationCallSegment("GetPrimitiveString");
ODataInvokeRequest<ODataProperty> req = getClient().getInvokeRequestFactory().
- getInvokeRequest(builder.build(), func);
+ getFunctionInvokeRequest(builder.build(), ODataProperty.class);
req.setFormat(format);
ODataInvokeResponse<ODataProperty> res = req.execute();
assertNotNull(res);
@@ -85,13 +67,10 @@ public class InvokeTestITCase extends AbstractTestITCase {
assertEquals("Foo", property.getPrimitiveValue().toString());
// 2. get collection of complex type property
- funcImp = container.getFunctionImport("EntityProjectionReturnsCollectionOfComplexTypes");
- func = funcImp.getUnboundFunction(null);
+ builder = getClient().newURIBuilder(testStaticServiceRootURL).
+ appendOperationCallSegment("EntityProjectionReturnsCollectionOfComplexTypes");
- builder = getClient().getURIBuilder(testStaticServiceRootURL).
- appendOperationCallSegment(URIUtils.operationImportURISegment(container, funcImp.getName()));
-
- req = getClient().getInvokeRequestFactory().getInvokeRequest(builder.build(), func);
+ req = getClient().getInvokeRequestFactory().getFunctionInvokeRequest(builder.build(), ODataProperty.class);
req.setFormat(format);
res = req.execute();
assertNotNull(res);
@@ -114,26 +93,13 @@ public class InvokeTestITCase extends AbstractTestITCase {
private void getWithParams(final ODataPubFormat format) throws EdmPrimitiveTypeException {
// 1. primitive result
- final Edm edm = getClient().getRetrieveRequestFactory().
- getMetadataRequest(testStaticServiceRootURL).execute().getBody();
- assertNotNull(edm);
-
- final EdmEntityContainer container = edm.getSchemas().get(0).getEntityContainer();
- EdmFunctionImport funcImp = container.getFunctionImport("GetArgumentPlusOne");
-
- URIBuilder builder = getClient().getURIBuilder(testStaticServiceRootURL).
- appendOperationCallSegment(URIUtils.operationImportURISegment(container, funcImp.getName()));
-
- EdmFunction function = funcImp.getUnboundFunction(Collections.singletonList("arg1"));
- EdmParameter param = function.getParameter(function.getParameterNames().get(0));
- ODataPrimitiveValue paramValue = getClient().getObjectFactory().newPrimitiveValueBuilder().
- setType(param.getType()).
- setValue(154).
- build();
+ URIBuilder builder = getClient().newURIBuilder(testStaticServiceRootURL).
+ appendOperationCallSegment("GetArgumentPlusOne");
+ ODataValue param = getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(154);
final ODataInvokeRequest<ODataProperty> primitiveReq = getClient().getInvokeRequestFactory().
- getInvokeRequest(builder.build(), function,
- Collections.<String, ODataValue>singletonMap(param.getName(), paramValue));
+ getFunctionInvokeRequest(builder.build(), ODataProperty.class,
+ Collections.<String, ODataValue>singletonMap("arg1", param));
primitiveReq.setFormat(format);
final ODataInvokeResponse<ODataProperty> primitiveRes = primitiveReq.execute();
@@ -143,22 +109,13 @@ public class InvokeTestITCase extends AbstractTestITCase {
assertNotNull(property);
assertEquals(Integer.valueOf(155), property.getPrimitiveValue().toCastValue(Integer.class));
- // 2. feed result
- funcImp = container.getFunctionImport("GetSpecificCustomer");
-
- builder = getClient().getURIBuilder(testStaticServiceRootURL).
- appendOperationCallSegment(URIUtils.operationImportURISegment(container, funcImp.getName()));
-
- function = funcImp.getUnboundFunction(Collections.singletonList("Name"));
- param = function.getParameter(function.getParameterNames().get(0));
- paramValue = getClient().getObjectFactory().newPrimitiveValueBuilder().
- setType(param.getType()).
- setValue(StringUtils.EMPTY).
- build();
+ // 2. entity set result
+ builder = getClient().newURIBuilder(testStaticServiceRootURL).appendOperationCallSegment("GetSpecificCustomer");
+ param = getClient().getObjectFactory().newPrimitiveValueBuilder().buildString(StringUtils.EMPTY);
final ODataInvokeRequest<ODataEntitySet> feedReq = getClient().getInvokeRequestFactory().
- getInvokeRequest(builder.build(), function,
- Collections.<String, ODataValue>singletonMap(param.getName(), paramValue));
+ getFunctionInvokeRequest(builder.build(), ODataEntitySet.class,
+ Collections.<String, ODataValue>singletonMap("Name", param));
feedReq.setFormat(format);
final ODataInvokeResponse<ODataEntitySet> feedRes = feedReq.execute();
@@ -199,7 +156,7 @@ public class InvokeTestITCase extends AbstractTestITCase {
employee.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty(
"Title", getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("CEO")));
- final URIBuilder uriBuilder = getClient().getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Person");
+ final URIBuilder uriBuilder = getClient().newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Person");
final ODataEntityCreateRequest<ODataEntity> createReq =
getClient().getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), employee);
@@ -213,7 +170,7 @@ public class InvokeTestITCase extends AbstractTestITCase {
}
private void deleteEmployee(final ODataPubFormat format, final Integer id) {
- final URIBuilder uriBuilder = getClient().getURIBuilder(testStaticServiceRootURL).
+ final URIBuilder uriBuilder = getClient().newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Person").appendKeySegment(id);
final ODataDeleteRequest deleteReq = getClient().getCUDRequestFactory().getDeleteRequest(uriBuilder.build());
@@ -233,24 +190,15 @@ public class InvokeTestITCase extends AbstractTestITCase {
// 1. invoke action bound with the employee just created
final ODataOperation operation = created.getOperations().get(0);
- final Edm edm = getClient().getRetrieveRequestFactory().
- getMetadataRequest(testStaticServiceRootURL).execute().getBody();
- assertNotNull(edm);
-
- final EdmEntityContainer container = edm.getSchemas().get(0).getEntityContainer();
- final EdmAction action = edm.getBoundAction(
- new FullQualifiedName(container.getNamespace(), operation.getTitle()),
- created.getTypeName(), false);
-
final ODataInvokeRequest<ODataNoContent> req = getClient().getInvokeRequestFactory().
- getInvokeRequest(operation.getTarget(), action);
+ getActionInvokeRequest(operation.getTarget(), ODataNoContent.class);
req.setFormat(ODataPubFormat.JSON_FULL_METADATA);
final ODataInvokeResponse<ODataNoContent> res = req.execute();
assertNotNull(res);
assertEquals(204, res.getStatusCode());
// 2. check that invoked action has effectively run
- final URIBuilder uriBuilder = getClient().getURIBuilder(testStaticServiceRootURL).
+ final URIBuilder uriBuilder = getClient().newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Person").appendKeySegment(createdId);
final ODataEntityRequest<ODataEntity> retrieveRes =
getClient().getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
@@ -266,7 +214,7 @@ public class InvokeTestITCase extends AbstractTestITCase {
@Test
public void boundPostWithParams() throws EdmPrimitiveTypeException {
// 1. read employees and store their current salary
- final URIBuilder builder = getClient().getURIBuilder(testStaticServiceRootURL).
+ final URIBuilder builder = getClient().newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Person").
appendEntitySetSegment("Microsoft.Test.OData.Services.AstoriaDefaultService.Employee");
final URI employeesURI = builder.build();
@@ -281,27 +229,11 @@ public class InvokeTestITCase extends AbstractTestITCase {
assertFalse(preSalaries.isEmpty());
// 2. invoke action bound, with additional parameter
- final Edm edm = getClient().getRetrieveRequestFactory().
- getMetadataRequest(testStaticServiceRootURL).execute().getBody();
- assertNotNull(edm);
-
- final EdmEntityContainer container = edm.getSchemas().get(0).getEntityContainer();
-
- final EdmTypeInfo employeesTypeInfo = new EdmTypeInfo.Builder().setEdm(edm).
- setTypeExpression("Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Employee)").build();
- final EdmAction action = edm.getBoundAction(
- new FullQualifiedName(container.getNamespace(), "IncreaseSalaries"),
- employeesTypeInfo.getFullQualifiedName(), employeesTypeInfo.isCollection());
-
- final EdmParameter param = action.getParameter(action.getParameterNames().get(1));
- final ODataPrimitiveValue paramValue = getClient().getObjectFactory().newPrimitiveValueBuilder().
- setType(param.getType()).
- setValue(1).
- build();
-
- final ODataInvokeRequest<ODataNoContent> req = getClient().getInvokeRequestFactory().getInvokeRequest(
- builder.appendOperationCallSegment(action.getName()).build(), action,
- Collections.<String, ODataValue>singletonMap(param.getName(), paramValue));
+ final ODataValue param = getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(1);
+ final ODataInvokeRequest<ODataNoContent> req = getClient().getInvokeRequestFactory().
+ getActionInvokeRequest(
+ builder.appendOperationCallSegment("IncreaseSalaries").build(), ODataNoContent.class,
+ Collections.<String, ODataValue>singletonMap("n", param));
final ODataInvokeResponse<ODataNoContent> res = req.execute();
assertNotNull(res);
assertEquals(204, res.getStatusCode());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/35e89699/fit/src/test/java/org/apache/olingo/fit/v3/KeyAsSegmentTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/KeyAsSegmentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/KeyAsSegmentTestITCase.java
index 7a1bebc..30c2d99 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/KeyAsSegmentTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/KeyAsSegmentTestITCase.java
@@ -39,7 +39,7 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase {
}
private void read(final ODataPubFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(testKeyAsSegmentServiceRootURL).
+ final URIBuilder uriBuilder = client.newURIBuilder(testKeyAsSegmentServiceRootURL).
appendEntitySetSegment("Customer").appendKeySegment(-10);
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
@@ -90,7 +90,7 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase {
@Test
public void replaceODataEntityAsAtom() {
final ODataPubFormat format = ODataPubFormat.ATOM;
- final ODataEntity changes = read(format, client.getURIBuilder(testKeyAsSegmentServiceRootURL).
+ final ODataEntity changes = read(format, client.newURIBuilder(testKeyAsSegmentServiceRootURL).
appendEntitySetSegment("Car").appendKeySegment(14).build());
updateEntityDescription(format, changes, UpdateType.REPLACE);
}
@@ -98,7 +98,7 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase {
@Test
public void replaceODataEntityAsJSON() {
final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final ODataEntity changes = read(format, client.getURIBuilder(testKeyAsSegmentServiceRootURL).
+ final ODataEntity changes = read(format, client.newURIBuilder(testKeyAsSegmentServiceRootURL).
appendEntitySetSegment("Car").appendKeySegment(14).build());
updateEntityDescription(format, changes, UpdateType.REPLACE);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/35e89699/fit/src/test/java/org/apache/olingo/fit/v3/LinkTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/LinkTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/LinkTestITCase.java
index 5edf429..54b0774 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/LinkTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/LinkTestITCase.java
@@ -49,7 +49,7 @@ public class LinkTestITCase extends AbstractTestITCase {
}
private ODataLinkCollection doRetrieveLinkURIs(final ODataFormat format, final String linkname) throws IOException {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()).
+ final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Customer").appendKeySegment(-10);
final ODataLinkCollectionRequest req =
@@ -95,7 +95,7 @@ public class LinkTestITCase extends AbstractTestITCase {
final ODataLink newLink = client.getObjectFactory().
newAssociationLink(URI.create(getServiceRoot() + "/Login('3')"));
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()).
+ final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Customer").appendKeySegment(-10).appendLinksSegment("Logins");
final ODataLinkCreateRequest req =
@@ -113,7 +113,7 @@ public class LinkTestITCase extends AbstractTestITCase {
assertEquals(Collections.singletonList(newLink.getLink()), after);
assertEquals(204, client.getCUDRequestFactory().getDeleteRequest(
- client.getURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer").
+ client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer").
appendKeySegment(-10).appendLinksSegment("Logins('3')").build()).execute().getStatusCode());
}
@@ -135,7 +135,7 @@ public class LinkTestITCase extends AbstractTestITCase {
ODataLink newLink = client.getObjectFactory().
newAssociationLink(URI.create(getServiceRoot() + "/CustomerInfo(12)"));
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot());
+ final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot());
uriBuilder.appendEntitySetSegment("Customer").appendKeySegment(-10).appendLinksSegment("Info");
ODataLinkUpdateRequest req =
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/35e89699/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java
index 5ae7e9e..7383c1b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java
@@ -47,7 +47,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
@Test
public void read() throws Exception {
- final URIBuilder builder = client.getURIBuilder(testStaticServiceRootURL).
+ final URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Car").appendKeySegment(12);
final ODataMediaRequest retrieveReq = client.getRetrieveRequestFactory().getMediaEntityRequest(builder.build());
@@ -63,7 +63,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
@Test(expected = ODataClientErrorException.class)
public void readWithXmlError() throws Exception {
final URIBuilder builder =
- client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car").appendKeySegment(12);
+ client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car").appendKeySegment(12);
final ODataMediaRequest retrieveReq = client.getRetrieveRequestFactory().getMediaEntityRequest(builder.build());
retrieveReq.setFormat(ODataMediaFormat.APPLICATION_XML);
@@ -74,7 +74,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
@Test(expected = ODataClientErrorException.class)
public void readWithJsonError() throws Exception {
final URIBuilder builder =
- client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car").appendKeySegment(12);
+ client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car").appendKeySegment(12);
final ODataMediaRequest retrieveReq = client.getRetrieveRequestFactory().getMediaEntityRequest(builder.build());
retrieveReq.setFormat(ODataMediaFormat.APPLICATION_JSON);
@@ -84,7 +84,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
private void updateMediaEntity(final ODataPubFormat format, final int id) throws Exception {
final URIBuilder builder =
- client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car").appendKeySegment(id);
+ client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car").appendKeySegment(id);
final String TO_BE_UPDATED = "new buffered stream sample";
final InputStream input = IOUtils.toInputStream(TO_BE_UPDATED);
@@ -115,7 +115,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
}
private void createMediaEntity(final ODataPubFormat format, final InputStream input) throws Exception {
- final URIBuilder builder = client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car");
+ final URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car");
final ODataMediaEntityCreateRequest<ODataEntity> createReq =
client.getCUDRequestFactory().getMediaEntityCreateRequest(builder.build(), input);
@@ -163,7 +163,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
@Test
public void updateNamedStream() throws Exception {
- URIBuilder builder = client.getURIBuilder(testStaticServiceRootURL).
+ URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Car").appendKeySegment(16).appendNavigationSegment("Photo");
final String TO_BE_UPDATED = "buffered stream sample";
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/35e89699/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java
index b3490a0..05d8a07 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java
@@ -53,7 +53,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
}
private ODataEntity readRow(final ODataPubFormat format, final String uuid) {
- final URIBuilder builder = getClient().getURIBuilder(testOpenTypeServiceRootURL).
+ final URIBuilder builder = getClient().newURIBuilder(testOpenTypeServiceRootURL).
appendEntitySetSegment("Row").appendKeySegment(UUID.fromString(uuid));
return read(format, builder.build());
}
@@ -139,13 +139,13 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
getClient().getObjectFactory().newComplexProperty("aContact", contactDetails));
final ODataEntityCreateRequest<ODataEntity> createReq = getClient().getCUDRequestFactory().
- getEntityCreateRequest(getClient().getURIBuilder(testOpenTypeServiceRootURL).
+ getEntityCreateRequest(getClient().newURIBuilder(testOpenTypeServiceRootURL).
appendEntitySetSegment("RowIndex").build(), rowIndex);
createReq.setFormat(format);
final ODataEntityCreateResponse<ODataEntity> createRes = createReq.execute();
assertEquals(201, createRes.getStatusCode());
- final URIBuilder builder = getClient().getURIBuilder(testOpenTypeServiceRootURL).
+ final URIBuilder builder = getClient().newURIBuilder(testOpenTypeServiceRootURL).
appendEntitySetSegment("RowIndex").appendKeySegment(id);
rowIndex = read(format, builder.build());
assertNotNull(rowIndex);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/35e89699/fit/src/test/java/org/apache/olingo/fit/v3/PrimitiveKeysTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/PrimitiveKeysTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/PrimitiveKeysTestITCase.java
index 079439b..73c7d9d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/PrimitiveKeysTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/PrimitiveKeysTestITCase.java
@@ -34,7 +34,7 @@ public class PrimitiveKeysTestITCase extends AbstractTestITCase {
private void readEntity(final String entityType, final Object key, final ODataPubFormat format) {
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(
- client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment(entityType).
+ client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment(entityType).
appendKeySegment(key).
build());
req.setFormat(format);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/35e89699/fit/src/test/java/org/apache/olingo/fit/v3/PropertyRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyRetrieveTestITCase.java
index 7e67e54..0904df8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyRetrieveTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyRetrieveTestITCase.java
@@ -43,7 +43,7 @@ import org.junit.Test;
public class PropertyRetrieveTestITCase extends AbstractTestITCase {
private void retrievePropertyTest(final ODataFormat format, String entitySegment, String structuralSegment) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment(entitySegment).appendPropertySegment(structuralSegment);
final ODataPropertyRequest<ODataProperty> req = client.getRetrieveRequestFactory().
getPropertyRequest(uriBuilder.build());
@@ -209,7 +209,7 @@ public class PropertyRetrieveTestITCase extends AbstractTestITCase {
@Test
public void navigationMediaLink() {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendNavigationSegment("Product").appendKeySegment(-7).appendLinksSegment("Photos");
final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
getEntitySetRequest(uriBuilder.build());
@@ -233,7 +233,7 @@ public class PropertyRetrieveTestITCase extends AbstractTestITCase {
@Test
public void navigationMediaLinkInvalidQuery() {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendNavigationSegment("Product").appendKeySegment(-7).appendLinksSegment("Photo");
final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
getEntitySetRequest(uriBuilder.build());
@@ -257,7 +257,7 @@ public class PropertyRetrieveTestITCase extends AbstractTestITCase {
@Test
public void navigationMediaLinkInvalidFormat() {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendNavigationSegment("Product").appendKeySegment(-7).appendLinksSegment("Photos");
final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
getEntitySetRequest(uriBuilder.build());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/35e89699/fit/src/test/java/org/apache/olingo/fit/v3/PropertyTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyTestITCase.java
index c9c1c00..e1fa1d4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyTestITCase.java
@@ -124,7 +124,7 @@ public class PropertyTestITCase extends AbstractTestITCase {
@Test
public void readCountValue() throws IOException {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot());
+ final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot());
uriBuilder.appendEntitySetSegment("Customer").count();
final ODataValueRequest req = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
@@ -143,7 +143,7 @@ public class PropertyTestITCase extends AbstractTestITCase {
@Test
public void nullNullableProperty() {
- final ODataDeleteResponse res = client.getCUDRequestFactory().getDeleteRequest(client.getURIBuilder(
+ final ODataDeleteResponse res = client.getCUDRequestFactory().getDeleteRequest(client.newURIBuilder(
getServiceRoot()).
appendEntitySetSegment("Order").appendKeySegment(-8).
appendPropertySegment("CustomerId").appendValueSegment().build()).
@@ -153,7 +153,7 @@ public class PropertyTestITCase extends AbstractTestITCase {
@Test(expected = ODataClientErrorException.class)
public void nullNonNullableProperty() {
- client.getCUDRequestFactory().getDeleteRequest(client.getURIBuilder(getServiceRoot()).
+ client.getCUDRequestFactory().getDeleteRequest(client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Driver").appendKeySegment("1").
appendPropertySegment("BirthDate").appendValueSegment().build()).
execute();
@@ -162,7 +162,7 @@ public class PropertyTestITCase extends AbstractTestITCase {
private void updatePropertyValue(final ODataValueFormat format, final UpdateType type)
throws IOException, EdmPrimitiveTypeException {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()).
+ final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Customer").appendKeySegment(-9).
appendPropertySegment("PrimaryContactInfo").
appendPropertySegment("HomePhone").
@@ -204,7 +204,7 @@ public class PropertyTestITCase extends AbstractTestITCase {
}
private void updateComplexProperty(final ODataFormat format, final UpdateType type) throws IOException {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()).
+ final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Customer").appendKeySegment(-9).appendPropertySegment("PrimaryContactInfo");
ODataPropertyRequest<ODataProperty> retrieveReq = client.getRetrieveRequestFactory().
@@ -251,7 +251,7 @@ public class PropertyTestITCase extends AbstractTestITCase {
}
private void updateCollectionProperty(final ODataFormat format) throws IOException {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot());
+ final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot());
uriBuilder.appendEntitySetSegment("Customer").appendKeySegment(-10).
appendPropertySegment("PrimaryContactInfo").appendPropertySegment("AlternativeNames");
@@ -299,7 +299,7 @@ public class PropertyTestITCase extends AbstractTestITCase {
}
private void updatePrimitiveProperty(final ODataFormat format) throws IOException, EdmPrimitiveTypeException {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot());
+ final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot());
uriBuilder.appendEntitySetSegment("Customer").appendKeySegment(-9).
appendPropertySegment("PrimaryContactInfo").
appendPropertySegment("HomePhone").appendPropertySegment("PhoneNumber");
@@ -344,7 +344,7 @@ public class PropertyTestITCase extends AbstractTestITCase {
}
private void rawRequest(final ODataFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()).
+ final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Customer").appendKeySegment(-10).appendPropertySegment("BackupContactInfo");
final ODataRawRequest req = client.getRetrieveRequestFactory().getRawRequest(uriBuilder.build());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/35e89699/fit/src/test/java/org/apache/olingo/fit/v3/PropertyValueTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyValueTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyValueTestITCase.java
index 4914eb5..2c8c9d9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyValueTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyValueTestITCase.java
@@ -34,7 +34,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveIntPropertyValueTest() {
- CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Product").appendKeySegment(-10).appendPropertySegment("ProductId");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
req.setFormat(ODataValueFormat.TEXT);
@@ -45,7 +45,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveBooleanPropertyValueTest() {
- CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Product").appendKeySegment(-10).appendPropertySegment("ProductId");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
req.setFormat(ODataValueFormat.TEXT);
@@ -56,7 +56,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveStringPropertyValueTest() {
- CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Product").appendKeySegment(-6).appendPropertySegment("Description");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
req.setFormat(ODataValueFormat.TEXT);
@@ -67,7 +67,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveDatePropertyValueTest() {
- CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Product").appendKeySegment(-7).appendPropertySegment(
"NestedComplexConcurrency/ModifiedDate");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
@@ -79,7 +79,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveDecimalPropertyValueTest() {
- CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Product").appendKeySegment(-6).appendPropertySegment("Dimensions/Height");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
req.setFormat(ODataValueFormat.TEXT);
@@ -90,7 +90,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveBinaryPropertyValueTest() throws IOException {
- CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendNavigationSegment("ProductPhoto(PhotoId=-3,ProductId=-3)").appendPropertySegment("Photo");
ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setAccept("application/json");
@@ -105,7 +105,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test(expected = ODataClientErrorException.class)
public void retrieveBinaryPropertyValueTestWithAtom() throws IOException {
- CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendNavigationSegment("ProductPhoto(PhotoId=-3,ProductId=-3)").appendPropertySegment("Photo");
ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setAccept("application/atom+xml");
@@ -120,7 +120,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test(expected = IllegalArgumentException.class)
public void retrieveBinaryPropertyValueTestWithXML() throws IOException {
- CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendNavigationSegment("ProductPhoto(PhotoId=-3,ProductId=-3)").appendPropertySegment("Photo");
ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setAccept("application/xml");
@@ -135,7 +135,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveCollectionPropertyValueTest() {
- CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Product").appendKeySegment(-7).appendPropertySegment(
"ComplexConcurrency/QueriedDateTime");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
@@ -149,7 +149,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveNullPropertyValueTest() {
- CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Product").appendKeySegment(-10).appendPropertySegment(
"ComplexConcurrency/Token");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/35e89699/fit/src/test/java/org/apache/olingo/fit/v3/QueryOptionsTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/QueryOptionsTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/QueryOptionsTestITCase.java
index 72ea453..1c0f8bd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/QueryOptionsTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/QueryOptionsTestITCase.java
@@ -60,7 +60,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
*/
@Test
public void filterOrderby() throws EdmPrimitiveTypeException {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Car").filter("(VIN lt 16)");
// 1. check that filtered entity set looks as expected
@@ -100,7 +100,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
*/
@Test
public void format() {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Customer").appendKeySegment(-10).format("json");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
@@ -135,7 +135,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
*/
@Test
public void skiptoken() throws EdmPrimitiveTypeException {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL);
+ final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL);
uriBuilder.appendEntitySetSegment("Customer").skipToken("-10");
final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
@@ -154,7 +154,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
*/
@Test
public void inlinecount() {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car").
+ final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car").
inlineCount(InlineCount.allpages);
final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
@@ -170,7 +170,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
*/
@Test
public void select() {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Customer").appendKeySegment(-10).select("CustomerId,Orders").expand("Orders");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
@@ -182,7 +182,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
@Test
public void issue131() {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Customer").appendKeySegment(-7).select("Name");
ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/35e89699/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
index 8fed8f7..32a6e19 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
@@ -131,7 +131,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
order.getProperties().add(orderShelfLifes);
final ODataEntityCreateRequest<ODataEntity> req = getClient().getCUDRequestFactory().getEntityCreateRequest(
- getClient().getURIBuilder(testStaticServiceRootURL).
+ getClient().newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Orders").build(), order);
req.setFormat(format);
final ODataEntity created = req.execute().getBody();
@@ -139,7 +139,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
assertEquals(2, created.getProperty("OrderShelfLifes").getCollectionValue().size());
final URI deleteURI = created.getEditLink() == null
- ? getClient().getURIBuilder(testStaticServiceRootURL).
+ ? getClient().newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Orders").appendKeySegment(id).build()
: created.getEditLink();
final ODataDeleteRequest deleteReq = getClient().getCUDRequestFactory().getDeleteRequest(deleteURI);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/35e89699/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
index bff5993..edeeae5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
@@ -46,7 +46,7 @@ public class AsyncTestITCase extends AbstractTestITCase {
@Test
public void clientAsync() throws InterruptedException, ExecutionException {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Customers");
final Future<ODataRetrieveResponse<ODataEntitySet>> futureRes =
client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build()).asyncExecute();
@@ -63,7 +63,7 @@ public class AsyncTestITCase extends AbstractTestITCase {
}
private void withInlineEntry(final ODataPubFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
@@ -130,7 +130,7 @@ public class AsyncTestITCase extends AbstractTestITCase {
}
private void asyncOrders(final ODataPubFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
+ final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("async").appendEntitySetSegment("Orders");
final ODataEntitySetRequest<ODataEntitySet> req =
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/35e89699/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java
index ef568b8..daf4ed2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java
@@ -122,7 +122,7 @@ public class BatchTestITCase extends AbstractTestITCase {
URIBuilder targetURI;
ODataEntityCreateRequest<ODataEntity> createReq;
- targetURI = client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Orders");
+ targetURI = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Orders");
for (int i = 1; i <= 2; i++) {
// Create Customer into the changeset
createReq = client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), newOrder(100 + i));
@@ -130,12 +130,12 @@ public class BatchTestITCase extends AbstractTestITCase {
changeset.addRequest(createReq);
}
- targetURI = client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("WrongEntitySet");
+ targetURI = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("WrongEntitySet");
createReq = client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), newOrder(105));
createReq.setFormat(ODataPubFormat.JSON);
changeset.addRequest(createReq);
- targetURI = client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Orders");
+ targetURI = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Orders");
for (int i = 3; i <= 4; i++) {
// Create Customer into the changeset
createReq = client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), newOrder(100 + i));
@@ -184,7 +184,7 @@ public class BatchTestITCase extends AbstractTestITCase {
// Add retrieve item
// -------------------------------------------
// prepare URI
- URIBuilder targetURI = client.getURIBuilder(testStaticServiceRootURL);
+ URIBuilder targetURI = client.newURIBuilder(testStaticServiceRootURL);
targetURI.appendEntitySetSegment("UnexistinfEntitySet").appendKeySegment(1);
// create new request
@@ -198,7 +198,7 @@ public class BatchTestITCase extends AbstractTestITCase {
// Add retrieve item
// -------------------------------------------
// prepare URI
- targetURI = client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customers").appendKeySegment(1);
+ targetURI = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customers").appendKeySegment(1);
// create new request
queryReq = client.getRetrieveRequestFactory().getEntityRequest(targetURI.build());
@@ -243,7 +243,7 @@ public class BatchTestITCase extends AbstractTestITCase {
final ODataChangeset changeset = streamManager.addChangeset();
ODataEntity order = newOrder(20);
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Orders");
+ final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Orders");
// add create request
final ODataEntityCreateRequest<ODataEntity> createReq =
@@ -258,7 +258,7 @@ public class BatchTestITCase extends AbstractTestITCase {
final ODataEntity customerChanges = client.getObjectFactory().newEntity(order.getTypeName());
customerChanges.addLink(client.getObjectFactory().newEntitySetNavigationLink(
"OrderDetails",
- client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("OrderDetails").
+ client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("OrderDetails").
appendKeySegment(new HashMap<String, Object>() {
private static final long serialVersionUID = 3109256773218160485L;
@@ -328,7 +328,7 @@ public class BatchTestITCase extends AbstractTestITCase {
// Add retrieve item
// -------------------------------------------
// prepare URI
- URIBuilder targetURI = client.getURIBuilder(testStaticServiceRootURL);
+ URIBuilder targetURI = client.newURIBuilder(testStaticServiceRootURL);
targetURI.appendEntitySetSegment("Customers").appendKeySegment(1).
expand("Orders").select("PersonID,Orders/OrderID");
@@ -343,7 +343,7 @@ public class BatchTestITCase extends AbstractTestITCase {
// Add new order with outside item
// -------------------------------------------
// prepare URI
- targetURI = client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Orders");
+ targetURI = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Orders");
final ODataEntity original = newOrder(2000);
final ODataEntityCreateRequest<ODataEntity> createReq =
client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), original);
@@ -396,7 +396,7 @@ public class BatchTestITCase extends AbstractTestITCase {
// Add retrieve item
// -------------------------------------------
// prepare URI
- URIBuilder targetURI = client.getURIBuilder(testStaticServiceRootURL);
+ URIBuilder targetURI = client.newURIBuilder(testStaticServiceRootURL);
targetURI.appendEntitySetSegment("Customers").appendKeySegment(1);
// create new request
@@ -412,7 +412,7 @@ public class BatchTestITCase extends AbstractTestITCase {
final ODataChangeset changeset = streamManager.addChangeset();
// Update Customer into the changeset
- targetURI = client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customers").appendKeySegment(1);
+ targetURI = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customers").appendKeySegment(1);
final URI editLink = targetURI.build();
final ODataEntity patch = client.getObjectFactory().newEntity(
@@ -430,7 +430,7 @@ public class BatchTestITCase extends AbstractTestITCase {
changeset.addRequest(changeReq);
// Create Order into the changeset
- targetURI = client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Orders");
+ targetURI = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Orders");
final ODataEntity original = newOrder(1000);
final ODataEntityCreateRequest<ODataEntity> createReq =
client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), original);
@@ -442,7 +442,7 @@ public class BatchTestITCase extends AbstractTestITCase {
// Add retrieve item
// -------------------------------------------
// prepare URI
- targetURI = client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customers").appendKeySegment(1);
+ targetURI = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customers").appendKeySegment(1);
// create new request
queryReq = client.getRetrieveRequestFactory().getEntityRequest(targetURI.build());
@@ -520,7 +520,7 @@ public class BatchTestITCase extends AbstractTestITCase {
// Add retrieve item
// -------------------------------------------
// prepare URI
- URIBuilder targetURI = client.getURIBuilder(testStaticServiceRootURL);
+ URIBuilder targetURI = client.newURIBuilder(testStaticServiceRootURL);
targetURI.appendEntitySetSegment("People").appendKeySegment(5);
// create new request
@@ -534,7 +534,7 @@ public class BatchTestITCase extends AbstractTestITCase {
// Add retrieve item
// -------------------------------------------
// prepare URI
- targetURI = client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customers").appendKeySegment(1);
+ targetURI = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customers").appendKeySegment(1);
// create new request
queryReq = client.getRetrieveRequestFactory().getEntityRequest(targetURI.build());