You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2014/07/03 09:16:01 UTC

[04/55] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle issues

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/PropertyValueTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyValueTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyValueTestITCase.java
index 82296f2..d64c89f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyValueTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyValueTestITCase.java
@@ -1,18 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * 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
- *
+ * 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
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  */
@@ -38,7 +38,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
   @Test
   public void retrieveIntPropertyValueTest() {
     CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Product").appendKeySegment(-10).appendPropertySegment("ProductId");
+        appendEntitySetSegment("Product").appendKeySegment(-10).appendPropertySegment("ProductId");
     final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
     req.setFormat(ODataFormat.TEXT_PLAIN);
     final ODataValue value = req.execute().getBody();
@@ -49,7 +49,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
   @Test
   public void retrieveBooleanPropertyValueTest() {
     CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Product").appendKeySegment(-10).appendPropertySegment("ProductId");
+        appendEntitySetSegment("Product").appendKeySegment(-10).appendPropertySegment("ProductId");
     final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
     req.setFormat(ODataFormat.TEXT_PLAIN);
     final ODataValue value = req.execute().getBody();
@@ -60,7 +60,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
   @Test
   public void retrieveStringPropertyValueTest() {
     CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Product").appendKeySegment(-6).appendPropertySegment("Description");
+        appendEntitySetSegment("Product").appendKeySegment(-6).appendPropertySegment("Description");
     final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
     req.setFormat(ODataFormat.TEXT_PLAIN);
     final ODataValue value = req.execute().getBody();
@@ -71,8 +71,8 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
   @Test
   public void retrieveDatePropertyValueTest() {
     CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Product").appendKeySegment(-7).appendPropertySegment(
-                    "NestedComplexConcurrency/ModifiedDate");
+        appendEntitySetSegment("Product").appendKeySegment(-7).appendPropertySegment(
+            "NestedComplexConcurrency/ModifiedDate");
     final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
     req.setFormat(ODataFormat.TEXT_PLAIN);
     final ODataValue value = req.execute().getBody();
@@ -83,7 +83,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
   @Test
   public void retrieveDecimalPropertyValueTest() {
     CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Product").appendKeySegment(-6).appendPropertySegment("Dimensions/Height");
+        appendEntitySetSegment("Product").appendKeySegment(-6).appendPropertySegment("Dimensions/Height");
     final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
     req.setFormat(ODataFormat.TEXT_PLAIN);
     final ODataValue value = req.execute().getBody();
@@ -94,7 +94,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
   @Test
   public void retrieveBinaryPropertyValueTest() throws IOException {
     CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendNavigationSegment("ProductPhoto(PhotoId=-3,ProductId=-3)").appendPropertySegment("Photo");
+        appendNavigationSegment("ProductPhoto(PhotoId=-3,ProductId=-3)").appendPropertySegment("Photo");
     ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
     req.setAccept("application/json");
     ODataRetrieveResponse<ODataEntity> res = req.execute();
@@ -102,14 +102,14 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
     ODataEntity entity = res.getBody();
     assertNotNull(entity);
     assertEquals("fi653p3+MklA/LdoBlhWgnMTUUEo8tEgtbMXnF0a3CUNL9BZxXpSRiD9ebTnmNR0zWPjJ"
-            + "VIDx4tdmCnq55XrJh+RW9aI/b34wAogK3kcORw=",
-            entity.getProperties().get(0).getValue().toString());
+        + "VIDx4tdmCnq55XrJh+RW9aI/b34wAogK3kcORw=",
+        entity.getProperties().get(0).getValue().toString());
   }
 
   @Test(expected = ODataClientErrorException.class)
   public void retrieveBinaryPropertyValueTestWithAtom() throws IOException {
     CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendNavigationSegment("ProductPhoto(PhotoId=-3,ProductId=-3)").appendPropertySegment("Photo");
+        appendNavigationSegment("ProductPhoto(PhotoId=-3,ProductId=-3)").appendPropertySegment("Photo");
     ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
     req.setAccept("application/atom+xml");
     ODataRetrieveResponse<ODataEntity> res = req.execute();
@@ -120,7 +120,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
   @Test(expected = IllegalArgumentException.class)
   public void retrieveBinaryPropertyValueTestWithXML() throws IOException {
     CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendNavigationSegment("ProductPhoto(PhotoId=-3,ProductId=-3)").appendPropertySegment("Photo");
+        appendNavigationSegment("ProductPhoto(PhotoId=-3,ProductId=-3)").appendPropertySegment("Photo");
     ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
     req.setAccept("application/xml");
     ODataRetrieveResponse<ODataEntity> res = req.execute();
@@ -131,8 +131,8 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
   @Test
   public void retrieveCollectionPropertyValueTest() {
     CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Product").appendKeySegment(-7).appendPropertySegment(
-                    "ComplexConcurrency/QueriedDateTime");
+        appendEntitySetSegment("Product").appendKeySegment(-7).appendPropertySegment(
+            "ComplexConcurrency/QueriedDateTime");
     final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
     req.setFormat(ODataFormat.TEXT_PLAIN);
     final ODataValue value = req.execute().getBody();
@@ -145,8 +145,8 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
   @Test
   public void retrieveNullPropertyValueTest() {
     CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Product").appendKeySegment(-10).appendPropertySegment(
-                    "ComplexConcurrency/Token");
+        appendEntitySetSegment("Product").appendKeySegment(-10).appendPropertySegment(
+            "ComplexConcurrency/Token");
     final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
     try {
       req.execute().getBody();

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/QueryOptionsTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/QueryOptionsTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/QueryOptionsTestITCase.java
index 09f4a33..202af48 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/QueryOptionsTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/QueryOptionsTestITCase.java
@@ -1,18 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * 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
- *
+ * 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
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  */
@@ -52,17 +52,17 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
 
   /**
    * Test <tt>$filter</tt> and <tt>orderby</tt>.
-   *
+   * 
    * @see org.apache.olingo.fit.v3.FilterFactoryTestITCase for more tests.
    */
   @Test
   public void filterOrderby() throws EdmPrimitiveTypeException {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Car").filter("(VIN lt 16)");
+        appendEntitySetSegment("Car").filter("(VIN lt 16)");
 
     // 1. check that filtered entity set looks as expected
     ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
-            getEntitySetRequest(uriBuilder.build());
+        getEntitySetRequest(uriBuilder.build());
     ODataEntitySet feed = req.execute().getBody();
     assertNotNull(feed);
     assertEquals(5, feed.getEntities().size());
@@ -98,7 +98,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
   @Test
   public void format() {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Customer").appendKeySegment(-10).format("json");
+        appendEntitySetSegment("Customer").appendKeySegment(-10).format("json");
 
     final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
     req.setFormat(ODataFormat.ATOM);
@@ -106,7 +106,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
     final ODataRetrieveResponse<ODataEntity> res = req.execute();
     assertNotNull(res);
     assertTrue(res.getContentType().replaceAll(" ", "").
-            startsWith(ODataFormat.JSON.getContentType(client.getServiceVersion()).toContentTypeString()));
+        startsWith(ODataFormat.JSON.getContentType(client.getServiceVersion()).toContentTypeString()));
   }
 
   /**
@@ -132,7 +132,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
     uriBuilder.appendEntitySetSegment("Customer").skipToken("-10");
 
     final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
-            getEntitySetRequest(uriBuilder.build());
+        getEntitySetRequest(uriBuilder.build());
     final ODataEntitySet feed = req.execute().getBody();
     assertNotNull(feed);
     assertEquals(2, feed.getEntities().size());
@@ -148,10 +148,10 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
   @Test
   public void inlinecount() {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car").
-            inlineCount(InlineCount.allpages);
+        inlineCount(InlineCount.allpages);
 
     final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
-            getEntitySetRequest(uriBuilder.build());
+        getEntitySetRequest(uriBuilder.build());
     req.setFormat(ODataFormat.ATOM);
     final ODataEntitySet feed = req.execute().getBody();
     assertNotNull(feed);
@@ -164,7 +164,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
   @Test
   public void select() {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Customer").appendKeySegment(-10).select("CustomerId,Orders").expand("Orders");
+        appendEntitySetSegment("Customer").appendKeySegment(-10).select("CustomerId,Orders").expand("Orders");
 
     final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
     final ODataEntity customer = req.execute().getBody();

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/ServiceDocumentTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/ServiceDocumentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/ServiceDocumentTestITCase.java
index 25a2b37..f961f4f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/ServiceDocumentTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/ServiceDocumentTestITCase.java
@@ -1,18 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * 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
- *
+ * 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
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  */
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.v3;
 import static org.junit.Assert.assertEquals;
 
 import java.net.URI;
+
 import org.apache.olingo.client.api.communication.request.retrieve.ODataServiceDocumentRequest;
 import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
 import org.apache.olingo.commons.api.domain.ODataServiceDocument;
@@ -31,7 +32,7 @@ public class ServiceDocumentTestITCase extends AbstractTestITCase {
 
   private void retrieveServiceDocument(final ODataFormat format) {
     final ODataServiceDocumentRequest req =
-            client.getRetrieveRequestFactory().getServiceDocumentRequest(testStaticServiceRootURL);
+        client.getRetrieveRequestFactory().getServiceDocumentRequest(testStaticServiceRootURL);
     req.setFormat(format);
 
     final ODataRetrieveResponse<ODataServiceDocument> res = req.execute();
@@ -41,7 +42,7 @@ public class ServiceDocumentTestITCase extends AbstractTestITCase {
     assertEquals(24, serviceDocument.getEntitySetNames().size());
 
     assertEquals(URI.create(testStaticServiceRootURL + "/ComputerDetail"),
-            serviceDocument.getEntitySetURI("ComputerDetail"));
+        serviceDocument.getEntitySetURI("ComputerDetail"));
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodEntityUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodEntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodEntityUpdateTestITCase.java
index a7589b7..ea12efd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodEntityUpdateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodEntityUpdateTestITCase.java
@@ -1,18 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * 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
- *
+ * 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
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  */

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodPropertyUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodPropertyUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodPropertyUpdateTestITCase.java
index 99ec3b5..291bac4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodPropertyUpdateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodPropertyUpdateTestITCase.java
@@ -1,18 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * 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
- *
+ * 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
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  */

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
index c7f3557..1ecd4bb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
@@ -1,18 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * 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
- *
+ * 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
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  */
@@ -81,7 +81,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
     testAuthServiceRootURL = "http://localhost:9080/stub/DefaultService.svc/V40/Static.svc";
 
     edmClient = ODataClientFactory.getEdmEnabledV4(testStaticServiceRootURL);
-    
+
     edmClient.getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
     client.getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
   }
@@ -109,36 +109,36 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
 
   protected void createAndDeleteOrder(final ODataFormat format, final int id) {
     final ODataEntity order = new ODataEntityImpl(
-            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
+        new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
 
     final ODataProperty orderId = getClient().getObjectFactory().newPrimitiveProperty("OrderID",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id));
+        getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id));
     order.getProperties().add(orderId);
 
     Calendar dateTime = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
     dateTime.set(2011, 2, 4, 16, 3, 57);
     final ODataProperty orderDate = getClient().getObjectFactory().newPrimitiveProperty("OrderDate",
-            getClient().getObjectFactory().newPrimitiveValueBuilder()
+        getClient().getObjectFactory().newPrimitiveValueBuilder()
             .setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(dateTime).build());
     order.getProperties().add(orderDate);
 
     final ODataProperty shelfLife = getClient().getObjectFactory().newPrimitiveProperty("ShelfLife",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().
+        getClient().getObjectFactory().newPrimitiveValueBuilder().
             setType(EdmPrimitiveTypeKind.Duration).setValue(BigDecimal.TEN.scaleByPowerOfTen(7)).build());
     order.getProperties().add(shelfLife);
 
     final ODataCollectionValue<ODataValue> orderShelfLifesValue = getClient().getObjectFactory().
-            newCollectionValue("Collection(Duration)");
+        newCollectionValue("Collection(Duration)");
     orderShelfLifesValue.add(getClient().getObjectFactory().newPrimitiveValueBuilder().
-            setType(EdmPrimitiveTypeKind.Duration).setValue(new BigDecimal("0.0000001")).build());
+        setType(EdmPrimitiveTypeKind.Duration).setValue(new BigDecimal("0.0000001")).build());
     orderShelfLifesValue.add(getClient().getObjectFactory().newPrimitiveValueBuilder().
-            setType(EdmPrimitiveTypeKind.Duration).setValue(new BigDecimal("0.0000002")).build());
+        setType(EdmPrimitiveTypeKind.Duration).setValue(new BigDecimal("0.0000002")).build());
     final ODataProperty orderShelfLifes = getClient().getObjectFactory().
-            newCollectionProperty("OrderShelfLifes", orderShelfLifesValue);
+        newCollectionProperty("OrderShelfLifes", orderShelfLifesValue);
     order.getProperties().add(orderShelfLifes);
 
     final ODataEntityCreateRequest<ODataEntity> req = getClient().getCUDRequestFactory().getEntityCreateRequest(
-            getClient().newURIBuilder(testStaticServiceRootURL).
+        getClient().newURIBuilder(testStaticServiceRootURL).
             appendEntitySetSegment("Orders").build(), order);
     req.setFormat(format);
     final ODataEntity created = req.execute().getBody();
@@ -146,9 +146,9 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
     assertEquals(2, created.getProperty("OrderShelfLifes").getCollectionValue().size());
 
     final URI deleteURI = created.getEditLink() == null
-            ? getClient().newURIBuilder(testStaticServiceRootURL).
+        ? getClient().newURIBuilder(testStaticServiceRootURL).
             appendEntitySetSegment("Orders").appendKeySegment(id).build()
-            : created.getEditLink();
+        : created.getEditLink();
     final ODataDeleteRequest deleteReq = getClient().getCUDRequestFactory().getDeleteRequest(deleteURI);
     final ODataDeleteResponse deleteRes = deleteReq.execute();
     assertEquals(204, deleteRes.getStatusCode());

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
index bcc8313..56c07a6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
@@ -1,18 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * 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
- *
+ * 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
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  */
@@ -48,9 +48,9 @@ public class AsyncTestITCase extends AbstractTestITCase {
   @Test
   public void clientAsync() throws InterruptedException, ExecutionException {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Customers");
+        appendEntitySetSegment("Customers");
     final Future<ODataRetrieveResponse<ODataEntitySet>> futureRes =
-            client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build()).asyncExecute();
+        client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build()).asyncExecute();
     assertNotNull(futureRes);
 
     while (!futureRes.isDone()) {
@@ -65,13 +65,13 @@ public class AsyncTestITCase extends AbstractTestITCase {
 
   private void withInlineEntry(final ODataFormat format) {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
+        appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
 
     final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
     req.setFormat(format);
 
     final AsyncRequestWrapper<ODataRetrieveResponse<ODataEntity>> async =
-            client.getAsyncRequestFactory().<ODataRetrieveResponse<ODataEntity>>getAsyncRequestWrapper(req);
+        client.getAsyncRequestFactory().<ODataRetrieveResponse<ODataEntity>> getAsyncRequestWrapper(req);
 
     final AsyncResponseWrapper<ODataRetrieveResponse<ODataEntity>> responseWrapper = async.execute();
 
@@ -102,15 +102,15 @@ public class AsyncTestITCase extends AbstractTestITCase {
         assertEquals(5, properties.size());
 
         assertTrue(properties.get(0).getName().equals("CompanyID")
-                || properties.get(1).getName().equals("CompanyID")
-                || properties.get(2).getName().equals("CompanyID")
-                || properties.get(3).getName().equals("CompanyID")
-                || properties.get(4).getName().equals("CompanyID"));
+            || properties.get(1).getName().equals("CompanyID")
+            || properties.get(2).getName().equals("CompanyID")
+            || properties.get(3).getName().equals("CompanyID")
+            || properties.get(4).getName().equals("CompanyID"));
         assertTrue(properties.get(0).getValue().toString().equals("0")
-                || properties.get(1).getValue().toString().equals("0")
-                || properties.get(2).getValue().toString().equals("0")
-                || properties.get(3).getValue().toString().equals("0")
-                || properties.get(4).getValue().toString().equals("0"));
+            || properties.get(1).getValue().toString().equals("0")
+            || properties.get(2).getValue().toString().equals("0")
+            || properties.get(3).getValue().toString().equals("0")
+            || properties.get(4).getValue().toString().equals("0"));
 
         found = true;
       }
@@ -132,14 +132,14 @@ public class AsyncTestITCase extends AbstractTestITCase {
 
   private void asyncOrders(final ODataFormat format) {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("async").appendEntitySetSegment("Orders");
+        appendEntitySetSegment("async").appendEntitySetSegment("Orders");
 
     final ODataEntitySetRequest<ODataEntitySet> req =
-            client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
+        client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
     req.setFormat(format);
 
     final AsyncRequestWrapper<ODataRetrieveResponse<ODataEntitySet>> async =
-            client.getAsyncRequestFactory().<ODataRetrieveResponse<ODataEntitySet>>getAsyncRequestWrapper(req);
+        client.getAsyncRequestFactory().<ODataRetrieveResponse<ODataEntitySet>> getAsyncRequestWrapper(req);
     async.callback(URI.create("http://client.service.it/callback/endpoint"));
 
     final AsyncResponseWrapper<ODataRetrieveResponse<ODataEntitySet>> responseWrapper = async.execute();

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java
index d09db86..ca42f04 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2014 The Apache Software Foundation.
- *
+ * 
  * Licensed 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
- *
+ * 
+ * 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 KIND, either express or implied.
@@ -96,15 +96,15 @@ public class AuthBatchTestITCase extends AbstractTestITCase {
     final URI editLink = targetURI.build();
 
     final ODataEntity patch = client.getObjectFactory().newEntity(
-            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
+        new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
     patch.setEditLink(editLink);
 
     patch.getProperties().add(client.getObjectFactory().newPrimitiveProperty(
-            "LastName",
-            client.getObjectFactory().newPrimitiveValueBuilder().buildString("new last name")));
+        "LastName",
+        client.getObjectFactory().newPrimitiveValueBuilder().buildString("new last name")));
 
     final ODataEntityUpdateRequest<ODataEntity> changeReq =
-            client.getCUDRequestFactory().getEntityUpdateRequest(UpdateType.PATCH, patch);
+        client.getCUDRequestFactory().getEntityUpdateRequest(UpdateType.PATCH, patch);
     changeReq.setFormat(ODataFormat.JSON_FULL_METADATA);
 
     changeset.addRequest(changeReq);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java
index 0f511b8..6fdf434 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java
@@ -1,18 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * 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
- *
+ * 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
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  */
@@ -158,7 +158,7 @@ public class BatchTestITCase extends AbstractTestITCase {
     assertEquals(404, res.getStatusCode());
     assertEquals("Not Found", res.getStatusMessage());
     assertEquals(Integer.valueOf(3), Integer.valueOf(
-            res.getHeader(ODataBatchConstants.CHANGESET_CONTENT_ID_NAME).iterator().next()));
+        res.getHeader(ODataBatchConstants.CHANGESET_CONTENT_ID_NAME).iterator().next()));
 
     assertFalse(retitem.hasNext());
     assertFalse(iter.hasNext());
@@ -249,7 +249,7 @@ public class BatchTestITCase extends AbstractTestITCase {
 
     // add create request
     final ODataEntityCreateRequest<ODataEntity> createReq =
-            client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), order);
+        client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), order);
 
     changeset.addRequest(createReq);
 
@@ -259,19 +259,19 @@ public class BatchTestITCase extends AbstractTestITCase {
     // add update request: link CustomerInfo(17) to the new customer
     final ODataEntity customerChanges = client.getObjectFactory().newEntity(order.getTypeName());
     customerChanges.addLink(client.getObjectFactory().newEntitySetNavigationLink(
-            "OrderDetails",
-            client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("OrderDetails").
+        "OrderDetails",
+        client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("OrderDetails").
             appendKeySegment(new HashMap<String, Object>() {
-      private static final long serialVersionUID = 3109256773218160485L;
+              private static final long serialVersionUID = 3109256773218160485L;
 
-      {
-        put("OrderID", 7);
-        put("ProductID", 5);
-      }
-    }).build()));
+              {
+                put("OrderID", 7);
+                put("ProductID", 5);
+              }
+            }).build()));
 
     final ODataEntityUpdateRequest<ODataEntity> updateReq = client.getCUDRequestFactory().getEntityUpdateRequest(
-            URI.create("$" + createRequestRef), UpdateType.PATCH, customerChanges);
+        URI.create("$" + createRequestRef), UpdateType.PATCH, customerChanges);
 
     changeset.addRequest(updateReq);
 
