http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchRequestPart.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchRequestPart.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchRequestPart.java
index 01c8330..f67410b 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchRequestPart.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchRequestPart.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,30 +31,30 @@ import org.apache.olingo.server.api.ODataRequest;
 public class BatchRequestPart {
   private List<ODataRequest> requests = new ArrayList<ODataRequest>();
   private boolean isChangeSet;
-  
+
   /**
    * Creates a new instance of BachRequestPart
-   * 
-   * @param isChangeSet   True, if this instance represents a change set
-   * @param requests      A list of {@link ODataRequest}
+   *
+   * @param isChangeSet True, if this instance represents a change set
+   * @param requests A list of {@link ODataRequest}
    */
   public BatchRequestPart(final boolean isChangeSet, final List<ODataRequest> 
requests) {
     this.isChangeSet = isChangeSet;
     this.requests = requests;
   }
-  
+
   /**
    * Creates a new instance of BachRequestPart
-   * 
-   * @param isChangeSet   True, if this instance represents a change set
-   * @param request       A single {@link ODataRequest}
+   *
+   * @param isChangeSet True, if this instance represents a change set
+   * @param request A single {@link ODataRequest}
    */
   public BatchRequestPart(final boolean isChangeSet, final ODataRequest 
request) {
     this.isChangeSet = isChangeSet;
-    this.requests = new ArrayList<ODataRequest>();
-    this.requests.add(request);
+    requests = new ArrayList<ODataRequest>();
+    requests.add(request);
   }
-  
+
   /**
    * Get the info if a BatchPart is a ChangeSet
    * @return true or false

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/ODataResponsePart.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/ODataResponsePart.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/ODataResponsePart.java
index 405deab..56c0084 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/ODataResponsePart.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/ODataResponsePart.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,52 +31,52 @@ import org.apache.olingo.server.api.ODataResponse;
 public class ODataResponsePart {
   private List<ODataResponse> responses;
   private boolean isChangeSet;
-  
+
   /**
    * Creates a new ODataResponsePart.
-   * 
+   *
    * An ODataResponsePart represents a collections of ODataResponses.
    * A list of ODataResponseParts can be combined by the BatchSerializer to a 
single
    * OData batch response.
-   *  
-   * @param responses     A list of {@link ODataResponse}
-   * @param isChangeSet   True this ODataResponsePart represents a change set, 
otherwise false
+   * 
+   * @param responses A list of {@link ODataResponse}
+   * @param isChangeSet True this ODataResponsePart represents a change set, 
otherwise false
    */
-  public ODataResponsePart(List<ODataResponse> responses, boolean isChangeSet) 
{
+  public ODataResponsePart(final List<ODataResponse> responses, final boolean 
isChangeSet) {
     this.responses = responses;
     this.isChangeSet = isChangeSet;
   }
-  
+
   /**
    * Creates a new ODataResponsePart.
-   * 
+   *
    * An ODataResponsePart represents a collections of ODataResponses.
    * A list of ODataResponseParts can be combined by the BatchSerializer to a 
single
    * OData batch response.
-   *  
-   * @param response      A single {@link ODataResponse}
-   * @param isChangeSet   True this ODataResponsePart represents a change set, 
otherwise false
+   * 
+   * @param response A single {@link ODataResponse}
+   * @param isChangeSet True this ODataResponsePart represents a change set, 
otherwise false
    */
-  public ODataResponsePart(ODataResponse response, boolean isChangeSet) {
-    this.responses = Arrays.asList(response);
+  public ODataResponsePart(final ODataResponse response, final boolean 
isChangeSet) {
+    responses = Arrays.asList(response);
     this.isChangeSet = isChangeSet;
   }
-  
+
   /**
    * Returns true if the current instance represents a change set.
-   * 
+   *
    * @return true or false
    */
   public List<ODataResponse> getResponses() {
     return responses;
   }
-  
+
   /**
    * Returns a collection of ODataResponses.
    * Each collections contains at least one {@link ODataResponse}.
-   * 
+   *
    * If this instance represents a change set, there are may many 
ODataResponses
-   *  
+   * 
    * @return a list of {@link ODataResponse}
    */
   public boolean isChangeSet() {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReference.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReference.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReference.java
index 1af98df..38d17fe 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReference.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReference.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 class EdmxReference {
    *
    * @param uri of reference
    */
-  public EdmxReference(URI uri) {
+  public EdmxReference(final URI uri) {
     this.uri = uri;
     edmxIncludes = new ArrayList<EdmxReferenceInclude>();
     edmxIncludeAnnotations = new ArrayList<EdmxReferenceIncludeAnnotation>();
@@ -66,7 +66,7 @@ public class EdmxReference {
    * @param include to be added
    * @return this EdmxReference object
    */
-  public EdmxReference addInclude(EdmxReferenceInclude include) {
+  public EdmxReference addInclude(final EdmxReferenceInclude include) {
     edmxIncludes.add(include);
     return this;
   }
@@ -86,7 +86,7 @@ public class EdmxReference {
    * @param includeAnnotation to be added
    * @return this EdmxReference object
    */
-  public EdmxReference addIncludeAnnotation(EdmxReferenceIncludeAnnotation 
includeAnnotation) {
+  public EdmxReference addIncludeAnnotation(final 
EdmxReferenceIncludeAnnotation includeAnnotation) {
     edmxIncludeAnnotations.add(includeAnnotation);
     return this;
   }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReferenceInclude.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReferenceInclude.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReferenceInclude.java
index 2cbff9f..acd6d8c 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReferenceInclude.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReferenceInclude.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 EdmxReferenceInclude {
    * @param namespace of include
    * @param alias of include
    */
-  public EdmxReferenceInclude(String namespace, String alias) {
+  public EdmxReferenceInclude(final String namespace, final String alias) {
     this.namespace = namespace;
     this.alias = alias;
   }
@@ -41,7 +41,7 @@ public class EdmxReferenceInclude {
    *
    * @param namespace of include
    */
-  public EdmxReferenceInclude(String namespace) {
+  public EdmxReferenceInclude(final String namespace) {
     this(namespace, null);
   }
 
@@ -52,9 +52,9 @@ public class EdmxReferenceInclude {
     return namespace;
   }
 
-       /**
-        * @return alias of the include if one defined; null otherwise
-        */
+  /**
+   * @return alias of the include if one defined; null otherwise
+   */
   public String getAlias() {
     return alias;
   }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReferenceIncludeAnnotation.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReferenceIncludeAnnotation.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReferenceIncludeAnnotation.java
index 9d6b6ab..4139c4a 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReferenceIncludeAnnotation.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/edmx/EdmxReferenceIncludeAnnotation.java
@@ -31,7 +31,7 @@ public class EdmxReferenceIncludeAnnotation {
    *
    * @param termNamespace of include annotation
    */
-  public EdmxReferenceIncludeAnnotation(String termNamespace) {
+  public EdmxReferenceIncludeAnnotation(final String termNamespace) {
     this(termNamespace, null, null);
   }
 
@@ -42,22 +42,23 @@ public class EdmxReferenceIncludeAnnotation {
    * @param qualifier of include annotation
    * @param targetNamespace of include annotation
    */
-  public EdmxReferenceIncludeAnnotation(String termNamespace, String 
qualifier, String targetNamespace) {
+  public EdmxReferenceIncludeAnnotation(final String termNamespace, final 
String qualifier,
+      final String targetNamespace) {
     this.termNamespace = termNamespace;
     this.qualifier = qualifier;
     this.targetNamespace = targetNamespace;
   }
 
   /**
-        * @return TermNamespace of the include annotation
-        */
+   * @return TermNamespace of the include annotation
+   */
   public String getTermNamespace() {
     return termNamespace;
   }
 
-       /**
-        * @return Qualifier if one defined; null otherwise
-        */
+  /**
+   * @return Qualifier if one defined; null otherwise
+   */
   public String getQualifier() {
     return qualifier;
   }
@@ -68,14 +69,14 @@ public class EdmxReferenceIncludeAnnotation {
    * @param qualifier for include annotation
    * @return this include annotation
    */
-  public EdmxReferenceIncludeAnnotation setQualifier(String qualifier) {
+  public EdmxReferenceIncludeAnnotation setQualifier(final String qualifier) {
     this.qualifier = qualifier;
     return this;
   }
 
-       /**
-        * @return targetNamespace if defined; null otherwise
-        */
+  /**
+   * @return targetNamespace if defined; null otherwise
+   */
   public String getTargetNamespace() {
     return targetNamespace;
   }
@@ -86,7 +87,7 @@ public class EdmxReferenceIncludeAnnotation {
    * @param targetNamespace for include annotation
    * @return this include annotation
    */
-  public EdmxReferenceIncludeAnnotation setTargetNamespace(String 
targetNamespace) {
+  public EdmxReferenceIncludeAnnotation setTargetNamespace(final String 
targetNamespace) {
     this.targetNamespace = targetNamespace;
     return this;
   }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionComplexCollectionProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionComplexCollectionProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionComplexCollectionProcessor.java
index 5f0c663..80b10ff 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionComplexCollectionProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionComplexCollectionProcessor.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,16 +32,16 @@ import org.apache.olingo.server.api.uri.UriInfo;
 public interface ActionComplexCollectionProcessor extends 
ComplexCollectionProcessor {
   /**
    * Process an action which has as return type a complex-type collection.
-   * @param request          OData request object containing raw HTTP 
information
-   * @param response         OData response object for collecting response data
-   * @param uriInfo          information about a parsed OData URI
-   * @param requestFormat    content type of body sent with request
-   * @param responseFormat   requested content type after content negotiation
+   * @param request OData request object containing raw HTTP information
+   * @param response OData response object for collecting response data
+   * @param uriInfo information about a parsed OData URI
+   * @param requestFormat content type of body sent with request
+   * @param responseFormat requested content type after content negotiation
    * @throws ODataApplicationException if the service implementation 
encounters a failure
-   * @throws DeserializerException     if deserialization failed
-   * @throws SerializerException       if serialization failed
+   * @throws DeserializerException if deserialization failed
+   * @throws SerializerException if serialization failed
    */
   void processActionComplexCollection(ODataRequest request, ODataResponse 
response, UriInfo uriInfo,
       ContentType requestFormat, ContentType responseFormat)
-      throws ODataApplicationException, DeserializerException, 
SerializerException;
+          throws ODataApplicationException, DeserializerException, 
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/ActionComplexProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionComplexProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionComplexProcessor.java
index 3acec8d..20f3266 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionComplexProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionComplexProcessor.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,16 +32,16 @@ import org.apache.olingo.server.api.uri.UriInfo;
 public interface ActionComplexProcessor extends ComplexProcessor {
   /**
    * Process an action which has as return type a complex type.
-   * @param request          OData request object containing raw HTTP 
information
-   * @param response         OData response object for collecting response data
-   * @param uriInfo          information about a parsed OData URI
-   * @param requestFormat    content type of body sent with request
-   * @param responseFormat   requested content type after content negotiation
+   * @param request OData request object containing raw HTTP information
+   * @param response OData response object for collecting response data
+   * @param uriInfo information about a parsed OData URI
+   * @param requestFormat content type of body sent with request
+   * @param responseFormat requested content type after content negotiation
    * @throws ODataApplicationException if the service implementation 
encounters a failure
-   * @throws DeserializerException     if deserialization failed
-   * @throws SerializerException       if serialization failed
+   * @throws DeserializerException if deserialization failed
+   * @throws SerializerException if serialization failed
    */
   void processActionComplex(ODataRequest request, ODataResponse response, 
UriInfo uriInfo,
       ContentType requestFormat, ContentType responseFormat)
-      throws ODataApplicationException, DeserializerException, 
SerializerException;
+          throws ODataApplicationException, DeserializerException, 
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/ActionEntityCollectionProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionEntityCollectionProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionEntityCollectionProcessor.java
index 82d776a..f51f5a8 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionEntityCollectionProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionEntityCollectionProcessor.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,16 +32,16 @@ import org.apache.olingo.server.api.uri.UriInfo;
 public interface ActionEntityCollectionProcessor extends 
EntityCollectionProcessor {
   /**
    * Process an action which has as return type a collection of entities.
-   * @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
-   * @param responseFormat  requested content type after content negotiation
+   * @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
+   * @param responseFormat requested content type after content negotiation
    * @throws ODataApplicationException if the service implementation 
encounters a failure
-   * @throws DeserializerException     if deserialization failed
-   * @throws SerializerException       if serialization failed
+   * @throws DeserializerException if deserialization failed
+   * @throws SerializerException if serialization failed
    */
   void processActionEntityCollection(ODataRequest request, ODataResponse 
response, UriInfo uriInfo,
       ContentType requestFormat, ContentType responseFormat)
-      throws ODataApplicationException, DeserializerException, 
SerializerException;
+          throws ODataApplicationException, DeserializerException, 
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/ActionEntityProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionEntityProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionEntityProcessor.java
index ec564d2..236dffe 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionEntityProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionEntityProcessor.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,16 +32,16 @@ import org.apache.olingo.server.api.uri.UriInfo;
 public interface ActionEntityProcessor extends EntityProcessor {
   /**
    * Process an action which has as return type an entity.
-   * @param request          OData request object containing raw HTTP 
information
-   * @param response         OData response object for collecting response data
-   * @param uriInfo          information about a parsed OData URI
-   * @param requestFormat    content type of body sent with request
-   * @param responseFormat   requested content type after content negotiation
+   * @param request OData request object containing raw HTTP information
+   * @param response OData response object for collecting response data
+   * @param uriInfo information about a parsed OData URI
+   * @param requestFormat content type of body sent with request
+   * @param responseFormat requested content type after content negotiation
    * @throws ODataApplicationException if the service implementation 
encounters a failure
-   * @throws DeserializerException     if deserialization failed
-   * @throws SerializerException       if serialization failed
+   * @throws DeserializerException if deserialization failed
+   * @throws SerializerException if serialization failed
    */
   void processActionEntity(ODataRequest request, ODataResponse response, 
UriInfo uriInfo,
       ContentType requestFormat, ContentType responseFormat)
-      throws ODataApplicationException, DeserializerException, 
SerializerException;
+          throws ODataApplicationException, DeserializerException, 
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/ActionPrimitiveCollectionProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionPrimitiveCollectionProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionPrimitiveCollectionProcessor.java
index ace9ff9..01e2c54 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionPrimitiveCollectionProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionPrimitiveCollectionProcessor.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,16 +32,16 @@ import org.apache.olingo.server.api.uri.UriInfo;
 public interface ActionPrimitiveCollectionProcessor extends 
PrimitiveCollectionProcessor {
   /**
    * Process an action which has as return type a primitive-type collection.
-   * @param request         OData request object containing raw HTTP 
information
-   * @param response        OData response object for collecting response data
-   * @param uriInfo         information about a parsed OData URI
-   * @param requestFormat   content type of body sent with request
-   * @param responseFormat   requested content type after content negotiation
+   * @param request OData request object containing raw HTTP information
+   * @param response OData response object for collecting response data
+   * @param uriInfo information about a parsed OData URI
+   * @param requestFormat content type of body sent with request
+   * @param responseFormat requested content type after content negotiation
    * @throws ODataApplicationException if the service implementation 
encounters a failure
-   * @throws DeserializerException     if deserialization failed
-   * @throws SerializerException       if serialization failed
+   * @throws DeserializerException if deserialization failed
+   * @throws SerializerException if serialization failed
    */
   void processActionPrimitiveCollection(ODataRequest request, ODataResponse 
response, UriInfo uriInfo,
       ContentType requestFormat, ContentType responseFormat)
-      throws ODataApplicationException, DeserializerException, 
SerializerException;
+          throws ODataApplicationException, DeserializerException, 
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/ActionPrimitiveProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionPrimitiveProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionPrimitiveProcessor.java
index 8c11eb7..df0fdf9 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionPrimitiveProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionPrimitiveProcessor.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,16 +32,16 @@ import org.apache.olingo.server.api.uri.UriInfo;
 public interface ActionPrimitiveProcessor extends PrimitiveProcessor {
   /**
    * Process an action which has as return type a primitive-type.
-   * @param request         OData request object containing raw HTTP 
information
-   * @param response        OData response object for collecting response data
-   * @param uriInfo         information about a parsed OData URI
-   * @param requestFormat   content type of body sent with request
-   * @param responseFormat  requested content type after content negotiation
+   * @param request OData request object containing raw HTTP information
+   * @param response OData response object for collecting response data
+   * @param uriInfo information about a parsed OData URI
+   * @param requestFormat content type of body sent with request
+   * @param responseFormat requested content type after content negotiation
    * @throws ODataApplicationException if the service implementation 
encounters a failure
-   * @throws DeserializerException     if deserialization failed
-   * @throws SerializerException       if serialization failed
+   * @throws DeserializerException if deserialization failed
+   * @throws SerializerException if serialization failed
    */
   void processActionPrimitive(ODataRequest request, ODataResponse response, 
UriInfo uriInfo,
       ContentType requestFormat, ContentType responseFormat)
-      throws ODataApplicationException, DeserializerException, 
SerializerException;
+          throws ODataApplicationException, DeserializerException, 
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/ActionVoidProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionVoidProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionVoidProcessor.java
index 2798132..bfdcb6d 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionVoidProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionVoidProcessor.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,12 +31,12 @@ import org.apache.olingo.server.api.uri.UriInfo;
 public interface ActionVoidProcessor extends Processor {
   /**
    * Process an action which has no return type.
-   * @param request        OData request object containing raw HTTP information
-   * @param response       OData response object for collecting response data
-   * @param uriInfo        information about a parsed OData URI
-   * @param requestFormat  content type of body sent with request
+   * @param request OData request object containing raw HTTP information
+   * @param response OData response object for collecting response data
+   * @param uriInfo information about 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 deserialization failed
+   * @throws DeserializerException if deserialization failed
    */
   void processActionVoid(ODataRequest request, ODataResponse response, UriInfo 
uriInfo, ContentType requestFormat)
       throws ODataApplicationException, DeserializerException;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java
index 022f557..de4586f 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.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,23 +34,22 @@ public interface BatchProcessor extends Processor {
 
   /**
    * Process a complete batch request and puts serialized content and status 
into the response.
-   * @param facade   BatchFacade which should be used for further batch part 
handling
-   * @param request  OData request object containing raw HTTP information
+   * @param facade BatchFacade which should be used for further batch part 
handling
+   * @param request OData request object containing raw HTTP information
    * @param response OData response object for collecting response data
-   * @throws BatchSerializerException     if the service implementation 
encounters a failure
-   * @throws BatchDeserializerException   if de-serialization failed
+   * @throws BatchSerializerException if the service implementation encounters 
a failure
+   * @throws BatchDeserializerException if de-serialization failed
    */
   void processBatch(BatchFacade facade, ODataRequest request, ODataResponse 
response)
       throws BatchSerializerException, BatchDeserializerException;
 
-
   /**
    * Process a batch change set (containing several batch requests)
    * and puts serialized content and status into the response.
-   * @param facade    BatchFacade which should be used for further batch part 
handling
-   * @param requests  List of ODataRequests which are included in the to be 
processed change set
-   * @throws BatchDeserializerException   if de-serialization failed
+   * @param facade BatchFacade which should be used for further batch part 
handling
+   * @param requests List of ODataRequests which are included in the to be 
processed change set
+   * @throws BatchDeserializerException if de-serialization failed
    */
   ODataResponsePart processChangeSet(BatchFacade facade, List<ODataRequest> 
requests)
-          throws BatchDeserializerException;
+      throws BatchDeserializerException;
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ComplexCollectionProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ComplexCollectionProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ComplexCollectionProcessor.java
index 1fe0b0c..bfc26ea 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ComplexCollectionProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ComplexCollectionProcessor.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,12 +35,12 @@ public interface ComplexCollectionProcessor extends 
Processor {
   /**
    * Reads complex-type collection.
    * If it is not available, for example due to permissions, the service 
responds with 404 Not Found.
-   * @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 readComplexCollection(ODataRequest request, ODataResponse response, 
UriInfo uriInfo, ContentType responseFormat)
       throws ODataApplicationException, SerializerException;
@@ -50,28 +50,28 @@ public interface ComplexCollectionProcessor extends 
Processor {
    * puts content, status, and Location into the response.
    * Update of complex-type collection is equal to a complete replace
    * of the property (see chapter "11.4.9.4 Update a Collection Property").
-   * @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 requestFormat   content type of body sent with request
-   * @param responseFormat   requested content type after content negotiation
+   * @param uriInfo information of a parsed OData URI
+   * @param requestFormat content type of body sent with request
+   * @param responseFormat requested content type after content negotiation
    * @throws ODataApplicationException if the service implementation 
encounters a failure
-   * @throws DeserializerException     if de-serialization failed
-   * @throws SerializerException       if serialization failed
+   * @throws DeserializerException if de-serialization failed
+   * @throws SerializerException if serialization failed
    */
   void updateComplexCollection(ODataRequest request, ODataResponse response, 
UriInfo uriInfo,
-                                 ContentType requestFormat, ContentType 
responseFormat)
-          throws ODataApplicationException, DeserializerException, 
SerializerException;
+      ContentType requestFormat, ContentType responseFormat)
+      throws ODataApplicationException, DeserializerException, 
SerializerException;
 
   /**
    * Deletes complex-type collection from an entity and puts the status into 
the response.
    * Deletion for complex-type collection is equal to
    * set the content to <code>EMPTY</code>.
-   * @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 deleteComplexCollection(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/ComplexProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ComplexProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ComplexProcessor.java
index 58d9bc8..847b101 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ComplexProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ComplexProcessor.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,12 +34,12 @@ public interface ComplexProcessor extends Processor {
   /**
    * Reads complex-type instance.
    * If it is not available, for example due to permissions, the service 
responds with 404 Not Found.
-   * @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 readComplex(ODataRequest request, ODataResponse response, UriInfo 
uriInfo, ContentType responseFormat)
       throws ODataApplicationException, SerializerException;
@@ -47,28 +47,28 @@ public interface ComplexProcessor extends Processor {
   /**
    * Update complex-type instance with send data in the persistence and
    * puts content, status, and Location 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 requestFormat   content type of body sent with request
-   * @param responseFormat   requested content type after content negotiation
+   * @param uriInfo information of a parsed OData URI
+   * @param requestFormat content type of body sent with request
+   * @param responseFormat requested content type after content negotiation
    * @throws ODataApplicationException if the service implementation 
encounters a failure
-   * @throws DeserializerException     if de-serialization failed
-   * @throws SerializerException       if serialization failed
+   * @throws DeserializerException if de-serialization failed
+   * @throws SerializerException if serialization failed
    */
   void updateComplex(ODataRequest request, ODataResponse response, UriInfo 
uriInfo,
-                    ContentType requestFormat, ContentType responseFormat)
-          throws ODataApplicationException, DeserializerException, 
SerializerException;
+      ContentType requestFormat, ContentType responseFormat)
+      throws ODataApplicationException, DeserializerException, 
SerializerException;
 
   /**
    * Deletes complex-type value from an entity and puts the status into the 
response.
    * Deletion for complex-type values is equal to
    * set the value to <code>NULL</code> (see chapter "11.4.9.2 Set a Value to 
Null")
-   * @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 deleteComplex(ODataRequest request, ODataResponse response, UriInfo 
uriInfo)
-          throws ODataApplicationException;
+      throws ODataApplicationException;
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountComplexCollectionProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountComplexCollectionProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountComplexCollectionProcessor.java
index 29b1528..f038ac6 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountComplexCollectionProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountComplexCollectionProcessor.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,11 +32,11 @@ public interface CountComplexCollectionProcessor extends 
Processor {
   /**
    * Counts complex properties from persistence and puts serialized content 
and status into the response.
    * Response content type is <code>text/plain</code> by default.
-   * @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
-   * @throws SerializerException       if serialization failed
+   * @throws SerializerException if serialization failed
    */
   void countComplexCollection(ODataRequest request, ODataResponse response, 
UriInfo uriInfo)
       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/CountEntityCollectionProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountEntityCollectionProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountEntityCollectionProcessor.java
index d64c6ce..1a1c7e0 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountEntityCollectionProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountEntityCollectionProcessor.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,11 +32,11 @@ public interface CountEntityCollectionProcessor extends 
Processor {
   /**
    * Counts entities from persistence and puts serialized content and status 
into the response.
    * Response content type is <code>text/plain</code> by default.
-   * @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
-   * @throws SerializerException       if serialization failed
+   * @throws SerializerException if serialization failed
    */
   void countEntityCollection(ODataRequest request, ODataResponse response, 
UriInfo uriInfo)
       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/CountPrimitiveCollectionProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountPrimitiveCollectionProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountPrimitiveCollectionProcessor.java
index 31c76ee..88791ca 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountPrimitiveCollectionProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountPrimitiveCollectionProcessor.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,11 +32,11 @@ public interface CountPrimitiveCollectionProcessor extends 
Processor {
   /**
    * Counts primitive properties from persistence and puts serialized content 
and status into the response.
    * Response content type is <code>text/plain</code> by default.
-   * @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
-   * @throws SerializerException       if serialization failed
+   * @throws SerializerException if serialization failed
    */
   void countPrimitiveCollection(ODataRequest request, ODataResponse response, 
UriInfo uriInfo)
       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/DefaultProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DefaultProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DefaultProcessor.java
index fc5e37a..e3193f1 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DefaultProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DefaultProcessor.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,11 +24,11 @@ import org.apache.olingo.commons.api.format.ContentType;
 import org.apache.olingo.commons.api.format.ODataFormat;
 import org.apache.olingo.commons.api.http.HttpHeader;
 import org.apache.olingo.commons.api.http.HttpStatusCode;
+import org.apache.olingo.server.api.ClientServerError;
 import org.apache.olingo.server.api.OData;
 import org.apache.olingo.server.api.ODataApplicationException;
 import org.apache.olingo.server.api.ODataRequest;
 import org.apache.olingo.server.api.ODataResponse;
-import org.apache.olingo.server.api.ClientServerError;
 import org.apache.olingo.server.api.ServiceMetadata;
 import org.apache.olingo.server.api.serializer.ODataSerializer;
 import org.apache.olingo.server.api.serializer.SerializerException;
@@ -71,8 +71,9 @@ public class DefaultProcessor implements MetadataProcessor, 
ServiceDocumentProce
   }
 
   @Override
-  public void processError(ODataRequest request, ODataResponse response, 
ClientServerError serverError,
-                           ContentType requestedContentType) {
+  public void processError(final ODataRequest request, final ODataResponse 
response,
+      final ClientServerError serverError,
+      final ContentType requestedContentType) {
     try {
       ODataSerializer serializer = 
odata.createSerializer(ODataFormat.fromContentType(requestedContentType));
       response.setContent(serializer.error(serverError).getContent());

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DeltaProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DeltaProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DeltaProcessor.java
index a834657..1892715 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DeltaProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DeltaProcessor.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,17 +23,17 @@ package org.apache.olingo.server.api.processor;
  */
 public interface DeltaProcessor extends Processor {
 
-//  NOT YET AVAILABLE
-//  /**
-//   * Reads delta information from persistence and put it as serialized 
content and
-//   * with according status 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 responseFormat   requested content type after content negotiation
-//   * @throws ODataApplicationException if the service implementation 
encounters a failure
-//   * @throws SerializerException       if serialization failed
-//   */
-//  void readDelta(ODataRequest request, ODataResponse response, UriInfo 
uriInfo, ContentType responseFormat)
-//      throws ODataApplicationException, SerializerException;
+  //  NOT YET AVAILABLE
+  //  /**
+  //   * Reads delta information from persistence and put it as serialized 
content and
+  //   * with according status 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 responseFormat   requested content type after content 
negotiation
+  //   * @throws ODataApplicationException if the service implementation 
encounters a failure
+  //   * @throws SerializerException       if serialization failed
+  //   */
+  //  void readDelta(ODataRequest request, ODataResponse response, UriInfo 
uriInfo, ContentType responseFormat)
+  //      throws ODataApplicationException, SerializerException;
 }
\ 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/EntityCollectionProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/EntityCollectionProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/EntityCollectionProcessor.java
index de96ab5..fbca861 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/EntityCollectionProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/EntityCollectionProcessor.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 EntityCollectionProcessor extends 
Processor {
 
   /**
    * Reads entities data 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 readEntityCollection(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/processor/EntityProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/EntityProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/EntityProcessor.java
index dbce4f2..7922580 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/EntityProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/EntityProcessor.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,51 +33,51 @@ public interface EntityProcessor extends Processor {
 
   /**
    * Reads entity data 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 readEntity(ODataRequest request, ODataResponse response, UriInfo 
uriInfo, ContentType responseFormat)
       throws ODataApplicationException, SerializerException;
 
   /**
    * Creates an entity with send data in the persistence and puts content, 
status, and Location 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 requestFormat   content type of body sent with request
-   * @param responseFormat   requested content type after content negotiation
+   * @param uriInfo information of a parsed OData URI
+   * @param requestFormat content type of body sent with request
+   * @param responseFormat requested content type after content negotiation
    * @throws ODataApplicationException if the service implementation 
encounters a failure
-   * @throws DeserializerException     if deserialization failed
-   * @throws SerializerException       if serialization failed
+   * @throws DeserializerException if deserialization failed
+   * @throws SerializerException if serialization failed
    */
   void createEntity(ODataRequest request, ODataResponse response, UriInfo 
uriInfo,
-                    ContentType requestFormat, ContentType responseFormat)
-          throws ODataApplicationException, DeserializerException, 
SerializerException;
+      ContentType requestFormat, ContentType responseFormat)
+      throws ODataApplicationException, DeserializerException, 
SerializerException;
 
   /**
    * Update entity data with send data in the persistence and puts content, 
status, and Location 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 requestFormat   content type of body sent with request
-   * @param responseFormat   requested content type after content negotiation
+   * @param uriInfo information of a parsed OData URI
+   * @param requestFormat content type of body sent with request
+   * @param responseFormat requested content type after content negotiation
    * @throws ODataApplicationException if the service implementation 
encounters a failure
-   * @throws DeserializerException     if deserialization failed
-   * @throws SerializerException       if serialization failed
+   * @throws DeserializerException if deserialization failed
+   * @throws SerializerException if serialization failed
    */
   void updateEntity(ODataRequest request, ODataResponse response, UriInfo 
uriInfo,
-                    ContentType requestFormat, ContentType responseFormat)
-          throws ODataApplicationException, DeserializerException, 
SerializerException;
+      ContentType requestFormat, ContentType responseFormat)
+      throws ODataApplicationException, DeserializerException, 
SerializerException;
 
   /**
    * Deletes entity from persistence and puts the 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 uriInfo information of a parsed OData URI
    * @throws ODataApplicationException if the service implementation 
encounters a failure
    */
   void deleteEntity(ODataRequest request, ODataResponse response, UriInfo 
uriInfo) throws ODataApplicationException;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ErrorProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ErrorProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ErrorProcessor.java
index af2c116..509929b 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ErrorProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ErrorProcessor.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
@@ -19,9 +19,9 @@
 package org.apache.olingo.server.api.processor;
 
 import org.apache.olingo.commons.api.format.ContentType;
+import org.apache.olingo.server.api.ClientServerError;
 import org.apache.olingo.server.api.ODataRequest;
 import org.apache.olingo.server.api.ODataResponse;
-import org.apache.olingo.server.api.ClientServerError;
 
 /**
  * Processor which is called if any error/exception occurs inside the library 
or another processor.
@@ -31,11 +31,11 @@ public interface ErrorProcessor extends Processor {
   /**
    * Processes an error/exception. MUST NOT throw an exception!
    *
-   * @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 serverError the server error
-   * @param responseFormat   requested content type after content negotiation
+   * @param responseFormat requested content type after content negotiation
    */
   public void processError(ODataRequest request, ODataResponse response, 
ClientServerError serverError,
-                           ContentType responseFormat);
+      ContentType responseFormat);
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/MediaEntityProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/MediaEntityProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/MediaEntityProcessor.java
index e700fa1..f8ad6aa 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/MediaEntityProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/MediaEntityProcessor.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,43 +33,43 @@ public interface MediaEntityProcessor extends 
EntityProcessor {
 
   /**
    * Reads entity media data from persistence and puts 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 readMediaEntity(ODataRequest request, ODataResponse response, UriInfo 
uriInfo, ContentType responseFormat)
       throws ODataApplicationException, SerializerException;
 
   /**
    * Creates an entity with send media data in the persistence and puts 
content, status and Location 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 requestFormat   content type of body sent with request
-   * @param responseFormat   requested content type after content negotiation
+   * @param uriInfo information of a parsed OData URI
+   * @param requestFormat content type of body sent with request
+   * @param responseFormat requested content type after content negotiation
    * @throws ODataApplicationException if the service implementation 
encounters a failure
-   * @throws DeserializerException     if deserialization failed
-   * @throws SerializerException       if serialization failed
+   * @throws DeserializerException if deserialization failed
+   * @throws SerializerException if serialization failed
    */
   void createMediaEntity(ODataRequest request, ODataResponse response, UriInfo 
uriInfo,
-                    ContentType requestFormat, ContentType responseFormat)
-          throws ODataApplicationException, DeserializerException, 
SerializerException;
+      ContentType requestFormat, ContentType responseFormat)
+      throws ODataApplicationException, DeserializerException, 
SerializerException;
 
   /**
    * Updates entity media data in the persistence and puts 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 requestFormat   content type of body sent with request
-   * @param responseFormat  requested content type after content negotiation
+   * @param uriInfo information of a parsed OData URI
+   * @param requestFormat content type of body sent with request
+   * @param responseFormat requested content type after content negotiation
    * @throws ODataApplicationException if the service implementation 
encounters a failure
-   * @throws DeserializerException     if deserialization failed
-   * @throws SerializerException       if serialization failed
+   * @throws DeserializerException if deserialization failed
+   * @throws SerializerException if serialization failed
    */
   void updateMediaEntity(ODataRequest request, ODataResponse response, UriInfo 
uriInfo,
-                         ContentType requestFormat, ContentType responseFormat)
-      throws ODataApplicationException, DeserializerException, 
SerializerException;
+      ContentType requestFormat, ContentType responseFormat)
+          throws ODataApplicationException, DeserializerException, 
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/MetadataProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/MetadataProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/MetadataProcessor.java
index 5faa56d..75f7e7a 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/MetadataProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/MetadataProcessor.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 MetadataProcessor extends Processor {
 
   /**
    * Reads data 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 readMetadata(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/processor/PrimitiveCollectionProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/PrimitiveCollectionProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/PrimitiveCollectionProcessor.java
index 07f3678..10eca43 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/PrimitiveCollectionProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/PrimitiveCollectionProcessor.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,44 +35,44 @@ public interface PrimitiveCollectionProcessor extends 
Processor {
   /**
    * Reads primitive-type collection.
    * If it is not available, for example due to permissions, the service 
responds with 404 Not Found.
-   * @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 readPrimitiveCollection(ODataRequest request, ODataResponse response, 
UriInfo uriInfo,
-                               ContentType responseFormat)
-      throws ODataApplicationException, SerializerException;
+      ContentType responseFormat)
+          throws ODataApplicationException, SerializerException;
 
   /**
    * Update (replace) primitive-type collection with send data in the 
persistence and
    * puts content, status, and Location into the response.
    * Update of primitive-type collection is equal to a complete replace
    * of the property (see chapter "11.4.9.4 Update a Collection Property").
-   * @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 requestFormat   content type of body sent with request
-   * @param responseFormat   requested content type after content negotiation
+   * @param uriInfo information of a parsed OData URI
+   * @param requestFormat content type of body sent with request
+   * @param responseFormat requested content type after content negotiation
    * @throws ODataApplicationException if the service implementation 
encounters a failure
-   * @throws DeserializerException     if deserialization failed
-   * @throws SerializerException       if serialization failed
+   * @throws DeserializerException if deserialization failed
+   * @throws SerializerException if serialization failed
    */
   void updatePrimitiveCollection(ODataRequest request, ODataResponse response, 
UriInfo uriInfo,
-                       ContentType requestFormat, ContentType responseFormat)
-          throws ODataApplicationException, DeserializerException, 
SerializerException;
+      ContentType requestFormat, ContentType responseFormat)
+      throws ODataApplicationException, DeserializerException, 
SerializerException;
 
   /**
    * Deletes primitive-type collection from an entity and puts the status into 
the response.
    * Deletion for primitive-type collection is equal to
    * set the content to <code>EMPTY</code>.
-   * @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 deletePrimitiveCollection(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/PrimitiveProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/PrimitiveProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/PrimitiveProcessor.java
index 8c24060..f155a3e 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/PrimitiveProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/PrimitiveProcessor.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,12 +35,12 @@ public interface PrimitiveProcessor extends Processor {
    * Reads primitive-type instance.
    * If its value is <code>null</code>, the service responds with 204 No 
Content.
    * If it is not available, for example due to permissions, the service 
responds with 404 Not Found.
-   * @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 readPrimitive(ODataRequest request, ODataResponse response, UriInfo 
uriInfo, ContentType responseFormat)
       throws ODataApplicationException, SerializerException;
@@ -48,29 +48,29 @@ public interface PrimitiveProcessor extends Processor {
   /**
    * Update primitive-type instance with send data in the persistence and
    * puts content, status, and Location 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 requestFormat   content type of body sent with request
-   * @param responseFormat   requested content type after content negotiation
+   * @param uriInfo information of a parsed OData URI
+   * @param requestFormat content type of body sent with request
+   * @param responseFormat requested content type after content negotiation
    * @throws ODataApplicationException if the service implementation 
encounters a failure
-   * @throws DeserializerException     if deserialization failed
-   * @throws SerializerException       if serialization failed
+   * @throws DeserializerException if deserialization failed
+   * @throws SerializerException if serialization failed
    */
   void updatePrimitive(ODataRequest request, ODataResponse response, UriInfo 
uriInfo,
-                    ContentType requestFormat, ContentType responseFormat)
-          throws ODataApplicationException, DeserializerException, 
SerializerException;
+      ContentType requestFormat, ContentType responseFormat)
+      throws ODataApplicationException, DeserializerException, 
SerializerException;
 
   /**
    * Deletes primitive-type value from an entity and puts the status into the 
response.
    * Deletion for primitive-type values is equal to
    * set the value to <code>NULL</code> (see chapter "11.4.9.2 Set a Value to 
Null")
-   * @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 deletePrimitive(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/PrimitiveValueProcessor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/PrimitiveValueProcessor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/PrimitiveValueProcessor.java
index 0770c2e..34c5aed 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/PrimitiveValueProcessor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/PrimitiveValueProcessor.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,12 +34,12 @@ public interface PrimitiveValueProcessor extends 
PrimitiveProcessor {
    * Reads raw value of a primitive-type instance, e.g., of a primitive 
property of an entity.
    * If the value is <code>null</code>, the service responds with 204 No 
Content.
    * If it is not available, for example due to permissions, the service 
responds with 404 Not Found.
-   * @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 org.apache.olingo.server.api.ODataApplicationException if the 
service implementation encounters a failure
-   * @throws org.apache.olingo.server.api.serializer.SerializerException       
if serialization failed
+   * @throws org.apache.olingo.server.api.serializer.SerializerException if 
serialization failed
    */
   void readPrimitiveValue(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/processor/Processor.java
----------------------------------------------------------------------
diff --git 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/Processor.java
 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/Processor.java
index 2b5eec2..2cd39e9 100644
--- 
a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/Processor.java
+++ 
b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/Processor.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,9 +30,9 @@ public interface Processor {
 
   /**
    * Initializes the processor for each HTTP request - response cycle.
-   * @param odata           Olingo's root object, acting as a factory for 
various object types
+   * @param odata Olingo's root object, acting as a factory for various object 
types
    * @param serviceMetadata metadata of the OData service like the EDM that 
have to be created
-   *                        before the OData request handling takes place
+   * before the OData request handling takes place
    */
   void init(OData odata, ServiceMetadata serviceMetadata);
 }

Reply via email to