olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sklev...@apache.org
Subject [03/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle issues
Date Mon, 30 Jun 2014 14:57:33 GMT
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java
index 748d5ed..ff69f43 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.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.
  */
@@ -73,10 +73,10 @@ public class ConformanceTestITCase extends AbstractTestITCase {
   @Test
   public void item1() {
     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());
+        client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
 
     assertEquals("4.0", req.getHeader("OData-MaxVersion"));
     assertEquals("4.0", req.getHeader(HeaderName.odataMaxVersion.toString()));
@@ -90,36 +90,36 @@ public class ConformanceTestITCase extends AbstractTestITCase {
   @Test
   public void item2() {
     final ODataEntity order =
-            new ODataEntityImpl(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
+        new ODataEntityImpl(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
 
     final ODataProperty orderId = getClient().getObjectFactory().newPrimitiveProperty("OrderID",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(2000));
+        getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(2000));
     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(new BigDecimal("0.0000001")).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(ODataFormat.JSON_FULL_METADATA);
 
@@ -129,22 +129,22 @@ public class ConformanceTestITCase extends AbstractTestITCase {
 
     // check for Content-Type
     assertEquals(
-            ODataFormat.JSON_FULL_METADATA.getContentType(ODataServiceVersion.V40).toContentTypeString(),
-            req.getHeader("Content-Type"));
+        ODataFormat.JSON_FULL_METADATA.getContentType(ODataServiceVersion.V40).toContentTypeString(),
+        req.getHeader("Content-Type"));
     assertEquals(
-            ODataFormat.JSON_FULL_METADATA.getContentType(ODataServiceVersion.V40).toContentTypeString(),
-            req.getHeader(HeaderName.contentType.toString()));
+        ODataFormat.JSON_FULL_METADATA.getContentType(ODataServiceVersion.V40).toContentTypeString(),
+        req.getHeader(HeaderName.contentType.toString()));
     assertEquals(
-            ODataFormat.JSON_FULL_METADATA.getContentType(ODataServiceVersion.V40).toContentTypeString(),
-            req.getContentType());
+        ODataFormat.JSON_FULL_METADATA.getContentType(ODataServiceVersion.V40).toContentTypeString(),
+        req.getContentType());
 
     final ODataEntity created = req.execute().getBody();
     assertNotNull(created);
 
     final URI deleteURI = created.getEditLink() == null
-            ? getClient().newURIBuilder(testStaticServiceRootURL).
+        ? getClient().newURIBuilder(testStaticServiceRootURL).
             appendEntitySetSegment("Orders").appendKeySegment(2000).build()
-            : created.getEditLink();
+        : created.getEditLink();
     final ODataDeleteRequest deleteReq = getClient().getCUDRequestFactory().getDeleteRequest(deleteURI);
     final ODataDeleteResponse deleteRes = deleteReq.execute();
     assertEquals(204, deleteRes.getStatusCode());
@@ -156,10 +156,10 @@ public class ConformanceTestITCase extends AbstractTestITCase {
   @Test
   public void item4() {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("redirect").
-            appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
+        appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
 
     final ODataEntityRequest<ODataEntity> req =
-            client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
+        client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
 
     assertEquals("4.0", req.getHeader("OData-MaxVersion"));
     assertEquals("4.0", req.getHeader(HeaderName.odataMaxVersion.toString()));
@@ -181,7 +181,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("People");
 
     ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
-            getEntitySetRequest(uriBuilder.build());
+        getEntitySetRequest(uriBuilder.build());
     req.setFormat(ODataFormat.JSON_FULL_METADATA);
     req.setPrefer(client.newPreferences().maxPageSize(5));
 
@@ -215,29 +215,29 @@ public class ConformanceTestITCase extends AbstractTestITCase {
     final Integer id = 2000;
 
     ODataEntity rowIndex = getClient().getObjectFactory().newEntity(
-            new FullQualifiedName("Microsoft.Test.OData.Services.OpenTypesServiceV4.RowIndex"));
+        new FullQualifiedName("Microsoft.Test.OData.Services.OpenTypesServiceV4.RowIndex"));
     getClient().getBinder().add(rowIndex,
-            getClient().getObjectFactory().newPrimitiveProperty("Id",
-                    getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
+        getClient().getObjectFactory().newPrimitiveProperty("Id",
+            getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
 
     // add property not in metadata
     getClient().getBinder().add(rowIndex,
-            getClient().getObjectFactory().newPrimitiveProperty("aString",
-                    getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("string")));
+        getClient().getObjectFactory().newPrimitiveProperty("aString",
+            getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("string")));
 
     // add navigation property not in metadata
     rowIndex.addLink(client.getObjectFactory().newEntityNavigationLink(
-            "Row", URI.create(testOpenTypeServiceRootURL + "/Row(71f7d0dc-ede4-45eb-b421-555a2aa1e58f)")));
+        "Row", URI.create(testOpenTypeServiceRootURL + "/Row(71f7d0dc-ede4-45eb-b421-555a2aa1e58f)")));
 
     final ODataEntityCreateRequest<ODataEntity> createReq = getClient().getCUDRequestFactory().
-            getEntityCreateRequest(getClient().newURIBuilder(testOpenTypeServiceRootURL).
-                    appendEntitySetSegment("RowIndex").build(), rowIndex);
+        getEntityCreateRequest(getClient().newURIBuilder(testOpenTypeServiceRootURL).
+            appendEntitySetSegment("RowIndex").build(), rowIndex);
 
     final ODataEntityCreateResponse<ODataEntity> createRes = createReq.execute();
     assertEquals(201, createRes.getStatusCode());
 
     final URIBuilder builder = getClient().newURIBuilder(testOpenTypeServiceRootURL).
-            appendEntitySetSegment("RowIndex").appendKeySegment(id);
+        appendEntitySetSegment("RowIndex").appendKeySegment(id);
 
     rowIndex = read(ODataFormat.JSON_FULL_METADATA, builder.build());
     assertNotNull(rowIndex);
@@ -246,7 +246,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
     assertNotNull(rowIndex.getNavigationLink("Row"));
 
     final ODataDeleteResponse deleteRes = getClient().getCUDRequestFactory().
-            getDeleteRequest(rowIndex.getEditLink()).execute();
+        getDeleteRequest(rowIndex.getEditLink()).execute();
     assertEquals(204, deleteRes.getStatusCode());
   }
 
@@ -256,18 +256,18 @@ public class ConformanceTestITCase extends AbstractTestITCase {
   @Test
   public void item7() {
     final URI uri = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Customers").appendKeySegment(1).build();
+        appendEntitySetSegment("Customers").appendKeySegment(1).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(uri);
 
     final String newname = "New Name (" + System.currentTimeMillis() + ")";
     patch.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("FirstName",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().buildString(newname)));
+        getClient().getObjectFactory().newPrimitiveValueBuilder().buildString(newname)));
 
     final ODataEntityUpdateRequest<ODataEntity> req =
-            getClient().getCUDRequestFactory().getEntityUpdateRequest(UpdateType.PATCH, patch);
+        getClient().getCUDRequestFactory().getEntityUpdateRequest(UpdateType.PATCH, patch);
 
     final ODataEntityUpdateResponse<ODataEntity> res = req.execute();
     assertEquals(204, res.getStatusCode());
@@ -287,7 +287,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
     client.getConfiguration().setHttpClientFactory(new BasicAuthHttpClientFactory("odatajclient", "odatajclient"));
 
     final CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testAuthServiceRootURL).
-            appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
+        appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
 
     final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
     req.setFormat(ODataFormat.JSON_FULL_METADATA);
@@ -303,8 +303,8 @@ public class ConformanceTestITCase extends AbstractTestITCase {
   @Test
   public void item9() {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Orders").appendKeySegment(8).appendNavigationSegment("CustomerForOrder").
-            appendRefSegment();
+        appendEntitySetSegment("Orders").appendKeySegment(8).appendNavigationSegment("CustomerForOrder").
+        appendRefSegment();
 
     ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
     req.setFormat(ODataFormat.JSON_FULL_METADATA);
@@ -317,7 +317,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
     assertTrue(entity.getId().toASCIIString().endsWith("/StaticService/V40/Static.svc/Customers(PersonID=1)"));
 
     final URI referenceURI = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntityIdSegment(entity.getId().toASCIIString()).build();
+        appendEntityIdSegment(entity.getId().toASCIIString()).build();
 
     req = client.getRetrieveRequestFactory().getEntityRequest(referenceURI);
     req.setFormat(ODataFormat.JSON_FULL_METADATA);
@@ -333,7 +333,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
   @Test
   public void item10() {
     final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().getEntitySetRequest(
-            client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customers").build());
+        client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customers").build());
     req.setPrefer(client.newPreferences().trackChanges());
 
     final ODataEntitySet customers = req.execute().getBody();
@@ -379,14 +379,14 @@ public class ConformanceTestITCase extends AbstractTestITCase {
   @Test
   public void item11() {
     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(ODataFormat.JSON_FULL_METADATA);
 
     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();
@@ -406,10 +406,10 @@ public class ConformanceTestITCase extends AbstractTestITCase {
   @Test
   public void item12() {
     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());
+        client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
     req.setFormat(ODataFormat.JSON);
 
     assertEquals("application/json;odata.metadata=minimal", req.getHeader("Accept"));

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java
index 6c76793..836fa6e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.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.
  */
@@ -34,9 +34,9 @@ public class DeltaTestITCase extends AbstractTestITCase {
 
   private void parse(final ODataFormat format) {
     final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().getEntitySetRequest(
-            client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customers").build());
+        client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customers").build());
     req.setPrefer(client.newPreferences().trackChanges());
-    
+
     final ODataEntitySet customers = req.execute().getBody();
     assertNotNull(customers);
     assertNotNull(customers.getDeltaLink());

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java
index 76e6937..98324d0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.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.
  */
@@ -45,10 +45,10 @@ public class DerivedTypeTestITCase extends AbstractTestITCase {
   private void read(final ODataFormat format) {
     // 1. entity set
     URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("People").
-            appendDerivedEntityTypeSegment("Microsoft.Test.OData.Services.ODataWCFService.Customer");
+        appendEntitySetSegment("People").
+        appendDerivedEntityTypeSegment("Microsoft.Test.OData.Services.ODataWCFService.Customer");
     ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
-            getEntitySetRequest(uriBuilder.build());
+        getEntitySetRequest(uriBuilder.build());
     req.setFormat(format);
 
     for (ODataEntity customer : req.execute().getBody().getEntities()) {
@@ -57,9 +57,9 @@ public class DerivedTypeTestITCase extends AbstractTestITCase {
 
     // 2. contained entity set
     uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Accounts").appendKeySegment(101).
-            appendNavigationSegment("MyPaymentInstruments").
-            appendDerivedEntityTypeSegment("Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI");
+        appendEntitySetSegment("Accounts").appendKeySegment(101).
+        appendNavigationSegment("MyPaymentInstruments").
+        appendDerivedEntityTypeSegment("Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI");
     req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
     req.setFormat(format);
 
@@ -80,60 +80,60 @@ public class DerivedTypeTestITCase extends AbstractTestITCase {
 
   private void createDelete(final ODataFormat format) {
     final ODataEntity customer = client.getObjectFactory().
-            newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
+        newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
 
     customer.getProperties().add(client.getObjectFactory().newPrimitiveProperty("PersonID",
-            client.getObjectFactory().newPrimitiveValueBuilder().buildInt32(976)));
+        client.getObjectFactory().newPrimitiveValueBuilder().buildInt32(976)));
     customer.getProperties().add(client.getObjectFactory().newPrimitiveProperty("FirstName",
-            client.getObjectFactory().newPrimitiveValueBuilder().buildString("Test")));
+        client.getObjectFactory().newPrimitiveValueBuilder().buildString("Test")));
     customer.getProperties().add(client.getObjectFactory().newPrimitiveProperty("LastName",
-            client.getObjectFactory().newPrimitiveValueBuilder().buildString("Test")));
+        client.getObjectFactory().newPrimitiveValueBuilder().buildString("Test")));
 
     final ODataComplexValue<ODataProperty> homeAddress =
-            client.getObjectFactory().newComplexValue("Microsoft.Test.OData.Services.ODataWCFService.CompanyAddress");
+        client.getObjectFactory().newComplexValue("Microsoft.Test.OData.Services.ODataWCFService.CompanyAddress");
     homeAddress.add(client.getObjectFactory().newPrimitiveProperty("Street",
-            client.getObjectFactory().newPrimitiveValueBuilder().buildString("V.le Gabriele D'Annunzio")));
+        client.getObjectFactory().newPrimitiveValueBuilder().buildString("V.le Gabriele D'Annunzio")));
     homeAddress.add(client.getObjectFactory().newPrimitiveProperty("City",
-            client.getObjectFactory().newPrimitiveValueBuilder().buildString("Pescara")));
+        client.getObjectFactory().newPrimitiveValueBuilder().buildString("Pescara")));
     homeAddress.add(client.getObjectFactory().newPrimitiveProperty("PostalCode",
-            client.getObjectFactory().newPrimitiveValueBuilder().buildString("65127")));
+        client.getObjectFactory().newPrimitiveValueBuilder().buildString("65127")));
     homeAddress.add(client.getObjectFactory().newPrimitiveProperty("CompanyName",
-            client.getObjectFactory().newPrimitiveValueBuilder().buildString("Tirasa")));
+        client.getObjectFactory().newPrimitiveValueBuilder().buildString("Tirasa")));
     customer.getProperties().add(client.getObjectFactory().newComplexProperty("HomeAddress", homeAddress));
 
     customer.getProperties().add(client.getObjectFactory().newCollectionProperty("Numbers",
-            client.getObjectFactory().newCollectionValue("Edm.String")));
+        client.getObjectFactory().newCollectionValue("Edm.String")));
     customer.getProperties().add(client.getObjectFactory().newCollectionProperty("Emails",
-            client.getObjectFactory().newCollectionValue("Edm.String")));
+        client.getObjectFactory().newCollectionValue("Edm.String")));
     customer.getProperties().add(client.getObjectFactory().newPrimitiveProperty("City",
-            client.getObjectFactory().newPrimitiveValueBuilder().buildString("Pescara")));
+        client.getObjectFactory().newPrimitiveValueBuilder().buildString("Pescara")));
     Calendar dateTime = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
     dateTime.set(1977, 8, 8, 0, 0, 0);
     customer.getProperties().add(client.getObjectFactory().newPrimitiveProperty("Birthday",
-            client.getObjectFactory().newPrimitiveValueBuilder().
+        client.getObjectFactory().newPrimitiveValueBuilder().
             setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(dateTime).build()));
     customer.getProperties().add(client.getObjectFactory().newPrimitiveProperty("TimeBetweenLastTwoOrders",
-            client.getObjectFactory().newPrimitiveValueBuilder().
+        client.getObjectFactory().newPrimitiveValueBuilder().
             setType(EdmPrimitiveTypeKind.Duration).setValue(new BigDecimal("0.0000002")).build()));
 
     final ODataEntityCreateRequest<ODataEntity> createReq = client.getCUDRequestFactory().