@@ -293,10 +293,10 @@ public class BatchTestITCase extends AbstractTestITCase {
 
     order = ((ODataEntityCreateResponse<ODataEntity>) res).getBody();
     final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().getEntitySetRequest(
-            URIUtils.getURI(testStaticServiceRootURL, order.getEditLink().toASCIIString() + "/OrderDetails"));
+        URIUtils.getURI(testStaticServiceRootURL, order.getEditLink().toASCIIString() + "/OrderDetails"));
 
     assertEquals(Integer.valueOf(7),
-            req.execute().getBody().getEntities().get(0).getProperty("OrderID").getPrimitiveValue().
+        req.execute().getBody().getEntities().get(0).getProperty("OrderID").getPrimitiveValue().
             toCastValue(Integer.class));
 
     res = chgitem.next();
@@ -305,13 +305,13 @@ public class BatchTestITCase extends AbstractTestITCase {
 
     // clean ...
     assertEquals(204, client.getCUDRequestFactory().getDeleteRequest(
-            URIUtils.getURI(testStaticServiceRootURL, order.getEditLink().toASCIIString())).execute().
-            getStatusCode());
+        URIUtils.getURI(testStaticServiceRootURL, order.getEditLink().toASCIIString())).execute().
+        getStatusCode());
 
     try {
       client.getRetrieveRequestFactory().getEntityRequest(
-              URIUtils.getURI(testStaticServiceRootURL, order.getEditLink().toASCIIString())).
-              execute().getBody();
+          URIUtils.getURI(testStaticServiceRootURL, order.getEditLink().toASCIIString())).
+          execute().getBody();
       fail();
     } catch (Exception e) {
       // ignore
@@ -332,7 +332,7 @@ public class BatchTestITCase extends AbstractTestITCase {
     // prepare URI
     URIBuilder targetURI = client.newURIBuilder(testStaticServiceRootURL);
     targetURI.appendEntitySetSegment("Customers").appendKeySegment(1).
-            expand("Orders").select("PersonID,Orders/OrderID");
+        expand("Orders").select("PersonID,Orders/OrderID");
 
     // create new request
     ODataEntityRequest<ODataEntity> queryReq = client.getRetrieveRequestFactory().getEntityRequest(targetURI.build());
@@ -348,7 +348,7 @@ public class BatchTestITCase extends AbstractTestITCase {
     targetURI = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Orders");
     final ODataEntity original = newOrder(2000);
     final ODataEntityCreateRequest<ODataEntity> createReq =
-            client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), original);
+        client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), original);
     createReq.setFormat(ODataFormat.JSON);
     streamManager.addRequest(createReq);
     // -------------------------------------------
