http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ReferenceCollectionProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ReferenceCollectionProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ReferenceCollectionProcessor.java
index 3373e3f..b087c76 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ReferenceCollectionProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ReferenceCollectionProcessor.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,14 +33,14 @@ public interface ReferenceCollectionProcessor extends 
Processor {
   /**
    * Reads entity references from persistence and put them as serialized 
content and with
    * according status into the response.
-   * @param request  OData request object containing raw HTTP information
+   * @param request OData request object containing raw HTTP information
    * @param response OData response object for collecting response data
-   * @param uriInfo  information of a parsed OData URI
-   * @param responseFormat   requested content type after content negotiation
+   * @param uriInfo information of a parsed OData URI
+   * @param responseFormat requested content type after content negotiation
    * @throws ODataApplicationException if the service implementation 
encounters a failure
-   * @throws SerializerException       if serialization failed
+   * @throws SerializerException if serialization failed
    */
   void readReferenceCollection(ODataRequest request, ODataResponse response, 
UriInfo uriInfo,
-                               ContentType responseFormat)
-      throws ODataApplicationException, SerializerException;
+      ContentType responseFormat)
+          throws ODataApplicationException, SerializerException;
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ReferenceProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ReferenceProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ReferenceProcessor.java
index 43c94ba..5420e38 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ReferenceProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ReferenceProcessor.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,36 +33,36 @@ public interface ReferenceProcessor extends Processor {
 
   /**
    * Reads entity reference from persistence and put it as serialized content 
and status into the response.
-   * @param request  OData request object containing raw HTTP information
+   * @param request OData request object containing raw HTTP information
    * @param response OData response object for collecting response data
-   * @param uriInfo  information of a parsed OData URI
-   * @param responseFormat   requested content type after content negotiation
+   * @param uriInfo information of a parsed OData URI
+   * @param responseFormat requested content type after content negotiation
    * @throws ODataApplicationException if the service implementation 
encounters a failure
-   * @throws SerializerException       if serialization failed
+   * @throws SerializerException if serialization failed
    */
   void readReference(ODataRequest request, ODataResponse response, UriInfo 
uriInfo, ContentType responseFormat)
       throws ODataApplicationException, SerializerException;
 
   /**
    * Creates entity reference in the persistence and puts content, status, and 
Location into the response.
-   * @param request       OData request object containing raw HTTP information
-   * @param response      OData response object for collecting response data
-   * @param uriInfo       information of a parsed OData URI
+   * @param request OData request object containing raw HTTP information
+   * @param response OData response object for collecting response data
+   * @param uriInfo information of a parsed OData URI
    * @param requestFormat content type of body sent with request
    * @throws ODataApplicationException if the service implementation 
encounters a failure
-   * @throws DeserializerException     if de-serialization failed
+   * @throws DeserializerException if de-serialization failed
    */
   void createReference(ODataRequest request, ODataResponse response, UriInfo 
uriInfo, ContentType requestFormat)
       throws ODataApplicationException, DeserializerException;
 
   /**
    * Update entity reference in the persistence and puts content, status, and 
Location into the response.
-   * @param request       OData request object containing raw HTTP information
-   * @param response      OData response object for collecting response data
-   * @param uriInfo       information of a parsed OData URI
+   * @param request OData request object containing raw HTTP information
+   * @param response OData response object for collecting response data
+   * @param uriInfo information of a parsed OData URI
    * @param requestFormat content type of body sent with request
    * @throws ODataApplicationException if the service implementation 
encounters a failure
-   * @throws DeserializerException     if de-serialization failed
+   * @throws DeserializerException if de-serialization failed
    */
   void updateReference(ODataRequest request, ODataResponse response, UriInfo 
uriInfo, ContentType requestFormat)
       throws ODataApplicationException, DeserializerException;
@@ -71,11 +71,11 @@ public interface ReferenceProcessor extends Processor {
    * Deletes reference to an entity from persistence and puts the status into 
the response.
    * Delete on a reference only removes the reference to and not the entity 
itself
    * (see chapter "11.4.6.2 Remove a Reference to an Entity")
-   * @param request  OData request object containing raw HTTP information
+   * @param request OData request object containing raw HTTP information
    * @param response OData response object for collecting response data
-   * @param uriInfo  information of a parsed OData URI
+   * @param uriInfo information of a parsed OData URI
    * @throws ODataApplicationException if the service implementation 
encounters a failure
    */
   void deleteReference(ODataRequest request, ODataResponse response, UriInfo 
uriInfo)
-          throws ODataApplicationException;
+      throws ODataApplicationException;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ServiceDocumentProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ServiceDocumentProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ServiceDocumentProcessor.java
index 5f0d4f9..ebbd7e6 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ServiceDocumentProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ServiceDocumentProcessor.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,12 +32,12 @@ public interface ServiceDocumentProcessor extends Processor 
{
 
   /**
    * Reads service-document information from persistence and puts serialized 
content and status into the response.
-   * @param request  OData request object containing raw HTTP information
+   * @param request OData request object containing raw HTTP information
    * @param response OData response object for collecting response data
-   * @param uriInfo  information of a parsed OData URI
-   * @param responseFormat   requested content type after content negotiation
+   * @param uriInfo information of a parsed OData URI
+   * @param responseFormat requested content type after content negotiation
    * @throws ODataApplicationException if the service implementation 
encounters a failure
-   * @throws SerializerException       if serialization failed
+   * @throws SerializerException if serialization failed
    */
   void readServiceDocument(ODataRequest request, ODataResponse response, 
UriInfo uriInfo, ContentType responseFormat)
       throws ODataApplicationException, SerializerException;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ComplexSerializerOptions.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ComplexSerializerOptions.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ComplexSerializerOptions.java
index d6788e5..b89dac8 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ComplexSerializerOptions.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ComplexSerializerOptions.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/server-api/src/main/java/org/apache/olingo/server/api/serializer/CustomContentTypeSupport.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/CustomContentTypeSupport.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/CustomContentTypeSupport.java
index ca4f0cb..6d2fef5 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/CustomContentTypeSupport.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/CustomContentTypeSupport.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -38,7 +38,7 @@ public interface CustomContentTypeSupport {
   /**
    * Returns a list of supported content types.
    * @param defaultContentTypes content types supported by Olingo's 
(de-)serializer
-   * @param type                the current type of representation
+   * @param type the current type of representation
    * @return modified list of supported content types
    */
   public List<ContentType> modifySupportedContentTypes(

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntityCollectionSerializerOptions.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntityCollectionSerializerOptions.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntityCollectionSerializerOptions.java
index e5dd6b0..bbfe1bf 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntityCollectionSerializerOptions.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntityCollectionSerializerOptions.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,7 +52,7 @@ public class EntityCollectionSerializerOptions {
     return select;
   }
 
-  /** only writes the references of the entities*/
+  /** only writes the references of the entities */
   public boolean onlyReferences() {
     return onlyReferences;
   }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntitySerializerOptions.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntitySerializerOptions.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntitySerializerOptions.java
index 0abb31c..563b058 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntitySerializerOptions.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntitySerializerOptions.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
@@ -44,7 +44,7 @@ public class EntitySerializerOptions {
     return select;
   }
 
-  /** only writes the references of the entities*/
+  /** only writes the references of the entities */
   public boolean onlyReferences() {
     return onlyReferences;
   }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/FixedFormatSerializer.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/FixedFormatSerializer.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/FixedFormatSerializer.java
index 9a0e693..fc41c73 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/FixedFormatSerializer.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/FixedFormatSerializer.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/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java
index e822415..bdaa87c 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.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
@@ -36,7 +36,7 @@ public interface ODataSerializer {
 
   /**
    * Writes the service document into an InputStream.
-   * @param edm         the Entity Data Model
+   * @param edm the Entity Data Model
    * @param serviceRoot the service-root URI of this OData service
    */
   SerializerResult serviceDocument(Edm edm, String serviceRoot) throws 
SerializerException;
@@ -58,8 +58,8 @@ public interface ODataSerializer {
    * Writes entity-collection data into an InputStream.
    * @param metadata Metadata for the service
    * @param entityType the {@link EdmEntityType}
-   * @param entitySet  the data of the entity set
-   * @param options    options for the serializer
+   * @param entitySet the data of the entity set
+   * @param options options for the serializer
    */
   SerializerResult entityCollection(ServiceMetadata metadata, EdmEntityType 
entityType,
       EntityCollection entitySet, EntityCollectionSerializerOptions options) 
throws SerializerException;
@@ -68,15 +68,15 @@ public interface ODataSerializer {
    * Writes entity data into an InputStream.
    * @param metadata Metadata for the service
    * @param entityType the {@link EdmEntityType}
-   * @param entity     the data of the entity
-   * @param options    options for the serializer
+   * @param entity the data of the entity
+   * @param options options for the serializer
    */
   SerializerResult entity(ServiceMetadata metadata, EdmEntityType entityType, 
Entity entity,
       EntitySerializerOptions options) throws SerializerException;
 
   /**
    * Writes primitive-type instance data into an InputStream.
-   * @param type     primitive type
+   * @param type primitive type
    * @param property property value
    * @param options options for the serializer
    */
@@ -86,7 +86,7 @@ public interface ODataSerializer {
   /**
    * Writes complex-type instance data into an InputStream.
    * @param metadata Metadata for the service
-   * @param type     complex type
+   * @param type complex type
    * @param property property value
    * @param options options for the serializer
    */
@@ -95,7 +95,7 @@ public interface ODataSerializer {
 
   /**
    * Writes data of a collection of primitive-type instances into an 
InputStream.
-   * @param type     primitive type
+   * @param type primitive type
    * @param property property value
    * @param options options for the serializer
    */
@@ -105,7 +105,7 @@ public interface ODataSerializer {
   /**
    * Writes data of a collection of complex-type instances into an InputStream.
    * @param metadata Metadata for the service
-   * @param type     complex type
+   * @param type complex type
    * @param property property value
    * @param options options for the serializer
    */

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/PrimitiveSerializerOptions.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/PrimitiveSerializerOptions.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/PrimitiveSerializerOptions.java
index 9339592..bd34599 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/PrimitiveSerializerOptions.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/PrimitiveSerializerOptions.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/server-api/src/main/java/org/apache/olingo/server/api/serializer/PrimitiveValueSerializerOptions.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/PrimitiveValueSerializerOptions.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/PrimitiveValueSerializerOptions.java
index e84aaa4..a0e8ab9 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/PrimitiveValueSerializerOptions.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/PrimitiveValueSerializerOptions.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/server-api/src/main/java/org/apache/olingo/server/api/serializer/RepresentationType.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/RepresentationType.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/RepresentationType.java
index 22efa28..29b251a 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/RepresentationType.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/RepresentationType.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,22 +23,40 @@ package org.apache.olingo.server.api.serializer;
  * OData request or the OData response, primarily used for content negotiation.
  */
 public enum RepresentationType {
-  /** service document */ SERVICE,
-  /** metadata document */ METADATA,
-  /** batch request or response */ BATCH,
-  /** error document */ ERROR,
-  /** single entity */ ENTITY,
-  /** collection of entities (entity set) */ COLLECTION_ENTITY,
-  /** single primitive-type instance */ PRIMITIVE,
-  /** collection of primitive-type instances */ COLLECTION_PRIMITIVE,
-  /** single complex-type instance */ COMPLEX,
-  /** collection of complex-type instances */ COLLECTION_COMPLEX,
-  /** differences */ DIFFERENCES,
-  /** media entity */ MEDIA,
-  /** binary-type instance */ BINARY,
-  /** single reference */ REFERENCE,
-  /** collection of references */ COLLECTION_REFERENCE,
-  /** textual raw value of a primitive-type instance (except binary) */ VALUE,
-  /** count of instances */ COUNT,
-  /** parameters of an action */ ACTION_PARAMETERS
+  /** service document */
+  SERVICE,
+  /** metadata document */
+  METADATA,
+  /** batch request or response */
+  BATCH,
+  /** error document */
+  ERROR,
+  /** single entity */
+  ENTITY,
+  /** collection of entities (entity set) */
+  COLLECTION_ENTITY,
+  /** single primitive-type instance */
+  PRIMITIVE,
+  /** collection of primitive-type instances */
+  COLLECTION_PRIMITIVE,
+  /** single complex-type instance */
+  COMPLEX,
+  /** collection of complex-type instances */
+  COLLECTION_COMPLEX,
+  /** differences */
+  DIFFERENCES,
+  /** media entity */
+  MEDIA,
+  /** binary-type instance */
+  BINARY,
+  /** single reference */
+  REFERENCE,
+  /** collection of references */
+  COLLECTION_REFERENCE,
+  /** textual raw value of a primitive-type instance (except binary) */
+  VALUE,
+  /** count of instances */
+  COUNT,
+  /** parameters of an action */
+  ACTION_PARAMETERS
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/SerializerException.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/SerializerException.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/SerializerException.java
index a7d067f..df38286 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/SerializerException.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/SerializerException.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,16 +28,22 @@ public class SerializerException extends 
ODataTranslatedException {
   /** Keys for exception texts in the resource bundle. */
   public static enum MessageKeys implements MessageKey {
     NOT_IMPLEMENTED,
-    /** parameter: format */ UNSUPPORTED_FORMAT,
+    /** parameter: format */
+    UNSUPPORTED_FORMAT,
     JSON_METADATA,
     IO_EXCEPTION,
     NULL_INPUT,
     NO_CONTEXT_URL,
-    /** parameter: property name */ UNSUPPORTED_PROPERTY_TYPE,
-    /** parameter: property name */ INCONSISTENT_PROPERTY_TYPE,
-    /** parameter: property name */ MISSING_PROPERTY,
-    /** parameters: property name, property value */ WRONG_PROPERTY_VALUE,
-    /** parameters: primitive-type name, value */ WRONG_PRIMITIVE_VALUE,
+    /** parameter: property name */
+    UNSUPPORTED_PROPERTY_TYPE,
+    /** parameter: property name */
+    INCONSISTENT_PROPERTY_TYPE,
+    /** parameter: property name */
+    MISSING_PROPERTY,
+    /** parameters: property name, property value */
+    WRONG_PROPERTY_VALUE,
+    /** parameters: primitive-type name, value */
+    WRONG_PRIMITIVE_VALUE,
     UNKNOWN_TYPE,
     WRONG_BASE_TYPE;
 
@@ -50,8 +56,8 @@ public class SerializerException extends 
ODataTranslatedException {
   /**
    * Creates serializer exception.
    * @param developmentMessage message text as fallback and for debugging 
purposes
-   * @param messageKey         one of the {@link MessageKeys} for the 
exception text in the resource bundle
-   * @param parameters         parameters for the exception text
+   * @param messageKey one of the {@link MessageKeys} for the exception text 
in the resource bundle
+   * @param parameters parameters for the exception text
    */
   public SerializerException(final String developmentMessage,
       final MessageKey messageKey, final String... parameters) {
@@ -61,9 +67,9 @@ public class SerializerException extends 
ODataTranslatedException {
   /**
    * Creates serializer exception.
    * @param developmentMessage message text as fallback and for debugging 
purposes
-   * @param cause              the cause of this exception
-   * @param messageKey         one of the {@link MessageKeys} for the 
exception text in the resource bundle
-   * @param parameters         parameters for the exception text
+   * @param cause the cause of this exception
+   * @param messageKey one of the {@link MessageKeys} for the exception text 
in the resource bundle
+   * @param parameters parameters for the exception text
    */
   public SerializerException(final String developmentMessage, final Throwable 
cause,
       final MessageKey messageKey, final String... parameters) {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/SerializerResult.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/SerializerResult.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/SerializerResult.java
index 5249bb4..edf3ac8 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/SerializerResult.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/SerializerResult.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
@@ -21,12 +21,12 @@ package org.apache.olingo.server.api.serializer;
 import java.io.InputStream;
 
 /**
-* Result type for {@link ODataSerializer} methods
+ * Result type for {@link ODataSerializer} methods
  */
 public interface SerializerResult {
   /**
    * Returns the serialized content
-   * @return  serialized content
+   * @return serialized content
    */
   InputStream getContent();
-} 
+}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriHelper.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriHelper.java 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriHelper.java
index a21ae1e..55f2bd9 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriHelper.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriHelper.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
@@ -37,7 +37,7 @@ public interface UriHelper {
 
   /**
    * Builds the select-list part of a {@link 
org.apache.olingo.commons.api.data.ContextURL ContextURL}.
-   * @param type   the {@link EdmStructuredType}
+   * @param type the {@link EdmStructuredType}
    * @param expand the $expand option
    * @param select the $select option
    * @return a String with the select list
@@ -55,7 +55,7 @@ public interface UriHelper {
   /**
    * Builds the relative canonical URL for the given entity in the given 
entity set.
    * @param edmEntitySet the entity set
-   * @param entity       the entity data
+   * @param entity the entity data
    * @return the relative canonical URL
    */
   String buildCanonicalURL(EdmEntitySet edmEntitySet, Entity entity) throws 
SerializerException;
@@ -63,11 +63,11 @@ public interface UriHelper {
   /**
    * Builds the key predicate for the given entity.
    * @param edmEntityType the entity type of the entity
-   * @param entity        the entity data
+   * @param entity the entity data
    * @return the key predicate
    */
   String buildKeyPredicate(EdmEntityType edmEntityType, Entity entity) throws 
SerializerException;
-  
+
   /**
    * Retrieves the key predicates from a canonical link to an entity.
    * A canonical link to an entity must follow the pattern
@@ -82,6 +82,6 @@ public interface UriHelper {
    * @return a list of key predicates
    * @throws DeserializerException in case the link is malformed
    */
-  List<UriParameter> getKeyPredicatesFromEntityLink(Edm edm, String 
entityLink, String rawServiceRoot) 
+  List<UriParameter> getKeyPredicatesFromEntityLink(Edm edm, String 
entityLink, String rawServiceRoot)
       throws DeserializerException;
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java
index a4af588..c7f1e7e 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.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,18 +18,18 @@
  */
 package org.apache.olingo.server.api.uri;
 
-import org.apache.olingo.server.api.uri.queryoption.SystemQueryOption;
-
 import java.util.Collection;
 
+import org.apache.olingo.server.api.uri.queryoption.SystemQueryOption;
+
 /**
  * Object acting as general access to URI information extracted from the 
request URI. Depending on
  * the URI info kind different interfaces are used to provide access to that 
information. </p>
  * Use method {@link #getKind()} to obtain URI info kind information and to 
perform an appropriate cast.
  */
 public interface UriInfo extends
-    UriInfoService, UriInfoAll, UriInfoBatch, UriInfoCrossjoin,
-    UriInfoEntityId, UriInfoMetadata, UriInfoResource {
+UriInfoService, UriInfoAll, UriInfoBatch, UriInfoCrossjoin,
+UriInfoEntityId, UriInfoMetadata, UriInfoResource {
 
   public UriInfoKind getKind();
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoAll.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoAll.java 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoAll.java
index 36ed151..dbbc023 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoAll.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoAll.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.server.api.uri;
  * http://.../serviceroot/$all
  */
 public interface UriInfoAll {
-//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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoBatch.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoBatch.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoBatch.java
index 8403f88..8aff381 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoBatch.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoBatch.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.server.api.uri;
  * http://.../serviceroot/$batch
  */
 public interface UriInfoBatch {
-//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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoCrossjoin.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoCrossjoin.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoCrossjoin.java
index 1352486..bdf16d3 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoCrossjoin.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoCrossjoin.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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java
index 3412517..6736ddc 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.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,6 +18,8 @@
  */
 package org.apache.olingo.server.api.uri;
 
+import java.util.List;
+
 import org.apache.olingo.commons.api.edm.EdmEntityType;
 import org.apache.olingo.server.api.uri.queryoption.CustomQueryOption;
 import org.apache.olingo.server.api.uri.queryoption.ExpandOption;
@@ -25,8 +27,6 @@ import 
org.apache.olingo.server.api.uri.queryoption.FormatOption;
 import org.apache.olingo.server.api.uri.queryoption.IdOption;
 import org.apache.olingo.server.api.uri.queryoption.SelectOption;
 
-import java.util.List;
-
 /**
  * Used for URI info kind {@link UriInfoKind#entityId} to describe URIs like
  * http://.../serviceroot/$entity...

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoKind.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoKind.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoKind.java
index 61dda8a..a09bffd 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoKind.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoKind.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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoMetadata.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoMetadata.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoMetadata.java
index 8906a64..b16f76c 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoMetadata.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoMetadata.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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.java
index 7a62c36..20d4880 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.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,6 +18,8 @@
  */
 package org.apache.olingo.server.api.uri;
 
+import java.util.List;
+
 import org.apache.olingo.server.api.uri.queryoption.CountOption;
 import org.apache.olingo.server.api.uri.queryoption.CustomQueryOption;
 import org.apache.olingo.server.api.uri.queryoption.ExpandOption;
@@ -31,8 +33,6 @@ import 
org.apache.olingo.server.api.uri.queryoption.SkipOption;
 import org.apache.olingo.server.api.uri.queryoption.SkipTokenOption;
 import org.apache.olingo.server.api.uri.queryoption.TopOption;
 
-import java.util.List;
-
 /**
  * Used for URI info kind {@link UriInfoKind#resource} to describe URIs like
  * E.g. http://.../serviceroot/entitySet
@@ -110,7 +110,7 @@ public interface UriInfoResource {
    * predicate information.<br>
    * - The second one of type {@link UriResourceComplexProperty} containing 
the name of
    * the accessed complex property
-   * 
+   *
    * @return List of resource parts.
    */
   List<UriResource> getUriResourceParts();

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoService.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoService.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoService.java
index ff3962b..189dfad 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoService.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoService.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.server.api.uri;
  * http://.../serviceroot
  */
 public interface UriInfoService {
-//No additional methods needed here.
+  //No additional methods needed here.
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriParameter.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriParameter.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriParameter.java
index 9f3d45f..db2f9d0 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriParameter.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriParameter.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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResource.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResource.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResource.java
index 468b15c..acafa57 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResource.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResource.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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceAction.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceAction.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceAction.java
index e916ce5..cc01a11 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceAction.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceAction.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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceComplexProperty.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceComplexProperty.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceComplexProperty.java
index 5a1f0ae..58d94ec 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceComplexProperty.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceComplexProperty.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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceCount.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceCount.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceCount.java
index 1a3747a..66e1a37 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceCount.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceCount.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.server.api.uri;
  * For example: http://.../serviceroot/entityset(1)/$count
  */
 public interface UriResourceCount extends UriResource {
-//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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceEntitySet.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceEntitySet.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceEntitySet.java
index d7f35fb..5029716 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceEntitySet.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceEntitySet.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,12 +18,12 @@
  */
 package org.apache.olingo.server.api.uri;
 
+import java.util.List;
+
 import org.apache.olingo.commons.api.edm.EdmEntitySet;
 import org.apache.olingo.commons.api.edm.EdmEntityType;
 import org.apache.olingo.commons.api.edm.EdmType;
 
-import java.util.List;
-
 /**
  * Used to describe an entity set used within an resource path
  * For example: http://.../serviceroot/entityset(1)

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.java
index 1caf000..d92dd89 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.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,12 +18,12 @@
  */
 package org.apache.olingo.server.api.uri;
 
+import java.util.List;
+
 import org.apache.olingo.commons.api.edm.EdmFunction;
 import org.apache.olingo.commons.api.edm.EdmFunctionImport;
 import org.apache.olingo.commons.api.edm.EdmType;
 
-import java.util.List;
-
 /**
  * Used to describe an function import or bound function used within an 
resource path
  * For example: http://.../serviceroot/functionImport(P1=1,P2='A')

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceIt.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceIt.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceIt.java
index c61ce19..f9a5ee0 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceIt.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceIt.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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceKind.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceKind.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceKind.java
index 9e65dc1..456de7d 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceKind.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceKind.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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAll.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAll.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAll.java
index 328d59b..cbb9edf 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAll.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAll.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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAny.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAny.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAny.java
index 2d1408d..8908284 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAny.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAny.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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaVariable.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaVariable.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaVariable.java
index db60dd4..67a5d3d 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaVariable.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaVariable.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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceNavigation.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceNavigation.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceNavigation.java
index 9139edf..3ef4c05 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceNavigation.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceNavigation.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.server.api.uri;
 
+import java.util.List;
+
 import org.apache.olingo.commons.api.edm.EdmNavigationProperty;
 import org.apache.olingo.commons.api.edm.EdmType;
 
-import java.util.List;
-
 /**
  * Used to describe an navigation property used within an resource path
  * For example: http://.../serviceroot/entityset(1)/navProperty

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourcePartTyped.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourcePartTyped.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourcePartTyped.java
index 0b624f2..5ff183c 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourcePartTyped.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourcePartTyped.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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourcePrimitiveProperty.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourcePrimitiveProperty.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourcePrimitiveProperty.java
index 29346d6..907d10c 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourcePrimitiveProperty.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourcePrimitiveProperty.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.server.api.uri;
  * For example: http://.../serviceroot/entityset(1)/property
  */
 public interface UriResourcePrimitiveProperty extends UriResourceProperty {
-//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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceProperty.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceProperty.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceProperty.java
index c9f7f85..c2b0493 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceProperty.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceProperty.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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceRef.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceRef.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceRef.java
index 9404966..5c564f2 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceRef.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceRef.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.server.api.uri;
  * For example: http://.../serviceroot/entityset/$ref
  */
 public interface UriResourceRef extends UriResource {
-//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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceRoot.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceRoot.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceRoot.java
index df7034a..09e6ed0 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceRoot.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceRoot.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
@@ -24,5 +24,5 @@ package org.apache.olingo.server.api.uri;
  * For example: http://.../serviceroot/entityset(1)?$filter=property eq 
$root/singleton/configstring
  */
 public interface UriResourceRoot extends UriResource {
-//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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceSingleton.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceSingleton.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceSingleton.java
index 89004cc..3a85f69 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceSingleton.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceSingleton.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/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceValue.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceValue.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceValue.java
index 33209a0..287e8f6 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceValue.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceValue.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.server.api.uri;
  * For example: http://.../serviceroot/entityset(1)/property/$value
  */
 public interface UriResourceValue extends UriResource {
-//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/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/AliasQueryOption.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/AliasQueryOption.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/AliasQueryOption.java
index 842d0c5..dffb0be 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/AliasQueryOption.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/AliasQueryOption.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/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/CountOption.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/CountOption.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/CountOption.java
index 4d78b77..cec4466 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/CountOption.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/CountOption.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/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/CustomQueryOption.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/CustomQueryOption.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/CustomQueryOption.java
index 60fc246..895f04b 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/CustomQueryOption.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/CustomQueryOption.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
@@ -24,5 +24,5 @@ package org.apache.olingo.server.api.uri.queryoption;
  * http://.../entitySet?myOption=true
  */
 public interface CustomQueryOption extends QueryOption {
-//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/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandItem.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandItem.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandItem.java
index 6954831..fccf844 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandItem.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandItem.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/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandOption.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandOption.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandOption.java
index 634802d..5894dc9 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandOption.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/ExpandOption.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/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/FilterOption.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/FilterOption.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/FilterOption.java
index 9ba1496..a45208f 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/FilterOption.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/FilterOption.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/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/FormatOption.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/FormatOption.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/FormatOption.java
index 0efb0d4..c831a01 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/FormatOption.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/FormatOption.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/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/IdOption.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/IdOption.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/IdOption.java
index 89b18b1..ab8b467 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/IdOption.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/IdOption.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/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/LevelsExpandOption.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/LevelsExpandOption.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/LevelsExpandOption.java
index 69166fc..67da30f 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/LevelsExpandOption.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/LevelsExpandOption.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/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/OrderByItem.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/OrderByItem.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/OrderByItem.java
index e7f7037..1e8acec 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/OrderByItem.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/OrderByItem.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/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/OrderByOption.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/OrderByOption.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/OrderByOption.java
index 4612f21..5b3fe25 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/OrderByOption.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/OrderByOption.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/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/QueryOption.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/QueryOption.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/QueryOption.java
index 860eaa6..793708c 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/QueryOption.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/QueryOption.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/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SearchOption.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SearchOption.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SearchOption.java
index ae608f2..628f638 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SearchOption.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SearchOption.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/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SelectItem.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SelectItem.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SelectItem.java
index 6ee25ec..a761154 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SelectItem.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SelectItem.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/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SelectOption.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SelectOption.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SelectOption.java
index 18ee432..bdd8c16 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SelectOption.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SelectOption.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/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SkipOption.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SkipOption.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SkipOption.java
index ecf94c7..4369d39 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SkipOption.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SkipOption.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/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SkipTokenOption.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SkipTokenOption.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SkipTokenOption.java
index f0cc0f8..785931d 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SkipTokenOption.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/SkipTokenOption.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