-            getEntityCreateRequest(
-                    client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("People").build(),
-                    customer);
+        getEntityCreateRequest(
+            client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("People").build(),
+            customer);
     createReq.setFormat(format);
 
     final ODataEntityCreateResponse<ODataEntity> createRes = createReq.execute();
     assertEquals(201, createRes.getStatusCode());
 
     final ODataEntityRequest<ODataEntity> fetchReq = client.getRetrieveRequestFactory().
-            getEntityRequest(client.newURIBuilder(testStaticServiceRootURL).
-                    appendEntitySetSegment("People").appendKeySegment(976).build());
+        getEntityRequest(client.newURIBuilder(testStaticServiceRootURL).
+            appendEntitySetSegment("People").appendKeySegment(976).build());
     fetchReq.setFormat(format);
 
     final ODataEntity actual = fetchReq.execute().getBody();
     assertEquals("Microsoft.Test.OData.Services.ODataWCFService.Customer", actual.getTypeName().toString());
     assertEquals("Microsoft.Test.OData.Services.ODataWCFService.CompanyAddress",
-            ((ODataValuable) actual.getProperty("HomeAddress")).getValue().getTypeName());
+        ((ODataValuable) actual.getProperty("HomeAddress")).getValue().getTypeName());
 
     final ODataDeleteRequest deleteReq = client.getCUDRequestFactory().getDeleteRequest(actual.getEditLink());
     assertEquals(204, deleteReq.execute().getStatusCode());

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java
index a6a8721..2b6c901 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.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,7 +52,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
 
   private void onContained(final ODataFormat format) {
     final URI uri = getClient().newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Accounts").
-            appendKeySegment(101).appendNavigationSegment("MyPaymentInstruments").build();
+        appendKeySegment(101).appendNavigationSegment("MyPaymentInstruments").build();
 
     // 1. read contained collection before any operation
     ODataEntitySet instruments = getClient().getRetrieveRequestFactory().getEntitySetRequest(uri).execute().getBody();
@@ -61,22 +61,22 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
 
     // 2. instantiate an ODataEntity of the same type as the collection above
     final ODataEntity instrument = getClient().getObjectFactory().
-            newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument"));
+        newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument"));
 
     int id = RandomUtils.nextInt(101999, 105000);
     instrument.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("PaymentInstrumentID",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
+        getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
     instrument.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("FriendlyName",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("New one")));
+        getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("New one")));
     instrument.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("CreatedDate",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().
+        getClient().getObjectFactory().newPrimitiveValueBuilder().
             setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(Calendar.getInstance()).build()));
 
     // 3. create it as contained entity
     final ODataEntityCreateRequest<ODataEntity> req = getClient().getCUDRequestFactory().