@@ -386,7 +386,7 @@ public class BatchTestITCase extends AbstractTestITCase {
   }
 
   @Test
-  @SuppressWarnings({"unchecked"})
+  @SuppressWarnings({ "unchecked" })
   public void batchRequest() throws EdmPrimitiveTypeException {
     // create your request
     final ODataBatchRequest request = client.getBatchRequestFactory().getBatchRequest(testStaticServiceRootURL);
@@ -418,15 +418,15 @@ public class BatchTestITCase extends AbstractTestITCase {
     final URI editLink = targetURI.build();
 
     final ODataEntity patch = client.getObjectFactory().newEntity(
-            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
+        new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
     patch.setEditLink(editLink);
 
     patch.getProperties().add(client.getObjectFactory().newPrimitiveProperty(
-            "LastName",
-            client.getObjectFactory().newPrimitiveValueBuilder().buildString("new last name")));
+        "LastName",
+        client.getObjectFactory().newPrimitiveValueBuilder().buildString("new last name")));
 
     final ODataEntityUpdateRequest<ODataEntity> changeReq =
-            client.getCUDRequestFactory().getEntityUpdateRequest(UpdateType.PATCH, patch);
+        client.getCUDRequestFactory().getEntityUpdateRequest(UpdateType.PATCH, patch);
     changeReq.setFormat(ODataFormat.JSON_FULL_METADATA);
 
     changeset.addRequest(changeReq);
@@ -435,7 +435,7 @@ public class BatchTestITCase extends AbstractTestITCase {
     targetURI = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Orders");
     final ODataEntity original = newOrder(1000);
     final ODataEntityCreateRequest<ODataEntity> createReq =
-            client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), original);
+        client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), original);
     createReq.setFormat(ODataFormat.JSON);
     changeset.addRequest(createReq);
     // -------------------------------------------
