http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java index 003dad4..c6c2efe 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -50,20 +50,20 @@ 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.ODataEntityUpdateResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.edm.xml.Reference; -import org.apache.olingo.client.api.edm.xml.XMLMetadata; -import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.client.api.domain.ClientAnnotation; import org.apache.olingo.client.api.domain.ClientComplexValue; import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.client.api.domain.ClientEntitySet; -import org.apache.olingo.commons.api.ODataError; import org.apache.olingo.client.api.domain.ClientInlineEntity; import org.apache.olingo.client.api.domain.ClientInlineEntitySet; import org.apache.olingo.client.api.domain.ClientObjectFactory; import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.client.api.domain.ClientServiceDocument; import org.apache.olingo.client.api.domain.ClientValue; +import org.apache.olingo.client.api.edm.xml.Reference; +import org.apache.olingo.client.api.edm.xml.XMLMetadata; +import org.apache.olingo.client.core.ODataClientFactory; +import org.apache.olingo.commons.api.ODataError; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.FullQualifiedName; @@ -342,9 +342,9 @@ public class BasicITCase extends AbstractBaseTestITCase { newEntity.getProperties().add( factory.newComplexProperty("PropertyCompTwoPrim", factory.newComplexValue("CTTwoPrim") - .add(factory.newPrimitiveProperty( - "PropertyInt16", - factory.newPrimitiveValueBuilder().buildInt16((short) 1))) + .add(factory.newPrimitiveProperty( + "PropertyInt16", + factory.newPrimitiveValueBuilder().buildInt16((short) 1))) .add(factory.newPrimitiveProperty( "PropertyString", factory.newPrimitiveValueBuilder().buildString("Test2"))))); @@ -380,9 +380,9 @@ public class BasicITCase extends AbstractBaseTestITCase { factory.newPrimitiveValueBuilder().buildInt32(42))); newEntity.addLink(factory.newEntityNavigationLink("NavPropertyETTwoPrimOne", client.newURIBuilder(SERVICE_URI) - .appendEntitySetSegment("ESTwoPrim") - .appendKeySegment(32766) - .build())); + .appendEntitySetSegment("ESTwoPrim") + .appendKeySegment(32766) + .build())); final ODataEntityCreateRequest<ClientEntity> createRequest = client.getCUDRequestFactory().getEntityCreateRequest( client.newURIBuilder(SERVICE_URI).appendEntitySetSegment("ESAllPrim").build(), @@ -461,30 +461,30 @@ public class BasicITCase extends AbstractBaseTestITCase { entity.getProperties().add( of.newCollectionProperty("CollPropertyComp", of.newCollectionValue("CTPrimComp") + .add( + of.newComplexValue("CTPrimComp") .add( - of.newComplexValue("CTPrimComp") - .add( - of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder() - .buildInt16( - (short) 42))) - .add( - of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim") - .add( - of.newPrimitiveProperty("PropertyString", of - .newPrimitiveValueBuilder() - .buildString("42")))))) - .add( - of.newComplexValue("CTPrimComp") - .add( - of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder() - .buildInt16( - (short) 43))) - .add( - of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim") - .add( - of.newPrimitiveProperty("PropertyString", of - .newPrimitiveValueBuilder() - .buildString("43")))))))); + of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder() + .buildInt16( + (short) 42))) + .add( + of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim") + .add( + of.newPrimitiveProperty("PropertyString", of + .newPrimitiveValueBuilder() + .buildString("42")))))) + .add( + of.newComplexValue("CTPrimComp") + .add( + of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder() + .buildInt16( + (short) 43))) + .add( + of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim") + .add( + of.newPrimitiveProperty("PropertyString", of + .newPrimitiveValueBuilder() + .buildString("43")))))))); final URI uri = getClient().newURIBuilder(SERVICE_URI) .appendEntitySetSegment("ESKeyNav") @@ -493,9 +493,9 @@ public class BasicITCase extends AbstractBaseTestITCase { final ODataEntityUpdateResponse<ClientEntity> response = getClient().getCUDRequestFactory() .getEntityUpdateRequest(uri, - UpdateType.PATCH, - entity) - .execute(); + UpdateType.PATCH, + entity) + .execute(); assertEquals(HttpStatusCode.NO_CONTENT.getStatusCode(), response.getStatusCode()); final String cookie = response.getHeader(HttpHeader.SET_COOKIE).iterator().next(); @@ -540,39 +540,39 @@ public class BasicITCase extends AbstractBaseTestITCase { final ClientEntity entity = of.newEntity(new FullQualifiedName("olingo.odata.test1", "ETKeyNav")); entity.getProperties().add( of.newPrimitiveProperty("PropertyString", - of.newPrimitiveValueBuilder().buildString("Complex collection test"))); + of.newPrimitiveValueBuilder().buildString("Complex collection test"))); entity.getProperties().add(of.newComplexProperty("PropertyCompTwoPrim", - of.newComplexValue("CTTwoPrim") - .add(of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder().buildInt16((short) 1))) - .add(of.newPrimitiveProperty("PropertyString", of.newPrimitiveValueBuilder().buildString("1"))))); + of.newComplexValue("CTTwoPrim") + .add(of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder().buildInt16((short) 1))) + .add(of.newPrimitiveProperty("PropertyString", of.newPrimitiveValueBuilder().buildString("1"))))); entity.getProperties().add(of.newCollectionProperty("CollPropertyComp", of.newCollectionValue("CTPrimComp") - .add(of.newComplexValue("CTPrimComp") - .add(of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder().buildInt16((short) 1))) - .add(of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim") - .add(of.newPrimitiveProperty("PropertyString", - of.newPrimitiveValueBuilder().buildString("1")))))) - .add(of.newComplexValue("CTPrimComp") - .add(of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim") - .add(of.newPrimitiveProperty("PropertyString", of.newPrimitiveValueBuilder().buildString - ("2"))) - .add(of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder().buildInt16( - (short) 2))) - .add(of.newPrimitiveProperty("PropertySingle", - of.newPrimitiveValueBuilder().buildSingle(2.0f)))))))); + .add(of.newComplexValue("CTPrimComp") + .add(of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder().buildInt16((short) 1))) + .add(of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim") + .add(of.newPrimitiveProperty("PropertyString", + of.newPrimitiveValueBuilder().buildString("1")))))) + .add(of.newComplexValue("CTPrimComp") + .add(of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim") + .add(of.newPrimitiveProperty("PropertyString", of.newPrimitiveValueBuilder().buildString + ("2"))) + .add(of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder().buildInt16( + (short) 2))) + .add(of.newPrimitiveProperty("PropertySingle", + of.newPrimitiveValueBuilder().buildSingle(2.0f)))))))); entity.addLink(of.newEntityNavigationLink("NavPropertyETTwoKeyNavOne", getClient().newURIBuilder(SERVICE_URI) - .appendEntitySetSegment("ESTwoKeyNav") - .appendKeySegment(new LinkedHashMap<String, Object>() { - private static final long serialVersionUID = 1L; + .appendEntitySetSegment("ESTwoKeyNav") + .appendKeySegment(new LinkedHashMap<String, Object>() { + private static final long serialVersionUID = 1L; - { - put("PropertyInt16", 1); - put("PropertyString", "1"); - } - }).build())); + { + put("PropertyInt16", 1); + put("PropertyString", "1"); + } + }).build())); final ODataEntityCreateResponse<ClientEntity> response = getClient().getCUDRequestFactory().getEntityCreateRequest( getClient().newURIBuilder(SERVICE_URI).appendEntitySetSegment("ESKeyNav").build(), @@ -671,9 +671,9 @@ public class BasicITCase extends AbstractBaseTestITCase { final ODataEntityRequest<ClientEntity> entityRequest = client.getRetrieveRequestFactory() .getEntityRequest(client.newURIBuilder() - .appendEntitySetSegment("ESTwoPrim") - .appendKeySegment(key) - .build()); + .appendEntitySetSegment("ESTwoPrim") + .appendKeySegment(key) + .build()); entityRequest.addCustomHeader(HttpHeader.COOKIE, cookie); final ODataRetrieveResponse<ClientEntity> responseEntityRequest = entityRequest.execute(); assertEquals(HttpStatusCode.OK.getStatusCode(), responseEntityRequest.getStatusCode()); @@ -746,8 +746,8 @@ public class BasicITCase extends AbstractBaseTestITCase { .add(of.newPrimitiveValueBuilder().buildString("Single entry!")))); entity.getProperties().add(of.newComplexProperty("PropertyCompAllPrim", of.newComplexValue("CTAllPrim") - .add(of.newPrimitiveProperty("PropertyString", - of.newPrimitiveValueBuilder().buildString("Changed"))))); + .add(of.newPrimitiveProperty("PropertyString", + of.newPrimitiveValueBuilder().buildString("Changed"))))); final ODataEntityUpdateResponse<ClientEntity> response = client.getCUDRequestFactory() .getEntityUpdateRequest(targetURI, UpdateType.PATCH, entity) @@ -758,11 +758,11 @@ public class BasicITCase extends AbstractBaseTestITCase { final ODataEntityRequest<ClientEntity> entityRequest = client.getRetrieveRequestFactory() .getEntityRequest( - client.newURIBuilder() - .appendEntitySetSegment("ESKeyNav") - .appendKeySegment(1) - .expand("NavPropertyETKeyNavOne", "NavPropertyETKeyNavMany") - .build()); + client.newURIBuilder() + .appendEntitySetSegment("ESKeyNav") + .appendKeySegment(1) + .expand("NavPropertyETKeyNavOne", "NavPropertyETKeyNavMany") + .build()); entityRequest.addCustomHeader(HttpHeader.COOKIE, cookie); final ODataRetrieveResponse<ClientEntity> entitytResponse = entityRequest.execute(); @@ -841,13 +841,13 @@ public class BasicITCase extends AbstractBaseTestITCase { entity.getProperties().add(of.newComplexProperty("PropertyCompTwoPrim", of.newComplexValue("CTTwoPrim") .add(of.newPrimitiveProperty("PropertyString", of.newPrimitiveValueBuilder() .buildString("Must not be null"))) - .add(of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder().buildInt16((short) 42))))); + .add(of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder().buildInt16((short) 42))))); entity.getProperties().add(of.newCollectionProperty("CollPropertyString", of.newCollectionValue("Edm.String") .add(of.newPrimitiveValueBuilder().buildString("Single entry!")))); entity.getProperties().add(of.newComplexProperty("PropertyCompAllPrim", of.newComplexValue("CTAllPrim") - .add(of.newPrimitiveProperty("PropertyString", - of.newPrimitiveValueBuilder().buildString("Changed"))))); + .add(of.newPrimitiveProperty("PropertyString", + of.newPrimitiveValueBuilder().buildString("Changed"))))); final ODataEntityUpdateResponse<ClientEntity> response = client.getCUDRequestFactory() .getEntityUpdateRequest(targetURI, UpdateType.REPLACE, entity) @@ -858,11 +858,11 @@ public class BasicITCase extends AbstractBaseTestITCase { final ODataEntityRequest<ClientEntity> entityRequest = client.getRetrieveRequestFactory() .getEntityRequest( - client.newURIBuilder() - .appendEntitySetSegment("ESKeyNav") - .appendKeySegment(1) - .expand("NavPropertyETKeyNavOne", "NavPropertyETKeyNavMany") - .build()); + client.newURIBuilder() + .appendEntitySetSegment("ESKeyNav") + .appendKeySegment(1) + .expand("NavPropertyETKeyNavOne", "NavPropertyETKeyNavMany") + .build()); entityRequest.addCustomHeader(HttpHeader.COOKIE, cookie); final ODataRetrieveResponse<ClientEntity> entitytResponse = entityRequest.execute();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java index 08bb95a..4cf68ee 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -42,12 +42,12 @@ 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.ODataResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.http.HttpClientException; -import org.apache.olingo.client.api.uri.URIBuilder; -import org.apache.olingo.client.core.communication.request.batch.ODataChangesetResponseItem; import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.client.api.domain.ClientEntitySet; import org.apache.olingo.client.api.domain.ClientObjectFactory; +import org.apache.olingo.client.api.http.HttpClientException; +import org.apache.olingo.client.api.uri.URIBuilder; +import org.apache.olingo.client.core.communication.request.batch.ODataChangesetResponseItem; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ContentType; @@ -78,11 +78,11 @@ public class BatchClientITCase extends AbstractTestITCase { /* * A bad request (status code >= 400) without "continue on error prefer header" in a changeset * should return a single response with Content-Type: application/http - * + * * See: * OData Version 4.0 Part 1: Protocol Plus Errata 01 * 11.7.4 Responding to a Batch Request - * + * * When a request within a change set fails, the change set response is not represented using * the multipart/mixed media type. Instead, a single response, using the application/http media type * and a Content-Transfer-Encoding header with a value of binary, is returned that applies to all requests @@ -586,7 +586,8 @@ public class BatchClientITCase extends AbstractTestITCase { .toValue()); } - private void appendGetRequest(final BatchManager manager, final String segment, final Object key, boolean isRelative) + private void appendGetRequest(final BatchManager manager, final String segment, final Object key, + final boolean isRelative) throws URISyntaxException { final URIBuilder targetURI = client.newURIBuilder(SERVICE_URI); targetURI.appendEntitySetSegment(segment).appendKeySegment(key); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BindingITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BindingITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BindingITCase.java index daad079..18df3a1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BindingITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BindingITCase.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -34,13 +34,13 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRe import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.client.api.domain.ClientInlineEntity; import org.apache.olingo.client.api.domain.ClientLink; import org.apache.olingo.client.api.domain.ClientObjectFactory; import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.client.api.domain.ClientValue; +import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; @@ -82,37 +82,37 @@ public class BindingITCase extends AbstractBaseTestITCase { // Create entity (EntitySet: ESKeyNav, Type: ETKeyNav) final ClientEntity entity = of.newEntity(ET_KEY_NAV); entity.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))); + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))); entity.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))); + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))); entity.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_NAV_FIVE_PROP) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))))); + .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_NAV_FIVE_PROP) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))))); entity.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_ALL_PRIM, of.newComplexValue(CT_ALL_PRIM) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))))); + .add(of.newComplexProperty(PROPERTY_COMP_ALL_PRIM, of.newComplexValue(CT_ALL_PRIM) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))))); entity.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))))); + .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))))); entity.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))) - .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_NAV_FIVE_PROP) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))))))); + .add(of.newComplexProperty(PROPERTY_COMP_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))) + .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_NAV_FIVE_PROP) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))))))); // Bind existing entities via binding synatx entity.addLink(of.newEntityNavigationLink(NAV_PROPERTY_ET_TWO_KEY_NAV_ONE, client.newURIBuilder(SERVICE_URI) - .appendEntitySetSegment(ES_TWO_KEY_NAV) - .appendKeySegment(new LinkedHashMap<String, Object>() { - private static final long serialVersionUID = 3109256773218160485L; + .appendEntitySetSegment(ES_TWO_KEY_NAV) + .appendKeySegment(new LinkedHashMap<String, Object>() { + private static final long serialVersionUID = 3109256773218160485L; - { - put(PROPERTY_INT16, 3); - put(PROPERTY_STRING, "1"); - } - }).build())); + { + put(PROPERTY_INT16, 3); + put(PROPERTY_STRING, "1"); + } + }).build())); final ClientLink navLinkOne = of.newEntityNavigationLink(NAV_PROPERTY_ET_KEY_NAV_ONE, client.newURIBuilder(SERVICE_URI) @@ -254,10 +254,8 @@ public class BindingITCase extends AbstractBaseTestITCase { .appendEntitySetSegment(ES_KEY_NAV).appendKeySegment(42).build()); entity.addLink(navLinkOne); - ODataEntityUpdateResponse<ClientEntity> updateResponse = null; try { - updateResponse = - client.getCUDRequestFactory().getEntityUpdateRequest(entityURI, UpdateType.PATCH, entity).execute(); + client.getCUDRequestFactory().getEntityUpdateRequest(entityURI, UpdateType.PATCH, entity).execute(); fail(); } catch (ODataClientErrorException e) { assertEquals(HttpStatusCode.NOT_FOUND.getStatusCode(), e.getStatusLine().getStatusCode()); @@ -271,8 +269,7 @@ public class BindingITCase extends AbstractBaseTestITCase { entity.addLink(navLinkMany); try { - updateResponse = - client.getCUDRequestFactory().getEntityUpdateRequest(entityURI, UpdateType.PATCH, entity).execute(); + client.getCUDRequestFactory().getEntityUpdateRequest(entityURI, UpdateType.PATCH, entity).execute(); } catch (ODataClientErrorException e) { assertEquals(HttpStatusCode.NOT_FOUND.getStatusCode(), e.getStatusLine().getStatusCode()); } @@ -346,30 +343,30 @@ public class BindingITCase extends AbstractBaseTestITCase { .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("2"))))); innerEntity.addLink(of.newEntityNavigationLink(NAV_PROPERTY_ET_TWO_KEY_NAV_ONE, client.newURIBuilder(SERVICE_URI) - .appendEntitySetSegment(ES_TWO_KEY_NAV) - .appendKeySegment(new LinkedHashMap<String, Object>() { - private static final long serialVersionUID = 3109256773218160485L; + .appendEntitySetSegment(ES_TWO_KEY_NAV) + .appendKeySegment(new LinkedHashMap<String, Object>() { + private static final long serialVersionUID = 3109256773218160485L; - { - put(PROPERTY_INT16, 3); - put(PROPERTY_STRING, "1"); - } - }).build())); + { + put(PROPERTY_INT16, 3); + put(PROPERTY_STRING, "1"); + } + }).build())); final ClientInlineEntity inlineLink = of.newDeepInsertEntity(NAV_PROPERTY_ET_KEY_NAV_ONE, innerEntity); entity.addLink(inlineLink); entity.addLink(of.newEntityNavigationLink(NAV_PROPERTY_ET_TWO_KEY_NAV_ONE, client.newURIBuilder(SERVICE_URI) - .appendEntitySetSegment(ES_TWO_KEY_NAV) - .appendKeySegment(new LinkedHashMap<String, Object>() { - private static final long serialVersionUID = 3109256773218160485L; - - { - put(PROPERTY_INT16, 3); - put(PROPERTY_STRING, "1"); - } - }).build())); + .appendEntitySetSegment(ES_TWO_KEY_NAV) + .appendKeySegment(new LinkedHashMap<String, Object>() { + private static final long serialVersionUID = 3109256773218160485L; + + { + put(PROPERTY_INT16, 3); + put(PROPERTY_STRING, "1"); + } + }).build())); final URI bindingURI = client.newURIBuilder(SERVICE_URI).appendEntitySetSegment(ES_KEY_NAV) .appendKeySegment(3) http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/DeepInsertITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/DeepInsertITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/DeepInsertITCase.java index 4bec968..b4b8efe 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/DeepInsertITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/DeepInsertITCase.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -39,7 +39,6 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySe import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.client.api.domain.ClientComplexValue; import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.client.api.domain.ClientEntitySet; @@ -49,6 +48,7 @@ import org.apache.olingo.client.api.domain.ClientLink; import org.apache.olingo.client.api.domain.ClientObjectFactory; import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.client.api.domain.ClientValue; +import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; @@ -135,12 +135,12 @@ public class DeepInsertITCase extends AbstractBaseTestITCase { // Binding links secondLevelTwoKeyNav.addLink(of.newEntityNavigationLink(NAV_PROPERTY_ET_TWO_KEY_NAV_ONE, client.newURIBuilder( SERVICE_URI).appendEntitySetSegment(ES_TWO_KEY_NAV).appendKeySegment(new LinkedHashMap<String, Object>() { - private static final long serialVersionUID = 3109256773218160485L; - { - put(PROPERTY_INT16, 3); - put(PROPERTY_STRING, "1"); - } - }).build())); + private static final long serialVersionUID = 3109256773218160485L; + { + put(PROPERTY_INT16, 3); + put(PROPERTY_STRING, "1"); + } + }).build())); final ClientInlineEntity secondLevelTwoKeyOneInline = of.newDeepInsertEntity(NAV_PROPERTY_ET_TWO_KEY_NAV_ONE, secondLevelTwoKeyNav); @@ -245,74 +245,74 @@ public class DeepInsertITCase extends AbstractBaseTestITCase { // Prepare entity(EntitySet: ESKeyNav, Type: ETKeyNav) entity.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))); + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))); entity.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))); + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))); entity.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_NAV_FIVE_PROP) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))))); + .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_NAV_FIVE_PROP) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))))); entity.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_ALL_PRIM, of.newComplexValue(CT_ALL_PRIM) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))))); + .add(of.newComplexProperty(PROPERTY_COMP_ALL_PRIM, of.newComplexValue(CT_ALL_PRIM) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))))); entity.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))))); + .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))))); entity.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))) - .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_NAV_FIVE_PROP) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))))))); + .add(of.newComplexProperty(PROPERTY_COMP_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))) + .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_NAV_FIVE_PROP) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))))))); // Non collection navigation property // Create related entity(EntitySet: ESTwoKeyNav, Type: ETTwoKeyNav, Nav. Property: NavPropertyETTwoKeyNavOne) final ClientEntity inlineEntitySingle = client.getObjectFactory().newEntity(ET_TWO_KEY_NAV); inlineEntitySingle.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 43))); + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 43))); inlineEntitySingle.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("43"))); + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("43"))); inlineEntitySingle.getProperties().add( of.newComplexProperty(PROPERTY_COMP, of.newComplexValue(CT_PRIM_COMP))); inlineEntitySingle.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 431))))); + .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 431))))); inlineEntitySingle.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 432))) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("432"))))); + .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 432))) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("432"))))); // Collection navigation property // The navigation property has a partner navigation property named "NavPropertyETKeyNavOne" // Create related entity(EntitySet: ESTwoKeyNav, Type: NavPropertyETTwoKeyNavMany final ClientEntity inlineEntityCol1 = client.getObjectFactory().newEntity(ET_TWO_KEY_NAV); inlineEntityCol1.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 44))); + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 44))); inlineEntityCol1.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("44"))); + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("44"))); inlineEntityCol1.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 441))))); + .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 441))))); inlineEntityCol1.getProperties().add( of.newComplexProperty(PROPERTY_COMP, of.newComplexValue(CT_PRIM_COMP))); inlineEntityCol1.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 442))) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("442"))))); + .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 442))) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("442"))))); final ClientEntity inlineEntityCol2 = client.getObjectFactory().newEntity(ET_TWO_KEY_NAV); inlineEntityCol2.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 45))); + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 45))); inlineEntityCol2.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("45"))); + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("45"))); inlineEntityCol2.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 451))))); + .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 451))))); inlineEntityCol2.getProperties().add( of.newComplexProperty(PROPERTY_COMP, of.newComplexValue(CT_PRIM_COMP))); inlineEntityCol2.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 452))) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("452"))))); + .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 452))) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("452"))))); final ClientInlineEntity newDeepInsertEntityLink = of.newDeepInsertEntity(NAV_PROPERTY_ET_TWO_KEY_NAV_ONE, inlineEntitySingle); @@ -338,7 +338,7 @@ public class DeepInsertITCase extends AbstractBaseTestITCase { final URI esKeyNavURI = client.newURIBuilder(SERVICE_URI).appendEntitySetSegment(ES_KEY_NAV).appendKeySegment( propertyInt16.getPrimitiveValue().toValue()).expand(NAV_PROPERTY_ET_TWO_KEY_NAV_ONE, - NAV_PROPERTY_ET_TWO_KEY_NAV_MANY).build(); + NAV_PROPERTY_ET_TWO_KEY_NAV_MANY).build(); final ODataEntityRequest<ClientEntity> esKeyNavRequest = client.getRetrieveRequestFactory() .getEntityRequest(esKeyNavURI); @@ -393,7 +393,7 @@ public class DeepInsertITCase extends AbstractBaseTestITCase { URI esTwoKeyNavEntityManyOneURI = client.newURIBuilder(SERVICE_URI).appendEntitySetSegment(ES_TWO_KEY_NAV).appendKeySegment(composedKey) - .expand(NAV_PROPERTY_ET_KEY_NAV_ONE).build(); + .expand(NAV_PROPERTY_ET_KEY_NAV_ONE).build(); final ODataEntityRequest<ClientEntity> esTwoKeyNavManyOneRequest = client.getRetrieveRequestFactory().getEntityRequest(esTwoKeyNavEntityManyOneURI); @@ -414,7 +414,7 @@ public class DeepInsertITCase extends AbstractBaseTestITCase { URI esTwoKeyNavEntityManyTwoURI = client.newURIBuilder(SERVICE_URI).appendEntitySetSegment(ES_TWO_KEY_NAV).appendKeySegment(composedKey) - .expand(NAV_PROPERTY_ET_KEY_NAV_ONE).build(); + .expand(NAV_PROPERTY_ET_KEY_NAV_ONE).build(); final ODataEntityRequest<ClientEntity> esTwoKeyNavManyTwoRequest = client.getRetrieveRequestFactory().getEntityRequest(esTwoKeyNavEntityManyTwoURI); @@ -437,72 +437,72 @@ public class DeepInsertITCase extends AbstractBaseTestITCase { // Prepare entity(EntitySet: ESKeyNav, Type: ETKeyNav) entity.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))); + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))); entity.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))); + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))); entity.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_NAV_FIVE_PROP) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))))); + .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_NAV_FIVE_PROP) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))))); entity.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_ALL_PRIM, of.newComplexValue(CT_ALL_PRIM) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))))); + .add(of.newComplexProperty(PROPERTY_COMP_ALL_PRIM, of.newComplexValue(CT_ALL_PRIM) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))))); entity.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))))); + .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))))); entity.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))) - .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_NAV_FIVE_PROP) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))))))); + .add(of.newComplexProperty(PROPERTY_COMP_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))) + .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_NAV_FIVE_PROP) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))))))); entity.addLink(of.newEntityNavigationLink("NavPropertyETTwoKeyNavOne", client.newURIBuilder(SERVICE_URI) - .appendEntitySetSegment(ES_TWO_KEY_NAV) - .appendKeySegment(new LinkedHashMap<String, Object>() { - private static final long serialVersionUID = 1L; + .appendEntitySetSegment(ES_TWO_KEY_NAV) + .appendKeySegment(new LinkedHashMap<String, Object>() { + private static final long serialVersionUID = 1L; - { - put(PROPERTY_INT16, 1); - put(PROPERTY_STRING, "1"); - } - }) - .build())); + { + put(PROPERTY_INT16, 1); + put(PROPERTY_STRING, "1"); + } + }) + .build())); // Prepare inline entity(EntitySet: ESKeyNav, Type: ETKeyNav) final ClientEntity innerEntity = of.newEntity(ET_KEY_NAV); innerEntity.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 43))); + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 43))); innerEntity.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("43"))); + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("43"))); innerEntity.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_NAV_FIVE_PROP) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 431))))); + .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_NAV_FIVE_PROP) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 431))))); innerEntity.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_ALL_PRIM, of.newComplexValue(CT_ALL_PRIM) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("431"))))); + .add(of.newComplexProperty(PROPERTY_COMP_ALL_PRIM, of.newComplexValue(CT_ALL_PRIM) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("431"))))); innerEntity.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 431))) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("431"))))); + .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 431))) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("431"))))); innerEntity - .getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("431"))) - .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_NAV_FIVE_PROP) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder() - .buildInt16((short) 431))))))); + .getProperties() + .add(of.newComplexProperty(PROPERTY_COMP_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("431"))) + .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_NAV_FIVE_PROP) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder() + .buildInt16((short) 431))))))); innerEntity.addLink(of.newEntityNavigationLink("NavPropertyETTwoKeyNavOne", client.newURIBuilder(SERVICE_URI) - .appendEntitySetSegment(ES_TWO_KEY_NAV) - .appendKeySegment(new LinkedHashMap<String, Object>() { - private static final long serialVersionUID = 1L; + .appendEntitySetSegment(ES_TWO_KEY_NAV) + .appendKeySegment(new LinkedHashMap<String, Object>() { + private static final long serialVersionUID = 1L; - { - put(PROPERTY_INT16, 1); - put(PROPERTY_STRING, "1"); - } - }) - .build())); + { + put(PROPERTY_INT16, 1); + put(PROPERTY_STRING, "1"); + } + }) + .build())); ClientInlineEntity inlineEntity = of.newDeepInsertEntity(NAV_PROPERTY_ET_KEY_NAV_ONE, innerEntity); entity.addLink(inlineEntity); @@ -516,7 +516,7 @@ public class DeepInsertITCase extends AbstractBaseTestITCase { // Fetch Entity URI fetchEntityURI = client.newURIBuilder(SERVICE_URI).appendEntitySetSegment(ES_KEY_NAV).appendKeySegment(esKeyNavEntityKey) - .expand(NAV_PROPERTY_ET_KEY_NAV_ONE).build(); + .expand(NAV_PROPERTY_ET_KEY_NAV_ONE).build(); ODataEntityRequest<ClientEntity> entityRequest = client.getRetrieveRequestFactory().getEntityRequest(fetchEntityURI); @@ -529,11 +529,11 @@ public class DeepInsertITCase extends AbstractBaseTestITCase { Short innerEntityInt16Key = entityResponse.getBody().getProperty(NAV_PROPERTY_ET_KEY_NAV_ONE).getComplexValue().get(PROPERTY_INT16) - .getPrimitiveValue().toCastValue(Short.class); + .getPrimitiveValue().toCastValue(Short.class); final URI innerEntityURI = client.newURIBuilder(SERVICE_URI).appendEntitySetSegment(ES_KEY_NAV).appendKeySegment(innerEntityInt16Key) - .build(); + .build(); final ODataEntityRequest<ClientEntity> innerRequest = client.getRetrieveRequestFactory().getEntityRequest(innerEntityURI); innerRequest.addCustomHeader(HttpHeader.COOKIE, cookie); @@ -678,74 +678,74 @@ public class DeepInsertITCase extends AbstractBaseTestITCase { // Prepare entity(EntitySet: ESKeyNav, Type: ETKeyNav) entity.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))); + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))); entity.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))); + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))); entity.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_NAV_FIVE_PROP) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))))); + .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_NAV_FIVE_PROP) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))))); entity.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_ALL_PRIM, of.newComplexValue(CT_ALL_PRIM) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))))); + .add(of.newComplexProperty(PROPERTY_COMP_ALL_PRIM, of.newComplexValue(CT_ALL_PRIM) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))))); entity.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))))); + .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))))); entity.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))) - .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_NAV_FIVE_PROP) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))))))); + .add(of.newComplexProperty(PROPERTY_COMP_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("42"))) + .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_NAV_FIVE_PROP) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 42))))))); // Non collection navigation property // Create related entity(EntitySet: ESTwoKeyNav, Type: ETTwoKeyNav, Nav. Property: NavPropertyETTwoKeyNavOne) final ClientEntity inlineEntitySingle = client.getObjectFactory().newEntity(ET_TWO_KEY_NAV); inlineEntitySingle.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 43))); + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 43))); inlineEntitySingle.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("43"))); + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("43"))); inlineEntitySingle.getProperties().add( of.newComplexProperty(PROPERTY_COMP, of.newComplexValue(CT_PRIM_COMP))); inlineEntitySingle.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 431))))); + .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 431))))); inlineEntitySingle.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 432))) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("432"))))); + .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 432))) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("432"))))); // Collection navigation property // The navigation property has a partner navigation property named "NavPropertyETKeyNavOne" // Create related entity(EntitySet: ESTwoKeyNav, Type: NavPropertyETTwoKeyNavMany final ClientEntity inlineEntityCol1 = client.getObjectFactory().newEntity(ET_TWO_KEY_NAV); inlineEntityCol1.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 44))); + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 44))); inlineEntityCol1.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("44"))); + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("44"))); inlineEntityCol1.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 441))))); + .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 441))))); inlineEntityCol1.getProperties().add( of.newComplexProperty(PROPERTY_COMP, of.newComplexValue(CT_PRIM_COMP))); inlineEntityCol1.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 442))) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("442"))))); + .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 442))) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("442"))))); final ClientEntity inlineEntityCol2 = client.getObjectFactory().newEntity(ET_TWO_KEY_NAV); inlineEntityCol2.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 45))); + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 45))); inlineEntityCol2.getProperties() - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("45"))); + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("45"))); inlineEntityCol2.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 451))))); + .add(of.newComplexProperty(PROPERTY_COMP_NAV, of.newComplexValue(CT_PRIM_COMP) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 451))))); inlineEntityCol2.getProperties().add( of.newComplexProperty(PROPERTY_COMP, of.newComplexValue(CT_PRIM_COMP))); inlineEntityCol2.getProperties() - .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) - .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 452))) - .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("452"))))); + .add(of.newComplexProperty(PROPERTY_COMP_TWO_PRIM, of.newComplexValue(CT_TWO_PRIM) + .add(of.newPrimitiveProperty(PROPERTY_INT16, of.newPrimitiveValueBuilder().buildInt16((short) 452))) + .add(of.newPrimitiveProperty(PROPERTY_STRING, of.newPrimitiveValueBuilder().buildString("452"))))); final ClientInlineEntity newDeepInsertEntityLink = of.newDeepInsertEntity(NAV_PROPERTY_ET_TWO_KEY_NAV_ONE, inlineEntitySingle); @@ -771,7 +771,7 @@ public class DeepInsertITCase extends AbstractBaseTestITCase { final URI esKeyNavURI = client.newURIBuilder(SERVICE_URI).appendEntitySetSegment(ES_KEY_NAV).appendKeySegment( propertyInt16.getPrimitiveValue().toValue()).expand(NAV_PROPERTY_ET_TWO_KEY_NAV_ONE, - NAV_PROPERTY_ET_TWO_KEY_NAV_MANY).build(); + NAV_PROPERTY_ET_TWO_KEY_NAV_MANY).build(); final ODataEntityRequest<ClientEntity> esKeyNavRequest = client.getRetrieveRequestFactory() .getEntityRequest(esKeyNavURI); @@ -826,7 +826,7 @@ public class DeepInsertITCase extends AbstractBaseTestITCase { URI esTwoKeyNavEntityManyOneURI = client.newURIBuilder(SERVICE_URI).appendEntitySetSegment(ES_TWO_KEY_NAV).appendKeySegment(composedKey) - .expand(NAV_PROPERTY_ET_KEY_NAV_ONE).build(); + .expand(NAV_PROPERTY_ET_KEY_NAV_ONE).build(); final ODataEntityRequest<ClientEntity> esTwoKeyNavManyOneRequest = client.getRetrieveRequestFactory().getEntityRequest(esTwoKeyNavEntityManyOneURI); @@ -847,7 +847,7 @@ public class DeepInsertITCase extends AbstractBaseTestITCase { URI esTwoKeyNavEntityManyTwoURI = client.newURIBuilder(SERVICE_URI).appendEntitySetSegment(ES_TWO_KEY_NAV).appendKeySegment(composedKey) - .expand(NAV_PROPERTY_ET_KEY_NAV_ONE).build(); + .expand(NAV_PROPERTY_ET_KEY_NAV_ONE).build(); final ODataEntityRequest<ClientEntity> esTwoKeyNavManyTwoRequest = client.getRetrieveRequestFactory().getEntityRequest(esTwoKeyNavEntityManyTwoURI); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandSelectITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandSelectITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandSelectITCase.java index a4fc570..1ae1f22 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandSelectITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandSelectITCase.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -27,13 +27,13 @@ import java.util.List; import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.client.api.domain.ClientInlineEntity; import org.apache.olingo.client.api.domain.ClientInlineEntitySet; import org.apache.olingo.client.api.domain.ClientLink; import org.apache.olingo.client.api.domain.ClientLinkType; import org.apache.olingo.client.api.domain.ClientProperty; +import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.commons.api.http.HttpStatusCode; import org.apache.olingo.fit.AbstractBaseTestITCase; import org.apache.olingo.fit.tecsvc.TecSvcConst; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandWithSystemQueryOptionsITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandWithSystemQueryOptionsITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandWithSystemQueryOptionsITCase.java index 1f13f88..7516e4d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandWithSystemQueryOptionsITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandWithSystemQueryOptionsITCase.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -31,10 +31,10 @@ import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.client.api.ODataClient; 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.QueryOption; -import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.client.api.domain.ClientEntitySet; +import org.apache.olingo.client.api.uri.QueryOption; +import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpHeader; import org.apache.olingo.commons.api.http.HttpStatusCode; @@ -230,7 +230,7 @@ public class ExpandWithSystemQueryOptionsITCase extends AbstractBaseTestITCase { final URI uri = client.newURIBuilder(SERVICE_URI).appendEntitySetSegment(ES_TWO_KEY_NAV).expandWithOptions( NAV_PROPERTY_ET_TWO_KEY_NAV_MANY, options).addQueryOption(QueryOption.SELECT, - "PropertyInt16,PropertyString").build(); + "PropertyInt16,PropertyString").build(); final ODataRetrieveResponse<ClientEntitySet> response = client.getRetrieveRequestFactory().getEntitySetRequest(uri).execute(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FilterSystemQueryITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FilterSystemQueryITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FilterSystemQueryITCase.java index 02a287c..3bf255a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FilterSystemQueryITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FilterSystemQueryITCase.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,11 +29,11 @@ import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateR import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.client.api.domain.ClientEntitySet; import org.apache.olingo.client.api.domain.ClientObjectFactory; import org.apache.olingo.client.api.domain.ClientValuable; +import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpHeader; @@ -292,9 +292,9 @@ public class FilterSystemQueryITCase extends AbstractBaseTestITCase { .buildInt16((short) 1))); entity.addLink(objectFactory.newEntityNavigationLink("NavPropertyETTwoPrimOne", client.newURIBuilder(SERVICE_URI) - .appendEntitySetSegment("ESTwoPrim") - .appendKeySegment(32766) - .build())); + .appendEntitySetSegment("ESTwoPrim") + .appendKeySegment(32766) + .build())); final URI uri = client.newURIBuilder(SERVICE_URI).appendEntitySetSegment("ESAllPrim").build(); ODataEntityCreateResponse<ClientEntity> createResponse = @@ -302,9 +302,9 @@ public class FilterSystemQueryITCase extends AbstractBaseTestITCase { final URI receiveURI = client.newURIBuilder(SERVICE_URI) - .appendEntitySetSegment("ESAllPrim") - .filter(filterString) - .build(); + .appendEntitySetSegment("ESAllPrim") + .filter(filterString) + .build(); ODataEntitySetRequest<ClientEntitySet> filterRequest = client.getRetrieveRequestFactory().getEntitySetRequest(receiveURI); @@ -475,9 +475,8 @@ public class FilterSystemQueryITCase extends AbstractBaseTestITCase { @SuppressWarnings("unused") public void testSubstringDouble() { try { - ODataRetrieveResponse<ClientEntitySet> result = - sendRequest(ES_ALL_PRIM, "substring(PropertyString, length('First')" - + "add 1, 2.0 * 4) eq ('Resource')"); + sendRequest(ES_ALL_PRIM, "substring(PropertyString, length('First')" + + "add 1, 2.0 * 4) eq ('Resource')"); } catch (ODataClientErrorException e) { assertEquals(400, e.getStatusLine().getStatusCode()); } @@ -941,32 +940,32 @@ public class FilterSystemQueryITCase extends AbstractBaseTestITCase { newEntity.getProperties().add( factory.newComplexProperty("PropertyCompAllPrim", factory.newComplexValue("CTAllPrim") - .add(factory.newPrimitiveProperty( - "PropertyString", - factory.newPrimitiveValueBuilder().buildString("Test 3"))))); + .add(factory.newPrimitiveProperty( + "PropertyString", + factory.newPrimitiveValueBuilder().buildString("Test 3"))))); newEntity.getProperties().add( factory.newComplexProperty("PropertyCompTwoPrim", factory.newComplexValue("CTTwoPrim") - .add(factory.newPrimitiveProperty( - "PropertyInt16", - factory.newPrimitiveValueBuilder().buildInt16((short) 1))) + .add(factory.newPrimitiveProperty( + "PropertyInt16", + factory.newPrimitiveValueBuilder().buildInt16((short) 1))) .add(factory.newPrimitiveProperty( "PropertyString", factory.newPrimitiveValueBuilder().buildString("Test2"))))); newEntity.addLink(factory.newEntityNavigationLink("NavPropertyETTwoKeyNavOne", client.newURIBuilder(SERVICE_URI) - .appendEntitySetSegment(ES_TWO_KEY_NAV) - .appendKeySegment(new LinkedHashMap<String, Object>() { - private static final long serialVersionUID = 1L; + .appendEntitySetSegment(ES_TWO_KEY_NAV) + .appendKeySegment(new LinkedHashMap<String, Object>() { + private static final long serialVersionUID = 1L; - { - put("PropertyInt16", 1); - put("PropertyString", "1"); - } - }) - .build())); + { + put("PropertyInt16", 1); + put("PropertyString", "1"); + } + }) + .build())); final URI uri = client.newURIBuilder(SERVICE_URI).appendEntitySetSegment("ESKeyNav").build(); ODataEntityCreateRequest<ClientEntity> request = @@ -991,18 +990,19 @@ public class FilterSystemQueryITCase extends AbstractBaseTestITCase { fail("ESServerSidePaging", "filter=contains(PropertyInt16, 3) eq 'hallo'", HttpStatusCode.BAD_REQUEST); } - private ODataRetrieveResponse<ClientEntitySet> sendRequest(String entitySet, String filterString) { + private ODataRetrieveResponse<ClientEntitySet> sendRequest(final String entitySet, final String filterString) { return sendRequest(entitySet, filterString, null); } - private ODataRetrieveResponse<ClientEntitySet> sendRequest(String entitySet, String filterString, String cookie) { + private ODataRetrieveResponse<ClientEntitySet> sendRequest(final String entitySet, final String filterString, + final String cookie) { final ODataClient client = getClient(); final URI uri = client.newURIBuilder(SERVICE_URI) - .appendEntitySetSegment(entitySet) - .filter(filterString) - .build(); + .appendEntitySetSegment(entitySet) + .filter(filterString) + .build(); ODataEntitySetRequest<ClientEntitySet> request = client.getRetrieveRequestFactory().getEntitySetRequest(uri); if (cookie != null) { @@ -1012,7 +1012,7 @@ public class FilterSystemQueryITCase extends AbstractBaseTestITCase { return request.execute(); } - private void fail(String entitySet, String filterString, HttpStatusCode errorCode) { + private void fail(final String entitySet, final String filterString, final HttpStatusCode errorCode) { try { sendRequest(entitySet, filterString); Assert.fail(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java index ae7dabf..a81a1df 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -33,12 +33,12 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataValueReq import org.apache.olingo.client.api.communication.response.ODataInvokeResponse; import org.apache.olingo.client.api.communication.response.ODataRawResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.client.api.domain.ClientEntitySet; import org.apache.olingo.client.api.domain.ClientPrimitiveValue; import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.client.api.domain.ClientValue; +import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpStatusCode; import org.apache.olingo.fit.AbstractBaseTestITCase; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java index 582cf43..9380ab4 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -38,9 +38,9 @@ import org.apache.olingo.client.api.communication.response.ODataDeleteResponse; import org.apache.olingo.client.api.communication.response.ODataMediaEntityCreateResponse; import org.apache.olingo.client.api.communication.response.ODataMediaEntityUpdateResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.client.api.domain.ClientProperty; +import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpHeader; @@ -56,7 +56,7 @@ public final class MediaITCase extends AbstractBaseTestITCase { final ODataClient client = getClient(); final ODataMediaRequest request = client.getRetrieveRequestFactory().getMediaRequest( client.newURIBuilder(TecSvcConst.BASE_URI) - .appendEntitySetSegment("ESMedia").appendKeySegment(1).appendValueSegment().build()); + .appendEntitySetSegment("ESMedia").appendKeySegment(1).appendValueSegment().build()); assertNotNull(request); final ODataRetrieveResponse<InputStream> response = request.execute(); @@ -139,7 +139,7 @@ public final class MediaITCase extends AbstractBaseTestITCase { // This check has to be in the same session in order to access the same data provider. ODataMediaRequest mediaRequest = client.getRetrieveRequestFactory().getMediaRequest( client.newURIBuilder(TecSvcConst.BASE_URI).appendEntitySetSegment("ESMedia") - .appendKeySegment(5).appendValueSegment().build()); + .appendKeySegment(5).appendValueSegment().build()); mediaRequest.addCustomHeader(HttpHeader.COOKIE, response.getHeader(HttpHeader.SET_COOKIE).iterator().next()); ODataRetrieveResponse<InputStream> mediaResponse = mediaRequest.execute(); assertEquals(HttpStatusCode.OK.getStatusCode(), mediaResponse.getStatusCode()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/NavigationITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/NavigationITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/NavigationITCase.java index b3db254..e20d44e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/NavigationITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/NavigationITCase.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -23,10 +23,10 @@ import static org.junit.Assert.assertNotNull; import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.client.api.domain.ClientEntitySet; import org.apache.olingo.client.api.domain.ClientProperty; +import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpStatusCode; import org.apache.olingo.fit.AbstractBaseTestITCase; @@ -42,8 +42,8 @@ public final class NavigationITCase extends AbstractBaseTestITCase { final ODataRetrieveResponse<ClientEntity> response = client.getRetrieveRequestFactory().getEntityRequest( client.newURIBuilder(TecSvcConst.BASE_URI) - .appendEntitySetSegment("ESAllPrim").appendKeySegment(32767) - .appendNavigationSegment("NavPropertyETTwoPrimOne").build()) + .appendEntitySetSegment("ESAllPrim").appendKeySegment(32767) + .appendNavigationSegment("NavPropertyETTwoPrimOne").build()) .execute(); assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode()); @@ -60,8 +60,8 @@ public final class NavigationITCase extends AbstractBaseTestITCase { final ODataRetrieveResponse<ClientEntity> response = client.getRetrieveRequestFactory().getEntityRequest( client.newURIBuilder(TecSvcConst.BASE_URI) - .appendEntitySetSegment("ESAllPrim").appendKeySegment(32767) - .appendNavigationSegment("NavPropertyETTwoPrimMany").appendKeySegment(-365).build()) + .appendEntitySetSegment("ESAllPrim").appendKeySegment(32767) + .appendNavigationSegment("NavPropertyETTwoPrimMany").appendKeySegment(-365).build()) .execute(); assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode()); @@ -78,9 +78,9 @@ public final class NavigationITCase extends AbstractBaseTestITCase { final ODataRetrieveResponse<ClientEntity> response = client.getRetrieveRequestFactory().getEntityRequest( client.newURIBuilder(TecSvcConst.BASE_URI) - .appendEntitySetSegment("ESTwoPrim").appendKeySegment(32767) - .appendNavigationSegment("NavPropertyETAllPrimOne") - .appendNavigationSegment("NavPropertyETTwoPrimMany").appendKeySegment(-365).build()) + .appendEntitySetSegment("ESTwoPrim").appendKeySegment(32767) + .appendNavigationSegment("NavPropertyETAllPrimOne") + .appendNavigationSegment("NavPropertyETTwoPrimMany").appendKeySegment(-365).build()) .execute(); assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode()); @@ -97,9 +97,9 @@ public final class NavigationITCase extends AbstractBaseTestITCase { final ODataRetrieveResponse<ClientEntitySet> response = client.getRetrieveRequestFactory().getEntitySetRequest( client.newURIBuilder(TecSvcConst.BASE_URI) - .appendEntitySetSegment("ESTwoPrim").appendKeySegment(32767) - .appendNavigationSegment("NavPropertyETAllPrimOne") - .appendNavigationSegment("NavPropertyETTwoPrimMany").build()) + .appendEntitySetSegment("ESTwoPrim").appendKeySegment(32767) + .appendNavigationSegment("NavPropertyETAllPrimOne") + .appendNavigationSegment("NavPropertyETTwoPrimMany").build()) .execute(); assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode()); @@ -119,10 +119,10 @@ public final class NavigationITCase extends AbstractBaseTestITCase { final ODataRetrieveResponse<ClientProperty> response = client.getRetrieveRequestFactory().getPropertyRequest( client.newURIBuilder(TecSvcConst.BASE_URI) - .appendEntitySetSegment("ESKeyNav").appendKeySegment(1) - .appendNavigationSegment("NavPropertyETKeyNavOne") - .appendNavigationSegment("NavPropertyETKeyNavMany").appendKeySegment(3) - .appendPropertySegment("PropertyCompNav").appendPropertySegment("PropertyInt16").build()) + .appendEntitySetSegment("ESKeyNav").appendKeySegment(1) + .appendNavigationSegment("NavPropertyETKeyNavOne") + .appendNavigationSegment("NavPropertyETKeyNavMany").appendKeySegment(3) + .appendPropertySegment("PropertyCompNav").appendPropertySegment("PropertyInt16").build()) .execute(); assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/OrderBySystemQueryITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/OrderBySystemQueryITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/OrderBySystemQueryITCase.java index 26be32e..aa91ed9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/OrderBySystemQueryITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/OrderBySystemQueryITCase.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -26,10 +26,10 @@ import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.client.api.domain.ClientEntitySet; import org.apache.olingo.client.api.domain.ClientValuable; +import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpStatusCode; import org.apache.olingo.fit.AbstractBaseTestITCase; @@ -138,21 +138,21 @@ public class OrderBySystemQueryITCase extends AbstractBaseTestITCase { fail(ES_TWO_PRIM, "PropertyString add 10", HttpStatusCode.BAD_REQUEST); } - private ODataRetrieveResponse<ClientEntitySet> sendRequest(String entitySet, String orderByString) { + private ODataRetrieveResponse<ClientEntitySet> sendRequest(final String entitySet, final String orderByString) { final ODataClient client = getClient(); final URI uri = client.newURIBuilder(SERVICE_URI) - .appendEntitySetSegment(entitySet) - .orderBy(orderByString) - .build(); + .appendEntitySetSegment(entitySet) + .orderBy(orderByString) + .build(); ODataEntitySetRequest<ClientEntitySet> request = client.getRetrieveRequestFactory().getEntitySetRequest(uri); return request.execute(); } - private void fail(String entitySet, String filterString, HttpStatusCode errorCode) { + private void fail(final String entitySet, final String filterString, final HttpStatusCode errorCode) { try { sendRequest(entitySet, filterString); Assert.fail();