-            getEntityCreateRequest(uri, instrument);
+        getEntityCreateRequest(uri, instrument);
     req.setFormat(format);
-    
+
     final ODataEntityCreateResponse<ODataEntity> res = req.execute();
     assertEquals(201, res.getStatusCode());
 
@@ -88,7 +88,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
 
     // 5. remove the contained entity created above
     final ODataDeleteResponse deleteRes = getClient().getCUDRequestFactory().
-            getDeleteRequest(getClient().newURIBuilder(uri.toASCIIString()).appendKeySegment(id).build()).execute();
+        getDeleteRequest(getClient().newURIBuilder(uri.toASCIIString()).appendKeySegment(id).build()).execute();
     assertEquals(204, deleteRes.getStatusCode());
 
     // 6. verify that the contained collection effectively reduced
@@ -109,72 +109,72 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
   }
 
   private void deepInsert(final ODataFormat format, final int productId, final int productDetailId)
-          throws EdmPrimitiveTypeException {
+      throws EdmPrimitiveTypeException {
 
     final ODataEntity product = getClient().getObjectFactory().
-            newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Product"));
+        newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Product"));
     product.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("ProductID",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(productId)));
+        getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(productId)));
     product.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("Name",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("Latte")));
+        getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("Latte")));
     product.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("QuantityPerUnit",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("100g Bag")));
+        getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("100g Bag")));
     product.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("UnitPrice",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().buildSingle(3.24f)));
+        getClient().getObjectFactory().newPrimitiveValueBuilder().buildSingle(3.24f)));
     product.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("QuantityInStock",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(100)));
+        getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(100)));
     product.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("Discontinued",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().buildBoolean(false)));