@@ -468,7 +468,7 @@ public class BatchTestITCase extends AbstractTestITCase {
     assertEquals("OK", res.getStatusMessage());
 
     ODataEntityRequestImpl<ODataEntity>.ODataEntityResponseImpl entres =
-            (ODataEntityRequestImpl.ODataEntityResponseImpl) res;
+        (ODataEntityRequestImpl.ODataEntityResponseImpl) res;
 
     ODataEntity entity = entres.getBody();
     assertEquals(1, entity.getProperty("PersonID").getPrimitiveValue().toCastValue(Integer.class), 0);
@@ -513,7 +513,7 @@ public class BatchTestITCase extends AbstractTestITCase {
   public void async() {
     // create your request
     final ODataBatchRequest request = client.getBatchRequestFactory().getBatchRequest(
-            URI.create(testStaticServiceRootURL + "/async/").normalize().toASCIIString());
+        URI.create(testStaticServiceRootURL + "/async/").normalize().toASCIIString());
     request.setAccept(ACCEPT);
 
     final AsyncBatchRequestWrapper async = client.getAsyncRequestFactory().getAsyncBatchRequestWrapper(request);
@@ -632,54 +632,22 @@ public class BatchTestITCase extends AbstractTestITCase {
     }
   }
 
-  private static class BatchStreamingThread extends Thread {
-
-    private final BatchManager streaming;
-
-    public BatchStreamingThread(final BatchManager streaming) {
-      super();
-      this.streaming = streaming;
-    }
-
-    @Override
-    public void run() {
-      try {
-        final StringBuilder builder = new StringBuilder();
-
-        final byte[] buff = new byte[1024];
-
-        int len;
-
-        while ((len = streaming.getBody().read(buff)) >= 0) {
-          builder.append(new String(buff, 0, len));
-        }
-
-        LOG.debug("Batch request {}", builder.toString());
-
-        assertTrue(builder.toString().contains("Content-Id:2"));
-        assertTrue(builder.toString().contains("GET " + testStaticServiceRootURL));
-      } catch (IOException e) {
-        fail();
-      }
-    }
-  }
-
   private ODataEntity newOrder(final int id) {
     final ODataEntity order = getClient().getObjectFactory().
-            newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
+        newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
 
     order.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("OrderID",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
+        getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
     order.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("OrderDate",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().
+        getClient().getObjectFactory().newPrimitiveValueBuilder().
             setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(Calendar.getInstance()).build()));
     order.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("ShelfLife",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().
+        getClient().getObjectFactory().newPrimitiveValueBuilder().
             setType(EdmPrimitiveTypeKind.Duration).setValue(new BigDecimal("0.0000002")).build()));
     order.getProperties().add(getClient().getObjectFactory().newCollectionProperty("OrderShelfLifes",
-            getClient().getObjectFactory().newCollectionValue(EdmPrimitiveTypeKind.Duration.name()).add(
+        getClient().getObjectFactory().newCollectionValue(EdmPrimitiveTypeKind.Duration.name()).add(
             getClient().getObjectFactory().newPrimitiveValueBuilder().setType(EdmPrimitiveTypeKind.Duration).
-            setValue(new BigDecimal("0.0000002")).build())));
+                setValue(new BigDecimal("0.0000002")).build())));
 
     return order;
   }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java
