http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java 
b/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java
index 6d17940..19af510 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,27 +18,27 @@
  */
 package org.apache.olingo.fit.v4;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 import 
org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
 import 
org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
 import 
org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
-import org.apache.olingo.client.api.uri.QueryOption;
-import org.apache.olingo.client.api.uri.URIBuilder;
 import org.apache.olingo.client.api.domain.ClientEntity;
 import org.apache.olingo.client.api.domain.ClientEntitySet;
 import org.apache.olingo.client.api.domain.ClientInlineEntitySet;
+import org.apache.olingo.client.api.uri.QueryOption;
+import org.apache.olingo.client.api.uri.URIBuilder;
 import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
 import org.apache.olingo.commons.api.format.ODataFormat;
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 /**
  * This is the unit test class to check for query options.
  */
@@ -74,7 +74,7 @@ public class QueryOptionsTestITCase extends 
AbstractTestITCase {
 
   /**
    * Test <tt>$filter</tt> and <tt>$orderby</tt>.
-   * 
+   *
    * @see org.apache.olingo.fit.v4.FilterFactoryTestITCase for more tests.
    */
   @Test

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/v4/ServiceDocumentTestITCase.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/v4/ServiceDocumentTestITCase.java 
b/fit/src/test/java/org/apache/olingo/fit/v4/ServiceDocumentTestITCase.java
index c9418fa..13f7628 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/ServiceDocumentTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/ServiceDocumentTestITCase.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,16 +18,16 @@
  */
 package org.apache.olingo.fit.v4;
 
+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.client.api.domain.ClientServiceDocument;
 import org.apache.olingo.commons.api.format.ODataFormat;
 import org.junit.Test;
 
-import java.net.URI;
-
-import static org.junit.Assert.assertEquals;
-
 public class ServiceDocumentTestITCase extends AbstractTestITCase {
 
   private void retrieveServiceDocument(final ODataFormat format) {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java 
b/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java
index ecb5699..14d9f1f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,27 +18,27 @@
  */
 package org.apache.olingo.fit.v4;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.net.URI;
+
 import org.apache.olingo.client.api.ODataClient;
 import 
org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
 import org.apache.olingo.client.api.communication.request.cud.UpdateType;
 import 
org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
 import 
org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse;
-import org.apache.olingo.client.api.uri.URIBuilder;
 import org.apache.olingo.client.api.domain.ClientAnnotation;
 import org.apache.olingo.client.api.domain.ClientSingleton;
 import org.apache.olingo.client.api.domain.ClientValuable;
+import org.apache.olingo.client.api.uri.URIBuilder;
 import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
 import org.apache.olingo.commons.api.edm.FullQualifiedName;
 import org.apache.olingo.commons.api.format.ODataFormat;
 import org.junit.Test;
 
-import java.net.URI;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 public class SingletonTestITCase extends AbstractTestITCase {
 
   private void read(final ODataClient client, final ODataFormat format) throws 
EdmPrimitiveTypeException {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/Constants.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/Constants.java 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/Constants.java
index ba9fd7a..93ff3bc 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/Constants.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/Constants.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,11 +18,11 @@
  */
 package org.apache.olingo.commons.api;
 
-import org.apache.olingo.commons.api.format.ContentType;
-
 import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
 
+import org.apache.olingo.commons.api.format.ContentType;
+
 /**
  * Constant values related to the OData protocol.
  */
@@ -36,22 +36,22 @@ public interface Constants {
   public final static Integer DEFAULT_PRECISION = 40;
 
   public final static Integer DEFAULT_SCALE = 25;
-  
+
   // Common Namespaces
   public final static String NS_BASE = "http://docs.oasis-open.org/odata/ns/";;
-  
+
   public final static String NS_DATASERVICES = 
"http://docs.oasis-open.org/odata/ns/data";;
-  
+
   public final static String NS_METADATA = 
"http://docs.oasis-open.org/odata/ns/metadata";;
-  
+
   public final static String NS_SCHEME = 
"http://docs.oasis-open.org/odata/ns/scheme";;
-  
+
   public final static String NS_NAVIGATION_LINK_REL = 
"http://docs.oasis-open.org/odata/ns/related/";;
-  
+
   public final static String NS_ASSOCIATION_LINK_REL = 
"http://docs.oasis-open.org/odata/ns/relatedlinks/";;
-  
+
   public final static String NS_MEDIA_EDIT_LINK_REL = 
"http://docs.oasis-open.org/odata/ns/edit-media/";;
-  
+
   public final static String NS_DELTA_LINK_REL = 
"http://docs.oasis-open.org/odata/ns/delta";;
 
   // XML namespaces and prefixes
@@ -73,7 +73,6 @@ public interface Constants {
 
   public final static String SRS_URLPREFIX = 
"http://www.opengis.net/def/crs/EPSG/0/";;
 
-
   // Link rel(s)
   public static final String EDIT_LINK_REL = "edit";
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataError.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataError.java 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataError.java
index 9ac0a80..b51fcc1 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataError.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataError.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -47,7 +47,7 @@ public class ODataError {
    * @param code
    * @return this for method chaining
    */
-  public ODataError setCode(String code) {
+  public ODataError setCode(final String code) {
     this.code = code;
     return this;
   }
@@ -67,7 +67,7 @@ public class ODataError {
    * @param message
    * @return this for method chaining
    */
-  public ODataError setMessage(String message) {
+  public ODataError setMessage(final String message) {
     this.message = message;
     return this;
   }
@@ -87,14 +87,14 @@ public class ODataError {
    * @param target
    * @return this for method chaining
    */
-  public ODataError setTarget(String target) {
+  public ODataError setTarget(final String target) {
     this.target = target;
     return this;
   }
 
   /**
    * Gets error details.
-   * 
+   *
    * @return ODataErrorDetail list.
    */
   public List<ODataErrorDetail> getDetails() {
@@ -103,17 +103,17 @@ public class ODataError {
 
   /**
    * Sets error details.
-   * 
+   *
    * @return this for method chaining.
    */
-  public ODataError setDetails(List<ODataErrorDetail> details) {
+  public ODataError setDetails(final List<ODataErrorDetail> details) {
     this.details = details;
     return this;
   }
 
   /**
    * Gets server defined key-value pairs for debug environment only.
-   * 
+   *
    * @return a pair representing server defined object. MAY be null.
    */
   public Map<String, String> getInnerError() {
@@ -122,10 +122,10 @@ public class ODataError {
 
   /**
    * Sets server defined key-value pairs for debug environment only.
-   * 
+   *
    * @return this for method chaining.
    */
-  public ODataError setInnerError(Map<String, String> innerError) {
+  public ODataError setInnerError(final Map<String, String> innerError) {
     this.innerError = innerError;
     return this;
   }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataErrorDetail.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataErrorDetail.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataErrorDetail.java
index f8b1fa5..10dd1da 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataErrorDetail.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataErrorDetail.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -31,7 +31,7 @@ public class ODataErrorDetail {
 
   /**
    * Gets error code.
-   * 
+   *
    * @return error code.
    */
   public String getCode() {
@@ -45,7 +45,7 @@ public class ODataErrorDetail {
 
   /**
    * Gets error message.
-   * 
+   *
    * @return error message.
    */
   public String getMessage() {
@@ -59,7 +59,7 @@ public class ODataErrorDetail {
 
   /**
    * Gets error target.
-   * 
+   *
    * @return error message.
    */
   public String getTarget() {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataException.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataException.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataException.java
index 784a8ac..dce6111 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataException.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataException.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataPropertyType.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataPropertyType.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataPropertyType.java
index 94c9fb0..4d6d2b1 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataPropertyType.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataPropertyType.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataRuntimeException.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataRuntimeException.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataRuntimeException.java
index 0c8374a..b8b6964 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataRuntimeException.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataRuntimeException.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/AbstractODataObject.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/AbstractODataObject.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/AbstractODataObject.java
index 2904bfd..237b8ef 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/AbstractODataObject.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/AbstractODataObject.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -29,7 +29,7 @@ public abstract class AbstractODataObject extends Annotatable 
{
 
   /**
    * Gets base URI.
-   * 
+   *
    * @return base URI.
    */
   public URI getBaseURI() {
@@ -40,10 +40,9 @@ public abstract class AbstractODataObject extends 
Annotatable {
     this.baseURI = baseURI == null ? null : URI.create(baseURI);
   }
 
-
   /**
    * Gest ID.
-   * 
+   *
    * @return ID.
    */
   public URI getId() {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotatable.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotatable.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotatable.java
index b43002f..d17da99 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotatable.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotatable.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotation.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotation.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotation.java
index 1b1741a..994cc6a 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotation.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotation.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ComplexValue.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ComplexValue.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ComplexValue.java
index d2611b3..ed22b94 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ComplexValue.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ComplexValue.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ContextURL.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ContextURL.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ContextURL.java
index af5cc4d..3c482c7 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ContextURL.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ContextURL.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,7 +43,7 @@ public class ContextURL {
   private String selectList;
 
   private String navOrPropertyPath;
-  
+
   private String keyPath;
 
   private Suffix suffix;
@@ -64,9 +64,7 @@ public class ContextURL {
     }
   }
 
-
-  private ContextURL() {
-  }
+  private ContextURL() {}
 
   public URI getServiceRoot() {
     return serviceRoot;
@@ -91,10 +89,10 @@ public class ContextURL {
   public String getNavOrPropertyPath() {
     return navOrPropertyPath;
   }
-  
+
   public String getKeyPath() {
     return keyPath;
-  }  
+  }
 
   public Suffix getSuffix() {
     return suffix;
@@ -141,11 +139,11 @@ public class ContextURL {
       contextURL.entitySetOrSingletonOrType = entitySet.getName();
       return this;
     }
-    
+
     public Builder keyPath(final String value) {
       contextURL.keyPath = value;
       return this;
-    }  
+    }
 
     public Builder entitySetOrSingletonOrType(final String 
entitySetOrSingletonOrType) {
       contextURL.entitySetOrSingletonOrType = entitySetOrSingletonOrType;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/DeletedEntity.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/DeletedEntity.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/DeletedEntity.java
index e51abfc..a3fe2cc 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/DeletedEntity.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/DeletedEntity.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Delta.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Delta.java 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Delta.java
index b87c05f..d825d78 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Delta.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Delta.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/DeltaLink.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/DeltaLink.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/DeltaLink.java
index 335863e..866fb1f 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/DeltaLink.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/DeltaLink.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Entity.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Entity.java 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Entity.java
index b6939c0..32a543e 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Entity.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Entity.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -41,7 +41,7 @@ public class Entity extends Linked {
 
   /**
    * Gets ETag.
-   * 
+   *
    * @return ETag.
    */
   public String getETag() {
@@ -54,7 +54,7 @@ public class Entity extends Linked {
 
   /**
    * Gets entity type.
-   * 
+   *
    * @return entity type.
    */
   public String getType() {
@@ -63,7 +63,7 @@ public class Entity extends Linked {
 
   /**
    * Sets entity type.
-   * 
+   *
    * @param type entity type.
    */
   public void setType(final String type) {
@@ -72,7 +72,7 @@ public class Entity extends Linked {
 
   /**
    * Gets entity self link.
-   * 
+   *
    * @return self link.
    */
   public Link getSelfLink() {
@@ -81,16 +81,16 @@ public class Entity extends Linked {
 
   /**
    * Sets entity self link.
-   * 
+   *
    * @param selfLink self link.
    */
   public void setSelfLink(final Link selfLink) {
-    this.readLink = selfLink;
+    readLink = selfLink;
   }
 
   /**
    * Gets entity edit link.
-   * 
+   *
    * @return edit link.
    */
   public Link getEditLink() {
@@ -99,7 +99,7 @@ public class Entity extends Linked {
 
   /**
    * Sets entity edit link.
-   * 
+   *
    * @param editLink edit link.
    */
   public void setEditLink(final Link editLink) {
@@ -108,7 +108,7 @@ public class Entity extends Linked {
 
   /**
    * Gets media entity links.
-   * 
+   *
    * @return links.
    */
   public List<Link> getMediaEditLinks() {
@@ -117,7 +117,7 @@ public class Entity extends Linked {
 
   /**
    * Gets operations.
-   * 
+   *
    * @return operations.
    */
   public List<Operation> getOperations() {
@@ -126,7 +126,7 @@ public class Entity extends Linked {
 
   /**
    * Add property to this Entity.
-   * 
+   *
    * @param property property which is added
    * @return this Entity for fluid/flow adding
    */
@@ -137,7 +137,7 @@ public class Entity extends Linked {
 
   /**
    * Gets properties.
-   * 
+   *
    * @return properties.
    */
   public List<Property> getProperties() {
@@ -146,7 +146,7 @@ public class Entity extends Linked {
 
   /**
    * Gets property with given name.
-   * 
+   *
    * @param name property name
    * @return property with given name if found, null otherwise
    */
@@ -165,7 +165,7 @@ public class Entity extends Linked {
 
   /**
    * Gets media content type.
-   * 
+   *
    * @return media content type.
    */
   public String getMediaContentType() {
@@ -174,7 +174,7 @@ public class Entity extends Linked {
 
   /**
    * Set media content type.
-   * 
+   *
    * @param mediaContentType media content type.
    */
   public void setMediaContentType(final String mediaContentType) {
@@ -183,7 +183,7 @@ public class Entity extends Linked {
 
   /**
    * Gets media content resource.
-   * 
+   *
    * @return media content resource.
    */
   public URI getMediaContentSource() {
@@ -192,7 +192,7 @@ public class Entity extends Linked {
 
   /**
    * Set media content source.
-   * 
+   *
    * @param mediaContentSource media content source.
    */
   public void setMediaContentSource(final URI mediaContentSource) {
@@ -201,7 +201,7 @@ public class Entity extends Linked {
 
   /**
    * ETag of the binary stream represented by this media entity or named 
stream property.
-   * 
+   *
    * @return media ETag value
    */
   public String getMediaETag() {
@@ -210,7 +210,7 @@ public class Entity extends Linked {
 
   /**
    * Set media ETag.
-   * 
+   *
    * @param eTag media ETag value
    */
   public void setMediaETag(final String eTag) {
@@ -219,7 +219,7 @@ public class Entity extends Linked {
 
   /**
    * Checks if the current entity is a media entity.
-   * 
+   *
    * @return 'TRUE' if is a media entity; 'FALSE' otherwise.
    */
   public boolean isMediaEntity() {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntityCollection.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntityCollection.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntityCollection.java
index 0946bea..8b6f1df 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntityCollection.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntityCollection.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -34,7 +34,7 @@ public class EntityCollection extends AbstractODataObject {
 
   /**
    * Sets number of entries.
-   * 
+   *
    * @param count number of entries
    */
   public void setCount(final Integer count) {
@@ -43,7 +43,7 @@ public class EntityCollection extends AbstractODataObject {
 
   /**
    * Gets number of entries - if it was required.
-   * 
+   *
    * @return number of entries into the entity set.
    */
   public Integer getCount() {
@@ -52,7 +52,7 @@ public class EntityCollection extends AbstractODataObject {
 
   /**
    * Gets entities.
-   * 
+   *
    * @return entries.
    */
   public List<Entity> getEntities() {
@@ -61,7 +61,7 @@ public class EntityCollection extends AbstractODataObject {
 
   /**
    * Sets next link.
-   * 
+   *
    * @param next next link.
    */
   public void setNext(final URI next) {
@@ -70,7 +70,7 @@ public class EntityCollection extends AbstractODataObject {
 
   /**
    * Gets next link if exists.
-   * 
+   *
    * @return next link if exists; null otherwise.
    */
   public URI getNext() {
@@ -79,7 +79,7 @@ public class EntityCollection extends AbstractODataObject {
 
   /**
    * Gets delta link if exists.
-   * 
+   *
    * @return delta link if exists; null otherwise.
    */
   public URI getDeltaLink() {
@@ -88,7 +88,7 @@ public class EntityCollection extends AbstractODataObject {
 
   /**
    * Sets delta link.
-   * 
+   *
    * @param deltaLink delta link.
    */
   public void setDeltaLink(final URI deltaLink) {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/GeoUtils.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/GeoUtils.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/GeoUtils.java
index 27f6611..4421892 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/GeoUtils.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/GeoUtils.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -52,33 +52,33 @@ public final class GeoUtils {
     if (Constants.ELEM_POINT.equals(elementName)) {
       type = dimension == Geospatial.Dimension.GEOGRAPHY
           ? EdmPrimitiveTypeKind.GeographyPoint
-          : EdmPrimitiveTypeKind.GeometryPoint;
+              : EdmPrimitiveTypeKind.GeometryPoint;
     } else if (Constants.ELEM_MULTIPOINT.equals(elementName)) {
       type = dimension == Geospatial.Dimension.GEOGRAPHY
           ? EdmPrimitiveTypeKind.GeographyMultiPoint
-          : EdmPrimitiveTypeKind.GeometryMultiPoint;
+              : EdmPrimitiveTypeKind.GeometryMultiPoint;
     } else if (Constants.ELEM_LINESTRING.equals(elementName)) {
       type = dimension == Geospatial.Dimension.GEOGRAPHY
           ? EdmPrimitiveTypeKind.GeographyLineString
-          : EdmPrimitiveTypeKind.GeometryLineString;
+              : EdmPrimitiveTypeKind.GeometryLineString;
     } else if (Constants.ELEM_MULTILINESTRING.equals(elementName)) {
       type = dimension == Geospatial.Dimension.GEOGRAPHY
           ? EdmPrimitiveTypeKind.GeographyMultiLineString
-          : EdmPrimitiveTypeKind.GeometryMultiLineString;
+              : EdmPrimitiveTypeKind.GeometryMultiLineString;
     } else if (Constants.ELEM_POLYGON.equals(elementName)) {
       type = dimension == Geospatial.Dimension.GEOGRAPHY
           ? EdmPrimitiveTypeKind.GeographyPolygon
-          : EdmPrimitiveTypeKind.GeometryPolygon;
+              : EdmPrimitiveTypeKind.GeometryPolygon;
     } else if (Constants.ELEM_MULTIPOLYGON.equals(elementName)) {
       type = dimension == Geospatial.Dimension.GEOGRAPHY
           ? EdmPrimitiveTypeKind.GeographyMultiPolygon
-          : EdmPrimitiveTypeKind.GeometryMultiPolygon;
+              : EdmPrimitiveTypeKind.GeometryMultiPolygon;
     } else if (Constants.ELEM_GEOCOLLECTION.equals(elementName)
         || Constants.ELEM_GEOMEMBERS.equals(elementName)) {
 
       type = dimension == Geospatial.Dimension.GEOGRAPHY
           ? EdmPrimitiveTypeKind.GeographyCollection
-          : EdmPrimitiveTypeKind.GeometryCollection;
+              : EdmPrimitiveTypeKind.GeometryCollection;
     }
 
     return type;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java
index 8278633..35acb31 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -35,7 +35,7 @@ public class Link extends Annotatable {
 
   /**
    * Gets title.
-   * 
+   *
    * @return title.
    */
   public String getTitle() {
@@ -44,7 +44,7 @@ public class Link extends Annotatable {
 
   /**
    * Sets title.
-   * 
+   *
    * @param title title.
    */
   public void setTitle(final String title) {
@@ -53,7 +53,7 @@ public class Link extends Annotatable {
 
   /**
    * Gets rel info.
-   * 
+   *
    * @return rel info.
    */
   public String getRel() {
@@ -62,7 +62,7 @@ public class Link extends Annotatable {
 
   /**
    * Sets rel info.
-   * 
+   *
    * @param rel rel info.
    */
   public void setRel(final String rel) {
@@ -71,7 +71,7 @@ public class Link extends Annotatable {
 
   /**
    * Gets href.
-   * 
+   *
    * @return href.
    */
   public String getHref() {
@@ -80,7 +80,7 @@ public class Link extends Annotatable {
 
   /**
    * Sets href.
-   * 
+   *
    * @param href href.
    */
   public void setHref(final String href) {
@@ -89,7 +89,7 @@ public class Link extends Annotatable {
 
   /**
    * Gets type.
-   * 
+   *
    * @return type.
    */
   public String getType() {
@@ -98,7 +98,7 @@ public class Link extends Annotatable {
 
   /**
    * Sets type.
-   * 
+   *
    * @param type type.
    */
   public void setType(final String type) {
@@ -107,7 +107,7 @@ public class Link extends Annotatable {
 
   /**
    * Gets Media ETag.
-   * 
+   *
    * @return media ETag
    */
   public String getMediaETag() {
@@ -116,7 +116,7 @@ public class Link extends Annotatable {
 
   /**
    * Sets Media ETag.
-   * 
+   *
    * @param mediaETag media ETag
    */
   public void setMediaETag(final String mediaETag) {
@@ -125,7 +125,7 @@ public class Link extends Annotatable {
 
   /**
    * Gets in-line entity.
-   * 
+   *
    * @return in-line entity.
    */
   public Entity getInlineEntity() {
@@ -134,17 +134,16 @@ public class Link extends Annotatable {
 
   /**
    * Sets in-line entity.
-   * 
+   *
    * @param entity entity.
    */
   public void setInlineEntity(final Entity entity) {
     this.entity = entity;
   }
 
-
   /**
    * Gets in-line entity set.
-   * 
+   *
    * @return in-line entity set.
    */
   public EntityCollection getInlineEntitySet() {
@@ -153,7 +152,7 @@ public class Link extends Annotatable {
 
   /**
    * Sets in-line entity set.
-   * 
+   *
    * @param entitySet entity set.
    */
   public void setInlineEntitySet(final EntityCollection entitySet) {
@@ -180,7 +179,7 @@ public class Link extends Annotatable {
    * Sets the binding link.
    * @param bindingLink
    */
-  public void setBindingLink(String bindingLink) {
+  public void setBindingLink(final String bindingLink) {
     this.bindingLink = bindingLink;
   }
 
@@ -188,7 +187,7 @@ public class Link extends Annotatable {
    * Sets the binding links. List MUST NOT be <tt>null</tt>.
    * @param bindingLinks
    */
-  public void setBindingLinks(List<String> bindingLinks) {
+  public void setBindingLinks(final List<String> bindingLinks) {
     this.bindingLinks = bindingLinks;
   }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Linked.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Linked.java 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Linked.java
index c136d55..9833af4 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Linked.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Linked.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -41,7 +41,7 @@ public abstract class Linked extends AbstractODataObject {
 
   /**
    * Gets association link with given name, if available, otherwise 
<tt>null</tt>.
-   * 
+   *
    * @param name candidate link name
    * @return association link with given name, if available, otherwise 
<tt>null</tt>
    */
@@ -51,7 +51,7 @@ public abstract class Linked extends AbstractODataObject {
 
   /**
    * Gets association links.
-   * 
+   *
    * @return association links.
    */
   public List<Link> getAssociationLinks() {
@@ -60,7 +60,7 @@ public abstract class Linked extends AbstractODataObject {
 
   /**
    * Gets navigation link with given name, if available, otherwise 
<tt>null</tt>.
-   * 
+   *
    * @param name candidate link name
    * @return navigation link with given name, if available, otherwise 
<tt>null</tt>
    */
@@ -70,7 +70,7 @@ public abstract class Linked extends AbstractODataObject {
 
   /**
    * Gets navigation links.
-   * 
+   *
    * @return links.
    */
   public List<Link> getNavigationLinks() {
@@ -82,13 +82,13 @@ public abstract class Linked extends AbstractODataObject {
    * @param name candidate link name
    * @return binding link with given name, if available, otherwise 
<tt>null</tt>
    */
-  public Link getNavigationBinding(String name) {
+  public Link getNavigationBinding(final String name) {
     return getOneByTitle(name, bindingLinks);
   }
 
   /**
    * Gets binding links.
-   * 
+   *
    * @return links.
    */
   public List<Link> getNavigationBindings() {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Operation.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Operation.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Operation.java
index 914c42c..faed256 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Operation.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Operation.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -30,7 +30,7 @@ public class Operation {
 
   /**
    * Gets metadata anchor.
-   * 
+   *
    * @return metadata anchor.
    */
   public String getMetadataAnchor() {
@@ -39,7 +39,7 @@ public class Operation {
 
   /**
    * Sets metadata anchor.
-   * 
+   *
    * @param metadataAnchor metadata anchor.
    */
   public void setMetadataAnchor(final String metadataAnchor) {
@@ -48,7 +48,7 @@ public class Operation {
 
   /**
    * Gets title.
-   * 
+   *
    * @return title.
    */
   public String getTitle() {
@@ -57,7 +57,7 @@ public class Operation {
 
   /**
    * Sets title.
-   * 
+   *
    * @param title title.
    */
   public void setTitle(final String title) {
@@ -66,7 +66,7 @@ public class Operation {
 
   /**
    * Gets target.
-   * 
+   *
    * @return target.
    */
   public URI getTarget() {
@@ -75,7 +75,7 @@ public class Operation {
 
   /**
    * Sets target.
-   * 
+   *
    * @param target target.
    */
   public void setTarget(final URI target) {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Parameter.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Parameter.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Parameter.java
index a5443c7..80e7cf8 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Parameter.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Parameter.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -32,7 +32,7 @@ public class Parameter extends Valuable {
   /**
    * @param name of the parameter
    */
-  public void setName(String name) {
+  public void setName(final String name) {
     this.name = name;
   }
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Property.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Property.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Property.java
index ef0adbd..00acc53 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Property.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Property.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -29,7 +29,7 @@ public class Property extends Valuable {
     super.setType(type);
   }
 
-  public Property(String type, String name, ValueType valueType, Object value) 
{
+  public Property(final String type, final String name, final ValueType 
valueType, final Object value) {
     this(type, name);
     setValue(valueType, value);
   }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ResWrap.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ResWrap.java 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ResWrap.java
index 06e889f..c64da07 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ResWrap.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ResWrap.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,7 +22,7 @@ import java.net.URI;
 
 /**
  * Outermost response payload wrapper.
- * 
+ *
  * @param <T> the actual response payload
  */
 public class ResWrap<T> {
@@ -46,7 +46,7 @@ public class ResWrap<T> {
    * <br />
    * For details on how the context URL is used to describe a payload, see the 
relevant sections in the particular
    * format.
-   * 
+   *
    * @return context URL.
    */
   public URI getContextURL() {
@@ -58,7 +58,7 @@ public class ResWrap<T> {
    * subsequently to make a conditional request for the metadata or service 
document. Clients can also compare the value
    * of the ETag header returned from a metadata document request to the 
metadata ETag returned in a response in order
    * to verify the version of the metadata used to generate that response.
-   * 
+   *
    * @return metadata ETag.
    */
   public String getMetadataETag() {
@@ -67,7 +67,7 @@ public class ResWrap<T> {
 
   /**
    * Gets contained object.
-   * 
+   *
    * @return contained object.
    */
   public T getPayload() {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Valuable.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Valuable.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Valuable.java
index f982aab..d71771b 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Valuable.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Valuable.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -43,14 +43,14 @@ public abstract class Valuable extends Annotatable {
   public void setType(final String type) {
     this.type = type;
   }
-  
+
   /**
    * Check if Valuable contains a PRIMITIVE or COLLECTION_PRIMITIVE ValueType
    *
    * @return true if ValueType is a PRIMITIVE or COLLECTION_PRIMITIVE, 
otherwise false
    */
   public boolean isPrimitive() {
-    if(isCollection()) {
+    if (isCollection()) {
       return valueType.getBaseType() == ValueType.PRIMITIVE;
     }
     return valueType == ValueType.PRIMITIVE;
@@ -62,20 +62,19 @@ public abstract class Valuable extends Annotatable {
    * @return true if ValueType is a GEOSPATIAL or COLLECTION_GEOSPATIAL, 
otherwise false
    */
   public boolean isGeospatial() {
-    if(isCollection()) {
+    if (isCollection()) {
       return valueType.getBaseType() == ValueType.GEOSPATIAL;
     }
     return valueType == ValueType.GEOSPATIAL;
   }
 
-
   /**
    * Check if Valuable contains a ENUM or COLLECTION_ENUM ValueType
    *
    * @return true if ValueType is a ENUM or COLLECTION_ENUM, otherwise false
    */
   public boolean isEnum() {
-    if(isCollection()) {
+    if (isCollection()) {
       return valueType.getBaseType() == ValueType.ENUM;
     }
     return valueType == ValueType.ENUM;
@@ -87,7 +86,7 @@ public abstract class Valuable extends Annotatable {
    * @return true if ValueType is a COMPLEX or COLLECTION_COMPLEX, otherwise 
false
    */
   public boolean isComplex() {
-    if(isCollection()) {
+    if (isCollection()) {
       return valueType.getBaseType() == ValueType.COMPLEX;
     }
     return valueType == ValueType.COMPLEX;
@@ -108,7 +107,7 @@ public abstract class Valuable extends Annotatable {
    * @return primitive representation or null if it is not based on a 
primitive ValueType
    */
   public Object asPrimitive() {
-    if(isCollection()) {
+    if (isCollection()) {
       return null;
     }
     return isPrimitive() ? value : null;
@@ -120,7 +119,7 @@ public abstract class Valuable extends Annotatable {
    * @return geospatial representation or null if it is not based on a 
geospatial ValueType
    */
   public Geospatial asGeospatial() {
-    if(isCollection()) {
+    if (isCollection()) {
       return null;
     }
     return isGeospatial() ? (Geospatial) value : null;
@@ -132,7 +131,7 @@ public abstract class Valuable extends Annotatable {
    * @return enum representation or null if it is not based on a enum ValueType
    */
   public Object asEnum() {
-    if(isCollection()) {
+    if (isCollection()) {
       return null;
     }
     return isEnum() ? value : null;
@@ -144,7 +143,7 @@ public abstract class Valuable extends Annotatable {
    * @return primitive complex or null if it is not based on a complex 
ValueType
    */
   public ComplexValue asComplex() {
-    if(isCollection()) {
+    if (isCollection()) {
       return null;
     }
     return isComplex() ? (ComplexValue) value : null;
@@ -177,7 +176,6 @@ public abstract class Valuable extends Annotatable {
     return valueType;
   }
 
-
   @Override
   public boolean equals(final Object obj) {
     return EqualsBuilder.reflectionEquals(this, obj);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ValueType.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ValueType.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ValueType.java
index 6dc460f..a077b51 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ValueType.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ValueType.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/package-info.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/package-info.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/package-info.java
index 40c8b1b..8a74ab6 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/package-info.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/package-info.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- *
+ * 
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/Edm.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/Edm.java 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/Edm.java
index 7b9376a..bfe1953 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/Edm.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/Edm.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -29,14 +29,14 @@ public interface Edm {
 
   /**
    * This method <b>DOES NOT</b> support lazy loading. All schemas are loaded 
completely!
-   * 
+   *
    * @return all schemas defined for this EDM
    */
   List<EdmSchema> getSchemas();
 
   /**
    * Get schema by namespace.
-   * 
+   *
    * @param namespace must not be null
    * @return {@link EdmSchema}
    */
@@ -46,16 +46,16 @@ public interface Edm {
    * Get main entity container.
    * <br/>
    * See {@link EdmEntityContainer} for more information.
-   * 
+   *
    * @return {@link EdmEntityContainer}
    */
   EdmEntityContainer getEntityContainer();
-  
+
   /**
    * Get entity container by full qualified name.
    * <br/>
    * See {@link EdmEntityContainer} for more information.
-   * 
+   *
    * @param name
    * @return {@link EdmEntityContainer}
    */
@@ -65,7 +65,7 @@ public interface Edm {
    * Get enum type by full qualified name.
    * <br/>
    * See {@link EdmEnumType} for more information
-   * 
+   *
    * @param name
    * @return {@link EdmEnumType}
    */
@@ -75,7 +75,7 @@ public interface Edm {
    * Get a type definition by full qualified name.
    * <br/>
    * See {@link EdmTypeDefinition} for more information
-   * 
+   *
    * @param name
    * @return {@link EdmTypeDefinition}
    */
@@ -85,7 +85,7 @@ public interface Edm {
    * Get entity type by full qualified name.
    * <br/>
    * See {@link EdmEntityType} for more information.
-   * 
+   *
    * @param name
    * @return {@link EdmEntityType}
    */
@@ -95,7 +95,7 @@ public interface Edm {
    * Get complex type by full qualified name..
    * <br/>
    * See {@link EdmComplexType} for more information.
-   * 
+   *
    * @param name
    * @return {@link EdmComplexType}
    */
@@ -103,7 +103,7 @@ public interface Edm {
 
   /**
    * Get unbound Action by full qualified name.
-   * 
+   *
    * @param actionName must not be null
    * @return {@link EdmAction}
    */
@@ -111,7 +111,7 @@ public interface Edm {
 
   /**
    * Get Action by full qualified name and binding parameter type.
-   * 
+   *
    * @param actionName must not be null
    * @param bindingParameterTypeName must not be null
    * @param isBindingParameterCollection may be null
@@ -122,7 +122,7 @@ public interface Edm {
 
   /**
    * Get Function by full qualified name.
-   * 
+   *
    * @param functionName must not be null
    * @return {@link EdmFunction}
    */
@@ -130,7 +130,7 @@ public interface Edm {
 
   /**
    * Get Function by full qualified name.
-   * 
+   *
    * @param functionName must not be null
    * @param parameterNames may be null: in this case it is considered as empty
    * @return {@link EdmFunction}
@@ -139,7 +139,7 @@ public interface Edm {
 
   /**
    * Get Function by full qualified name and binding parameter type and 
binding parameter names.
-   * 
+   *
    * @param functionName must not be null
    * @param bindingParameterTypeName must not be null
    * @param isBindingParameterCollection may be null
@@ -151,7 +151,7 @@ public interface Edm {
 
   /**
    * Get Term full by qualified name.
-   * 
+   *
    * @param termName must not be null
    * @return {@link EdmTerm}
    */
@@ -159,7 +159,7 @@ public interface Edm {
 
   /**
    * Get {@link EdmAnnotations} by target.
-   * 
+   *
    * @param targetName <tt>edm:Annotations</tt> target
    * @return {@link EdmAnnotations}
    */
@@ -167,7 +167,7 @@ public interface Edm {
 
   /**
    * Get all {@link EdmAnnotation} by element FQN.
-   * 
+   *
    * @param annotatableName must not be null
    * @return {@link EdmAnnotation}
    */
@@ -175,7 +175,7 @@ public interface Edm {
 
   /**
    * Get {@link EdmAnnotation} by element FQN and term.
-   * 
+   *
    * @param annotatableName must not be null
    * @param term <tt>edm:Annotation</tt> term
    * @return {@link EdmAnnotation}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAction.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAction.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAction.java
index dc6c2de..7c42074 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAction.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAction.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,5 +22,5 @@ package org.apache.olingo.commons.api.edm;
  * A CSDL action.
  */
 public interface EdmAction extends EdmOperation {
-//No additional methods needed for now.
+  // No additional methods needed for now.
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImport.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImport.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImport.java
index 7c6ca59..c01cfa8 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImport.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImport.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -25,7 +25,7 @@ public interface EdmActionImport extends EdmOperationImport {
 
   /**
    * Gets unbound action.
-   * 
+   *
    * @return unbound action.
    */
   EdmAction getUnboundAction();

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImportInfo.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImportInfo.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImportInfo.java
index 2b54f71..a2b1c10 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImportInfo.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImportInfo.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -33,7 +33,7 @@ public interface EdmActionImportInfo extends 
EdmOperationImportInfo {
   /**
    * We use a {@link URI} object here to ensure the right encoding. If a 
string representation is needed the
    * toASCIIString() method can be used.
-   * 
+   *
    * @return the uri to this function import
    */
   URI getActionImportUri();

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotatable.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotatable.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotatable.java
index 2244ce3..04f0143 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotatable.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotatable.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotation.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotation.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotation.java
index f3e3ee0..ef0e352 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotation.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotation.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotations.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotations.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotations.java
index 596f1c8..de00b44 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotations.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotations.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotationsTarget.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotationsTarget.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotationsTarget.java
index c734cb7..24e5910 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotationsTarget.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotationsTarget.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@ package org.apache.olingo.commons.api.edm;
 
 /**
  * Interface for CSDL elements thar can be evaluated as <tt>target</tt> for 
<tt>edm:Annotations</tt>.
- * 
+ *
  * @see EdmAnnotations
  */
 public interface EdmAnnotationsTarget {
@@ -55,7 +55,7 @@ public interface EdmAnnotationsTarget {
 
   /**
    * @return {@link FullQualifiedName} of this target, or of the parent 
element if applicable
-   * 
+   *
    */
   FullQualifiedName getAnnotationsTargetFQN();
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmBindingTarget.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmBindingTarget.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmBindingTarget.java
index e2cf10f..52a228b 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmBindingTarget.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmBindingTarget.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -28,7 +28,7 @@ public interface EdmBindingTarget extends EdmNamed, 
EdmAnnotationsTarget, EdmAnn
 
   /**
    * Returns the target for a given path.
-   * 
+   *
    * @param path
    * @return {@link EdmBindingTarget}
    */
@@ -41,14 +41,14 @@ public interface EdmBindingTarget extends EdmNamed, 
EdmAnnotationsTarget, EdmAnn
 
   /**
    * Returns the entity container this target is contained in.
-   * 
+   *
    * @return {@link EdmEntityContainer}
    */
   EdmEntityContainer getEntityContainer();
 
   /**
    * Get the entity type.
-   * 
+   *
    * @return {@link EdmEntityType}
    */
   EdmEntityType getEntityType();

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmComplexType.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmComplexType.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmComplexType.java
index f888daf..0be16d5 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmComplexType.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmComplexType.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmElement.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmElement.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmElement.java
index 5e6159e..8b651b5 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmElement.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmElement.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -23,5 +23,5 @@ package org.apache.olingo.commons.api.edm;
  * {@link EdmParameter}.
  */
 public interface EdmElement extends EdmNamed, EdmTyped {
-//No additional methods needed for now.
+  // No additional methods needed for now.
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityContainer.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityContainer.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityContainer.java
index 07e330f..756db6c 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityContainer.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityContainer.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * A CSDL EntityContainer element.
- * 
+ *
  * <br/>
  * EdmEntityContainer hold the information of EntitySets, Singletons, 
ActionImports and FunctionImports contained
  */
@@ -40,7 +40,7 @@ public interface EdmEntityContainer extends EdmNamed, 
EdmAnnotationsTarget, EdmA
 
   /**
    * Get contained Singleton by name.
-   * 
+   *
    * @param name
    * @return {@link EdmSingleton}
    */
@@ -48,7 +48,7 @@ public interface EdmEntityContainer extends EdmNamed, 
EdmAnnotationsTarget, EdmA
 
   /**
    * Get contained EntitySet by name.
-   * 
+   *
    * @param name
    * @return {@link EdmEntitySet}
    */
@@ -56,7 +56,7 @@ public interface EdmEntityContainer extends EdmNamed, 
EdmAnnotationsTarget, EdmA
 
   /**
    * Get contained ActionImport by name.
-   * 
+   *
    * @param name
    * @return {@link EdmActionImport}
    */
@@ -64,7 +64,7 @@ public interface EdmEntityContainer extends EdmNamed, 
EdmAnnotationsTarget, EdmA
 
   /**
    * Get contained FunctionImport by name.
-   * 
+   *
    * @param name
    * @return {@link EdmFunctionImport}
    */
@@ -72,28 +72,28 @@ public interface EdmEntityContainer extends EdmNamed, 
EdmAnnotationsTarget, EdmA
 
   /**
    * This method <b>DOES NOT</b> support lazy loading
-   * 
+   *
    * @return returns all entity sets for this container.
    */
   List<EdmEntitySet> getEntitySets();
 
   /**
    * This method <b>DOES NOT</b> support lazy loading
-   * 
+   *
    * @return returns all function imports for this container.
    */
   List<EdmFunctionImport> getFunctionImports();
 
   /**
    * This method <b>DOES NOT</b> support lazy loading
-   * 
+   *
    * @return returns all singletons for this container.
    */
   List<EdmSingleton> getSingletons();
 
   /**
    * This method <b>DOES NOT</b> support lazy loading
-   * 
+   *
    * @return returns all action imports for this container.
    */
   List<EdmActionImport> getActionImports();

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntitySet.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntitySet.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntitySet.java
index 5b3a569..50df2a4 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntitySet.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntitySet.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityType.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityType.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityType.java
index ce6c039..e4dc248 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityType.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityType.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,21 +27,21 @@ public interface EdmEntityType extends EdmStructuredType {
 
   /**
    * Gets all key predicate names. In case an alias is defined for a key 
predicate this will be returned.
-   * 
+   *
    * @return collection of key property names of type List&lt;String&gt;
    */
   List<String> getKeyPredicateNames();
 
   /**
    * Get all key properties references as list of {@link EdmKeyPropertyRef}.
-   * 
+   *
    * @return collection of key properties of type List&lt;EdmKeyPropertyRef&gt;
    */
   List<EdmKeyPropertyRef> getKeyPropertyRefs();
 
   /**
    * Get a key property ref by its name.
-   * 
+   *
    * @param keyPredicateName
    * @return {@link EdmKeyPropertyRef} for given name
    */
@@ -49,14 +49,14 @@ public interface EdmEntityType extends EdmStructuredType {
 
   /**
    * Indicates if the entity type is treated as Media Link Entry with 
associated Media Resource.
-   * 
+   *
    * @return <code>true</code> if the entity type is a Media Link Entry
    */
   boolean hasStream();
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.olingo.api.edm.EdmStructuralType#getBaseType()
    */
   @Override

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEnumType.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEnumType.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEnumType.java
index 8a8ee76..e0feda9 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEnumType.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEnumType.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmException.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmException.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmException.java
index a852049..65bd432 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmException.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmException.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunction.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunction.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunction.java
index 861ea52..5bec073 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunction.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunction.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunctionImport.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunctionImport.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunctionImport.java
index 1f7b9b2..9fcf365 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunctionImport.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunctionImport.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,14 +27,14 @@ public interface EdmFunctionImport extends 
EdmOperationImport {
 
   /**
    * Gets unbound functions.
-   * 
+   *
    * @return unbound functions
    */
   List<EdmFunction> getUnboundFunctions();
 
   /**
    * Gets unbound function with given parameter names.
-   * 
+   *
    * @param parameterNames parameter names
    * @return unbound function with given parameter names
    */

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmKeyPropertyRef.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmKeyPropertyRef.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmKeyPropertyRef.java
index bcf6cb9..a845559 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmKeyPropertyRef.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmKeyPropertyRef.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmMappable.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmMappable.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmMappable.java
index 86b5b21..e17169a 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmMappable.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmMappable.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -25,7 +25,7 @@ public interface EdmMappable {
 
   /**
    * Get mapping information applied to an EDM element. May return null if no 
mapping is defined.
-   * 
+   *
    * @return {@link EdmMapping} or <b>null</b> if no mapping is defined
    */
   EdmMapping getMapping();

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmMapping.java
----------------------------------------------------------------------
diff --git 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmMapping.java
 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmMapping.java
index b116fd0..e223152 100644
--- 
a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmMapping.java
+++ 
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmMapping.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

Reply via email to