+        getClient().getObjectFactory().newPrimitiveValueBuilder().buildBoolean(false)));
     product.getProperties().add(getClient().getObjectFactory().newEnumProperty("UserAccess",
-            getClient().getObjectFactory().
+        getClient().getObjectFactory().
             newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", "Execute")));
     product.getProperties().add(getClient().getObjectFactory().newEnumProperty("SkinColor",
-            getClient().getObjectFactory().
+        getClient().getObjectFactory().
             newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.Color", "Blue")));
     product.getProperties().add(getClient().getObjectFactory().newCollectionProperty("CoverColors",
-            getClient().getObjectFactory().
+        getClient().getObjectFactory().
             newCollectionValue("Microsoft.Test.OData.Services.ODataWCFService.Color")));
     product.getProperty("CoverColors").getCollectionValue().add(getClient().getObjectFactory().
-            newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.Color", "Green"));
+        newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.Color", "Green"));
     product.getProperty("CoverColors").getCollectionValue().add(getClient().getObjectFactory().
-            newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.Color", "Red"));
+        newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.Color", "Red"));
 
     final ODataEntity detail = getClient().getObjectFactory().
-            newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.ProductDetail"));
+        newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.ProductDetail"));
     detail.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("ProductID",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(productId)));
+        getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(productId)));
     detail.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("ProductDetailID",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(productDetailId)));
+        getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(productDetailId)));
     detail.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("ProductName",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("LatteHQ")));
+        getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("LatteHQ")));
     detail.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("Description",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("High-Quality Milk")));
+        getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("High-Quality Milk")));
 
     final ODataEntitySet details = getClient().getObjectFactory().newEntitySet();
     details.getEntities().add(detail);
 
     final ODataInlineEntitySet inlineDetails = getClient().getObjectFactory().
-            newDeepInsertEntitySet("Details", details);
+        newDeepInsertEntitySet("Details", details);
     product.addLink(inlineDetails);
 
     final ODataEntityCreateRequest<ODataEntity> req = getClient().getCUDRequestFactory().getEntityCreateRequest(
-            getClient().newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Products").build(), product);
+        getClient().newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Products").build(), product);
     req.setFormat(format);
     final ODataEntityCreateResponse<ODataEntity> res = req.execute();
     assertEquals(201, res.getStatusCode());
 
     final ODataEntity createdProduct = res.getBody();
     assertEquals(productId,
-            createdProduct.getProperty("ProductID").getPrimitiveValue().toCastValue(Integer.class), 0);
+        createdProduct.getProperty("ProductID").getPrimitiveValue().toCastValue(Integer.class), 0);
 
     final ODataLink createdLink = createdProduct.getNavigationLink("Details");
     assertNotNull(createdLink);
 
     final ODataEntitySet createdProductDetails =
-            getClient().getRetrieveRequestFactory().getEntitySetRequest(createdLink.getLink()).execute().getBody();
+        getClient().getRetrieveRequestFactory().getEntitySetRequest(createdLink.getLink()).execute().getBody();
     assertNotNull(createdProductDetails);
     assertEquals(productDetailId, createdProductDetails.getEntities().iterator().next().
-            getProperty("ProductDetailID").getPrimitiveValue().toCastValue(Integer.class), 0);
+        getProperty("ProductDetailID").getPrimitiveValue().toCastValue(Integer.class), 0);
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java
index 4937d7a..b999d63 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.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.
  */
@@ -56,10 +56,10 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
 
   private void withInlineEntity(final ODataClient client, 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());
+        getEntityRequest(uriBuilder.build());
     req.setFormat(format);
 
     final ODataRetrieveResponse<ODataEntity> res = req.execute();
@@ -91,15 +91,15 @@ public class EntityRetrieveTestITCase 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;
         }
@@ -126,10 +126,10 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
 
   private void withInlineEntitySet(final ODataClient client, final ODataFormat format) {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Customers").appendKeySegment(1).expand("Orders");
+        appendEntitySetSegment("Customers").appendKeySegment(1).expand("Orders");
 
     final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().
-            getEntityRequest(uriBuilder.build());
+        getEntityRequest(uriBuilder.build());
     req.setFormat(format);
 
     final ODataRetrieveResponse<ODataEntity> res = req.execute();
@@ -169,7 +169,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
 
   private void rawRequest(final ODataFormat format) {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("People").appendKeySegment(5);
+        appendEntitySetSegment("People").appendKeySegment(5);
 
     final ODataRawRequest req = client.getRetrieveRequestFactory().getRawRequest(uriBuilder.build());
     req.setFormat(format.getContentType(client.getServiceVersion()).toContentTypeString());
@@ -201,7 +201,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
     multiKey.put("ProductDetailID", 1);
 
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("ProductDetails").appendKeySegment(multiKey);
+        appendEntitySetSegment("ProductDetails").appendKeySegment(multiKey);
 
     final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
     req.setFormat(format);
@@ -210,7 +210,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
     final ODataEntity entity = res.getBody();
     assertNotNull(entity);
     assertEquals(Integer.valueOf(1),
-            entity.getProperty("ProductDetailID").getPrimitiveValue().toCastValue(Integer.class));
+        entity.getProperty("ProductDetailID").getPrimitiveValue().toCastValue(Integer.class));
   }
 
   @Test
@@ -225,7 +225,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
 
   private void checkForETag(final ODataClient client, final ODataFormat format) {
     final URIBuilder uriBuilder =
-            client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Orders").appendKeySegment(8);
+        client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Orders").appendKeySegment(8);
 
     final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
     req.setFormat(format);
@@ -274,8 +274,8 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
 
   private void reference(final ODataFormat format) {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Orders").appendKeySegment(8).appendNavigationSegment("CustomerForOrder").
-            appendRefSegment();
+        appendEntitySetSegment("Orders").appendKeySegment(8).appendNavigationSegment("CustomerForOrder").
+        appendRefSegment();
 
     ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
     req.setFormat(format);
@@ -288,7 +288,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
     assertTrue(entity.getId().toASCIIString().endsWith("/StaticService/V40/Static.svc/Customers(PersonID=1)"));
 
     final URI referenceURI = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntityIdSegment(entity.getId().toASCIIString()).build();
+        appendEntityIdSegment(entity.getId().toASCIIString()).build();
 
     req = client.getRetrieveRequestFactory().getEntityRequest(referenceURI);
     req.setFormat(format);
@@ -310,8 +310,8 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
 
   private void contained(final ODataClient client, final ODataFormat format) throws EdmPrimitiveTypeException {
     final URI uri = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Accounts").appendKeySegment(101).
-            appendNavigationSegment("MyPaymentInstruments").appendKeySegment(101902).build();
+        appendEntitySetSegment("Accounts").appendKeySegment(101).
+        appendNavigationSegment("MyPaymentInstruments").appendKeySegment(101902).build();
     final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uri);
     req.setFormat(format);
 
@@ -319,7 +319,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
     assertNotNull(contained);
     assertEquals("Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument", contained.getTypeName().toString());
     assertEquals(101902,
-            contained.getProperty("PaymentInstrumentID").getPrimitiveValue().toCastValue(Integer.class), 0);
+        contained.getProperty("PaymentInstrumentID").getPrimitiveValue().toCastValue(Integer.class), 0);
     assertEquals("Edm.DateTimeOffset", contained.getProperty("CreatedDate").getPrimitiveValue().getTypeName());
   }
 