index 1e6fc57..122096e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java
@@ -1,18 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * 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
- *
+ * 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
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  */
@@ -54,7 +54,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
     // GetEmployeesCount
     URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).appendSingletonSegment("Company");
     final ODataEntityRequest<ODataSingleton> singletonReq =
-            client.getRetrieveRequestFactory().getSingletonRequest(builder.build());
+        client.getRetrieveRequestFactory().getSingletonRequest(builder.build());
     singletonReq.setFormat(format);
     final ODataSingleton company = singletonReq.execute().getBody();
     assertNotNull(company);
@@ -63,7 +63,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
     assertNotNull(boundOp);
 
     final ODataInvokeRequest<ODataProperty> getEmployeesCountReq =
-            client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataProperty.class);
+        client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataProperty.class);
     getEmployeesCountReq.setFormat(format);
     final ODataProperty getEmployeesCountRes = getEmployeesCountReq.execute().getBody();
     assertNotNull(getEmployeesCountRes);
@@ -71,9 +71,9 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
 
     // GetProductDetails
     builder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Products").appendKeySegment(5);
+        appendEntitySetSegment("Products").appendKeySegment(5);
     ODataEntityRequest<ODataEntity> entityReq = client.getRetrieveRequestFactory().
-            getEntityRequest(builder.build());
+        getEntityRequest(builder.build());
     entityReq.setFormat(format);
     ODataEntity entity = entityReq.execute().getBody();
     assertNotNull(entity);
@@ -83,8 +83,8 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
 
     final ODataPrimitiveValue count = client.getObjectFactory().newPrimitiveValueBuilder().buildInt32(1);
     final ODataInvokeRequest<ODataEntitySet> getProductDetailsReq =
-            client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataEntitySet.class,
-                    Collections.<String, ODataValue>singletonMap("count", count));
+        client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataEntitySet.class,
+            Collections.<String, ODataValue> singletonMap("count", count));
     getProductDetailsReq.setFormat(format);
     final ODataEntitySet getProductDetailsRes = getProductDetailsReq.execute().getBody();
     assertNotNull(getProductDetailsRes);
@@ -95,7 +95,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
     keyMap.put("ProductID", 6);
     keyMap.put("ProductDetailID", 1);
     builder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("ProductDetails").appendKeySegment(keyMap);
+        appendEntitySetSegment("ProductDetails").appendKeySegment(keyMap);
     entityReq = client.getRetrieveRequestFactory().getEntityRequest(builder.build());
     entityReq.setFormat(format);
     entity = entityReq.execute().getBody();
@@ -105,17 +105,17 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
     assertNotNull(boundOp);
 
     final ODataInvokeRequest<ODataEntity> getRelatedProductReq =
-            client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataEntity.class);
+        client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataEntity.class);
     getRelatedProductReq.setFormat(format);
     final ODataEntity getRelatedProductRes = getRelatedProductReq.execute().getBody();
     assertNotNull(getRelatedProductRes);
     assertEquals("Microsoft.Test.OData.Services.ODataWCFService.Product",
-            getRelatedProductRes.getTypeName().toString());
+        getRelatedProductRes.getTypeName().toString());
     assertEquals(6, getRelatedProductRes.getProperty("ProductID").getPrimitiveValue().toCastValue(Integer.class), 0);
 
     // GetDefaultPI
     builder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Accounts").appendKeySegment(102);
+        appendEntitySetSegment("Accounts").appendKeySegment(102);
     entityReq = client.getRetrieveRequestFactory().getEntityRequest(builder.build());
     entityReq.setFormat(format);
     entity = entityReq.execute().getBody();
@@ -125,31 +125,31 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
     assertNotNull(boundOp);
 
     final ODataInvokeRequest<ODataEntity> getDefaultPIReq =
-            client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataEntity.class);
+        client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataEntity.class);
     getDefaultPIReq.setFormat(format);
     final ODataEntity getDefaultPIRes = getDefaultPIReq.execute().getBody();
     assertNotNull(getDefaultPIRes);
     assertEquals("Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument",
-            getDefaultPIRes.getTypeName().toString());
+        getDefaultPIRes.getTypeName().toString());
     assertEquals(102901,
-            getDefaultPIRes.getProperty("PaymentInstrumentID").getPrimitiveValue().toCastValue(Integer.class), 0);
+        getDefaultPIRes.getProperty("PaymentInstrumentID").getPrimitiveValue().toCastValue(Integer.class), 0);
 
     // GetAccountInfo
     boundOp = entity.getOperation("Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo");
     assertNotNull(boundOp);
 
     final ODataInvokeRequest<ODataProperty> getAccountInfoReq =
-            client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataProperty.class);
+        client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataProperty.class);
     getAccountInfoReq.setFormat(format);
     final ODataProperty getAccountInfoRes = getAccountInfoReq.execute().getBody();
     assertNotNull(getAccountInfoRes);
     assertTrue(getAccountInfoRes.hasComplexValue());
     assertEquals("Microsoft.Test.OData.Services.ODataWCFService.AccountInfo",
-            getAccountInfoRes.getComplexValue().getTypeName());
+        getAccountInfoRes.getComplexValue().getTypeName());
 
     // GetActualAmount
     entityReq = client.getRetrieveRequestFactory().getEntityRequest(
-            entity.getNavigationLink("MyGiftCard").getLink());
+        entity.getNavigationLink("MyGiftCard").getLink());
     entityReq.setFormat(format);
     entity = entityReq.execute().getBody();
     assertNotNull(entity);
