Repository: olingo-odata4 Updated Branches: refs/heads/master 85a3e0e81 -> 569d07f9d
White noise: fixing some imports Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/569d07f9 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/569d07f9 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/569d07f9 Branch: refs/heads/master Commit: 569d07f9d5288f629bbb8554d995683b16bd3ecf Parents: 85a3e0e Author: Francesco Chicchiriccò <[email protected]> Authored: Sat Apr 19 19:20:00 2014 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Sat Apr 19 19:20:00 2014 +0200 ---------------------------------------------------------------------- .../olingo/client/core/ODataClientTest.java | 1 - .../client/core/it/v3/AbstractTestITCase.java | 47 ++++++++++++++------ .../client/core/it/v3/AsyncTestITCase.java | 12 +++-- .../client/core/it/v3/EntitySetTestITCase.java | 12 +++-- .../client/core/it/v3/ErrorTestITCase.java | 24 +++++----- .../core/it/v3/FilterFactoryTestITCase.java | 10 ++--- .../client/core/it/v3/FilterTestITCase.java | 10 ++--- .../core/it/v3/PrimitiveKeysTestITCase.java | 3 +- .../client/core/it/v3/PropertyTestITCase.java | 33 +++++++------- .../core/it/v3/QueryOptionsTestITCase.java | 22 ++++----- .../client/core/it/v4/BatchTestITCase.java | 5 +-- .../core/it/v4/EntityRetrieveTestITCase.java | 1 - .../client/core/it/v4/EntitySetTestITCase.java | 14 +++--- .../it/v4/OperationImportInvokeTestITCase.java | 2 +- .../olingo/client/core/v3/EntitySetTest.java | 3 +- 15 files changed, 104 insertions(+), 95 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/569d07f9/lib/client-core/src/test/java/org/apache/olingo/client/core/ODataClientTest.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/ODataClientTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/ODataClientTest.java index bb882b8..cce9881 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/ODataClientTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/ODataClientTest.java @@ -22,7 +22,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertEquals; import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/569d07f9/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/AbstractTestITCase.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/AbstractTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/AbstractTestITCase.java index 36f45b9..1f2f69a 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/AbstractTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/AbstractTestITCase.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.client.core.it.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.io.IOException; import java.net.URI; import java.util.ArrayList; @@ -46,7 +39,7 @@ import org.apache.olingo.client.api.communication.response.ODataEntityCreateResp import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.client.api.uri.CommonURIBuilder; +import org.apache.olingo.client.api.uri.v3.URIBuilder; import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.client.core.it.AbstractBaseTestITCase; @@ -64,6 +57,32 @@ import org.apache.olingo.commons.api.domain.v3.ODataEntity; import org.apache.olingo.commons.api.domain.v3.ODataProperty; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataPubFormat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.junit.Assert.fail; +import static org.junit.Assert.fail; +import static org.junit.Assert.fail; +import static org.junit.Assert.fail; + import org.junit.BeforeClass; public abstract class AbstractTestITCase extends AbstractBaseTestITCase { @@ -181,13 +200,13 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase { original.getClass().getSimpleName(), actual.getClass().getSimpleName()); if (original.isComplex()) { - final List<CommonODataProperty> originalFileds = new ArrayList<CommonODataProperty>(); - for (CommonODataProperty prop : original.asComplex()) { + final List<ODataProperty> originalFileds = new ArrayList<ODataProperty>(); + for (ODataProperty prop : original.<ODataProperty>asComplex()) { originalFileds.add(prop); } - final List<CommonODataProperty> actualFileds = new ArrayList<CommonODataProperty>(); - for (CommonODataProperty prop : actual.asComplex()) { + final List<ODataProperty> actualFileds = new ArrayList<ODataProperty>(); + for (ODataProperty prop : actual.<ODataProperty>asComplex()) { actualFileds.add(prop); } @@ -326,7 +345,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase { final ODataEntity original, final String entitySetName) { - final CommonURIBuilder<?> uriBuilder = getClient().getURIBuilder(serviceRootURL). + final URIBuilder uriBuilder = getClient().getURIBuilder(serviceRootURL). appendEntitySetSegment(entitySetName); debugODataEntity(original, "About to create"); @@ -353,7 +372,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase { final int actualObjectId, final Collection<String> expands) { - final CommonURIBuilder<?> uriBuilder = getClient().getURIBuilder(serviceRootURL). + final URIBuilder uriBuilder = getClient().getURIBuilder(serviceRootURL). appendEntitySetSegment("Customer").appendKeySegment(actualObjectId); // search expanded http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/569d07f9/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/AsyncTestITCase.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/AsyncTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/AsyncTestITCase.java index a5a60b9..1864abc 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/AsyncTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/AsyncTestITCase.java @@ -35,8 +35,7 @@ import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEnt import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; import org.apache.olingo.client.api.communication.response.ODataMediaEntityCreateResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.uri.CommonURIBuilder; -import org.apache.olingo.commons.api.domain.CommonODataEntity; +import org.apache.olingo.client.api.uri.v3.URIBuilder; import org.apache.olingo.commons.api.domain.v3.ODataEntity; import org.apache.olingo.commons.api.domain.v3.ODataEntitySet; import org.junit.Test; @@ -45,7 +44,7 @@ public class AsyncTestITCase extends AbstractTestITCase { @Test public void retrieveEntitySet() throws InterruptedException, ExecutionException { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL). + final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL). appendEntitySetSegment("Product"); final Future<ODataRetrieveResponse<ODataEntitySet>> futureRes = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build()).asyncExecute(); @@ -97,7 +96,7 @@ public class AsyncTestITCase extends AbstractTestITCase { */ @Test public void createMediaEntity() throws Exception { - CommonURIBuilder<?> builder = client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car"); + URIBuilder builder = client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car"); final String TO_BE_UPDATED = "async buffered stream sample"; final InputStream input = IOUtils.toInputStream(TO_BE_UPDATED); @@ -112,11 +111,10 @@ public class AsyncTestITCase extends AbstractTestITCase { Thread.sleep(1000L); } - final ODataMediaEntityCreateResponse createRes = futureCreateRes.get(); - + final ODataMediaEntityCreateResponse<ODataEntity> createRes = futureCreateRes.get(); assertEquals(201, createRes.getStatusCode()); - final CommonODataEntity created = createRes.getBody(); + final ODataEntity created = createRes.getBody(); assertNotNull(created); assertEquals(2, created.getProperties().size()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/569d07f9/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java index 90e2674..a8b1c51 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java @@ -30,10 +30,8 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataRawReque import org.apache.olingo.client.api.communication.response.ODataRawResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.domain.ODataEntitySetIterator; -import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.api.uri.v3.URIBuilder; import org.apache.olingo.client.core.uri.URIUtils; -import org.apache.olingo.commons.api.domain.CommonODataEntitySet; import org.apache.olingo.commons.api.domain.v3.ODataEntity; import org.apache.olingo.commons.api.domain.v3.ODataEntitySet; import org.apache.olingo.commons.api.format.ODataPubFormat; @@ -100,7 +98,7 @@ public class EntitySetTestITCase extends AbstractTestITCase { } private void readEntitySetWithNextLink(final ODataPubFormat format) { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(getServiceRoot()); + final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()); uriBuilder.appendEntitySetSegment("Customer"); final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory(). @@ -125,7 +123,7 @@ public class EntitySetTestITCase extends AbstractTestITCase { } private void readODataEntitySetIterator(final ODataPubFormat format) { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(getServiceRoot()); + final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()); uriBuilder.appendEntitySetSegment("Customer"); final ODataEntitySetIteratorRequest<ODataEntitySet, ODataEntity> req = @@ -157,12 +155,12 @@ public class EntitySetTestITCase extends AbstractTestITCase { final ODataRawResponse res = req.execute(); assertNotNull(res); - final CommonODataEntitySet entitySet = res.getBodyAs(CommonODataEntitySet.class); + final ODataEntitySet entitySet = res.getBodyAs(ODataEntitySet.class); assertEquals(10, entitySet.getCount()); } private void rawRequest(final ODataPubFormat format) { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(getServiceRoot()); + final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()); uriBuilder.appendEntitySetSegment("Car"); final ODataRawRequest req = client.getRetrieveRequestFactory().getRawRequest(uriBuilder.build()); @@ -171,7 +169,7 @@ public class EntitySetTestITCase extends AbstractTestITCase { final ODataRawResponse res = req.execute(); assertNotNull(res); - final CommonODataEntitySet entitySet = res.getBodyAs(CommonODataEntitySet.class); + final ODataEntitySet entitySet = res.getBodyAs(ODataEntitySet.class); assertNotNull(entitySet); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/569d07f9/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ErrorTestITCase.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ErrorTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ErrorTestITCase.java index ced5338..d5d575d 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ErrorTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ErrorTestITCase.java @@ -21,26 +21,24 @@ package org.apache.olingo.client.core.it.v3; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; - import static org.junit.Assert.fail; + import java.io.ByteArrayInputStream; import java.io.InputStream; import java.net.URI; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; -import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; import org.apache.olingo.client.api.communication.response.ODataInvokeResponse; import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.client.api.uri.CommonURIBuilder; 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.CommonODataEntity; 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; @@ -56,7 +54,7 @@ import org.junit.Test; public class ErrorTestITCase extends AbstractTestITCase { private class ErrorGeneratingRequest - extends AbstractODataBasicRequest<ODataEntityCreateResponse, ODataPubFormat> { + extends AbstractODataBasicRequest<ODataEntityCreateResponse<ODataEntity>, ODataPubFormat> { public ErrorGeneratingRequest(final HttpMethod method, final URI uri) { super(client, ODataPubFormat.class, method, uri); @@ -68,31 +66,29 @@ public class ErrorTestITCase extends AbstractTestITCase { } @Override - public ODataEntityCreateResponse execute() { + public ODataEntityCreateResponse<ODataEntity> execute() { final HttpResponse res = doExecute(); return new ErrorResponseImpl(client, httpClient, res); } - private class ErrorResponseImpl extends AbstractODataResponse implements ODataEntityCreateResponse { - - private final CommonODataClient odataClient; + private class ErrorResponseImpl extends AbstractODataResponse implements ODataEntityCreateResponse<ODataEntity> { - public ErrorResponseImpl( - final CommonODataClient odataClient, final HttpClient client, final HttpResponse res) { + private final ODataClient odataClient; + public ErrorResponseImpl(final ODataClient odataClient, final HttpClient client, final HttpResponse res) { super(client, res); this.odataClient = odataClient; } @Override - public CommonODataEntity getBody() { + public ODataEntity getBody() { return odataClient.getObjectFactory().newEntity(new FullQualifiedName("Invalid.Invalid")); } } } private void stacktraceError(final ODataPubFormat format) { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL); + final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL); uriBuilder.appendEntitySetSegment("Customer"); final ErrorGeneratingRequest errorReq = new ErrorGeneratingRequest(HttpMethod.POST, uriBuilder.build()); @@ -119,7 +115,7 @@ public class ErrorTestITCase extends AbstractTestITCase { } private void notfoundError(final ODataPubFormat format) { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL); + final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL); uriBuilder.appendEntitySetSegment("Customer(154)"); final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/569d07f9/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterFactoryTestITCase.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterFactoryTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterFactoryTestITCase.java index de6808c..1422df8 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterFactoryTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterFactoryTestITCase.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.client.core.it.v3; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import org.apache.olingo.commons.api.domain.CommonODataEntitySet; -import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.api.uri.URIFilter; import org.apache.olingo.client.api.uri.v3.FilterArgFactory; import org.apache.olingo.client.api.uri.v3.FilterFactory; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - +import org.apache.olingo.client.api.uri.v3.URIBuilder; import org.junit.Test; public class FilterFactoryTestITCase extends AbstractTestITCase { @@ -39,7 +39,7 @@ public class FilterFactoryTestITCase extends AbstractTestITCase { } private void match(final String entitySet, final URIFilter filter, final int expected) { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL). + final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL). appendEntitySetSegment(entitySet).filter(filter); final CommonODataEntitySet feed = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build()). http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/569d07f9/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterTestITCase.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterTestITCase.java index 44be0fe..3204fb0 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterTestITCase.java @@ -18,19 +18,19 @@ */ package org.apache.olingo.client.core.it.v3; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; -import org.apache.olingo.commons.api.domain.CommonODataEntitySet; -import org.apache.olingo.client.api.uri.CommonURIBuilder; +import org.apache.olingo.client.api.uri.v3.URIBuilder; +import org.apache.olingo.commons.api.domain.v3.ODataEntitySet; import org.junit.Test; public class FilterTestITCase extends AbstractTestITCase { private void filterQueryTest(final String entity, final String filter, final int expected) { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL). + final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL). appendEntitySetSegment(entity).filter(filter); - final CommonODataEntitySet entitySet = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build()). + final ODataEntitySet entitySet = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build()). execute().getBody(); assertNotNull(entitySet); assertEquals(expected, entitySet.getEntities().size()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/569d07f9/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PrimitiveKeysTestITCase.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PrimitiveKeysTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PrimitiveKeysTestITCase.java index da65378..d4ecbab 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PrimitiveKeysTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PrimitiveKeysTestITCase.java @@ -25,7 +25,6 @@ import java.math.BigDecimal; import java.util.UUID; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.commons.api.domain.CommonODataEntity; import org.apache.olingo.commons.api.domain.v3.ODataEntity; import org.apache.olingo.commons.api.format.ODataPubFormat; @@ -41,7 +40,7 @@ public class PrimitiveKeysTestITCase extends AbstractTestITCase { req.setFormat(format); final ODataRetrieveResponse<ODataEntity> res = req.execute(); assertEquals(200, res.getStatusCode()); - final CommonODataEntity entity = res.getBody(); + final ODataEntity entity = res.getBody(); assertNotNull(entity); assertNotNull(entity.getProperty("Id")); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/569d07f9/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyTestITCase.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyTestITCase.java index 0204f78..dcaac2b 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyTestITCase.java @@ -18,11 +18,6 @@ */ package org.apache.olingo.client.core.it.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.cud.ODataPropertyUpdateRequest; @@ -37,8 +32,7 @@ import org.apache.olingo.client.api.communication.response.ODataRawResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.communication.response.ODataValueUpdateResponse; import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.client.api.uri.CommonURIBuilder; -import org.apache.olingo.commons.api.domain.CommonODataProperty; +import org.apache.olingo.client.api.uri.v3.URIBuilder; import org.apache.olingo.commons.api.domain.ODataCollectionValue; import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; import org.apache.olingo.commons.api.domain.ODataValue; @@ -46,6 +40,15 @@ import org.apache.olingo.commons.api.domain.v3.ODataProperty; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.format.ODataValueFormat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertTrue; + import org.junit.Test; /** @@ -124,7 +127,7 @@ public class PropertyTestITCase extends AbstractTestITCase { @Test public void readCountValue() throws IOException { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(getServiceRoot()); + final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()); uriBuilder.appendEntitySetSegment("Customer").count(); final ODataValueRequest req = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build()); @@ -162,7 +165,7 @@ public class PropertyTestITCase extends AbstractTestITCase { private void updatePropertyValue(final ODataValueFormat format, final UpdateType type) throws IOException, EdmPrimitiveTypeException { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(getServiceRoot()). + final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()). appendEntitySetSegment("Customer").appendKeySegment(-9). appendPropertySegment("PrimaryContactInfo"). appendPropertySegment("HomePhone"). @@ -205,7 +208,7 @@ public class PropertyTestITCase extends AbstractTestITCase { } private void updateComplexProperty(final ODataFormat format, final UpdateType type) throws IOException { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(getServiceRoot()). + final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()). appendEntitySetSegment("Customer").appendKeySegment(-9).appendPropertySegment("PrimaryContactInfo"); ODataPropertyRequest<ODataProperty> retrieveReq = client.getRetrieveRequestFactory(). @@ -252,7 +255,7 @@ public class PropertyTestITCase extends AbstractTestITCase { } private void updateCollectionProperty(final ODataFormat format) throws IOException { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(getServiceRoot()); + final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()); uriBuilder.appendEntitySetSegment("Customer").appendKeySegment(-10). appendPropertySegment("PrimaryContactInfo").appendPropertySegment("AlternativeNames"); @@ -300,7 +303,7 @@ public class PropertyTestITCase extends AbstractTestITCase { } private void updatePrimitiveProperty(final ODataFormat format) throws IOException, EdmPrimitiveTypeException { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(getServiceRoot()); + final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()); uriBuilder.appendEntitySetSegment("Customer").appendKeySegment(-9). appendPropertySegment("PrimaryContactInfo"). appendPropertySegment("HomePhone").appendPropertySegment("PhoneNumber"); @@ -312,7 +315,7 @@ public class PropertyTestITCase extends AbstractTestITCase { ODataRetrieveResponse<ODataProperty> retrieveRes = retrieveReq.execute(); assertEquals(200, retrieveRes.getStatusCode()); - CommonODataProperty phoneNumber = retrieveRes.getBody(); + ODataProperty phoneNumber = retrieveRes.getBody(); final String oldMsg = phoneNumber.getPrimitiveValue().toCastValue(String.class); final String newMsg = "new item " + System.currentTimeMillis(); @@ -345,7 +348,7 @@ public class PropertyTestITCase extends AbstractTestITCase { } private void rawRequest(final ODataFormat format) { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(getServiceRoot()). + final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()). appendEntitySetSegment("Customer").appendKeySegment(-10).appendPropertySegment("BackupContactInfo"); final ODataRawRequest req = client.getRetrieveRequestFactory().getRawRequest(uriBuilder.build()); @@ -354,7 +357,7 @@ public class PropertyTestITCase extends AbstractTestITCase { final ODataRawResponse res = req.execute(); assertNotNull(res); - final CommonODataProperty property = res.getBodyAs(CommonODataProperty.class); + final ODataProperty property = res.getBodyAs(ODataProperty.class); assertNotNull(property); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/569d07f9/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/QueryOptionsTestITCase.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/QueryOptionsTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/QueryOptionsTestITCase.java index a45da3a..1479efc 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/QueryOptionsTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/QueryOptionsTestITCase.java @@ -24,10 +24,9 @@ import java.util.List; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.uri.CommonURIBuilder; +import org.apache.olingo.client.api.uri.v3.URIBuilder; import org.apache.olingo.client.api.uri.v3.URIBuilder.InlineCount; import org.apache.olingo.commons.api.data.Entry; -import org.apache.olingo.commons.api.domain.CommonODataEntity; import org.apache.olingo.commons.api.domain.ODataInlineEntitySet; import org.apache.olingo.commons.api.domain.v3.ODataEntity; import org.apache.olingo.commons.api.domain.v3.ODataEntitySet; @@ -35,8 +34,11 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.commons.core.data.AtomEntryImpl; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertTrue; import org.junit.Test; @@ -61,7 +63,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase { */ @Test public void filterOrderby() throws EdmPrimitiveTypeException { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL). + final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL). appendEntitySetSegment("Car").filter("(VIN lt 16)"); // 1. check that filtered entity set looks as expected @@ -73,7 +75,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase { // 2. extract VIN values - sorted ASC by default final List<Integer> vinsASC = new ArrayList<Integer>(5); - for (CommonODataEntity entity : feed.getEntities()) { + for (ODataEntity entity : feed.getEntities()) { final Integer vin = entity.getProperty("VIN").getPrimitiveValue().toCastValue(Integer.class); assertTrue(vin < 16); vinsASC.add(vin); @@ -87,7 +89,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase { // 4. extract again VIN value - now they were required to be sorted DESC final List<Integer> vinsDESC = new ArrayList<Integer>(5); - for (CommonODataEntity entity : feed.getEntities()) { + for (ODataEntity entity : feed.getEntities()) { vinsDESC.add(entity.getProperty("VIN").getPrimitiveValue().toCastValue(Integer.class)); } @@ -101,7 +103,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase { */ @Test public void format() { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL). + final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL). appendEntitySetSegment("Customer").appendKeySegment(-10).format("json"); final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build()); @@ -136,7 +138,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase { */ @Test public void skiptoken() throws EdmPrimitiveTypeException { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL); + final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL); uriBuilder.appendEntitySetSegment("Customer").skipToken("-10"); final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory(). @@ -155,7 +157,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase { */ @Test public void inlinecount() { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car"). + final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car"). inlineCount(InlineCount.allpages); final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory(). @@ -171,7 +173,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase { */ @Test public void select() { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL). + final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL). appendEntitySetSegment("Customer").appendKeySegment(-10).select("CustomerId,Orders").expand("Orders"); final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build()); @@ -183,7 +185,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase { @Test public void issue131() { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(testStaticServiceRootURL). + final URIBuilder uriBuilder = client.getURIBuilder(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/569d07f9/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/BatchTestITCase.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/BatchTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/BatchTestITCase.java index d9b7293..27f25c1 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/BatchTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/BatchTestITCase.java @@ -20,6 +20,8 @@ package org.apache.olingo.client.core.it.v4; import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.io.IOException; import java.net.URI; @@ -56,7 +58,6 @@ import org.apache.olingo.client.core.communication.request.batch.ODataRetrieveRe import org.apache.olingo.client.core.communication.request.batch.v4.ODataOutsideUpdateResponseItem; import org.apache.olingo.client.core.communication.request.retrieve.ODataEntityRequestImpl; import org.apache.olingo.client.core.communication.request.retrieve.ODataEntityRequestImpl.ODataEntityResponseImpl; -import static org.apache.olingo.client.core.it.v4.AbstractTestITCase.client; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.commons.api.domain.v4.ODataEntity; import org.apache.olingo.commons.api.domain.v4.ODataEntitySet; @@ -65,8 +66,6 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.format.ODataPubFormat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import org.junit.Test; public class BatchTestITCase extends AbstractTestITCase { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/569d07f9/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/EntityRetrieveTestITCase.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/EntityRetrieveTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/EntityRetrieveTestITCase.java index 9e0b390..db69cca 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/EntityRetrieveTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/EntityRetrieveTestITCase.java @@ -42,7 +42,6 @@ import org.apache.olingo.commons.api.domain.v4.ODataEntity; import org.apache.olingo.commons.api.domain.v4.ODataEntitySet; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.format.ODataPubFormat; - import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/569d07f9/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/EntitySetTestITCase.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/EntitySetTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/EntitySetTestITCase.java index e73004e..1c9e301 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/EntitySetTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/EntitySetTestITCase.java @@ -30,10 +30,8 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataRawReque import org.apache.olingo.client.api.communication.response.ODataRawResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.domain.ODataEntitySetIterator; -import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.api.uri.v4.URIBuilder; import org.apache.olingo.client.core.uri.URIUtils; -import org.apache.olingo.commons.api.domain.CommonODataEntitySet; import org.apache.olingo.commons.api.domain.v4.ODataEntity; import org.apache.olingo.commons.api.domain.v4.ODataEntitySet; import org.apache.olingo.commons.api.format.ODataPubFormat; @@ -99,7 +97,7 @@ public class EntitySetTestITCase extends AbstractTestITCase { } private void readEntitySetWithNextLink(final ODataPubFormat format) { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(getServiceRoot()); + final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()); uriBuilder.appendEntitySetSegment("People"); final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory(). @@ -107,7 +105,7 @@ public class EntitySetTestITCase extends AbstractTestITCase { req.setFormat(format); final ODataRetrieveResponse<ODataEntitySet> res = req.execute(); - final CommonODataEntitySet feed = res.getBody(); + final ODataEntitySet feed = res.getBody(); assertNotNull(feed); @@ -123,7 +121,7 @@ public class EntitySetTestITCase extends AbstractTestITCase { } private void readODataEntitySetIterator(final ODataPubFormat format) { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(getServiceRoot()); + final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()); uriBuilder.appendEntitySetSegment("People"); final ODataEntitySetIteratorRequest<ODataEntitySet, ODataEntity> req = @@ -155,12 +153,12 @@ public class EntitySetTestITCase extends AbstractTestITCase { final ODataRawResponse res = req.execute(); assertNotNull(res); - final CommonODataEntitySet entitySet = res.getBodyAs(CommonODataEntitySet.class); + final ODataEntitySet entitySet = res.getBodyAs(ODataEntitySet.class); assertEquals(5, entitySet.getCount()); } private void rawRequest(final ODataPubFormat format) { - final CommonURIBuilder<?> uriBuilder = client.getURIBuilder(getServiceRoot()); + final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()); uriBuilder.appendEntitySetSegment("People"); final ODataRawRequest req = client.getRetrieveRequestFactory().getRawRequest(uriBuilder.build()); @@ -169,7 +167,7 @@ public class EntitySetTestITCase extends AbstractTestITCase { final ODataRawResponse res = req.execute(); assertNotNull(res); - final CommonODataEntitySet entitySet = res.getBodyAs(CommonODataEntitySet.class); + final ODataEntitySet entitySet = res.getBodyAs(ODataEntitySet.class); assertNotNull(entitySet); assertTrue(res.getContextURL().toASCIIString().endsWith("$metadata#People")); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/569d07f9/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/OperationImportInvokeTestITCase.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/OperationImportInvokeTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/OperationImportInvokeTestITCase.java index 989c152..d6daa34 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/OperationImportInvokeTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/OperationImportInvokeTestITCase.java @@ -262,7 +262,7 @@ public class OperationImportInvokeTestITCase extends AbstractTestITCase { assertTrue(bossEmails.hasCollectionValue()); assertEquals(2, bossEmails.getCollectionValue().size()); - EdmFunctionImport funcImp = container.getFunctionImport("GetBossEmails"); + final EdmFunctionImport funcImp = container.getFunctionImport("GetBossEmails"); final Map<String, ODataValue> params = new LinkedHashMap<String, ODataValue>(2); params.put("start", getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(0)); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/569d07f9/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java index 0400321..67edef3 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java @@ -24,7 +24,6 @@ import static org.junit.Assert.assertEquals; import java.io.IOException; import java.io.InputStream; import org.apache.olingo.client.api.v3.ODataClient; -import org.apache.olingo.commons.api.domain.CommonODataEntitySet; import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.commons.api.domain.v3.ODataEntitySet; @@ -47,7 +46,7 @@ public class EntitySetTest extends AbstractTest { assertEquals(2, entitySet.getEntities().size()); assertNotNull(entitySet.getNext()); - final CommonODataEntitySet written = getClient().getBinder().getODataEntitySet(getClient(). + final ODataEntitySet written = getClient().getBinder().getODataEntitySet(getClient(). getBinder().getFeed(entitySet, ResourceFactory.feedClassForFormat(format == ODataPubFormat.ATOM))); assertEquals(entitySet, written); }