@@ -340,7 +340,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
 
   private void entitySetNavigationLink(final ODataClient client, final ODataFormat format) {
     final URI uri = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Accounts").appendKeySegment(101).build();
+        appendEntitySetSegment("Accounts").appendKeySegment(101).build();
     final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uri);
     req.setFormat(format);
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java
index 0b87fbe..9de562e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.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.
  */
@@ -71,7 +71,7 @@ public class EntitySetTestITCase extends AbstractTestITCase {
 
   private void readWithInlineCount(final ODataClient client, final ODataFormat format) {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("People").count(true);
+        appendEntitySetSegment("People").count(true);
 
     final ODataRawRequest req = client.getRetrieveRequestFactory().getRawRequest(uriBuilder.build());
     req.setFormat(format.getContentType(client.getServiceVersion()).toContentTypeString());
@@ -83,7 +83,7 @@ public class EntitySetTestITCase extends AbstractTestITCase {
     assertEquals(5, entitySet.getPayload().getCount());
 
     assertEquals("Microsoft.Test.OData.Services.ODataWCFService.Address",
-            entitySet.getPayload().getEntities().get(2).getProperty("HomeAddress").getComplexValue().getTypeName());
+        entitySet.getPayload().getEntities().get(2).getProperty("HomeAddress").getComplexValue().getTypeName());
   }
 
   @Test
@@ -105,7 +105,7 @@ public class EntitySetTestITCase extends AbstractTestITCase {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("People");
 
     final ODataEntitySetIteratorRequest<ODataEntitySet, ODataEntity> req =
-            client.getRetrieveRequestFactory().getEntitySetIteratorRequest(uriBuilder.build());
+        client.getRetrieveRequestFactory().getEntitySetIteratorRequest(uriBuilder.build());
     req.setFormat(format);
 
     final ODataRetrieveResponse<ODataEntitySetIterator<ODataEntitySet, ODataEntity>> res = req.execute();
@@ -147,7 +147,7 @@ public class EntitySetTestITCase extends AbstractTestITCase {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("People");
 
     final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
-            getEntitySetRequest(uriBuilder.build());
+        getEntitySetRequest(uriBuilder.build());
     req.setFormat(format);
     req.setPrefer(client.newPreferences().maxPageSize(5));
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/EntityUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/EntityUpdateTestITCase.java
index 34fa574..9a5ce99 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/EntityUpdateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/EntityUpdateTestITCase.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.
  */
@@ -42,22 +42,22 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
 
   private void upsert(final UpdateType updateType, final ODataFormat format) {
     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(9)));
+        getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(9)));
     order.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("OrderDate",
-            getClient().getObjectFactory().newPrimitiveValueBuilder()
+        getClient().getObjectFactory().newPrimitiveValueBuilder()
             .setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(
                 Calendar.getInstance(TimeZone.getTimeZone("GMT"))).build()));
     order.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("ShelfLife",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().
+        getClient().getObjectFactory().newPrimitiveValueBuilder().
             setType(EdmPrimitiveTypeKind.Duration).setValue(new BigDecimal("0.0000002")).build()));
 
     final URI upsertURI = getClient().newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Orders").appendKeySegment(9).build();
+        appendEntitySetSegment("Orders").appendKeySegment(9).build();
     final ODataEntityUpdateRequest<ODataEntity> req = getClient().getCUDRequestFactory().
-            getEntityUpdateRequest(upsertURI, updateType, order);
+        getEntityUpdateRequest(upsertURI, updateType, order);
     req.setFormat(format);
 
     req.execute();
@@ -66,9 +66,9 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
       assertNotNull(read);
       assertEquals(order.getProperty("OrderID"), read.getProperty("OrderID"));
       assertEquals(order.getProperty("OrderDate").getPrimitiveValue().toString(),
-              read.getProperty("OrderDate").getPrimitiveValue().toString());
+          read.getProperty("OrderDate").getPrimitiveValue().toString());
       assertEquals(order.getProperty("ShelfLife").getPrimitiveValue().toString(),
-              read.getProperty("ShelfLife").getPrimitiveValue().toString());
+          read.getProperty("ShelfLife").getPrimitiveValue().toString());
     } finally {
       getClient().getCUDRequestFactory().getDeleteRequest(upsertURI).execute();
     }
@@ -89,15 +89,15 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
   private void onContained(final ODataFormat format) {
     final String newName = UUID.randomUUID().toString();
     final ODataEntity changes = getClient().getObjectFactory().newEntity(
-            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument"));
+        new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument"));
     changes.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("FriendlyName",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().buildString(newName)));
+        getClient().getObjectFactory().newPrimitiveValueBuilder().buildString(newName)));
 
     final URI uri = getClient().newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Accounts").appendKeySegment(101).
-            appendNavigationSegment("MyPaymentInstruments").appendKeySegment(101901).build();
+        appendEntitySetSegment("Accounts").appendKeySegment(101).
+        appendNavigationSegment("MyPaymentInstruments").appendKeySegment(101901).build();
     final ODataEntityUpdateRequest<ODataEntity> req = getClient().getCUDRequestFactory().
-            getEntityUpdateRequest(uri, UpdateType.PATCH, changes);
+        getEntityUpdateRequest(uri, UpdateType.PATCH, changes);
     req.setFormat(format);
 
     final ODataEntityUpdateResponse<ODataEntity> res = req.execute();