@@ -160,8 +160,8 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
 
     final ODataPrimitiveValue bonusRate = client.getObjectFactory().newPrimitiveValueBuilder().buildDouble(1.1);
     final ODataInvokeRequest<ODataProperty> getActualAmountReq =
-            client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataProperty.class,
-                    Collections.<String, ODataValue>singletonMap("bonusRate", bonusRate));
+        client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataProperty.class,
+            Collections.<String, ODataValue> singletonMap("bonusRate", bonusRate));
     getActualAmountReq.setFormat(format);
     final ODataProperty getActualAmountRes = getActualAmountReq.execute().getBody();
     assertNotNull(getActualAmountRes);
@@ -182,11 +182,11 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
   public void edmEnabledFunctions() throws EdmPrimitiveTypeException {
     // GetEmployeesCount
     final ODataInvokeRequest<ODataProperty> getEmployeesCountReq =
-            edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
-                    edmClient.newURIBuilder().appendSingletonSegment("Company").build(),
-                    new FullQualifiedName(("Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount")),
-                    new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Company"),
-                    false);
+        edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
+            edmClient.newURIBuilder().appendSingletonSegment("Company").build(),
+            new FullQualifiedName(("Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount")),
+            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Company"),
+            false);
     final ODataProperty getEmployeesCountRes = getEmployeesCountReq.execute().getBody();
     assertNotNull(getEmployeesCountRes);
     assertTrue(getEmployeesCountRes.hasPrimitiveValue());
@@ -194,12 +194,12 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
     // GetProductDetails
     final ODataPrimitiveValue count = edmClient.getObjectFactory().newPrimitiveValueBuilder().buildInt32(1);
     final ODataInvokeRequest<ODataEntitySet> getProductDetailsReq =
-            edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
-                    edmClient.newURIBuilder().appendEntitySetSegment("Products").appendKeySegment(5).build(),
-                    new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"),
-                    new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Product"),
-                    false,
-                    Collections.<String, ODataValue>singletonMap("count", count));
+        edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
+            edmClient.newURIBuilder().appendEntitySetSegment("Products").appendKeySegment(5).build(),
+            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"),
+            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Product"),
+            false,
+            Collections.<String, ODataValue> singletonMap("count", count));
     final ODataEntitySet getProductDetailsRes = getProductDetailsReq.execute().getBody();
     assertNotNull(getProductDetailsRes);
     assertEquals(1, getProductDetailsRes.getCount());
@@ -211,54 +211,54 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
     URIBuilder builder = edmClient.newURIBuilder().appendEntitySetSegment("ProductDetails").appendKeySegment(keyMap);
 
     final ODataInvokeRequest<ODataEntity> getRelatedProductReq =
-            edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
-                    builder.build(),
-                    new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct"),
-                    new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.ProductDetail"),
-                    false);
+        edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
+            builder.build(),
+            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct"),
+            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.ProductDetail"),
+            false);
     final ODataEntity getRelatedProductRes = getRelatedProductReq.execute().getBody();
     assertNotNull(getRelatedProductRes);
     assertEquals("Microsoft.Test.OData.Services.ODataWCFService.Product",
-            getRelatedProductRes.getTypeName().toString());
+        getRelatedProductRes.getTypeName().toString());
     assertEquals(6, getRelatedProductRes.getProperty("ProductID").getPrimitiveValue().toCastValue(Integer.class), 0);
 
     // GetDefaultPI
     final ODataInvokeRequest<ODataEntity> getDefaultPIReq =
-            edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
-                    edmClient.newURIBuilder().appendEntitySetSegment("Accounts").appendKeySegment(102).build(),
-                    new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"),
-                    new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Account"),
-                    false);
+        edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
+            edmClient.newURIBuilder().appendEntitySetSegment("Accounts").appendKeySegment(102).build(),
+            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"),
+            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Account"),
+            false);
     final ODataEntity getDefaultPIRes = getDefaultPIReq.execute().getBody();
     assertNotNull(getDefaultPIRes);
     assertEquals("Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument",
-            getDefaultPIRes.getTypeName().toString());
+        getDefaultPIRes.getTypeName().toString());
     assertEquals(102901,
-            getDefaultPIRes.getProperty("PaymentInstrumentID").getPrimitiveValue().toCastValue(Integer.class), 0);
+        getDefaultPIRes.getProperty("PaymentInstrumentID").getPrimitiveValue().toCastValue(Integer.class), 0);
 
     // GetAccountInfo
     final ODataInvokeRequest<ODataProperty> getAccountInfoReq =
-            edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
-                    edmClient.newURIBuilder().appendEntitySetSegment("Accounts").appendKeySegment(102).build(),
-                    new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"),
-                    new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Account"),
-                    false);
+        edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
+            edmClient.newURIBuilder().appendEntitySetSegment("Accounts").appendKeySegment(102).build(),
+            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"),
+            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Account"),
+            false);
     final ODataProperty getAccountInfoRes = getAccountInfoReq.execute().getBody();
     assertNotNull(getAccountInfoRes);
     assertTrue(getAccountInfoRes.hasComplexValue());
     assertEquals("Microsoft.Test.OData.Services.ODataWCFService.AccountInfo",
-            getAccountInfoRes.getComplexValue().getTypeName());
+        getAccountInfoRes.getComplexValue().getTypeName());
 
     // GetActualAmount
     final ODataPrimitiveValue bonusRate = edmClient.getObjectFactory().newPrimitiveValueBuilder().buildDouble(1.1);
     final ODataInvokeRequest<ODataProperty> getActualAmountReq =
-            edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
-                    edmClient.newURIBuilder().appendEntitySetSegment("Accounts").appendKeySegment(102).
-                    appendNavigationSegment("MyGiftCard").build(),
-                    new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"),
-                    new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GiftCard"),
-                    false,
-                    Collections.<String, ODataValue>singletonMap("bonusRate", bonusRate));
+        edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
+            edmClient.newURIBuilder().appendEntitySetSegment("Accounts").appendKeySegment(102).
+                appendNavigationSegment("MyGiftCard").build(),
+            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"),
+            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GiftCard"),
+            false,
+            Collections.<String, ODataValue> singletonMap("bonusRate", bonusRate));
     final ODataProperty getActualAmountRes = getActualAmountReq.execute().getBody();
     assertNotNull(getActualAmountRes);
     assertEquals(41.79, getActualAmountRes.getPrimitiveValue().toCastValue(Double.class), 0);
