You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2013/09/20 15:33:32 UTC

[10/59] [abbrv] git commit: Clean up of odata api

Clean up of odata api


Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/cf4caabf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/cf4caabf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/cf4caabf

Branch: refs/heads/master
Commit: cf4caabf88c17f4b88a05361ef23e0def9eedc26
Parents: 66db1e9
Author: Christian Amend <ch...@apache.org>
Authored: Fri Sep 20 13:48:54 2013 +0200
Committer: Christian Amend <ch...@apache.org>
Committed: Fri Sep 20 13:48:54 2013 +0200

----------------------------------------------------------------------
 .../apache/olingo/odata2/api/ODataCallback.java |  14 +-
 .../olingo/odata2/api/ODataDebugCallback.java   |  12 +-
 .../apache/olingo/odata2/api/ODataService.java  |  46 +-
 .../olingo/odata2/api/ODataServiceFactory.java  |  17 +-
 .../olingo/odata2/api/ODataServiceVersion.java  |  14 +-
 .../olingo/odata2/api/batch/BatchException.java |  72 ++-
 .../olingo/odata2/api/batch/BatchHandler.java   |  13 +-
 .../odata2/api/batch/BatchRequestPart.java      |  10 +-
 .../odata2/api/batch/BatchResponsePart.java     |  23 +-
 .../odata2/api/client/batch/BatchChangeSet.java |  16 +-
 .../api/client/batch/BatchChangeSetPart.java    |  10 +-
 .../odata2/api/client/batch/BatchPart.java      |  10 +-
 .../odata2/api/client/batch/BatchQueryPart.java |  10 +-
 .../api/client/batch/BatchSingleResponse.java   |  17 +-
 .../odata2/api/commons/HttpContentType.java     |  14 +-
 .../olingo/odata2/api/commons/HttpHeaders.java  |  14 +-
 .../odata2/api/commons/HttpStatusCodes.java     |  40 +-
 .../olingo/odata2/api/commons/InlineCount.java  |  12 +-
 .../odata2/api/commons/ODataHttpHeaders.java    |  12 +-
 .../odata2/api/commons/ODataHttpMethod.java     |  12 +-
 .../olingo/odata2/api/commons/package-info.java |  10 +-
 .../org/apache/olingo/odata2/api/edm/Edm.java   |  15 +-
 .../apache/olingo/odata2/api/edm/EdmAction.java |  15 +-
 .../olingo/odata2/api/edm/EdmAnnotatable.java   |  12 +-
 .../odata2/api/edm/EdmAnnotationAttribute.java  |  14 +-
 .../odata2/api/edm/EdmAnnotationElement.java    |  14 +-
 .../olingo/odata2/api/edm/EdmAnnotations.java   |  12 +-
 .../olingo/odata2/api/edm/EdmAssociation.java   |  14 +-
 .../odata2/api/edm/EdmAssociationEnd.java       |  12 +-
 .../odata2/api/edm/EdmAssociationSet.java       |  12 +-
 .../odata2/api/edm/EdmAssociationSetEnd.java    |  12 +-
 .../olingo/odata2/api/edm/EdmComplexType.java   |  16 +-
 .../odata2/api/edm/EdmConcurrencyMode.java      |  15 +-
 .../olingo/odata2/api/edm/EdmContentKind.java   |  14 +-
 .../api/edm/EdmCustomizableFeedMappings.java    |  12 +-
 .../olingo/odata2/api/edm/EdmElement.java       |  12 +-
 .../odata2/api/edm/EdmEntityContainer.java      |  15 +-
 .../olingo/odata2/api/edm/EdmEntitySet.java     |  14 +-
 .../olingo/odata2/api/edm/EdmEntitySetInfo.java |  17 +-
 .../olingo/odata2/api/edm/EdmEntityType.java    |  21 +-
 .../olingo/odata2/api/edm/EdmException.java     |  12 +-
 .../apache/olingo/odata2/api/edm/EdmFacets.java |  14 +-
 .../odata2/api/edm/EdmFunctionImport.java       |  12 +-
 .../olingo/odata2/api/edm/EdmLiteral.java       |  15 +-
 .../odata2/api/edm/EdmLiteralException.java     |  18 +-
 .../olingo/odata2/api/edm/EdmLiteralKind.java   |  12 +-
 .../olingo/odata2/api/edm/EdmMappable.java      |  12 +-
 .../olingo/odata2/api/edm/EdmMapping.java       |  12 +-
 .../olingo/odata2/api/edm/EdmMultiplicity.java  |  18 +-
 .../apache/olingo/odata2/api/edm/EdmNamed.java  |  14 +-
 .../odata2/api/edm/EdmNavigationProperty.java   |  12 +-
 .../olingo/odata2/api/edm/EdmParameter.java     |  15 +-
 .../olingo/odata2/api/edm/EdmProperty.java      |  12 +-
 .../api/edm/EdmReferentialConstraint.java       |  10 +-
 .../api/edm/EdmReferentialConstraintRole.java   |  12 +-
 .../odata2/api/edm/EdmServiceMetadata.java      |  17 +-
 .../olingo/odata2/api/edm/EdmSimpleType.java    |  87 +--
 .../odata2/api/edm/EdmSimpleTypeException.java  |  45 +-
 .../odata2/api/edm/EdmSimpleTypeFacade.java     |  12 +-
 .../odata2/api/edm/EdmSimpleTypeKind.java       |  19 +-
 .../odata2/api/edm/EdmStructuralType.java       |  12 +-
 .../olingo/odata2/api/edm/EdmTargetPath.java    |  12 +-
 .../apache/olingo/odata2/api/edm/EdmType.java   |  12 +-
 .../olingo/odata2/api/edm/EdmTypeKind.java      |  12 +-
 .../apache/olingo/odata2/api/edm/EdmTyped.java  |  12 +-
 .../odata2/api/edm/FullQualifiedName.java       |  12 +-
 .../olingo/odata2/api/edm/package-info.java     |  10 +-
 .../api/edm/provider/AnnotationAttribute.java   |  12 +-
 .../api/edm/provider/AnnotationElement.java     |  12 +-
 .../odata2/api/edm/provider/Association.java    |  12 +-
 .../odata2/api/edm/provider/AssociationEnd.java |  14 +-
 .../odata2/api/edm/provider/AssociationSet.java |  12 +-
 .../api/edm/provider/AssociationSetEnd.java     |  12 +-
 .../api/edm/provider/ComplexProperty.java       |  12 +-
 .../odata2/api/edm/provider/ComplexType.java    |  14 +-
 .../edm/provider/CustomizableFeedMappings.java  |  16 +-
 .../odata2/api/edm/provider/DataServices.java   |  15 +-
 .../odata2/api/edm/provider/Documentation.java  |  12 +-
 .../odata2/api/edm/provider/EdmProvider.java    |  20 +-
 .../api/edm/provider/EdmProviderAccessor.java   |  16 +-
 .../api/edm/provider/EdmProviderFactory.java    |  19 +-
 .../api/edm/provider/EntityContainer.java       |  12 +-
 .../api/edm/provider/EntityContainerInfo.java   |  12 +-
 .../odata2/api/edm/provider/EntitySet.java      |  12 +-
 .../odata2/api/edm/provider/EntityType.java     |  12 +-
 .../olingo/odata2/api/edm/provider/Facets.java  |  18 +-
 .../odata2/api/edm/provider/FunctionImport.java |  14 +-
 .../edm/provider/FunctionImportParameter.java   |  12 +-
 .../olingo/odata2/api/edm/provider/Key.java     |  12 +-
 .../olingo/odata2/api/edm/provider/Mapping.java |  12 +-
 .../api/edm/provider/NavigationProperty.java    |  12 +-
 .../odata2/api/edm/provider/OnDelete.java       |  12 +-
 .../odata2/api/edm/provider/Property.java       |  12 +-
 .../odata2/api/edm/provider/PropertyRef.java    |  14 +-
 .../api/edm/provider/ReferentialConstraint.java |  12 +-
 .../edm/provider/ReferentialConstraintRole.java |  12 +-
 .../odata2/api/edm/provider/ReturnType.java     |  14 +-
 .../olingo/odata2/api/edm/provider/Schema.java  |  12 +-
 .../odata2/api/edm/provider/SimpleProperty.java |  12 +-
 .../olingo/odata2/api/edm/provider/Using.java   |  10 +-
 .../odata2/api/edm/provider/package-info.java   | 539 ++++++++++---------
 .../olingo/odata2/api/ep/EntityProvider.java    | 396 ++++++++------
 .../api/ep/EntityProviderBatchProperties.java   |  12 +-
 .../odata2/api/ep/EntityProviderException.java  |  84 +--
 .../api/ep/EntityProviderReadProperties.java    |  14 +-
 .../api/ep/EntityProviderWriteProperties.java   |  35 +-
 .../api/ep/callback/OnReadInlineContent.java    |  39 +-
 .../api/ep/callback/OnWriteEntryContent.java    |  19 +-
 .../api/ep/callback/OnWriteFeedContent.java     |  19 +-
 .../odata2/api/ep/callback/ReadEntryResult.java |  21 +-
 .../odata2/api/ep/callback/ReadFeedResult.java  |  19 +-
 .../odata2/api/ep/callback/ReadResult.java      |  33 +-
 .../api/ep/callback/TombstoneCallback.java      |  16 +-
 .../ep/callback/TombstoneCallbackResult.java    |  22 +-
 .../api/ep/callback/WriteCallbackContext.java   |  17 +-
 .../ep/callback/WriteEntryCallbackContext.java  |  17 +-
 .../ep/callback/WriteEntryCallbackResult.java   |  15 +-
 .../ep/callback/WriteFeedCallbackContext.java   |  17 +-
 .../ep/callback/WriteFeedCallbackResult.java    |  17 +-
 .../odata2/api/ep/callback/package-info.java    |  22 +-
 .../odata2/api/ep/entry/EntryMetadata.java      |  10 +-
 .../odata2/api/ep/entry/MediaMetadata.java      |  12 +-
 .../olingo/odata2/api/ep/entry/ODataEntry.java  |  14 +-
 .../odata2/api/ep/entry/package-info.java       |  13 +-
 .../olingo/odata2/api/ep/feed/FeedMetadata.java |  14 +-
 .../olingo/odata2/api/ep/feed/ODataFeed.java    |  14 +-
 .../olingo/odata2/api/ep/feed/package-info.java |  13 +-
 .../olingo/odata2/api/ep/package-info.java      |  25 +-
 .../odata2/api/exception/MessageReference.java  |  28 +-
 .../exception/ODataApplicationException.java    |  51 +-
 .../api/exception/ODataBadRequestException.java |  36 +-
 .../api/exception/ODataConflictException.java   |  12 +-
 .../odata2/api/exception/ODataException.java    |  37 +-
 .../api/exception/ODataForbiddenException.java  |  12 +-
 .../api/exception/ODataHttpException.java       |  21 +-
 .../api/exception/ODataMessageException.java    |  37 +-
 .../ODataMethodNotAllowedException.java         |  18 +-
 .../exception/ODataNotAcceptableException.java  |  18 +-
 .../api/exception/ODataNotFoundException.java   |  15 +-
 .../exception/ODataNotImplementedException.java |  15 +-
 .../ODataPreconditionFailedException.java       |  18 +-
 .../ODataPreconditionRequiredException.java     |  18 +-
 .../ODataServiceUnavailableException.java       |  18 +-
 .../ODataUnsupportedMediaTypeException.java     |  24 +-
 .../odata2/api/exception/package-info.java      |  88 +--
 .../apache/olingo/odata2/api/package-info.java  |  38 +-
 .../odata2/api/processor/ODataContext.java      |  18 +-
 .../api/processor/ODataErrorCallback.java       |  22 +-
 .../odata2/api/processor/ODataErrorContext.java |  23 +-
 .../odata2/api/processor/ODataProcessor.java    |  12 +-
 .../odata2/api/processor/ODataRequest.java      |  10 +-
 .../odata2/api/processor/ODataResponse.java     |  32 +-
 .../api/processor/ODataSingleProcessor.java     | 109 ++--
 .../processor/feature/CustomContentType.java    |  14 +-
 .../feature/ODataProcessorFeature.java          |  16 +-
 .../api/processor/feature/package-info.java     |  12 +-
 .../odata2/api/processor/package-info.java      |  36 +-
 .../api/processor/part/BatchProcessor.java      |  28 +-
 .../part/EntityComplexPropertyProcessor.java    |  19 +-
 .../api/processor/part/EntityLinkProcessor.java |  17 +-
 .../processor/part/EntityLinksProcessor.java    |  17 +-
 .../processor/part/EntityMediaProcessor.java    |  15 +-
 .../api/processor/part/EntityProcessor.java     |  21 +-
 .../api/processor/part/EntitySetProcessor.java  |  19 +-
 .../part/EntitySimplePropertyProcessor.java     |  17 +-
 .../EntitySimplePropertyValueProcessor.java     |  22 +-
 .../processor/part/FunctionImportProcessor.java |  14 +-
 .../part/FunctionImportValueProcessor.java      |  12 +-
 .../api/processor/part/MetadataProcessor.java   |  16 +-
 .../part/ServiceDocumentProcessor.java          |  16 +-
 .../odata2/api/processor/part/package-info.java |  10 +-
 .../olingo/odata2/api/rt/RuntimeDelegate.java   |  38 +-
 .../olingo/odata2/api/rt/package-info.java      |  14 +-
 .../odata2/api/servicedocument/Accept.java      |  12 +-
 .../odata2/api/servicedocument/AtomInfo.java    |  14 +-
 .../odata2/api/servicedocument/Categories.java  |  15 +-
 .../odata2/api/servicedocument/Category.java    |  14 +-
 .../odata2/api/servicedocument/Collection.java  |  16 +-
 .../api/servicedocument/CommonAttributes.java   |  14 +-
 .../api/servicedocument/ExtensionAttribute.java |  14 +-
 .../api/servicedocument/ExtensionElement.java   |  16 +-
 .../odata2/api/servicedocument/Fixed.java       |  20 +-
 .../api/servicedocument/ServiceDocument.java    |  14 +-
 .../servicedocument/ServiceDocumentParser.java  |  10 +-
 .../ServiceDocumentParserException.java         |  10 +-
 .../odata2/api/servicedocument/Title.java       |  12 +-
 .../odata2/api/servicedocument/Workspace.java   |  14 +-
 .../odata2/api/uri/ExpandSelectTreeNode.java    |  16 +-
 .../olingo/odata2/api/uri/KeyPredicate.java     |  14 +-
 .../api/uri/NavigationPropertySegment.java      |  12 +-
 .../odata2/api/uri/NavigationSegment.java       |  12 +-
 .../apache/olingo/odata2/api/uri/PathInfo.java  |  12 +-
 .../olingo/odata2/api/uri/PathSegment.java      |  16 +-
 .../olingo/odata2/api/uri/SelectItem.java       |  12 +-
 .../apache/olingo/odata2/api/uri/UriInfo.java   |  12 +-
 .../odata2/api/uri/UriNotMatchingException.java |  27 +-
 .../apache/olingo/odata2/api/uri/UriParser.java | 128 ++---
 .../odata2/api/uri/UriSyntaxException.java      |  75 ++-
 .../api/uri/expression/BinaryExpression.java    |  24 +-
 .../api/uri/expression/BinaryOperator.java      |  23 +-
 .../api/uri/expression/CommonExpression.java    |  32 +-
 .../expression/ExceptionVisitExpression.java    |  23 +-
 .../api/uri/expression/ExpressionKind.java      |  28 +-
 .../expression/ExpressionParserException.java   |  99 ++--
 .../api/uri/expression/ExpressionVisitor.java   | 106 ++--
 .../api/uri/expression/FilterExpression.java    |  19 +-
 .../api/uri/expression/LiteralExpression.java   |  16 +-
 .../api/uri/expression/MemberExpression.java    |  32 +-
 .../api/uri/expression/MethodExpression.java    |  18 +-
 .../api/uri/expression/MethodOperator.java      |  25 +-
 .../api/uri/expression/OrderByExpression.java   |  25 +-
 .../api/uri/expression/OrderExpression.java     |  17 +-
 .../api/uri/expression/PropertyExpression.java  |  22 +-
 .../odata2/api/uri/expression/SortOrder.java    |  22 +-
 .../api/uri/expression/UnaryExpression.java     |  16 +-
 .../api/uri/expression/UnaryOperator.java       |  16 +-
 .../odata2/api/uri/expression/Visitable.java    |  35 +-
 .../odata2/api/uri/expression/package-info.java |  16 +-
 .../odata2/api/uri/info/DeleteUriInfo.java      |  14 +-
 .../api/uri/info/GetComplexPropertyUriInfo.java |  12 +-
 .../api/uri/info/GetEntityCountUriInfo.java     |  12 +-
 .../api/uri/info/GetEntityLinkCountUriInfo.java |  12 +-
 .../api/uri/info/GetEntityLinkUriInfo.java      |  12 +-
 .../api/uri/info/GetEntitySetCountUriInfo.java  |  12 +-
 .../uri/info/GetEntitySetLinksCountUriInfo.java |  12 +-
 .../api/uri/info/GetEntitySetLinksUriInfo.java  |  12 +-
 .../api/uri/info/GetEntitySetUriInfo.java       |  12 +-
 .../odata2/api/uri/info/GetEntityUriInfo.java   |  12 +-
 .../api/uri/info/GetFunctionImportUriInfo.java  |  12 +-
 .../api/uri/info/GetMediaResourceUriInfo.java   |  12 +-
 .../odata2/api/uri/info/GetMetadataUriInfo.java |  12 +-
 .../api/uri/info/GetServiceDocumentUriInfo.java |  12 +-
 .../api/uri/info/GetSimplePropertyUriInfo.java  |  12 +-
 .../olingo/odata2/api/uri/info/PostUriInfo.java |  12 +-
 .../api/uri/info/PutMergePatchUriInfo.java      |  12 +-
 .../odata2/api/uri/info/package-info.java       |  10 +-
 .../olingo/odata2/api/uri/package-info.java     |  15 +-
 src/eclipse/eclipse-codestyle-formatter.xml     |  12 +-
 238 files changed, 2955 insertions(+), 2588 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataCallback.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataCallback.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataCallback.java