@@ -120,16 +120,16 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
 
   private void bindOperation(final ODataFormat format) throws EdmPrimitiveTypeException {
     final ODataEntity changes = getClient().getObjectFactory().newEntity(
-            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
+        new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
     final ODataLink parent = getClient().getObjectFactory().newEntityNavigationLink("Parent",
-            getClient().newURIBuilder(testStaticServiceRootURL).
+        getClient().newURIBuilder(testStaticServiceRootURL).
             appendEntitySetSegment("People").appendKeySegment(1).build());
     changes.getNavigationLinks().add(parent);
 
     final URI uri = getClient().newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("People").appendKeySegment(5).build();
+        appendEntitySetSegment("People").appendKeySegment(5).build();
     final ODataEntityUpdateRequest<ODataEntity> req = getClient().getCUDRequestFactory().
-            getEntityUpdateRequest(uri, UpdateType.PATCH, changes);
+        getEntityUpdateRequest(uri, UpdateType.PATCH, changes);
     req.setFormat(format);
 
     final ODataEntityUpdateResponse<ODataEntity> res = req.execute();
@@ -141,7 +141,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
     assertNotNull(updatedLink);
 
     final ODataEntity updatedEntity = getClient().getRetrieveRequestFactory().getEntityRequest(updatedLink.getLink()).
-            execute().getBody();
+        execute().getBody();
     assertNotNull(updatedEntity);
     assertEquals(1, updatedEntity.getProperty("PersonID").getPrimitiveValue().toCastValue(Integer.class), 0);
   }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java
index 54f6f74..1a742a2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.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.
  */
@@ -35,8 +35,8 @@ public class ErrorResponseTestITCase extends AbstractTestITCase {
   @Test
   public void jsonError() {
     final URI readURI = getClient().newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Customers").appendKeySegment(32).
-            build();
+        appendEntitySetSegment("Customers").appendKeySegment(32).
+        build();
 
     try {
       read(ODataFormat.JSON, readURI);
@@ -54,9 +54,9 @@ public class ErrorResponseTestITCase extends AbstractTestITCase {
       final Map<String, String> innerErr = err.getInnerError();
       assertEquals("innerError dictionary size should be correct", 2, innerErr.size());
       assertEquals("innerError['context'] should be correct",
-              "{\"key1\":\"for debug deployment only\"}", innerErr.get("context"));
+          "{\"key1\":\"for debug deployment only\"}", innerErr.get("context"));
       assertEquals("innerError['trace'] should be correct",
-              "[\"callmethod1 etc\",\"callmethod2 etc\"]", innerErr.get("trace"));
+          "[\"callmethod1 etc\",\"callmethod2 etc\"]", innerErr.get("trace"));
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/FilterFactoryTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/FilterFactoryTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/FilterFactoryTestITCase.java
index 737f355..82956e4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/FilterFactoryTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/FilterFactoryTestITCase.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.
  */
@@ -43,13 +43,13 @@ public class FilterFactoryTestITCase extends AbstractTestITCase {
   @Test
   public void crossjoin() {
     final URIFilter filter = getFilterFactory().eq(
-            getFilterArgFactory().property("Orders/OrderID"), getFilterArgFactory().property("Customers/Order"));
+        getFilterArgFactory().property("Orders/OrderID"), getFilterArgFactory().property("Customers/Order"));
 
     final URIBuilder uriBuilder =
-            client.newURIBuilder(testStaticServiceRootURL).appendCrossjoinSegment("Customers", "Orders").filter(filter);
+        client.newURIBuilder(testStaticServiceRootURL).appendCrossjoinSegment("Customers", "Orders").filter(filter);
 
     final ODataEntitySetRequest<ODataEntitySet> req =
-            client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
+        client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
     req.setFormat(ODataFormat.JSON_FULL_METADATA);
 
     final ODataEntitySet feed = req.execute().getBody();

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java
index 04651b3..172a5f9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.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.
  */
@@ -62,8 +62,8 @@ public class JSONFormatConformanceTestITCase extends AbstractTestITCase {
   @Test
   public void item1() throws EdmPrimitiveTypeException {
     final URI uri = edmClient.newURIBuilder().
-            appendEntitySetSegment("Accounts").appendKeySegment(102).
-            appendNavigationSegment("MyPaymentInstruments").appendKeySegment(102902).build();
+        appendEntitySetSegment("Accounts").appendKeySegment(102).
+        appendNavigationSegment("MyPaymentInstruments").appendKeySegment(102902).build();
     final ODataEntityRequest<ODataEntity> req = edmClient.getRetrieveRequestFactory().getEntityRequest(uri);
 
     // request format (via Accept header) is set to minimal by default
@@ -89,7 +89,7 @@ public class JSONFormatConformanceTestITCase extends AbstractTestITCase {
   @Test
   public void item2() {
     final URI uri = edmClient.newURIBuilder(testStaticServiceRootURL).
-            appendEntitySetSegment("Accounts").appendKeySegment(102).build();
+        appendEntitySetSegment("Accounts").appendKeySegment(102).build();
     final ODataEntityRequest<ODataEntity> req = edmClient.getRetrieveRequestFactory().getEntityRequest(uri);
     req.setFormat(ODataFormat.JSON_FULL_METADATA);
 
@@ -119,34 +119,34 @@ public class JSONFormatConformanceTestITCase extends AbstractTestITCase {
   @Test
   public void item3() throws Exception {
     final String fromSection71 = "{"
-            + "\"NullValue\": null,"
-            + "\"TrueValue\": true,"
-            + "\"FalseValue\": false,"
-            + "\"BinaryValue@odata.type\": \"Binary\","
-            + "\"BinaryValue\": \"T0RhdGE\","
-            + "\"IntegerValue\": -128,"
-            + "\"DoubleValue\": 3.1415926535897931,"
-            + "\"SingleValue@odata.type\": \"Single\","
-            + "\"SingleValue\": \"INF\","
-            + "\"DecimalValue@odata.type\": \"Decimal\","
-            + "\"DecimalValue\": 34.95,"
-            + "\"StringValue\": \"Say \\\"Hello\\\",\\nthen go\","
-            + "\"DateValue@odata.type\": \"Date\","
-            + "\"DateValue\": \"2012-12-03\","
-            + "\"DateTimeOffsetValue@odata.type\": \"DateTimeOffset\","
-            + "\"DateTimeOffsetValue\": \"2012-12-03T07:16:23Z\","
-            + "\"DurationValue@odata.type\": \"Duration\","
-            + "\"DurationValue\": \"P12DT23H59M59.999999999999S\","
-            + "\"TimeOfDayValue@odata.type\": \"TimeOfDay\","
-            + "\"TimeOfDayValue\": \"07:59:59.999\","
-            + "\"GuidValue@odata.type\": \"Guid\","
-            + "\"GuidValue\": \"01234567-89ab-cdef-0123-456789abcdef\","
-            + "\"Int64Value@odata.type\": \"Int64\","
-            + "\"Int64Value\": 0,"
-            + "\"ColorEnumValue@odata.type\": \"Test.Color\","
-            + "\"ColorEnumValue\": \"Yellow\","
-            + "\"GeographyPoint\": {\"type\": \"Point\",\"coordinates\":[142.1,64.1]}"
-            + "}";
+        + "\"NullValue\": null,"
+        + "\"TrueValue\": true,"
+        + "\"FalseValue\": false,"
+        + "\"BinaryValue@odata.type\": \"Binary\","
+        + "\"BinaryValue\": \"T0RhdGE\","
+        + "\"IntegerValue\": -128,"
+        + "\"DoubleValue\": 3.1415926535897931,"
+        + "\"SingleValue@odata.type\": \"Single\","
+        + "\"SingleValue\": \"INF\","
+        + "\"DecimalValue@odata.type\": \"Decimal\","
+        + "\"DecimalValue\": 34.95,"
+        + "\"StringValue\": \"Say \\\"Hello\\\",\\nthen go\","
+        + "\"DateValue@odata.type\": \"Date\","
+        + "\"DateValue\": \"2012-12-03\","
+        + "\"DateTimeOffsetValue@odata.type\": \"DateTimeOffset\","
+        + "\"DateTimeOffsetValue\": \"2012-12-03T07:16:23Z\","
+        + "\"DurationValue@odata.type\": \"Duration\","
+        + "\"DurationValue\": \"P12DT23H59M59.999999999999S\","
+        + "\"TimeOfDayValue@odata.type\": \"TimeOfDay\","
+        + "\"TimeOfDayValue\": \"07:59:59.999\","
+        + "\"GuidValue@odata.type\": \"Guid\","
+        + "\"GuidValue\": \"01234567-89ab-cdef-0123-456789abcdef\","
+        + "\"Int64Value@odata.type\": \"Int64\","
+        + "\"Int64Value\": 0,"
+        + "\"ColorEnumValue@odata.type\": \"Test.Color\","
+        + "\"ColorEnumValue\": \"Yellow\","
+        + "\"GeographyPoint\": {\"type\": \"Point\",\"coordinates\":[142.1,64.1]}"
+        + "}";
 
     final ODataEntity entity = client.getReader().readEntity(IOUtils.toInputStream(fromSection71), ODataFormat.JSON);
 
@@ -165,29 +165,29 @@ public class JSONFormatConformanceTestITCase extends AbstractTestITCase {
 
     assertEquals(EdmPrimitiveTypeKind.Double, entity.getProperty("DoubleValue").getPrimitiveValue().getTypeKind());
     assertEquals(3.1415926535897931,
-            entity.getProperty("DoubleValue").getPrimitiveValue().toCastValue(Double.class), 0);
+        entity.getProperty("DoubleValue").getPrimitiveValue().toCastValue(Double.class), 0);
 
     assertEquals(EdmPrimitiveTypeKind.Single, entity.getProperty("SingleValue").getPrimitiveValue().getTypeKind());
     assertEquals(Float.POSITIVE_INFINITY,
-            entity.getProperty("SingleValue").getPrimitiveValue().toCastValue(Float.class), 0);
+        entity.getProperty("SingleValue").getPrimitiveValue().toCastValue(Float.class), 0);
 
     assertEquals(EdmPrimitiveTypeKind.Decimal, entity.getProperty("DecimalValue").getPrimitiveValue().getTypeKind());
     assertEquals(BigDecimal.valueOf(34.95),
-            entity.getProperty("DecimalValue").getPrimitiveValue().toCastValue(BigDecimal.class));
+        entity.getProperty("DecimalValue").getPrimitiveValue().toCastValue(BigDecimal.class));
 
     assertEquals(EdmPrimitiveTypeKind.String, entity.getProperty("StringValue").getPrimitiveValue().getTypeKind());
     assertEquals("Say \"Hello\",\nthen go",
-            entity.getProperty("StringValue").getPrimitiveValue().toCastValue(String.class));
+        entity.getProperty("StringValue").getPrimitiveValue().toCastValue(String.class));
 
     assertEquals(EdmPrimitiveTypeKind.Date, entity.getProperty("DateValue").getPrimitiveValue().getTypeKind());
 
     assertEquals(EdmPrimitiveTypeKind.DateTimeOffset,
-            entity.getProperty("DateTimeOffsetValue").getPrimitiveValue().getTypeKind());
+        entity.getProperty("DateTimeOffsetValue").getPrimitiveValue().getTypeKind());
 
     assertEquals(EdmPrimitiveTypeKind.Duration, entity.getProperty("DurationValue").getPrimitiveValue().getTypeKind());
 
     assertEquals(EdmPrimitiveTypeKind.TimeOfDay,
-            entity.getProperty("TimeOfDayValue").getPrimitiveValue().getTypeKind());
+        entity.getProperty("TimeOfDayValue").getPrimitiveValue().getTypeKind());
 
     assertEquals(EdmPrimitiveTypeKind.Guid, entity.getProperty("GuidValue").getPrimitiveValue().getTypeKind());
 
@@ -196,7 +196,7 @@ public class JSONFormatConformanceTestITCase extends AbstractTestITCase {
     assertTrue(entity.getProperty("ColorEnumValue").hasEnumValue());
 
     assertEquals(EdmPrimitiveTypeKind.GeographyPoint,
-            entity.getProperty("GeographyPoint").getPrimitiveValue().getTypeKind());
+        entity.getProperty("GeographyPoint").getPrimitiveValue().getTypeKind());
   }
 
   /**
@@ -205,21 +205,21 @@ public class JSONFormatConformanceTestITCase extends AbstractTestITCase {
   @Test
   public void item4() throws Exception {
     final String fromSection45_1 = "{"
-            + "\"@odata.context\": \"http://host/service/$metadata#Customers/$entity\","
-            + "\"@odata.metadataEtag\": \"W/\\\"A1FF3E230954908F\\\"\","
-            + "\"@odata.etag\": \"W/\\\"A1FF3E230954908G\\\"\","
-            + "\"@odata.type\": \"#Model.VipCustomer\","
-            + "\"@odata.id\": \"http://host/service/Employees(PersonID=3)\","
-            + "\"@odata.editLink\": \"People(976)\","
-            + "\"@odata.mediaEditLink\": \"Employees(1)/$value\","
-            + "\"@odata.mediaContentType\": \"image/jpeg\","
-            + "\"@odata.mediaEtag\": \"W/\\\"A1FF3E230954908H\\\"\","
-            + "\"Parent@odata.navigationLink\": \"People(976)/Parent\","
-            + "\"Parent@odata.associationLink\": \"People(976)/Parent\""
-            + "}";
+        + "\"@odata.context\": \"http://host/service/$metadata#Customers/$entity\","
+        + "\"@odata.metadataEtag\": \"W/\\\"A1FF3E230954908F\\\"\","
+        + "\"@odata.etag\": \"W/\\\"A1FF3E230954908G\\\"\","
+        + "\"@odata.type\": \"#Model.VipCustomer\","
+        + "\"@odata.id\": \"http://host/service/Employees(PersonID=3)\","
+        + "\"@odata.editLink\": \"People(976)\","
+        + "\"@odata.mediaEditLink\": \"Employees(1)/$value\","
+        + "\"@odata.mediaContentType\": \"image/jpeg\","
+        + "\"@odata.mediaEtag\": \"W/\\\"A1FF3E230954908H\\\"\","
+        + "\"Parent@odata.navigationLink\": \"People(976)/Parent\","
+        + "\"Parent@odata.associationLink\": \"People(976)/Parent\""
+        + "}";
 
     final ResWrap<Entity> entity =
-            client.getDeserializer(ODataFormat.JSON).toEntity(IOUtils.toInputStream(fromSection45_1));
+        client.getDeserializer(ODataFormat.JSON).toEntity(IOUtils.toInputStream(fromSection45_1));
 
     assertEquals("http://host/service/$metadata#Customers/$entity", entity.getContextURL().getURI().toASCIIString());
     assertEquals("W/\"A1FF3E230954908F\"", entity.getMetadataETag());
@@ -234,14 +234,14 @@ public class JSONFormatConformanceTestITCase extends AbstractTestITCase {
     assertEquals("People(976)/Parent", entity.getPayload().getAssociationLink("Parent").getHref());
 
     final String fromSection45_2 = "{"
-            + "  \"@odata.count\": 5,"
-            + "  \"value\": [],"
-            + "  \"@odata.nextLink\": \"Customers?$expand=Orders&$skipToken=5\","
-            + "  \"@odata.deltaLink\": \"Customers?$expand=Orders&$deltatoken=8015\""
-            + "}";
+        + "  \"@odata.count\": 5,"
+        + "  \"value\": [],"
+        + "  \"@odata.nextLink\": \"Customers?$expand=Orders&$skipToken=5\","
+        + "  \"@odata.deltaLink\": \"Customers?$expand=Orders&$deltatoken=8015\""
+        + "}";
 
     final ResWrap<EntitySet> entitySet =
-            client.getDeserializer(ODataFormat.JSON).toEntitySet(IOUtils.toInputStream(fromSection45_2));
+        client.getDeserializer(ODataFormat.JSON).toEntitySet(IOUtils.toInputStream(fromSection45_2));
 
     assertEquals(5, entitySet.getPayload().getCount(), 0);
     assertEquals("Customers?$expand=Orders&$skipToken=5", entitySet.getPayload().getNext().toASCIIString());
@@ -250,28 +250,28 @@ public class JSONFormatConformanceTestITCase extends AbstractTestITCase {
 
   /**
    * MUST be prepared to receive any annotations, including custom annotations and <tt>odata</tt> annotations not
-   * defined in the <tt>OData-Version</tt> header of the payload (section 20). 
+   * defined in the <tt>OData-Version</tt> header of the payload (section 20).
    */
   @Test
   public void item5() throws Exception {
     final String sample = "{"
-            + "  \"@odata.context\": \"http://host/service/$metadata#Customers\","
-            + "  \"@odata.notdefined\": 11,"
-            + "  \"@com.contoso.customer.setkind\": \"VIPs\","
-            + "  \"value\": ["
-            + "    {"
-            + "      \"@com.contoso.display.highlight\": true,"
-            + "      \"ID\": \"ALFKI\","
-            + "      \"CompanyName@com.contoso.display.style\": { \"title\": true, \"order\": 1 },"
-            + "      \"CompanyName\": \"Alfreds Futterkiste\","
-            + "      \"Orders@com.contoso.display.style\": { \"order\": 2 },"
-            + "      \"Orders@odata.navigationLink\": \"People(976)/Orders\""
-            + "    }"
-            + "  ]"
-            + "}";
+        + "  \"@odata.context\": \"http://host/service/$metadata#Customers\","
+        + "  \"@odata.notdefined\": 11,"
+        + "  \"@com.contoso.customer.setkind\": \"VIPs\","
+        + "  \"value\": ["
+        + "    {"
+        + "      \"@com.contoso.display.highlight\": true,"
+        + "      \"ID\": \"ALFKI\","
+        + "      \"CompanyName@com.contoso.display.style\": { \"title\": true, \"order\": 1 },"
+        + "      \"CompanyName\": \"Alfreds Futterkiste\","
+        + "      \"Orders@com.contoso.display.style\": { \"order\": 2 },"
+        + "      \"Orders@odata.navigationLink\": \"People(976)/Orders\""
+        + "    }"
+        + "  ]"
+        + "}";
 
     final ODataEntitySet entitySet = client.getReader().
-            readEntitySet(IOUtils.toInputStream(sample), ODataFormat.JSON);
+        readEntitySet(IOUtils.toInputStream(sample), ODataFormat.JSON);
 
     assertEquals(2, entitySet.getAnnotations().size());
 
@@ -314,8 +314,8 @@ public class JSONFormatConformanceTestITCase extends AbstractTestITCase {
   @Test
   public void item6() throws EdmPrimitiveTypeException {
     final URI uri = edmClient.newURIBuilder().
-            appendEntitySetSegment("Accounts").appendKeySegment(102).
-            appendNavigationSegment("MyPaymentInstruments").appendKeySegment(102902).build();
+        appendEntitySetSegment("Accounts").appendKeySegment(102).
+        appendNavigationSegment("MyPaymentInstruments").appendKeySegment(102902).build();
     final ODataEntityRequest<ODataEntity> req = edmClient.getRetrieveRequestFactory().getEntityRequest(uri);
 
     // request format (via Accept header) does not contain odata.streaming=true

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java
index 612619f..91da2c5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.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,7 +52,7 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase {
 
   private void read(final ODataFormat format) {
     final URIBuilder uriBuilder = client.newURIBuilder(testKeyAsSegmentServiceRootURL).
-            appendEntitySetSegment("Accounts").appendKeySegment(101);
+        appendEntitySetSegment("Accounts").appendKeySegment(101);
 
     final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
     req.setFormat(format);
@@ -90,15 +90,15 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase {
 
   private void update(final ODataFormat format) {
     final ODataEntity changes = getClient().getObjectFactory().newEntity(
-            new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
+        new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
     final ODataProperty middleName = getClient().getObjectFactory().newPrimitiveProperty("MiddleName",
-            getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("middle"));
+        getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("middle"));
     changes.getProperties().add(middleName);
 
     final URI uri = getClient().newURIBuilder(testKeyAsSegmentServiceRootURL).
-            appendEntitySetSegment("People").appendKeySegment(5).build();
+        appendEntitySetSegment("People").appendKeySegment(5).build();
     final ODataEntityUpdateRequest<ODataEntity> req = getClient().getCUDRequestFactory().
-            getEntityUpdateRequest(uri, UpdateType.PATCH, changes);
+        getEntityUpdateRequest(uri, UpdateType.PATCH, changes);
     req.setFormat(format);
 
     final ODataEntityUpdateResponse<ODataEntity> res = req.execute();


Mime
View raw message