@@ -268,7 +268,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
     // IncreaseRevenue
     URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).appendSingletonSegment("Company");
     ODataEntityRequest<ODataEntity> entityReq =
-            client.getRetrieveRequestFactory().getEntityRequest(builder.build());
+        client.getRetrieveRequestFactory().getEntityRequest(builder.build());
     entityReq.setFormat(format);
     ODataEntity entity = entityReq.execute().getBody();
     assertNotNull(entity);
@@ -277,10 +277,10 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
     assertNotNull(boundOp);
 
     final ODataPrimitiveValue increaseValue =
-            client.getObjectFactory().newPrimitiveValueBuilder().buildInt64(12L);
+        client.getObjectFactory().newPrimitiveValueBuilder().buildInt64(12L);
     final ODataInvokeRequest<ODataProperty> increaseRevenueReq =
-            client.getInvokeRequestFactory().getActionInvokeRequest(boundOp.getTarget(), ODataProperty.class,
-                    Collections.<String, ODataValue>singletonMap("IncreaseValue", increaseValue));
+        client.getInvokeRequestFactory().getActionInvokeRequest(boundOp.getTarget(), ODataProperty.class,
+            Collections.<String, ODataValue> singletonMap("IncreaseValue", increaseValue));
     increaseRevenueReq.setFormat(format);
     final ODataProperty increaseRevenueRes = increaseRevenueReq.execute().getBody();
     assertNotNull(increaseRevenueRes);
@@ -288,7 +288,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
 
     // AddAccessRight
     builder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Products").appendKeySegment(5);
+        appendEntitySetSegment("Products").appendKeySegment(5);
     entityReq = client.getRetrieveRequestFactory().getEntityRequest(builder.build());
     entityReq.setFormat(format);
     entity = entityReq.execute().getBody();
@@ -298,10 +298,10 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
     assertNotNull(boundOp);
 
     final ODataEnumValue accessRight = client.getObjectFactory().
-            newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", "Execute");
+        newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", "Execute");
     final ODataInvokeRequest<ODataProperty> getProductDetailsReq =
-            client.getInvokeRequestFactory().getActionInvokeRequest(boundOp.getTarget(), ODataProperty.class,
-                    Collections.<String, ODataValue>singletonMap("accessRight", accessRight));
+        client.getInvokeRequestFactory().getActionInvokeRequest(boundOp.getTarget(), ODataProperty.class,
+            Collections.<String, ODataValue> singletonMap("accessRight", accessRight));
     getProductDetailsReq.setFormat(format);
     final ODataProperty getProductDetailsRes = getProductDetailsReq.execute().getBody();
     assertNotNull(getProductDetailsRes);
@@ -309,7 +309,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
 
     // ResetAddress
     builder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Customers").appendKeySegment(2);
+        appendEntitySetSegment("Customers").appendKeySegment(2);
     entityReq = client.getRetrieveRequestFactory().getEntityRequest(builder.build());
     entityReq.setFormat(format);
     entity = entityReq.execute().getBody();
@@ -319,23 +319,23 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
     assertNotNull(boundOp);
 
     final ODataCollectionValue<org.apache.olingo.commons.api.domain.v4.ODataValue> addresses =
-            client.getObjectFactory().
+        client.getObjectFactory().
             newCollectionValue("Collection(Microsoft.Test.OData.Services.ODataWCFService.Address)");
     final ODataComplexValue<ODataProperty> address = client.getObjectFactory().
-            newLinkedComplexValue("Microsoft.Test.OData.Services.ODataWCFService.Address");
+        newLinkedComplexValue("Microsoft.Test.OData.Services.ODataWCFService.Address");
     address.add(client.getObjectFactory().newPrimitiveProperty("Street",
-            client.getObjectFactory().newPrimitiveValueBuilder().buildString("Piazza La Bomba E Scappa")));
+        client.getObjectFactory().newPrimitiveValueBuilder().buildString("Piazza La Bomba E Scappa")));
     address.add(client.getObjectFactory().newPrimitiveProperty("City",
-            client.getObjectFactory().newPrimitiveValueBuilder().buildString("Tollo")));
+        client.getObjectFactory().newPrimitiveValueBuilder().buildString("Tollo")));
     address.add(client.getObjectFactory().newPrimitiveProperty("PostalCode",
-            client.getObjectFactory().newPrimitiveValueBuilder().buildString("66010")));
+        client.getObjectFactory().newPrimitiveValueBuilder().buildString("66010")));
     addresses.add(address);
     final ODataPrimitiveValue index = client.getObjectFactory().newPrimitiveValueBuilder().buildInt32(0);
     final Map<String, ODataValue> params = new LinkedHashMap<String, ODataValue>(2);
     params.put("addresses", addresses);
     params.put("index", index);
     final ODataInvokeRequest<ODataEntity> resetAddressReq =
-            client.getInvokeRequestFactory().getActionInvokeRequest(boundOp.getTarget(), ODataEntity.class, params);
+        client.getInvokeRequestFactory().getActionInvokeRequest(boundOp.getTarget(), ODataEntity.class, params);
     resetAddressReq.setFormat(format);
     final ODataEntity resetAddressRes = resetAddressReq.execute().getBody();
     assertNotNull(resetAddressRes);
@@ -343,7 +343,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
 
     // RefreshDefaultPI
     builder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Accounts").appendKeySegment(102);
+        appendEntitySetSegment("Accounts").appendKeySegment(102);
     entityReq = client.getRetrieveRequestFactory().getEntityRequest(builder.build());
     entityReq.setFormat(format);
     entity = entityReq.execute().getBody();
@@ -355,17 +355,17 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
     Calendar dateTime = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
     dateTime.set(2014, 3, 9, 0, 0, 0);
     final ODataPrimitiveValue newDate = client.getObjectFactory().newPrimitiveValueBuilder().
-            setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(dateTime).build();
+        setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(dateTime).build();
     final ODataInvokeRequest<ODataEntity> getDefaultPIReq =
-            client.getInvokeRequestFactory().getActionInvokeRequest(boundOp.getTarget(), ODataEntity.class,
-                    Collections.<String, ODataValue>singletonMap("newDate", newDate));
+        client.getInvokeRequestFactory().getActionInvokeRequest(boundOp.getTarget(), ODataEntity.class,
+            Collections.<String, ODataValue> singletonMap("newDate", newDate));
     getDefaultPIReq.setFormat(format);
     final ODataEntity getDefaultPIRes = getDefaultPIReq.execute().getBody();
     assertNotNull(getDefaultPIRes);
     assertEquals("Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument",
-            getDefaultPIRes.getTypeName().toString());
+        getDefaultPIRes.getTypeName().toString());
     assertEquals(102901,
-            getDefaultPIRes.getProperty("PaymentInstrumentID").getPrimitiveValue().toCastValue(Integer.class), 0);
+        getDefaultPIRes.getProperty("PaymentInstrumentID").getPrimitiveValue().toCastValue(Integer.class), 0);
   }
 
   @Test