index 91861a8..94bd570 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataCallback.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataCallback.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api;
 /**
  * Common OData callback interface. Every callback implementation has to implement this interface as a marker.
  * 
- *  
- *
+ * 
+ * 
  */
 public interface ODataCallback {}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataDebugCallback.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataDebugCallback.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataDebugCallback.java
index e3e3bf4..f3dbffa 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataDebugCallback.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataDebugCallback.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
@@ -28,7 +28,7 @@ public interface ODataDebugCallback extends ODataCallback {
    * Determines whether additional debug information can be retrieved
    * from this OData service for the current request.
    * @return <code>true</code> if the system is in debug mode
-   *         and the current user has the rights to debug the OData service
+   * and the current user has the rights to debug the OData service
    */
   boolean isDebugEnabled();
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataService.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataService.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataService.java
index b7cc844..1b9f66b 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataService.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataService.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
@@ -40,8 +40,8 @@ import org.apache.olingo.odata2.api.processor.part.ServiceDocumentProcessor;
 /**
  * Root interface for a custom OData service.
  * 
- *  
- *
+ * 
+ * 
  */
 public interface ODataService {
 
@@ -53,112 +53,112 @@ public interface ODataService {
   String getVersion() throws ODataException;
 
   /**
-   * @return entity data model of this service 
+   * @return entity data model of this service
    * @see Edm
    * @throws ODataException
    */
   Edm getEntityDataModel() throws ODataException;
 
   /**
-   * @return a processor which handles this request 
+   * @return a processor which handles this request
    * @throws ODataException
    * @see MetadataProcessor
    */
   MetadataProcessor getMetadataProcessor() throws ODataException;
 
   /**
-   * @return a processor which handles this request 
+   * @return a processor which handles this request
    * @throws ODataException
    * @see ServiceDocumentProcessor
    */
   ServiceDocumentProcessor getServiceDocumentProcessor() throws ODataException;
 
   /**
-   * @return a processor which handles this request 
+   * @return a processor which handles this request
    * @throws ODataException
    * @see EntityProcessor
    */
   EntityProcessor getEntityProcessor() throws ODataException;
 
   /**
-   * @return a processor which handles this request 
+   * @return a processor which handles this request
    * @throws ODataException
    * @see EntitySetProcessor
    */
   EntitySetProcessor getEntitySetProcessor() throws ODataException;
 
   /**
-   * @return a processor which handles this request 
+   * @return a processor which handles this request
    * @throws ODataException
    * @see EntityComplexPropertyProcessor
    */
   EntityComplexPropertyProcessor getEntityComplexPropertyProcessor() throws ODataException;
 
   /**
-   * @return a processor which handles this request 
+   * @return a processor which handles this request
    * @throws ODataException
    * @see EntityLinkProcessor
    */
   EntityLinkProcessor getEntityLinkProcessor() throws ODataException;
 
   /**
-   * @return a processor which handles this request 
+   * @return a processor which handles this request
    * @throws ODataException
    * @see EntityLinksProcessor
    */
   EntityLinksProcessor getEntityLinksProcessor() throws ODataException;
 
   /**
-   * @return a processor which handles this request 
+   * @return a processor which handles this request
    * @throws ODataException
    * @see EntityMediaProcessor
    */
   EntityMediaProcessor getEntityMediaProcessor() throws ODataException;
 
   /**
-   * @return a processor which handles this request 
+   * @return a processor which handles this request
    * @throws ODataException
    * @see EntitySimplePropertyProcessor
    */
   EntitySimplePropertyProcessor getEntitySimplePropertyProcessor() throws ODataException;
 
   /**
-   * @return a processor which handles this request 
+   * @return a processor which handles this request
    * @throws ODataException
    * @see EntitySimplePropertyValueProcessor
    */
   EntitySimplePropertyValueProcessor getEntitySimplePropertyValueProcessor() throws ODataException;
 
   /**
-   * @return a processor which handles this request 
+   * @return a processor which handles this request
    * @throws ODataException
    * @see FunctionImportProcessor
    */
   FunctionImportProcessor getFunctionImportProcessor() throws ODataException;
 
   /**
-   * @return a processor which handles this request 
+   * @return a processor which handles this request
    * @throws ODataException
    * @see FunctionImportValueProcessor
    */
   FunctionImportValueProcessor getFunctionImportValueProcessor() throws ODataException;
 
   /**
-   * @return a processor which handles this request 
+   * @return a processor which handles this request
    * @throws ODataException
    * @see BatchProcessor
    */
   BatchProcessor getBatchProcessor() throws ODataException;
 
   /**
-   * @return root processor interface 
+   * @return root processor interface
    * @throws ODataException
    * @see ODataProcessor
    */
   ODataProcessor getProcessor() throws ODataException;
 
   /**
-   * @param processorFeature 
+   * @param processorFeature
    * @return ordered list of all <code>content types</code> this service supports
    * @throws ODataException
    */

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceFactory.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceFactory.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceFactory.java
index 3e26faf..7b6f7a3 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceFactory.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceFactory.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.rt.RuntimeDelegate;
 /**
  * Creates instance of custom OData service.
  * 
- *  
+ * 
  */
 public abstract class ODataServiceFactory {
 
@@ -37,7 +37,7 @@ public abstract class ODataServiceFactory {
   public static final String FACTORY_LABEL = "org.apache.olingo.odata2.service.factory";
 
   /**
-   * Label used in core to access application class loader 
+   * Label used in core to access application class loader
    */
   public static final String FACTORY_CLASSLOADER_LABEL = "org.apache.olingo.odata2.service.factory.classloader";
 
@@ -60,7 +60,8 @@ public abstract class ODataServiceFactory {
    * @param processor A custom processor implementation derived from <code>ODataSingleProcessor</code> .
    * @return A new default <code>ODataSingleProcessorService</code> instance.
    */
-  public ODataService createODataSingleProcessorService(final EdmProvider provider, final ODataSingleProcessor processor) {
+  public ODataService createODataSingleProcessorService(final EdmProvider provider,
+      final ODataSingleProcessor processor) {
     return RuntimeDelegate.createODataSingleProcessorService(provider, processor);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceVersion.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceVersion.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceVersion.java
index 30c7fad..699cd52 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceVersion.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceVersion.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
@@ -23,8 +23,8 @@ import java.util.regex.Pattern;
 
 /**
  * This class is a container for the supported ODataServiceVersions.
- *  
- *
+ * 
+ * 
  */
 public class ODataServiceVersion {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchException.java
index f5582d6..647b071 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchException.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
@@ -29,76 +29,96 @@ public class BatchException extends ODataMessageException {
   private static final long serialVersionUID = 1L;
 
   /** INVALID_CHANGESET_BOUNDARY requires 1 content value ('line number') */
-  public static final MessageReference INVALID_CHANGESET_BOUNDARY = createMessageReference(BatchException.class, "INVALID_CHANGESET_BOUNDARY");
+  public static final MessageReference INVALID_CHANGESET_BOUNDARY = createMessageReference(BatchException.class,
+      "INVALID_CHANGESET_BOUNDARY");
 
-  /** INVALID_BOUNDARY_DELIMITER requires 1 content value ('line number')*/
-  public static final MessageReference INVALID_BOUNDARY_DELIMITER = createMessageReference(BatchException.class, "INVALID_BOUNDARY_DELIMITER");
+  /** INVALID_BOUNDARY_DELIMITER requires 1 content value ('line number') */
+  public static final MessageReference INVALID_BOUNDARY_DELIMITER = createMessageReference(BatchException.class,
+      "INVALID_BOUNDARY_DELIMITER");
 
   /** MISSING_BOUNDARY_DELIMITER requires 1 content value('line number') */
-  public static final MessageReference MISSING_BOUNDARY_DELIMITER = createMessageReference(BatchException.class, "MISSING_BOUNDARY_DELIMITER");
+  public static final MessageReference MISSING_BOUNDARY_DELIMITER = createMessageReference(BatchException.class,
+      "MISSING_BOUNDARY_DELIMITER");
 
   /** MISSING_CLOSE_DELIMITER requires 1 content value ('line number') */
-  public static final MessageReference MISSING_CLOSE_DELIMITER = createMessageReference(BatchException.class, "MISSING_CLOSE_DELIMITER");
+  public static final MessageReference MISSING_CLOSE_DELIMITER = createMessageReference(BatchException.class,
+      "MISSING_CLOSE_DELIMITER");
 
   /** INVALID_QUERY_OPERATION_METHOD requires 1 content value ('line number') */
-  public static final MessageReference INVALID_QUERY_OPERATION_METHOD = createMessageReference(BatchException.class, "INVALID_QUERY_OPERATION_METHOD");
+  public static final MessageReference INVALID_QUERY_OPERATION_METHOD = createMessageReference(BatchException.class,
+      "INVALID_QUERY_OPERATION_METHOD");
 
   /** INVALID_CHANGESET_METHOD requires 1 content value ('line number') */
-  public static final MessageReference INVALID_CHANGESET_METHOD = createMessageReference(BatchException.class, "INVALID_CHANGESET_METHOD");
+  public static final MessageReference INVALID_CHANGESET_METHOD = createMessageReference(BatchException.class,
+      "INVALID_CHANGESET_METHOD");
 
   /** INVALID_QUERY_PARAMETER requires no content value */
-  public static final MessageReference INVALID_QUERY_PARAMETER = createMessageReference(BatchException.class, "INVALID_QUERY_PARAMETER");
+  public static final MessageReference INVALID_QUERY_PARAMETER = createMessageReference(BatchException.class,
+      "INVALID_QUERY_PARAMETER");
 
   /** INVALID_URI requires 1 content value('line number') */
   public static final MessageReference INVALID_URI = createMessageReference(BatchException.class, "INVALID_URI");
 
   /** INVALID_BOUNDARY requires 1 content value('line number') */
-  public static final MessageReference INVALID_BOUNDARY = createMessageReference(BatchException.class, "INVALID_BOUNDARY");
+  public static final MessageReference INVALID_BOUNDARY = createMessageReference(BatchException.class,
+      "INVALID_BOUNDARY");
 
   /** NO_MATCH_WITH_BOUNDARY_STRING requires 2 content value ('required boundary', 'line number') */
-  public static final MessageReference NO_MATCH_WITH_BOUNDARY_STRING = createMessageReference(BatchException.class, "NO_MATCH_WITH_BOUNDARY_STRING");
+  public static final MessageReference NO_MATCH_WITH_BOUNDARY_STRING = createMessageReference(BatchException.class,
+      "NO_MATCH_WITH_BOUNDARY_STRING");
 
   /** MISSING_CONTENT_TYPE requires no content value */
-  public static final MessageReference MISSING_CONTENT_TYPE = createMessageReference(BatchException.class, "MISSING_CONTENT_TYPE");
+  public static final MessageReference MISSING_CONTENT_TYPE = createMessageReference(BatchException.class,
+      "MISSING_CONTENT_TYPE");
 
   /** INVALID_CONTENT_TYPE requires 1 content value ('required content-type') */
-  public static final MessageReference INVALID_CONTENT_TYPE = createMessageReference(BatchException.class, "INVALID_CONTENT_TYPE");
+  public static final MessageReference INVALID_CONTENT_TYPE = createMessageReference(BatchException.class,
+      "INVALID_CONTENT_TYPE");
 
   /** MISSING_PARAMETER_IN_CONTENT_TYPE requires no content value */
-  public static final MessageReference MISSING_PARAMETER_IN_CONTENT_TYPE = createMessageReference(BatchException.class, "MISSING_PARAMETER_IN_CONTENT_TYPE");
+  public static final MessageReference MISSING_PARAMETER_IN_CONTENT_TYPE = createMessageReference(BatchException.class,
+      "MISSING_PARAMETER_IN_CONTENT_TYPE");
 
   /** INVALID_HEADER requires 1 content value ('header', 'line number') */
   public static final MessageReference INVALID_HEADER = createMessageReference(BatchException.class, "INVALID_HEADER");
 
   /** INVALID_ACCEPT_HEADER requires 1 content value ('header') */
-  public static final MessageReference INVALID_ACCEPT_HEADER = createMessageReference(BatchException.class, "INVALID_ACCEPT_HEADER");
+  public static final MessageReference INVALID_ACCEPT_HEADER = createMessageReference(BatchException.class,
+      "INVALID_ACCEPT_HEADER");
 
   /** INVALID_ACCEPT_LANGUAGE_HEADER requires 1 content value ('header') */
-  public static final MessageReference INVALID_ACCEPT_LANGUAGE_HEADER = createMessageReference(BatchException.class, "INVALID_ACCEPT_LANGUAGE_HEADER");
+  public static final MessageReference INVALID_ACCEPT_LANGUAGE_HEADER = createMessageReference(BatchException.class,
+      "INVALID_ACCEPT_LANGUAGE_HEADER");
 
   /** INVALID_CONTENT_TRANSFER_ENCODING requires no content value */
-  public static final MessageReference INVALID_CONTENT_TRANSFER_ENCODING = createMessageReference(BatchException.class, "INVALID_CONTENT_TRANSFER_ENCODING");
+  public static final MessageReference INVALID_CONTENT_TRANSFER_ENCODING = createMessageReference(BatchException.class,
+      "INVALID_CONTENT_TRANSFER_ENCODING");
 
   /** MISSING_BLANK_LINE requires 2 content value ('supplied line','line number') */
-  public static final MessageReference MISSING_BLANK_LINE = createMessageReference(BatchException.class, "MISSING_BLANK_LINE");
+  public static final MessageReference MISSING_BLANK_LINE = createMessageReference(BatchException.class,
+      "MISSING_BLANK_LINE");
 
   /** INVALID_PATHINFO requires no content value */
-  public static final MessageReference INVALID_PATHINFO = createMessageReference(BatchException.class, "INVALID_PATHINFO");
+  public static final MessageReference INVALID_PATHINFO = createMessageReference(BatchException.class,
+      "INVALID_PATHINFO");
 
   /** MISSING_METHOD requires 1 content value ('request line') */
   public static final MessageReference MISSING_METHOD = createMessageReference(BatchException.class, "MISSING_METHOD");
 
   /** INVALID_REQUEST_LINE requires 2 content value ('request line', 'line number') */
-  public static final MessageReference INVALID_REQUEST_LINE = createMessageReference(BatchException.class, "INVALID_REQUEST_LINE");
+  public static final MessageReference INVALID_REQUEST_LINE = createMessageReference(BatchException.class,
+      "INVALID_REQUEST_LINE");
 
   /** INVALID_STATUS_LINE requires 2 content value ('status line', 'line number') */
-  public static final MessageReference INVALID_STATUS_LINE = createMessageReference(BatchException.class, "INVALID_STATUS_LINE");
+  public static final MessageReference INVALID_STATUS_LINE = createMessageReference(BatchException.class,
+      "INVALID_STATUS_LINE");
 
   /** TRUNCETED_BODY requires 1 content value ('line number') */
   public static final MessageReference TRUNCATED_BODY = createMessageReference(BatchException.class, "TRUNCATED_BODY");
 
   /** UNSUPPORTED_ABSOLUTE_PATH requires 1 content value ('line number') */
-  public static final MessageReference UNSUPPORTED_ABSOLUTE_PATH = createMessageReference(BatchException.class, "UNSUPPORTED_ABSOLUTE_PATH");
+  public static final MessageReference UNSUPPORTED_ABSOLUTE_PATH = createMessageReference(BatchException.class,
+      "UNSUPPORTED_ABSOLUTE_PATH");
 
   public BatchException(final MessageReference messageReference) {
     super(messageReference);

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchHandler.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchHandler.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchHandler.java
index 1748e3e..673f0ae 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchHandler.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchHandler.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
@@ -35,7 +35,8 @@ public interface BatchHandler {
   public BatchResponsePart handleBatchPart(BatchRequestPart batchRequestPart) throws ODataException;
 
   /**
-   * <p>Delegates a handling of the request {@link ODataRequest} to the request handler and provides ODataResponse {@link ODataResponse}.</p>
+   * <p>Delegates a handling of the request {@link ODataRequest} to the request handler and provides ODataResponse
+   * {@link ODataResponse}.</p>
    * @param request the incoming request
    * @return the corresponding result
    * @throws ODataException

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchRequestPart.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchRequestPart.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchRequestPart.java
index a12f774..5e3e2f2 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchRequestPart.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchRequestPart.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchResponsePart.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchResponsePart.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchResponsePart.java
index b75a797..dfafbdb 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchResponsePart.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchResponsePart.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
@@ -24,10 +24,11 @@ import org.apache.olingo.odata2.api.processor.ODataResponse;
 import org.apache.olingo.odata2.api.rt.RuntimeDelegate;
 
 /**
-* A BatchResponsePart
-* <p> BatchResponsePart represents a distinct part of a Batch Response body. It can be a ChangeSet response or a response to a retrieve request
-*  
-*/
+ * A BatchResponsePart
+ * <p> BatchResponsePart represents a distinct part of a Batch Response body. It can be a ChangeSet response or a
+ * response to a retrieve request
+ * 
+ */
 public abstract class BatchResponsePart {
 
   /**
@@ -67,8 +68,8 @@ public abstract class BatchResponsePart {
   }
 
   /**
-   * Implementation of the builder pattern to create instances of this type of object. 
-   *  
+   * Implementation of the builder pattern to create instances of this type of object.
+   * 
    */
   public static abstract class BatchResponsePartBuilder {
     public abstract BatchResponsePart build();

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSet.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSet.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSet.java
index 13f7df0..83aa367 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSet.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSet.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
@@ -30,18 +30,18 @@ public abstract class BatchChangeSet implements BatchPart {
 
   /**
    * Add a new change request to the ChangeSet
-   * @param BatchChangeSetPart {@link BatchChangeSetPart}
+   * @param request {@link BatchChangeSetPart}
    */
   public abstract void add(BatchChangeSetPart request);
 
   /**
-   * Get change requests 
+   * Get change requests
    * @return a list of {@link BatchChangeSetPart}
    */
   public abstract List<BatchChangeSetPart> getChangeSetParts();
 
   /**
-   * Get new builder instance 
+   * Get new builder instance
    * @return {@link BatchChangeSetBuilder}
    */
   public static BatchChangeSetBuilder newBuilder() {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSetPart.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSetPart.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSetPart.java
index ba59edc..d9a81d8 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSetPart.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSetPart.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchPart.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchPart.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchPart.java
index 6c6c7f0..2f2b5d5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchPart.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchPart.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchQueryPart.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchQueryPart.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchQueryPart.java
index 42bd28d..78827eb 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchQueryPart.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchQueryPart.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchSingleResponse.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchSingleResponse.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchSingleResponse.java
index 4d99c7d..dc8c9b7 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchSingleResponse.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchSingleResponse.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
@@ -22,9 +22,10 @@ import java.util.Map;
 import java.util.Set;
 
 /**
-* A BatchSingleResponse
-* <p> BatchSingleResponse represents a single response of a Batch Response body. It can be a response to a change request of ChangeSet or a response to a retrieve request
-*/
+ * A BatchSingleResponse
+ * <p> BatchSingleResponse represents a single response of a Batch Response body. It can be a response to a change
+ * request of ChangeSet or a response to a retrieve request
+ */
 public interface BatchSingleResponse {
   /**
    * @return a result code of the attempt to understand and satisfy the request

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpContentType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpContentType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpContentType.java
index d274afb..7f51ae3 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpContentType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpContentType.java
@@ -1,27 +1,27 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
 package org.apache.olingo.odata2.api.commons;
 
 /**
- * Constants for <code>Http Content Type</code> definitions as specified in 
+ * Constants for <code>Http Content Type</code> definitions as specified in
  * <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html">RFC 2616 Section 14</a>.
- *  
+ * 
  */
 public interface HttpContentType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpHeaders.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpHeaders.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpHeaders.java
index 6c098e8..f0851d1 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpHeaders.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpHeaders.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
@@ -20,8 +20,8 @@ package org.apache.olingo.odata2.api.commons;
 
 /**
  * HTTP header constants
- *  
- *
+ * 
+ * 
  */
 public interface HttpHeaders {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpStatusCodes.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpStatusCodes.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpStatusCodes.java
index 267e69b..e2a416f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpStatusCodes.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpStatusCodes.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
@@ -21,17 +21,29 @@ package org.apache.olingo.odata2.api.commons;
 /**
  * HTTP status codes as defined in RFC2616-sec10
  * and additional status codes as defined in RFC6585
- *  
+ * 
  */
 public enum HttpStatusCodes {
 
-  OK(200, "OK"), CREATED(201, "Created"), ACCEPTED(202, "Accepted"), NO_CONTENT(204, "No Content"), RESET_CONTENT(205, "Reset Content"), PARTIAL_CONTENT(206, "Partial Content"),
+  OK(200, "OK"), CREATED(201, "Created"), ACCEPTED(202, "Accepted"), NO_CONTENT(204, "No Content"), RESET_CONTENT(205,
+      "Reset Content"), PARTIAL_CONTENT(206, "Partial Content"),
 
-  MOVED_PERMANENTLY(301, "Moved Permanently"), FOUND(302, "Found"), SEE_OTHER(303, "See Other"), NOT_MODIFIED(304, "Not Modified"), USE_PROXY(305, "Use Proxy"), TEMPORARY_REDIRECT(307, "Temporary Redirect"),
+  MOVED_PERMANENTLY(301, "Moved Permanently"), FOUND(302, "Found"), SEE_OTHER(303, "See Other"), NOT_MODIFIED(304,
+      "Not Modified"), USE_PROXY(305, "Use Proxy"), TEMPORARY_REDIRECT(307, "Temporary Redirect"),
 
-  BAD_REQUEST(400, "Bad Request"), UNAUTHORIZED(401, "Unauthorized"), PAYMENT_REQUIRED(402, "Payment Required"), FORBIDDEN(403, "Forbidden"), NOT_FOUND(404, "Not Found"), METHOD_NOT_ALLOWED(405, "Method Not Allowed"), NOT_ACCEPTABLE(406, "Not Acceptable"), PROXY_AUTHENTICATION_REQUIRED(407, "Proxy Authentication Required"), REQUEST_TIMEOUT(408, "Request Timeout"), CONFLICT(409, "Conflict"), GONE(410, "Gone"), LENGTH_REQUIRED(411, "Length Required"), PRECONDITION_FAILED(412, "Precondition Failed"), REQUEST_ENTITY_TOO_LARGE(413, "Request Entity Too Large"), REQUEST_URI_TOO_LONG(414, "Request-URI Too Long"), UNSUPPORTED_MEDIA_TYPE(415, "Unsupported Media Type"), REQUESTED_RANGE_NOT_SATISFIABLE(416, "Requested Range Not Satisfiable"), EXPECTATION_FAILED(417, "Expectation Failed"), PRECONDITION_REQUIRED(428, "Precondition Required"),
+  BAD_REQUEST(400, "Bad Request"), UNAUTHORIZED(401, "Unauthorized"), PAYMENT_REQUIRED(402, "Payment Required"),
+  FORBIDDEN(
+      403, "Forbidden"), NOT_FOUND(404, "Not Found"), METHOD_NOT_ALLOWED(405, "Method Not Allowed"), NOT_ACCEPTABLE(
+      406, "Not Acceptable"), PROXY_AUTHENTICATION_REQUIRED(407, "Proxy Authentication Required"), REQUEST_TIMEOUT(408,
+      "Request Timeout"), CONFLICT(409, "Conflict"), GONE(410, "Gone"), LENGTH_REQUIRED(411, "Length Required"),
+  PRECONDITION_FAILED(412, "Precondition Failed"), REQUEST_ENTITY_TOO_LARGE(413, "Request Entity Too Large"),
+  REQUEST_URI_TOO_LONG(414, "Request-URI Too Long"), UNSUPPORTED_MEDIA_TYPE(415, "Unsupported Media Type"),
+  REQUESTED_RANGE_NOT_SATISFIABLE(416, "Requested Range Not Satisfiable"),
+  EXPECTATION_FAILED(417, "Expectation Failed"), PRECONDITION_REQUIRED(428, "Precondition Required"),
 
-  INTERNAL_SERVER_ERROR(500, "Internal Server Error"), NOT_IMPLEMENTED(501, "Not Implemented"), BAD_GATEWAY(502, "Bad Gateway"), SERVICE_UNAVAILABLE(503, "Service Unavailable"), GATEWAY_TIMEOUT(504, "Gateway Timeout"), HTTP_VERSION_NOT_SUPPORTED(505, "HTTP Version Not Supported");
+  INTERNAL_SERVER_ERROR(500, "Internal Server Error"), NOT_IMPLEMENTED(501, "Not Implemented"), BAD_GATEWAY(502,
+      "Bad Gateway"), SERVICE_UNAVAILABLE(503, "Service Unavailable"), GATEWAY_TIMEOUT(504, "Gateway Timeout"),
+  HTTP_VERSION_NOT_SUPPORTED(505, "HTTP Version Not Supported");
 
   private final int code;
   private final String info;
@@ -43,7 +55,7 @@ public enum HttpStatusCodes {
 
   /**
    * Convert a numerical status code into the corresponding status enum object.
-   *
+   * 
    * @param statusCode the numerical status code
    * @return the matching status enum object or null if no matching enum is defined
    */
@@ -58,7 +70,7 @@ public enum HttpStatusCodes {
 
   /**
    * Get the associated status code.
-   *
+   * 
    * @return the status code.
    */
   public int getStatusCode() {
@@ -67,7 +79,7 @@ public enum HttpStatusCodes {
 
   /**
    * Get the status code info.
-   *
+   * 
    * @return the status code info
    */
   public String getInfo() {
@@ -76,7 +88,7 @@ public enum HttpStatusCodes {
 
   /**
    * Get the status code info.
-   *
+   * 
    * @return the status code info
    */
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/InlineCount.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/InlineCount.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/InlineCount.java
index f2b0ecf..03a998e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/InlineCount.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/InlineCount.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.api.commons;
 
 /**
  * Inlinecount constants as described in the OData protocol
- *  
+ * 
  */
 public enum InlineCount {
   ALLPAGES, NONE;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java
index 10e8d5b..be139de 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.api.commons;
 
 /**
  * HTTP header constants as used in the OData protocol
- *  
+ * 
  */
 public class ODataHttpHeaders {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpMethod.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpMethod.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpMethod.java
index d583fd5..2cd2a6e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpMethod.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpMethod.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.api.commons;
 
 /**
  * The supported HTTP methods.
- *  
+ * 
  */
 public enum ODataHttpMethod {
   GET, PUT, POST, DELETE, PATCH, MERGE;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/package-info.java
index 1efa8e2..ecb129b 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/package-info.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/package-info.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/Edm.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/Edm.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/Edm.java
index 5561292..2126254 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/Edm.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/Edm.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
@@ -24,7 +24,7 @@ import java.util.List;
  * @org.apache.olingo.odata2.DoNotImplement
  * Entity Data Model (EDM)
  * <p>Interface representing a Entity Data Model as described in the Conceptual Schema Definition.
- *  
+ * 
  */
 public interface Edm {
 
@@ -38,7 +38,8 @@ public interface Edm {
   public static final String NAMESPACE_M_2007_08 = "http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";
   public static final String NAMESPACE_EDMX_2007_06 = "http://schemas.microsoft.com/ado/2007/06/edmx";
   public static final String NAMESPACE_REL_2007_08 = "http://schemas.microsoft.com/ado/2007/08/dataservices/related/";
-  public static final String NAMESPACE_REL_ASSOC_2007_08 = "http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/";
+  public static final String NAMESPACE_REL_ASSOC_2007_08 =
+      "http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/";
   public static final String NAMESPACE_SCHEME_2007_08 = "http://schemas.microsoft.com/ado/2007/08/dataservices/scheme";
   public static final String NAMESPACE_XML_1998 = "http://www.w3.org/XML/1998/namespace";
   public static final String PREFIX_EDM = "edm";

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAction.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAction.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAction.java
index 180bd6f..cc45a9c 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAction.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAction.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
@@ -21,8 +21,9 @@ package org.apache.olingo.odata2.api.edm;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * A CSDL Action Element
- * <p>EdmAction can either be Cascade or None. Cascade implies that a delete operation on an entity also should delete the relationship instances.
- *  
+ * <p>EdmAction can either be Cascade or None. Cascade implies that a delete operation on an entity also should delete
+ * the relationship instances.
+ * 
  */
 public enum EdmAction {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java
index 186494a..55120c5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * EdmAnnotatable can be applied to CSDL elements as described in the Conceptual Schema Definition Language.
- *  
+ * 
  */
 public interface EdmAnnotatable {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationAttribute.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationAttribute.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationAttribute.java
index 7c2778d..2cc526d 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationAttribute.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationAttribute.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
@@ -20,9 +20,9 @@ package org.apache.olingo.odata2.api.edm;
 
 /**
  * @org.apache.olingo.odata2.DoNotImplement
- * A CSDL AnnotationAttribute element. 
+ * A CSDL AnnotationAttribute element.
  * <p>EdmAnnotationAttribute is a custom XML attribute which can be applied to a CSDL element.
- *  
+ * 
  */
 public interface EdmAnnotationAttribute {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java
index a4e33ef..5dabffd 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  * 
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
@@ -26,8 +26,8 @@ import org.apache.olingo.odata2.api.edm.provider.AnnotationElement;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * A CSDL AnnotationElement element
- * <p>EdmAnnotationElement is a custom XML element which can be applied to a CSDL element. 
- *  
+ * <p>EdmAnnotationElement is a custom XML element which can be applied to a CSDL element.
+ * 
  */
 public interface EdmAnnotationElement {