@@ -383,42 +383,42 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
     // IncreaseRevenue
     final ODataPrimitiveValue increaseValue = edmClient.getObjectFactory().newPrimitiveValueBuilder().buildInt64(12L);
     final ODataInvokeRequest<ODataProperty> increaseRevenueReq =
-            edmClient.getInvokeRequestFactory().getBoundActionInvokeRequest(
-                    edmClient.newURIBuilder().appendSingletonSegment("Company").build(),
-                    new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue"),
-                    new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Company"),
-                    false,
-                    Collections.<String, ODataValue>singletonMap("IncreaseValue", increaseValue));
+        edmClient.getInvokeRequestFactory().getBoundActionInvokeRequest(
+            edmClient.newURIBuilder().appendSingletonSegment("Company").build(),
+            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue"),
+            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Company"),
+            false,
+            Collections.<String, ODataValue> singletonMap("IncreaseValue", increaseValue));
     final ODataProperty increaseRevenueRes = increaseRevenueReq.execute().getBody();
     assertNotNull(increaseRevenueRes);
     assertTrue(increaseRevenueRes.hasPrimitiveValue());
 
     // AddAccessRight
     final ODataEnumValue accessRight = edmClient.getObjectFactory().
-            newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", "Execute");
+        newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", "Execute");
     final ODataInvokeRequest<ODataProperty> getProductDetailsReq =
-            edmClient.getInvokeRequestFactory().getBoundActionInvokeRequest(
-                    edmClient.newURIBuilder().appendEntitySetSegment("Products").appendKeySegment(5).build(),
-                    new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"),
-                    new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Product"),
-                    false,
-                    Collections.<String, ODataValue>singletonMap("accessRight", accessRight));
+        edmClient.getInvokeRequestFactory().getBoundActionInvokeRequest(
+            edmClient.newURIBuilder().appendEntitySetSegment("Products").appendKeySegment(5).build(),
+            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"),
+            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Product"),
+            false,
+            Collections.<String, ODataValue> singletonMap("accessRight", accessRight));
     final ODataProperty getProductDetailsRes = getProductDetailsReq.execute().getBody();
     assertNotNull(getProductDetailsRes);
     assertTrue(getProductDetailsRes.hasEnumValue());
 
     // ResetAddress
     final ODataCollectionValue<org.apache.olingo.commons.api.domain.v4.ODataValue> addresses =
-            edmClient.getObjectFactory().
+        edmClient.getObjectFactory().
             newCollectionValue("Collection(Microsoft.Test.OData.Services.ODataWCFService.Address)");
     final ODataComplexValue<ODataProperty> address = edmClient.getObjectFactory().
-            newLinkedComplexValue("Microsoft.Test.OData.Services.ODataWCFService.Address");
+        newLinkedComplexValue("Microsoft.Test.OData.Services.ODataWCFService.Address");
     address.add(edmClient.getObjectFactory().newPrimitiveProperty("Street",
-            edmClient.getObjectFactory().newPrimitiveValueBuilder().buildString("Piazza La Bomba E Scappa")));
+        edmClient.getObjectFactory().newPrimitiveValueBuilder().buildString("Piazza La Bomba E Scappa")));
     address.add(edmClient.getObjectFactory().newPrimitiveProperty("City",
-            edmClient.getObjectFactory().newPrimitiveValueBuilder().buildString("Tollo")));
+        edmClient.getObjectFactory().newPrimitiveValueBuilder().buildString("Tollo")));
     address.add(edmClient.getObjectFactory().newPrimitiveProperty("PostalCode",
-            edmClient.getObjectFactory().newPrimitiveValueBuilder().buildString("66010")));
+        edmClient.getObjectFactory().newPrimitiveValueBuilder().buildString("66010")));
     addresses.add(address);
     final ODataPrimitiveValue index = edmClient.getObjectFactory().newPrimitiveValueBuilder().buildInt32(0);
     final Map<String, ODataValue> params = new LinkedHashMap<String, ODataValue>(2);
@@ -427,12 +427,12 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
     final Map<String, Object> keys = new HashMap<String, Object>();
     keys.put("PersonID", 2);
     final ODataInvokeRequest<ODataEntity> resetAddressReq =
-            edmClient.getInvokeRequestFactory().getBoundActionInvokeRequest(
-                    edmClient.newURIBuilder().appendEntitySetSegment("Customers").appendKeySegment(keys).build(),
-                    new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"),
-                    new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Person"),
-                    false,
-                    params);
+        edmClient.getInvokeRequestFactory().getBoundActionInvokeRequest(
+            edmClient.newURIBuilder().appendEntitySetSegment("Customers").appendKeySegment(keys).build(),
+            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"),
+            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Person"),
+            false,
+            params);
     final ODataEntity resetAddressRes = resetAddressReq.execute().getBody();
     assertNotNull(resetAddressRes);
     assertEquals(2, resetAddressRes.getProperty("PersonID").getPrimitiveValue().toCastValue(Integer.class), 0);
@@ -441,19 +441,19 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
     Calendar dateTime = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
     dateTime.set(2014, 3, 9, 0, 0, 0);
     final ODataPrimitiveValue newDate = edmClient.getObjectFactory().newPrimitiveValueBuilder().
-            setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(dateTime).build();
+        setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(dateTime).build();
     final ODataInvokeRequest<ODataEntity> getDefaultPIReq =
-            edmClient.getInvokeRequestFactory().getBoundActionInvokeRequest(
-                    edmClient.newURIBuilder().appendEntitySetSegment("Accounts").appendKeySegment(102).build(),
-                    new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"),
-                    new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Account"),
-                    false,
-                    Collections.<String, ODataValue>singletonMap("newDate", newDate));
+        edmClient.getInvokeRequestFactory().getBoundActionInvokeRequest(
+            edmClient.newURIBuilder().appendEntitySetSegment("Accounts").appendKeySegment(102).build(),
+            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"),
+            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Account"),
+            false,
+            Collections.<String, ODataValue> singletonMap("newDate", newDate));
     final ODataEntity getDefaultPIRes = getDefaultPIReq.execute().getBody();
     assertNotNull(getDefaultPIRes);
     assertEquals("Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument",
-            getDefaultPIRes.getTypeName().toString());
+        getDefaultPIRes.getTypeName().toString());
     assertEquals(102901,
-            getDefaultPIRes.getProperty("PaymentInstrumentID").getPrimitiveValue().toCastValue(Integer.class), 0);
+        getDefaultPIRes.getProperty("PaymentInstrumentID").getPrimitiveValue().toCastValue(Integer.class), 0);
   }
 }