You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2014/07/16 15:34:58 UTC

[23/23] git commit: Removed unused imports

Removed unused imports


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/890628e0
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/890628e0
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/890628e0

Branch: refs/heads/master
Commit: 890628e047e98b28124211b7eb29c9d3fd8d5ceb
Parents: 8442ea8
Author: Michael Bolz <mi...@sap.com>
Authored: Wed Jul 16 15:10:08 2014 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Wed Jul 16 15:10:08 2014 +0200

----------------------------------------------------------------------
 .../android/http/AndroidHttpClientFactory.java  |  3 +-
 .../org/apache/olingo/ext/proxy/Service.java    |  8 +-
 .../olingo/ext/proxy/api/AbstractEntityKey.java |  3 +-
 .../apache/olingo/ext/proxy/api/AsyncCall.java  |  3 +-
 .../org/apache/olingo/ext/proxy/api/Search.java |  3 +-
 .../ext/proxy/api/annotations/EnumType.java     |  3 +-
 .../ext/proxy/api/annotations/Operation.java    |  3 +-
 .../ext/proxy/api/annotations/Property.java     |  7 +-
 ...stractEntityCollectionInvocationHandler.java | 11 +--
 .../commons/AbstractInvocationHandler.java      | 23 ++---
 .../commons/AbstractPersistenceManager.java     | 22 ++---
 .../AbstractStructuredInvocationHandler.java    | 21 ++---
 .../commons/AnnotatableInvocationHandler.java   | 17 ++--
 .../commons/AnnotatationsInvocationHandler.java |  5 +-
 .../ComplexFactoryInvocationHandler.java        |  5 +-
 .../proxy/commons/ComplexInvocationHandler.java | 15 ++--
 .../EntityCollectionInvocationHandler.java      | 19 +++--
 .../EntityContainerInvocationHandler.java       |  7 +-
 .../proxy/commons/EntityInvocationHandler.java  | 35 ++++----
 .../commons/EntitySetInvocationHandler.java     | 14 ++--
 .../ext/proxy/commons/EntitySetIterator.java    |  9 +-
 .../NonTransactionalPersistenceManagerImpl.java |  3 +-
 .../commons/OperationInvocationHandler.java     | 19 +++--
 .../ext/proxy/commons/PersistenceChanges.java   |  3 +-
 .../olingo/ext/proxy/commons/SearchImpl.java    |  3 +-
 .../commons/SingletonInvocationHandler.java     |  5 +-
 .../TransactionalPersistenceManagerImpl.java    |  5 +-
 .../olingo/ext/proxy/context/EntityContext.java |  3 +-
 .../ext/proxy/context/EntityLinkDesc.java       |  7 +-
 .../olingo/ext/proxy/context/EntityUUID.java    |  5 +-
 .../olingo/ext/proxy/utils/ClassUtils.java      | 15 ++--
 .../olingo/ext/proxy/utils/CoreUtils.java       | 29 +++----
 .../olingo/ext/pojogen/AbstractPOJOGenMojo.java | 25 +++---
 .../olingo/ext/pojogen/AbstractUtility.java     | 19 +++--
 .../org/apache/olingo/fit/AbstractServices.java | 88 ++++++++++----------
 .../apache/olingo/fit/V3ActionOverloading.java  | 33 ++++----
 .../org/apache/olingo/fit/V3KeyAsSegment.java   | 21 +++--
 .../java/org/apache/olingo/fit/V3OpenType.java  | 31 ++++---
 .../org/apache/olingo/fit/V3PrimitiveKeys.java  | 10 +--
 .../java/org/apache/olingo/fit/V3Services.java  | 53 ++++++------
 .../main/java/org/apache/olingo/fit/V4Demo.java | 29 ++++---
 .../org/apache/olingo/fit/V4KeyAsSegment.java   | 19 ++---
 .../java/org/apache/olingo/fit/V4NorthWind.java | 10 +--
 .../org/apache/olingo/fit/V4NorthWindExt.java   | 12 +--
 .../java/org/apache/olingo/fit/V4OAuth2.java    |  6 +-
 .../java/org/apache/olingo/fit/V4OpenType.java  | 27 +++---
 .../java/org/apache/olingo/fit/V4Services.java  | 73 ++++++++--------
 .../org/apache/olingo/fit/V4Vocabularies.java   | 16 ++--
 .../apache/olingo/fit/metadata/Metadata.java    | 27 +++---
 .../org/apache/olingo/fit/methods/MERGE.java    |  3 +-
 .../org/apache/olingo/fit/methods/PATCH.java    |  3 +-
 .../olingo/fit/rest/OAuth2InInterceptor.java    | 13 +--
 .../apache/olingo/fit/rest/OAuth2Provider.java  |  5 +-
 .../rest/ResolvingReferencesInterceptor.java    |  8 +-
 .../fit/rest/ServiceNameResponseFilter.java     | 15 ++--
 .../fit/rest/StaticSecurityInterceptor.java     | 13 +--
 .../olingo/fit/rest/XHTTPMethodInterceptor.java |  6 +-
 .../apache/olingo/fit/rproxy/LinkRewrite.java   |  4 +-
 .../olingo/fit/rproxy/LinkRewriteRenderer.java  |  6 +-
 .../fit/serializer/FITAtomDeserializer.java     | 13 ++-
 .../olingo/fit/utils/AbstractUtilities.java     | 41 +++++----
 .../org/apache/olingo/fit/utils/Accept.java     |  4 +-
 .../org/apache/olingo/fit/utils/Commons.java    | 35 ++++----
 .../org/apache/olingo/fit/utils/Constants.java  |  4 +-
 .../org/apache/olingo/fit/utils/FSManager.java  | 23 +++--
 .../apache/olingo/fit/utils/JSONUtilities.java  | 30 ++++---
 .../olingo/fit/utils/MetadataLinkInfo.java      |  3 +-
 .../olingo/fit/utils/NavigationLinks.java       |  4 +-
 .../olingo/fit/utils/XMLEventReaderWrapper.java | 15 ++--
 .../apache/olingo/fit/utils/XMLUtilities.java   | 41 +++++----
 .../olingo/fit/AbstractBaseTestITCase.java      |  8 +-
 .../fit/CXFOAuth2HttpUriRequestFactory.java     |  3 +-
 .../olingo/fit/proxy/v3/AbstractTestITCase.java | 29 ++++---
 .../proxy/v3/ActionOverloadingTestITCase.java   | 27 +++---
 .../olingo/fit/proxy/v3/AsyncTestITCase.java    | 26 +++---
 .../olingo/fit/proxy/v3/ContextTestITCase.java  | 38 +++++----
 .../fit/proxy/v3/EntityCreateTestITCase.java    | 20 +++--
 .../fit/proxy/v3/EntityRetrieveTestITCase.java  | 69 +++++++++------
 .../fit/proxy/v3/EntitySetTestITCase.java       | 14 ++--
 .../fit/proxy/v3/EntityUpdateTestITCase.java    | 24 +++---
 .../olingo/fit/proxy/v3/FilterTestITCase.java   | 31 ++++---
 .../olingo/fit/proxy/v3/InvokeTestITCase.java   | 38 +++++----
 .../fit/proxy/v3/MediaEntityTestITCase.java     | 14 ++--
 .../olingo/fit/proxy/v3/OpenTypeTestITCase.java | 22 ++---
 .../fit/proxy/v3/PrimitiveKeysTestITCase.java   | 12 +--
 .../olingo/fit/proxy/v3/PropertyTestITCase.java |  6 +-
 .../AllGeoCollectionTypesSet.java               | 21 -----
 .../astoriadefaultservice/AllGeoTypesSet.java   | 21 -----
 .../services/astoriadefaultservice/Car.java     | 21 -----
 .../astoriadefaultservice/Computer.java         | 21 -----
 .../astoriadefaultservice/ComputerDetail.java   | 21 -----
 .../astoriadefaultservice/Customer.java         | 21 -----
 .../astoriadefaultservice/CustomerInfo.java     | 21 -----
 .../astoriadefaultservice/DefaultContainer.java | 24 +-----
 .../services/astoriadefaultservice/Driver.java  | 21 -----
 .../astoriadefaultservice/LastLogin.java        | 21 -----
 .../services/astoriadefaultservice/License.java | 21 -----
 .../services/astoriadefaultservice/Login.java   | 21 -----
 .../astoriadefaultservice/MappedEntityType.java | 21 -----
 .../services/astoriadefaultservice/Message.java | 23 +----
 .../MessageAttachment.java                      | 21 -----
 .../services/astoriadefaultservice/Order.java   | 21 -----
 .../astoriadefaultservice/OrderLine.java        | 23 +----
 .../astoriadefaultservice/PageView.java         | 21 -----
 .../services/astoriadefaultservice/Person.java  | 21 -----
 .../astoriadefaultservice/PersonMetadata.java   | 21 -----
 .../services/astoriadefaultservice/Product.java | 21 -----
 .../astoriadefaultservice/ProductDetail.java    | 21 -----
 .../astoriadefaultservice/ProductPhoto.java     | 23 +----
 .../astoriadefaultservice/ProductReview.java    | 23 +----
 .../astoriadefaultservice/RSAToken.java         | 21 -----
 .../astoriadefaultservice/types/Aliases.java    | 23 -----
 .../types/AllSpatialCollectionTypes.java        | 29 +------
 .../AllSpatialCollectionTypesCollection.java    | 20 -----
 .../types/AllSpatialCollectionTypes_Simple.java | 29 +------
 ...SpatialCollectionTypes_SimpleCollection.java | 20 -----
 .../types/AllSpatialTypes.java                  | 29 +------
 .../types/AllSpatialTypesCollection.java        | 20 -----
 .../astoriadefaultservice/types/AuditInfo.java  | 23 -----
 .../types/BackOrderLine.java                    | 28 +------
 .../types/BackOrderLine2.java                   | 28 +------
 .../types/BackOrderLine2Collection.java         | 20 -----
 .../types/BackOrderLineCollection.java          | 20 -----
 .../astoriadefaultservice/types/Car.java        | 29 +------
 .../types/CarCollection.java                    | 20 -----
 .../types/ComplexToCategory.java                | 23 -----
 .../astoriadefaultservice/types/Computer.java   | 29 +------
 .../types/ComputerCollection.java               | 20 -----
 .../types/ComputerDetail.java                   | 29 +------
 .../types/ComputerDetailCollection.java         | 20 -----
 .../types/ConcurrencyInfo.java                  | 23 -----
 .../types/ContactDetails.java                   | 23 -----
 .../astoriadefaultservice/types/Contractor.java | 30 +------
 .../types/ContractorCollection.java             | 20 -----
 .../astoriadefaultservice/types/Customer.java   | 29 +------
 .../types/CustomerCollection.java               | 20 -----
 .../types/CustomerInfo.java                     | 29 +------
 .../types/CustomerInfoCollection.java           | 20 -----
 .../astoriadefaultservice/types/Dimensions.java | 23 -----
 .../types/DiscontinuedProduct.java              | 29 +------
 .../types/DiscontinuedProductCollection.java    | 20 -----
 .../astoriadefaultservice/types/Driver.java     | 29 +------
 .../types/DriverCollection.java                 | 20 -----
 .../astoriadefaultservice/types/Employee.java   | 29 +------
 .../types/EmployeeCollection.java               | 17 ----
 .../astoriadefaultservice/types/LastLogin.java  | 29 +------
 .../types/LastLoginCollection.java              | 20 -----
 .../astoriadefaultservice/types/License.java    | 29 +------
 .../types/LicenseCollection.java                | 20 -----
 .../astoriadefaultservice/types/Login.java      | 29 +------
 .../types/LoginCollection.java                  | 20 -----
 .../types/MappedEntityType.java                 | 29 +------
 .../types/MappedEntityTypeCollection.java       | 20 -----
 .../astoriadefaultservice/types/Message.java    | 28 +------
 .../types/MessageAttachment.java                | 29 +------
 .../types/MessageAttachmentCollection.java      | 20 -----
 .../types/MessageCollection.java                | 20 -----
 .../astoriadefaultservice/types/MessageKey.java | 27 +-----
 .../astoriadefaultservice/types/Order.java      | 29 +------
 .../types/OrderCollection.java                  | 20 -----
 .../astoriadefaultservice/types/OrderLine.java  | 29 +------
 .../types/OrderLineCollection.java              | 20 -----
 .../types/OrderLineKey.java                     | 27 +-----
 .../astoriadefaultservice/types/PageView.java   | 29 +------
 .../types/PageViewCollection.java               | 20 -----
 .../astoriadefaultservice/types/Person.java     | 30 +------
 .../types/PersonCollection.java                 | 20 -----
 .../types/PersonMetadata.java                   | 29 +------
 .../types/PersonMetadataCollection.java         | 20 -----
 .../astoriadefaultservice/types/Phone.java      | 23 -----
 .../astoriadefaultservice/types/Product.java    | 30 +------
 .../types/ProductCollection.java                | 20 -----
 .../types/ProductDetail.java                    | 29 +------
 .../types/ProductDetailCollection.java          | 20 -----
 .../types/ProductPageView.java                  | 29 +------
 .../types/ProductPageViewCollection.java        | 20 -----
 .../types/ProductPhoto.java                     | 28 +------
 .../types/ProductPhotoCollection.java           | 20 -----
 .../types/ProductPhotoKey.java                  | 27 +-----
 .../types/ProductReview.java                    | 28 +------
 .../types/ProductReviewCollection.java          | 20 -----
 .../types/ProductReviewKey.java                 | 27 +-----
 .../astoriadefaultservice/types/RSAToken.java   | 29 +------
 .../types/RSATokenCollection.java               | 20 -----
 .../types/SpecialEmployee.java                  | 30 +------
 .../types/SpecialEmployeeCollection.java        | 17 ----
 .../opentypesservicev3/DefaultContainer.java    | 23 -----
 .../odata/services/opentypesservicev3/Row.java  | 21 -----
 .../services/opentypesservicev3/RowIndex.java   | 21 -----
 .../types/ContactDetails.java                   | 23 -----
 .../opentypesservicev3/types/IndexedRow.java    | 30 +------
 .../types/IndexedRowCollection.java             | 20 -----
 .../services/opentypesservicev3/types/Row.java  | 30 +------
 .../opentypesservicev3/types/RowCollection.java | 20 -----
 .../opentypesservicev3/types/RowIndex.java      | 30 +------
 .../types/RowIndexCollection.java               | 20 -----
 .../primitivekeysservice/EdmBinarySet.java      | 21 -----
 .../primitivekeysservice/EdmBooleanSet.java     | 21 -----
 .../primitivekeysservice/EdmByteSet.java        | 21 -----
 .../EdmDateTimeOffsetSet.java                   | 21 -----
 .../primitivekeysservice/EdmDateTimeSet.java    | 21 -----
 .../primitivekeysservice/EdmDecimalSet.java     | 21 -----
 .../primitivekeysservice/EdmDoubleSet.java      | 21 -----
 .../primitivekeysservice/EdmGuidSet.java        | 21 -----
 .../primitivekeysservice/EdmInt16Set.java       | 21 -----
 .../primitivekeysservice/EdmInt32Set.java       | 21 -----
 .../primitivekeysservice/EdmInt64Set.java       | 21 -----
 .../primitivekeysservice/EdmSingleSet.java      | 21 -----
 .../primitivekeysservice/EdmStringSet.java      | 21 -----
 .../primitivekeysservice/EdmTimeSet.java        | 21 -----
 .../services/primitivekeysservice/Folders.java  | 21 -----
 .../primitivekeysservice/TestContext.java       | 23 -----
 .../primitivekeysservice/types/EdmBinary.java   | 29 +------
 .../types/EdmBinaryCollection.java              | 20 -----
 .../primitivekeysservice/types/EdmBoolean.java  | 29 +------
 .../types/EdmBooleanCollection.java             | 20 -----
 .../primitivekeysservice/types/EdmByte.java     | 29 +------
 .../types/EdmByteCollection.java                | 20 -----
 .../primitivekeysservice/types/EdmDateTime.java | 29 +------
 .../types/EdmDateTimeCollection.java            | 20 -----
 .../types/EdmDateTimeOffset.java                | 29 +------
 .../types/EdmDateTimeOffsetCollection.java      | 20 -----
 .../primitivekeysservice/types/EdmDecimal.java  | 29 +------
 .../types/EdmDecimalCollection.java             | 20 -----
 .../primitivekeysservice/types/EdmDouble.java   | 29 +------
 .../types/EdmDoubleCollection.java              | 20 -----
 .../primitivekeysservice/types/EdmGuid.java     | 29 +------
 .../types/EdmGuidCollection.java                | 20 -----
 .../primitivekeysservice/types/EdmInt16.java    | 29 +------
 .../types/EdmInt16Collection.java               | 20 -----
 .../primitivekeysservice/types/EdmInt32.java    | 29 +------
 .../types/EdmInt32Collection.java               | 20 -----
 .../primitivekeysservice/types/EdmInt64.java    | 29 +------
 .../types/EdmInt64Collection.java               | 20 -----
 .../primitivekeysservice/types/EdmSingle.java   | 29 +------
 .../types/EdmSingleCollection.java              | 20 -----
 .../primitivekeysservice/types/EdmString.java   | 29 +------
 .../types/EdmStringCollection.java              | 20 -----
 .../primitivekeysservice/types/EdmTime.java     | 29 +------
 .../types/EdmTimeCollection.java                | 20 -----
 .../primitivekeysservice/types/Folder.java      | 29 +------
 .../types/FolderCollection.java                 | 20 -----
 .../AllGeoCollectionTypesSet.java               | 21 -----
 .../astoriadefaultservice/AllGeoTypesSet.java   | 21 -----
 .../services/astoriadefaultservice/Car.java     | 21 -----
 .../astoriadefaultservice/Computer.java         | 21 -----
 .../astoriadefaultservice/ComputerDetail.java   | 21 -----
 .../astoriadefaultservice/Customer.java         | 21 -----
 .../astoriadefaultservice/CustomerInfo.java     | 21 -----
 .../astoriadefaultservice/DefaultContainer.java | 24 +-----
 .../services/astoriadefaultservice/Driver.java  | 21 -----
 .../astoriadefaultservice/LastLogin.java        | 21 -----
 .../services/astoriadefaultservice/License.java | 21 -----
 .../services/astoriadefaultservice/Login.java   | 21 -----
 .../astoriadefaultservice/MappedEntityType.java | 21 -----
 .../services/astoriadefaultservice/Message.java | 23 +----
 .../MessageAttachment.java                      | 21 -----
 .../services/astoriadefaultservice/Order.java   | 21 -----
 .../astoriadefaultservice/OrderLine.java        | 23 +----
 .../astoriadefaultservice/PageView.java         | 21 -----
 .../services/astoriadefaultservice/Person.java  | 21 -----
 .../astoriadefaultservice/PersonMetadata.java   | 21 -----
 .../services/astoriadefaultservice/Product.java | 21 -----
 .../astoriadefaultservice/ProductDetail.java    | 21 -----
 .../astoriadefaultservice/ProductPhoto.java     | 23 +----
 .../astoriadefaultservice/ProductReview.java    | 23 +----
 .../astoriadefaultservice/RSAToken.java         | 21 -----
 .../astoriadefaultservice/types/Aliases.java    | 23 -----
 .../types/AllSpatialCollectionTypes.java        | 29 +------
 .../AllSpatialCollectionTypesCollection.java    | 20 -----
 .../types/AllSpatialCollectionTypes_Simple.java | 29 +------
 ...SpatialCollectionTypes_SimpleCollection.java | 20 -----
 .../types/AllSpatialTypes.java                  | 29 +------
 .../types/AllSpatialTypesCollection.java        | 20 -----
 .../astoriadefaultservice/types/AuditInfo.java  | 23 -----
 .../types/BackOrderLine.java                    | 28 +------
 .../types/BackOrderLine2.java                   | 28 +------
 .../types/BackOrderLine2Collection.java         | 20 -----
 .../types/BackOrderLineCollection.java          | 20 -----
 .../astoriadefaultservice/types/Car.java        | 29 +------
 .../types/CarCollection.java                    | 20 -----
 .../types/ComplexToCategory.java                | 23 -----
 .../types/ComplexWithAllPrimitiveTypes.java     | 23 -----
 .../astoriadefaultservice/types/Computer.java   | 30 +------
 .../types/ComputerCollection.java               | 20 -----
 .../types/ComputerDetail.java                   | 29 +------
 .../types/ComputerDetailCollection.java         | 20 -----
 .../types/ConcurrencyInfo.java                  | 23 -----
 .../types/ContactDetails.java                   | 23 -----
 .../astoriadefaultservice/types/Contractor.java | 29 +------
 .../types/ContractorCollection.java             | 20 -----
 .../astoriadefaultservice/types/Customer.java   | 29 +------
 .../types/CustomerCollection.java               | 20 -----
 .../types/CustomerInfo.java                     | 29 +------
 .../types/CustomerInfoCollection.java           | 20 -----
 .../astoriadefaultservice/types/Dimensions.java | 23 -----
 .../types/DiscontinuedProduct.java              | 29 +------
 .../types/DiscontinuedProductCollection.java    | 20 -----
 .../astoriadefaultservice/types/Driver.java     | 29 +------
 .../types/DriverCollection.java                 | 20 -----
 .../astoriadefaultservice/types/Employee.java   | 30 +------
 .../types/EmployeeCollection.java               | 17 ----
 .../astoriadefaultservice/types/LastLogin.java  | 29 +------
 .../types/LastLoginCollection.java              | 20 -----
 .../astoriadefaultservice/types/License.java    | 29 +------
 .../types/LicenseCollection.java                | 20 -----
 .../astoriadefaultservice/types/Login.java      | 29 +------
 .../types/LoginCollection.java                  | 20 -----
 .../types/MappedEntityType.java                 | 29 +------
 .../types/MappedEntityTypeCollection.java       | 20 -----
 .../astoriadefaultservice/types/Message.java    | 28 +------
 .../types/MessageAttachment.java                | 29 +------
 .../types/MessageAttachmentCollection.java      | 20 -----
 .../types/MessageCollection.java                | 20 -----
 .../astoriadefaultservice/types/MessageKey.java | 27 +-----
 .../astoriadefaultservice/types/Order.java      | 29 +------
 .../types/OrderCollection.java                  | 20 -----
 .../astoriadefaultservice/types/OrderLine.java  | 28 +------
 .../types/OrderLineCollection.java              | 20 -----
 .../types/OrderLineKey.java                     | 27 +-----
 .../astoriadefaultservice/types/PageView.java   | 29 +------
 .../types/PageViewCollection.java               | 20 -----
 .../astoriadefaultservice/types/Person.java     | 29 +------
 .../types/PersonCollection.java                 | 20 -----
 .../types/PersonMetadata.java                   | 29 +------
 .../types/PersonMetadataCollection.java         | 20 -----
 .../astoriadefaultservice/types/Phone.java      | 23 -----
 .../astoriadefaultservice/types/Product.java    | 29 +------
 .../types/ProductCollection.java                | 20 -----
 .../types/ProductDetail.java                    | 29 +------
 .../types/ProductDetailCollection.java          | 20 -----
 .../types/ProductPageView.java                  | 29 +------
 .../types/ProductPageViewCollection.java        | 20 -----
 .../types/ProductPhoto.java                     | 28 +------
 .../types/ProductPhotoCollection.java           | 20 -----
 .../types/ProductPhotoKey.java                  | 27 +-----
 .../types/ProductReview.java                    | 28 +------
 .../types/ProductReviewCollection.java          | 20 -----
 .../types/ProductReviewKey.java                 | 27 +-----
 .../astoriadefaultservice/types/RSAToken.java   | 29 +------
 .../types/RSATokenCollection.java               | 20 -----
 .../types/SpecialEmployee.java                  | 29 +------
 .../types/SpecialEmployeeCollection.java        | 20 -----
 .../fit/proxy/v4/APIBasicDesignTestITCase.java  | 27 +++---
 .../olingo/fit/proxy/v4/AbstractTestITCase.java | 24 +++---
 .../olingo/fit/proxy/v4/AsyncTestITCase.java    | 20 +++--
 .../v4/BoundOperationInvokeTestITCase.java      | 28 ++++---
 .../fit/proxy/v4/DerivedTypeTestITCase.java     | 23 ++---
 .../fit/proxy/v4/EntityCreateTestITCase.java    | 38 +++++----
 .../fit/proxy/v4/EntityRetrieveTestITCase.java  | 39 +++++----
 .../fit/proxy/v4/EntitySetTestITCase.java       |  6 +-
 .../fit/proxy/v4/EntityUpdateTestITCase.java    | 30 +++----
 .../olingo/fit/proxy/v4/FilterTestITCase.java   | 20 +++--
 .../fit/proxy/v4/KeyAsSegmentTestITCase.java    |  6 +-
 .../fit/proxy/v4/MediaEntityTestITCase.java     | 20 ++---
 .../olingo/fit/proxy/v4/OpenTypeTestITCase.java | 24 +++---
 .../v4/OperationImportInvokeTestITCase.java     | 18 ++--
 .../olingo/fit/proxy/v4/PropertyTestITCase.java |  6 +-
 .../fit/proxy/v4/SingletonTestITCase.java       |  8 +-
 .../proxy/v4/demo/odatademo/Advertisements.java | 21 -----
 .../fit/proxy/v4/demo/odatademo/Categories.java | 21 -----
 .../proxy/v4/demo/odatademo/DemoService.java    | 24 +-----
 .../proxy/v4/demo/odatademo/PersonDetails.java  | 21 -----
 .../fit/proxy/v4/demo/odatademo/Persons.java    | 21 -----
 .../proxy/v4/demo/odatademo/ProductDetails.java | 21 -----
 .../fit/proxy/v4/demo/odatademo/Products.java   | 21 -----
 .../fit/proxy/v4/demo/odatademo/Suppliers.java  | 21 -----
 .../proxy/v4/demo/odatademo/types/Address.java  | 20 -----
 .../v4/demo/odatademo/types/Advertisement.java  | 29 +------
 .../types/AdvertisementCollection.java          | 20 -----
 .../proxy/v4/demo/odatademo/types/Category.java | 30 +------
 .../odatademo/types/CategoryCollection.java     | 20 -----
 .../proxy/v4/demo/odatademo/types/Customer.java | 29 +------
 .../odatademo/types/CustomerCollection.java     | 20 -----
 .../proxy/v4/demo/odatademo/types/Employee.java | 29 +------
 .../odatademo/types/EmployeeCollection.java     | 20 -----
 .../demo/odatademo/types/FeaturedProduct.java   | 29 +------
 .../types/FeaturedProductCollection.java        | 20 -----
 .../proxy/v4/demo/odatademo/types/Person.java   | 29 +------
 .../demo/odatademo/types/PersonCollection.java  | 20 -----
 .../v4/demo/odatademo/types/PersonDetail.java   | 29 +------
 .../odatademo/types/PersonDetailCollection.java | 20 -----
 .../proxy/v4/demo/odatademo/types/Product.java  | 29 +------
 .../demo/odatademo/types/ProductCollection.java | 20 -----
 .../v4/demo/odatademo/types/ProductDetail.java  | 29 +------
 .../types/ProductDetailCollection.java          | 20 -----
 .../proxy/v4/demo/odatademo/types/Supplier.java | 29 +------
 .../odatademo/types/SupplierCollection.java     | 20 -----
 .../opentypesservicev4/DefaultContainer.java    | 23 -----
 .../odata/services/opentypesservicev4/Row.java  | 21 -----
 .../services/opentypesservicev4/RowIndex.java   | 21 -----
 .../opentypesservicev4/types/AccountInfo.java   | 19 -----
 .../opentypesservicev4/types/Color.java         |  2 -
 .../types/ContactDetails.java                   | 20 -----
 .../opentypesservicev4/types/IndexedRow.java    | 30 +------
 .../types/IndexedRowCollection.java             | 20 -----
 .../services/opentypesservicev4/types/Row.java  | 30 +------
 .../opentypesservicev4/types/RowCollection.java | 20 -----
 .../opentypesservicev4/types/RowIndex.java      | 30 +------
 .../types/RowIndexCollection.java               | 20 -----
 .../services/odatawcfservice/Accounts.java      | 21 -----
 .../odata/services/odatawcfservice/Boss.java    | 21 -----
 .../odata/services/odatawcfservice/Company.java | 21 -----
 .../services/odatawcfservice/Customers.java     | 21 -----
 .../odatawcfservice/DefaultStoredPI.java        | 21 -----
 .../services/odatawcfservice/Departments.java   | 21 -----
 .../services/odatawcfservice/Employees.java     | 21 -----
 .../odatawcfservice/InMemoryEntities.java       | 24 +-----
 .../services/odatawcfservice/LabourUnion.java   | 21 -----
 .../services/odatawcfservice/OrderDetails.java  | 22 +----
 .../odata/services/odatawcfservice/Orders.java  | 21 -----
 .../odata/services/odatawcfservice/People.java  | 21 -----
 .../odatawcfservice/ProductDetails.java         | 23 +----
 .../odatawcfservice/ProductReviews.java         | 23 +----
 .../services/odatawcfservice/Products.java      | 21 -----
 .../services/odatawcfservice/PublicCompany.java | 21 -----
 .../services/odatawcfservice/StoredPIs.java     | 21 -----
 .../odatawcfservice/SubscriptionTemplates.java  | 21 -----
 .../services/odatawcfservice/VipCustomer.java   | 21 -----
 .../odatawcfservice/types/AccessLevel.java      |  2 -
 .../services/odatawcfservice/types/Account.java | 30 +------
 .../types/AccountCollection.java                | 20 -----
 .../odatawcfservice/types/AccountInfo.java      | 19 -----
 .../services/odatawcfservice/types/Address.java | 20 -----
 .../services/odatawcfservice/types/Asset.java   | 29 +------
 .../odatawcfservice/types/AssetCollection.java  | 20 -----
 .../services/odatawcfservice/types/Club.java    | 29 +------
 .../odatawcfservice/types/ClubCollection.java   | 20 -----
 .../services/odatawcfservice/types/Color.java   |  2 -
 .../services/odatawcfservice/types/Company.java | 30 +------
 .../odatawcfservice/types/CompanyAddress.java   | 20 -----
 .../odatawcfservice/types/CompanyCategory.java  |  2 -
 .../types/CompanyCollection.java                | 20 -----
 .../odatawcfservice/types/CreditCardPI.java     | 30 +------
 .../types/CreditCardPICollection.java           | 20 -----
 .../odatawcfservice/types/CreditRecord.java     | 29 +------
 .../types/CreditRecordCollection.java           | 20 -----
 .../odatawcfservice/types/Customer.java         | 29 +------
 .../types/CustomerCollection.java               | 20 -----
 .../odatawcfservice/types/Department.java       | 29 +------
 .../types/DepartmentCollection.java             | 20 -----
 .../odatawcfservice/types/Employee.java         | 29 +------
 .../types/EmployeeCollection.java               | 20 -----
 .../odatawcfservice/types/GiftCard.java         | 29 +------
 .../types/GiftCardCollection.java               | 20 -----
 .../odatawcfservice/types/HomeAddress.java      | 20 -----
 .../services/odatawcfservice/types/IsBoss.java  |  4 -
 .../odatawcfservice/types/LabourUnion.java      | 29 +------
 .../types/LabourUnionCollection.java            | 20 -----
 .../services/odatawcfservice/types/Order.java   | 29 +------
 .../odatawcfservice/types/OrderCollection.java  | 20 -----
 .../odatawcfservice/types/OrderDetail.java      | 28 +------
 .../types/OrderDetailCollection.java            | 20 -----
 .../odatawcfservice/types/OrderDetailKey.java   | 27 +-----
 .../types/PaymentInstrument.java                | 30 +------
 .../types/PaymentInstrumentCollection.java      | 20 -----
 .../services/odatawcfservice/types/Person.java  | 29 +------
 .../odatawcfservice/types/PersonCollection.java | 20 -----
 .../services/odatawcfservice/types/Product.java | 29 +------
 .../types/ProductCollection.java                | 17 ----
 .../odatawcfservice/types/ProductDetail.java    | 29 +------
 .../types/ProductDetailCollection.java          | 20 -----
 .../odatawcfservice/types/ProductDetailKey.java | 27 +-----
 .../odatawcfservice/types/ProductReview.java    | 28 +------
 .../types/ProductReviewCollection.java          | 20 -----
 .../odatawcfservice/types/ProductReviewKey.java | 27 +-----
 .../odatawcfservice/types/PublicCompany.java    | 31 +------
 .../types/PublicCompanyCollection.java          | 20 -----
 .../odatawcfservice/types/Statement.java        | 29 +------
 .../types/StatementCollection.java              | 20 -----
 .../odatawcfservice/types/StoredPI.java         | 29 +------
 .../types/StoredPICollection.java               | 20 -----
 .../odatawcfservice/types/Subscription.java     | 29 +------
 .../types/SubscriptionCollection.java           | 20 -----
 .../olingo/fit/tecsvc/client/BasicITCase.java   |  8 +-
 .../olingo/fit/tecsvc/http/BasicHttpITCase.java | 10 +--
 .../olingo/fit/tecsvc/http/PingITCase.java      | 10 +--
 .../olingo/fit/v3/AbstractTestITCase.java       | 34 ++++----
 .../fit/v3/ActionOverloadingTestITCase.java     | 12 +--
 .../apache/olingo/fit/v3/AsyncTestITCase.java   | 18 ++--
 .../apache/olingo/fit/v3/BatchTestITCase.java   | 22 ++---
 .../apache/olingo/fit/v3/CountTestITCase.java   |  8 +-
 .../olingo/fit/v3/EntityCreateTestITCase.java   | 22 ++---
 .../olingo/fit/v3/EntityRetrieveTestITCase.java | 16 ++--
 .../olingo/fit/v3/EntitySetTestITCase.java      | 14 ++--
 .../olingo/fit/v3/EntityUpdateTestITCase.java   | 14 ++--
 .../apache/olingo/fit/v3/ErrorTestITCase.java   | 18 ++--
 .../olingo/fit/v3/FilterFactoryTestITCase.java  |  6 +-
 .../apache/olingo/fit/v3/FilterTestITCase.java  |  6 +-
 .../apache/olingo/fit/v3/InvokeTestITCase.java  | 24 +++---
 .../olingo/fit/v3/KeyAsSegmentTestITCase.java   |  7 +-
 .../apache/olingo/fit/v3/LinkTestITCase.java    | 20 ++---
 .../olingo/fit/v3/MediaEntityTestITCase.java    | 12 +--
 .../olingo/fit/v3/MetadataTestITCase.java       |  4 +-
 .../olingo/fit/v3/OpenTypeTestITCase.java       | 14 ++--
 .../olingo/fit/v3/PrimitiveKeysTestITCase.java  | 12 +--
 .../fit/v3/PropertyRetrieveTestITCase.java      | 14 ++--
 .../olingo/fit/v3/PropertyTestITCase.java       | 14 ++--
 .../olingo/fit/v3/PropertyValueTestITCase.java  | 10 +--
 .../olingo/fit/v3/QueryOptionsTestITCase.java   | 16 ++--
 .../fit/v3/ServiceDocumentTestITCase.java       |  8 +-
 .../olingo/fit/v4/AbstractTestITCase.java       | 18 ++--
 .../apache/olingo/fit/v4/AsyncTestITCase.java   | 20 ++---
 .../olingo/fit/v4/AuthBatchTestITCase.java      |  8 +-
 .../apache/olingo/fit/v4/BatchTestITCase.java   | 30 +++----
 .../fit/v4/BoundOperationInvokeTestITCase.java  | 22 ++---
 .../olingo/fit/v4/ConformanceTestITCase.java    | 20 ++---
 .../apache/olingo/fit/v4/DeltaTestITCase.java   |  8 +-
 .../olingo/fit/v4/DerivedTypeTestITCase.java    | 12 +--
 .../olingo/fit/v4/EntityCreateTestITCase.java   | 12 +--
 .../olingo/fit/v4/EntityRetrieveTestITCase.java | 18 ++--
 .../olingo/fit/v4/EntitySetTestITCase.java      | 14 ++--
 .../olingo/fit/v4/EntityUpdateTestITCase.java   | 18 ++--
 .../olingo/fit/v4/ErrorResponseTestITCase.java  | 12 +--
 .../olingo/fit/v4/FilterFactoryTestITCase.java  |  4 +-
 .../fit/v4/JSONFormatConformanceTestITCase.java | 16 ++--
 .../olingo/fit/v4/KeyAsSegmentTestITCase.java   | 12 +--
 .../olingo/fit/v4/MediaEntityTestITCase.java    | 22 ++---
 .../olingo/fit/v4/MetadataTestITCase.java       | 10 +--
 .../apache/olingo/fit/v4/OAuth2TestITCase.java  |  9 +-
 .../olingo/fit/v4/OpenTypeTestITCase.java       | 16 ++--
 .../fit/v4/OperationImportInvokeTestITCase.java | 16 ++--
 .../olingo/fit/v4/PropertyTestITCase.java       | 10 +--
 .../olingo/fit/v4/PropertyValueTestITCase.java  | 10 +--
 .../olingo/fit/v4/QueryOptionsTestITCase.java   | 18 ++--
 .../fit/v4/ServiceDocumentTestITCase.java       |  8 +-
 .../olingo/fit/v4/SingletonTestITCase.java      | 14 ++--
 .../apache/olingo/client/api/Configuration.java |  4 +-
 .../api/communication/header/HeaderName.java    |  5 +-
 .../communication/header/ODataPreferences.java  |  5 +-
 .../request/ODataBasicRequest.java              |  4 +-
 .../request/ODataPayloadManager.java            |  3 +-
 .../api/communication/request/ODataRequest.java |  5 +-
 .../request/batch/ODataBatchResponseItem.java   |  3 +-
 .../request/cud/CommonCUDRequestFactory.java    |  9 +-
 .../request/cud/v3/CUDRequestFactory.java       |  3 +-
 .../request/cud/v4/CUDRequestFactory.java       |  3 +-
 .../invoke/EdmEnabledInvokeRequestFactory.java  |  5 +-
 .../request/invoke/InvokeRequestFactory.java    |  7 +-
 .../request/invoke/ODataInvokeRequest.java      |  4 +-
 .../request/invoke/ODataNoContent.java          |  3 +-
 .../retrieve/CommonRetrieveRequestFactory.java  |  5 +-
 .../request/retrieve/ODataPropertyRequest.java  |  1 -
 .../request/retrieve/XMLMetadataRequest.java    |  4 +-
 .../retrieve/v3/RetrieveRequestFactory.java     |  3 +-
 .../retrieve/v4/RetrieveRequestFactory.java     |  3 +-
 .../request/v4/AsyncRequestWrapper.java         |  3 +-
 .../response/ODataBatchResponse.java            |  3 +-
 .../communication/response/ODataResponse.java   |  7 +-
 .../response/v4/AsyncResponseWrapper.java       |  3 +-
 .../api/domain/ODataEntitySetIterator.java      | 18 ++--
 .../client/api/edm/xml/v3/Annotations.java      |  4 +-
 .../client/api/edm/xml/v3/Association.java      |  4 +-
 .../client/api/edm/xml/v3/AssociationSet.java   |  4 +-
 .../edm/xml/v3/ReferentialConstraintRole.java   |  4 +-
 .../olingo/client/api/edm/xml/v4/Action.java    |  4 +-
 .../client/api/edm/xml/v4/BindingTarget.java    |  4 +-
 .../api/edm/xml/v4/NavigationProperty.java      |  2 +-
 .../olingo/client/api/edm/xml/v4/Term.java      |  3 +-
 .../client/api/edm/xml/v4/TypeDefinition.java   |  4 +-
 .../client/api/edm/xml/v4/annotation/Apply.java |  3 +-
 .../api/edm/xml/v4/annotation/Record.java       |  3 +-
 .../client/api/http/HttpClientFactory.java      |  3 +-
 .../client/api/http/HttpUriRequestFactory.java  |  3 +-
 .../serialization/ClientODataDeserializer.java  |  4 +-
 .../api/serialization/CommonODataReader.java    |  6 +-
 .../client/api/serialization/ODataWriter.java   |  6 +-
 .../api/serialization/v3/ODataBinder.java       |  2 +-
 .../api/serialization/v3/ODataDeserializer.java |  4 +-
 .../api/serialization/v3/ODataReader.java       |  4 +-
 .../api/serialization/v4/ODataDeserializer.java |  4 +-
 .../api/serialization/v4/ODataReader.java       |  4 +-
 .../client/api/uri/v3/FilterArgFactory.java     |  2 +-
 .../client/api/uri/v4/FilterArgFactory.java     |  2 +-
 .../olingo/client/api/uri/v4/FilterFactory.java |  2 +-
 .../olingo/client/api/uri/v4/URIBuilder.java    |  5 +-
 .../olingo/client/core/ConfigurationImpl.java   | 10 +--
 .../communication/header/ODataHeadersImpl.java  |  5 +-
 .../request/AbstractODataBasicRequest.java      | 12 +--
 .../request/AbstractODataRequest.java           | 14 ++--
 .../request/AbstractODataStreamManager.java     | 11 +--
 .../request/AbstractODataStreamer.java          |  7 +-
 .../communication/request/AbstractRequest.java  |  4 +-
 .../request/batch/AbstractBatchManager.java     |  5 +-
 .../batch/AbstractODataBatchRequest.java        | 13 +--
 .../batch/AbstractODataBatchResponseItem.java   |  7 +-
 .../request/batch/ODataBatchUtilities.java      | 23 ++---
 .../request/batch/ODataChangesetImpl.java       |  3 +-
 .../batch/ODataChangesetResponseItem.java       |  8 +-
 .../request/batch/ODataSingleResponseItem.java  |  7 +-
 .../batch/v3/BatchRequestFactoryImpl.java       |  2 +-
 .../request/batch/v3/ODataBatchRequestImpl.java | 11 ++-
 .../batch/v4/BatchRequestFactoryImpl.java       |  2 +-
 .../request/batch/v4/ODataBatchRequestImpl.java |  9 +-
 .../request/cud/AbstractCUDRequestFactory.java  |  5 +-
 .../request/cud/ODataDeleteRequestImpl.java     |  6 +-
 .../cud/ODataEntityCreateRequestImpl.java       |  6 +-
 .../cud/ODataEntityUpdateRequestImpl.java       |  6 +-
 .../cud/ODataPropertyUpdateRequestImpl.java     |  6 +-
 .../cud/ODataValueUpdateRequestImpl.java        |  6 +-
 .../request/cud/v3/CUDRequestFactoryImpl.java   |  7 +-
 .../cud/v3/ODataLinkCreateRequestImpl.java      |  6 +-
 .../cud/v3/ODataLinkUpdateRequestImpl.java      |  6 +-
 .../request/cud/v4/CUDRequestFactoryImpl.java   |  5 +-
 .../AbstractEdmEnabledInvokeRequestFactory.java |  7 +-
 .../invoke/AbstractInvokeRequestFactory.java    |  5 +-
 .../invoke/AbstractODataInvokeRequest.java      | 12 +--
 .../v3/EdmEnabledInvokeRequestFactoryImpl.java  |  5 +-
 .../invoke/v3/InvokeRequestFactoryImpl.java     | 11 +--
 .../invoke/v3/ODataInvokeRequestImpl.java       |  8 +-
 .../v4/EdmEnabledInvokeRequestFactoryImpl.java  |  5 +-
 .../invoke/v4/InvokeRequestFactoryImpl.java     |  7 +-
 .../invoke/v4/ODataInvokeRequestImpl.java       | 10 +--
 .../retrieve/AbstractMetadataRequestImpl.java   |  3 +-
 .../retrieve/AbstractODataRetrieveRequest.java  |  5 +-
 .../AbstractRetrieveRequestFactory.java         |  7 +-
 .../retrieve/EdmMetadataRequestImpl.java        |  5 +-
 .../retrieve/ODataEntityRequestImpl.java        |  4 +-
 .../ODataEntitySetIteratorRequestImpl.java      |  4 +-
 .../retrieve/ODataEntitySetRequestImpl.java     |  4 +-
 .../request/retrieve/ODataMediaRequestImpl.java |  8 +-
 .../retrieve/ODataPropertyRequestImpl.java      |  6 +-
 .../request/retrieve/ODataRawRequestImpl.java   |  8 +-
 .../ODataServiceDocumentRequestImpl.java        |  4 +-
 .../request/retrieve/ODataValueRequestImpl.java |  4 +-
 .../v3/ODataLinkCollectionRequestImpl.java      | 12 +--
 .../retrieve/v3/RetrieveRequestFactoryImpl.java |  5 +-
 .../retrieve/v3/XMLMetadataRequestImpl.java     |  8 +-
 .../retrieve/v4/ODataDeltaRequestImpl.java      |  6 +-
 .../retrieve/v4/RetrieveRequestFactoryImpl.java |  3 +-
 .../retrieve/v4/XMLMetadataRequestImpl.java     |  8 +-
 .../AbstractODataStreamedEntityRequest.java     |  4 +-
 .../streamed/AbstractODataStreamedRequest.java  | 12 +--
 .../ODataMediaEntityCreateRequestImpl.java      |  8 +-
 .../ODataMediaEntityUpdateRequestImpl.java      |  8 +-
 .../streamed/ODataStreamUpdateRequestImpl.java  |  7 +-
 .../v4/AsyncBatchRequestWrapperImpl.java        |  5 +-
 .../request/v4/AsyncRequestWrapperImpl.java     |  9 +-
 .../response/AbstractODataResponse.java         | 21 ++---
 .../response/batch/ODataBatchErrorResponse.java |  5 +-
 .../batch/ODataBatchResponseManager.java        | 15 ++--
 .../response/v4/AsyncResponseImpl.java          |  5 +-
 .../data/JSONServiceDocumentDeserializer.java   | 19 ++---
 .../client/core/data/ServiceDocumentImpl.java   |  8 +-
 .../data/XMLServiceDocumentDeserializer.java    | 15 ++--
 .../edm/AbstractEdmServiceMetadataImpl.java     |  8 +-
 .../client/core/edm/EdmActionImportImpl.java    |  5 +-
 .../core/edm/EdmAnnotationHelperImpl.java       |  5 +-
 .../client/core/edm/EdmAnnotationImpl.java      |  7 +-
 .../client/core/edm/EdmAnnotationsImpl.java     |  5 +-
 .../client/core/edm/EdmBindingTargetImpl.java   |  6 +-
 .../olingo/client/core/edm/EdmClientImpl.java   | 17 ++--
 .../client/core/edm/EdmComplexTypeImpl.java     |  7 +-
 .../client/core/edm/EdmEntityContainerImpl.java | 10 +--
 .../client/core/edm/EdmEntityTypeImpl.java      | 10 +--
 .../olingo/client/core/edm/EdmEnumTypeImpl.java | 21 ++---
 .../client/core/edm/EdmFunctionImportImpl.java  |  6 +-
 .../olingo/client/core/edm/EdmMemberImpl.java   |  5 +-
 .../core/edm/EdmNavigationPropertyImpl.java     |  6 +-
 .../client/core/edm/EdmOperationImpl.java       |  6 +-
 .../client/core/edm/EdmOperationImportImpl.java |  5 +-
 .../client/core/edm/EdmParameterImpl.java       |  5 +-
 .../olingo/client/core/edm/EdmPropertyImpl.java |  5 +-
 .../core/edm/EdmReferentialConstraintImpl.java  |  3 +-
 .../olingo/client/core/edm/EdmSchemaImpl.java   |  9 +-
 .../core/edm/EdmStructuredTypeHelperImpl.java   |  8 +-
 .../olingo/client/core/edm/EdmTermImpl.java     |  5 +-
 .../client/core/edm/EdmTypeDefinitionImpl.java  |  3 +-
 .../core/edm/v3/EdmActionImportProxy.java       |  2 +-
 .../client/core/edm/v3/EdmEntitySetProxy.java   |  9 +-
 .../core/edm/v3/EdmFunctionImportProxy.java     |  4 +-
 .../core/edm/v3/EdmNavigationPropertyProxy.java |  7 +-
 .../client/core/edm/v3/EdmOperationProxy.java   | 10 +--
 .../core/edm/v3/EdmServiceMetadataImpl.java     |  8 +-
 .../core/edm/v4/EdmServiceMetadataImpl.java     |  6 +-
 .../EdmConstantAnnotationExpressionImpl.java    |  6 +-
 .../core/edm/v4/annotation/EdmRecordImpl.java   |  3 +-
 .../core/edm/xml/AbstractComplexType.java       |  1 -
 .../core/edm/xml/AbstractDataServices.java      |  1 -
 .../core/edm/xml/AbstractEdmDeserializer.java   |  5 +-
 .../client/core/edm/xml/AbstractEdmItem.java    |  8 +-
 .../client/core/edm/xml/AbstractEdmx.java       |  1 -
 .../core/edm/xml/AbstractEntityContainer.java   |  5 +-
 .../client/core/edm/xml/AbstractEntitySet.java  |  1 -
 .../client/core/edm/xml/AbstractEntityType.java |  1 -
 .../client/core/edm/xml/AbstractEnumType.java   |  5 +-
 .../client/core/edm/xml/AbstractMember.java     |  1 -
 .../edm/xml/AbstractNavigationProperty.java     |  1 -
 .../client/core/edm/xml/AbstractParameter.java  |  1 -
 .../client/core/edm/xml/AbstractProperty.java   |  1 -
 .../client/core/edm/xml/AbstractSchema.java     |  1 -
 .../core/edm/xml/AbstractXMLMetadata.java       |  8 +-
 .../core/edm/xml/ComplexTypeDeserializer.java   |  5 +-
 .../core/edm/xml/DataServicesDeserializer.java  |  3 +-
 .../client/core/edm/xml/EdmxDeserializer.java   |  5 +-
 .../edm/xml/EntityContainerDeserializer.java    |  5 +-
 .../client/core/edm/xml/EntityKeyImpl.java      |  5 +-
 .../core/edm/xml/EntitySetDeserializer.java     |  5 +-
 .../core/edm/xml/EntityTypeDeserializer.java    |  5 +-
 .../core/edm/xml/EnumTypeDeserializer.java      |  5 +-
 .../client/core/edm/xml/OnDeleteImpl.java       |  3 +-
 .../core/edm/xml/ParameterDeserializer.java     |  5 +-
 .../core/edm/xml/PropertyDeserializer.java      | 13 ++-
 .../client/core/edm/xml/PropertyRefImpl.java    |  1 -
 .../client/core/edm/xml/SchemaDeserializer.java |  5 +-
 .../edm/xml/v3/AnnotationsDeserializer.java     |  3 +-
 .../client/core/edm/xml/v3/AnnotationsImpl.java |  7 +-
 .../edm/xml/v3/AssociationDeserializer.java     |  3 +-
 .../core/edm/xml/v3/AssociationEndImpl.java     |  1 -
 .../client/core/edm/xml/v3/AssociationImpl.java |  7 +-
 .../edm/xml/v3/AssociationSetDeserializer.java  |  3 +-
 .../core/edm/xml/v3/AssociationSetEndImpl.java  |  1 -
 .../core/edm/xml/v3/AssociationSetImpl.java     |  7 +-
 .../client/core/edm/xml/v3/ComplexTypeImpl.java |  6 +-
 .../core/edm/xml/v3/DataServicesImpl.java       |  6 +-
 .../core/edm/xml/v3/EntityContainerImpl.java    |  6 +-
 .../client/core/edm/xml/v3/EntityTypeImpl.java  |  4 +-
 .../client/core/edm/xml/v3/EnumTypeImpl.java    |  6 +-
 .../edm/xml/v3/FunctionImportDeserializer.java  |  5 +-
 .../core/edm/xml/v3/FunctionImportImpl.java     |  5 +-
 .../core/edm/xml/v3/NavigationPropertyImpl.java |  1 -
 .../core/edm/xml/v3/PropertyValueImpl.java      |  5 +-
 .../edm/xml/v3/ReferentialConstraintImpl.java   |  1 -
 .../ReferentialConstraintRoleDeserializer.java  |  5 +-
 .../xml/v3/ReferentialConstraintRoleImpl.java   |  7 +-
 .../client/core/edm/xml/v3/SchemaImpl.java      |  6 +-
 .../edm/xml/v3/TypeAnnotationDeserializer.java  |  3 +-
 .../core/edm/xml/v3/TypeAnnotationImpl.java     |  7 +-
 .../client/core/edm/xml/v3/UsingImpl.java       |  1 -
 .../core/edm/xml/v3/ValueAnnotationImpl.java    |  5 +-
 .../client/core/edm/xml/v3/ValueTermImpl.java   |  1 -
 .../core/edm/xml/v4/ActionDeserializer.java     |  5 +-
 .../client/core/edm/xml/v4/ActionImpl.java      |  7 +-
 .../core/edm/xml/v4/ActionImportImpl.java       |  1 -
 .../core/edm/xml/v4/AnnotationDeserializer.java |  5 +-
 .../client/core/edm/xml/v4/AnnotationImpl.java  |  1 -
 .../edm/xml/v4/AnnotationsDeserializer.java     |  3 +-
 .../client/core/edm/xml/v4/AnnotationsImpl.java |  6 +-
 .../client/core/edm/xml/v4/ComplexTypeImpl.java |  6 +-
 .../core/edm/xml/v4/DataServicesImpl.java       |  6 +-
 .../olingo/client/core/edm/xml/v4/EdmxImpl.java |  6 +-
 .../client/core/edm/xml/v4/EntitySetImpl.java   |  6 +-
 .../client/core/edm/xml/v4/EntityTypeImpl.java  |  6 +-
 .../client/core/edm/xml/v4/EnumTypeImpl.java    |  5 +-
 .../core/edm/xml/v4/FunctionDeserializer.java   |  5 +-
 .../client/core/edm/xml/v4/FunctionImpl.java    |  1 -
 .../edm/xml/v4/FunctionImportDeserializer.java  |  5 +-
 .../core/edm/xml/v4/FunctionImportImpl.java     |  6 +-
 .../core/edm/xml/v4/IncludeAnnotationsImpl.java |  1 -
 .../client/core/edm/xml/v4/IncludeImpl.java     |  1 -
 .../xml/v4/NavigationPropertyBindingImpl.java   |  1 -
 .../xml/v4/NavigationPropertyDeserializer.java  |  8 +-
 .../core/edm/xml/v4/NavigationPropertyImpl.java |  7 +-
 .../client/core/edm/xml/v4/ParameterImpl.java   |  5 +-
 .../client/core/edm/xml/v4/PropertyImpl.java    |  6 +-
 .../core/edm/xml/v4/ReferenceDeserializer.java  |  3 +-
 .../client/core/edm/xml/v4/ReferenceImpl.java   |  7 +-
 .../edm/xml/v4/ReferentialConstraintImpl.java   |  1 -
 .../core/edm/xml/v4/ReturnTypeDeserializer.java |  5 +-
 .../client/core/edm/xml/v4/ReturnTypeImpl.java  |  1 -
 .../client/core/edm/xml/v4/SchemaImpl.java      | 12 +--
 .../core/edm/xml/v4/SingletonDeserializer.java  |  3 +-
 .../client/core/edm/xml/v4/SingletonImpl.java   |  5 +-
 .../core/edm/xml/v4/TermDeserializer.java       |  7 +-
 .../olingo/client/core/edm/xml/v4/TermImpl.java |  5 +-
 .../edm/xml/v4/TypeDefinitionDeserializer.java  |  5 +-
 .../core/edm/xml/v4/TypeDefinitionImpl.java     |  7 +-
 .../client/core/edm/xml/v4/XMLMetadataImpl.java |  4 +-
 ...tAnnotatableDynamicAnnotationExpression.java |  5 +-
 .../xml/v4/annotation/ApplyDeserializer.java    |  5 +-
 .../core/edm/xml/v4/annotation/ApplyImpl.java   |  5 +-
 .../edm/xml/v4/annotation/CastDeserializer.java |  7 +-
 .../core/edm/xml/v4/annotation/CastImpl.java    |  3 +-
 .../v4/annotation/CollectionDeserializer.java   |  3 +-
 .../edm/xml/v4/annotation/CollectionImpl.java   |  5 +-
 ...DynamicAnnotationExpressionDeserializer.java |  3 +-
 .../core/edm/xml/v4/annotation/IfImpl.java      |  2 +-
 .../edm/xml/v4/annotation/IsOfDeserializer.java |  7 +-
 .../core/edm/xml/v4/annotation/IsOfImpl.java    |  3 +-
 .../annotation/LabeledElementDeserializer.java  |  5 +-
 .../xml/v4/annotation/LabeledElementImpl.java   |  3 +-
 .../edm/xml/v4/annotation/NullDeserializer.java |  5 +-
 .../annotation/PropertyValueDeserializer.java   |  5 +-
 .../xml/v4/annotation/PropertyValueImpl.java    |  3 +-
 .../xml/v4/annotation/RecordDeserializer.java   |  5 +-
 .../core/edm/xml/v4/annotation/RecordImpl.java  |  5 +-
 .../xml/v4/annotation/UrlRefDeserializer.java   |  3 +-
 .../core/edm/xml/v4/annotation/UrlRefImpl.java  |  3 +-
 .../core/http/AbstractHttpClientFactory.java    |  5 +-
 .../AbstractOAuth2HttpUriRequestFactory.java    |  3 +-
 .../core/http/BasicAuthHttpClientFactory.java   |  4 +-
 .../core/http/DefaultHttpClientFactory.java     |  3 +-
 .../core/http/DefaultHttpUriRequestFactory.java |  4 +-
 .../olingo/client/core/http/HttpMerge.java      |  3 +-
 .../olingo/client/core/http/HttpPatch.java      |  3 +-
 .../core/http/NTLMAuthHttpClientFactory.java    |  4 +-
 .../http/ProxyWrapperHttpClientFactory.java     |  3 +-
 .../core/serialization/AbstractODataBinder.java | 10 +--
 .../AbstractODataDeserializer.java              | 25 +++---
 .../core/serialization/AbstractODataReader.java |  8 +-
 .../core/serialization/ODataWriterImpl.java     | 16 ++--
 .../serialization/v3/ODataDeserializerImpl.java |  7 +-
 .../core/serialization/v3/ODataReaderImpl.java  |  4 +-
 .../core/serialization/v4/ODataBinderImpl.java  |  6 +-
 .../serialization/v4/ODataDeserializerImpl.java |  7 +-
 .../core/serialization/v4/ODataReaderImpl.java  |  4 +-
 .../core/uri/AbstractFilterArgFactory.java      |  2 +-
 .../client/core/uri/AbstractFilterFactory.java  |  2 +-
 .../client/core/uri/AbstractURIBuilder.java     | 18 ++--
 .../olingo/client/core/uri/FilterFunction.java  |  2 +-
 .../apache/olingo/client/core/uri/URIUtils.java | 33 ++++----
 .../client/core/uri/v4/URIBuilderImpl.java      |  6 +-
 .../olingo/client/core/ODataClientTest.java     |  6 +-
 .../olingo/client/core/uri/URIEscapeTest.java   | 17 ++--
 .../client/core/uri/v3/FilterFactoryTest.java   |  5 +-
 .../client/core/uri/v3/URIBuilderTest.java      | 12 +--
 .../client/core/uri/v4/FilterFactoryTest.java   | 15 ++--
 .../client/core/uri/v4/URIBuilderTest.java      | 13 +--
 .../apache/olingo/client/core/v3/AtomTest.java  | 21 +++--
 .../olingo/client/core/v3/EntitySetTest.java    | 14 ++--
 .../olingo/client/core/v3/EntityTest.java       | 14 ++--
 .../apache/olingo/client/core/v3/ErrorTest.java |  6 +-
 .../apache/olingo/client/core/v3/JSONTest.java  | 17 ++--
 .../olingo/client/core/v3/MetadataTest.java     | 24 +++---
 .../client/core/v3/PrimitiveValueTest.java      | 25 +++---
 .../olingo/client/core/v3/PropertyTest.java     | 16 ++--
 .../client/core/v3/ServiceDocumentTest.java     |  5 +-
 .../apache/olingo/client/core/v4/AtomTest.java  | 17 ++--
 .../olingo/client/core/v4/EntitySetTest.java    | 16 ++--
 .../olingo/client/core/v4/EntityTest.java       | 20 ++---
 .../apache/olingo/client/core/v4/ErrorTest.java |  6 +-
 .../apache/olingo/client/core/v4/JSONTest.java  | 27 +++---
 .../olingo/client/core/v4/MetadataTest.java     | 10 +--
 .../client/core/v4/PrimitiveValueTest.java      |  9 +-
 .../olingo/client/core/v4/PropertyTest.java     | 14 ++--
 .../client/core/v4/ServiceDocumentTest.java     | 16 ++--
 .../olingo/commons/api/data/ContextURL.java     |  4 +-
 .../apache/olingo/commons/api/data/Entity.java  |  4 +-
 .../olingo/commons/api/data/Valuable.java       |  4 +-
 .../commons/api/domain/CommonODataEntity.java   |  4 +-
 .../api/domain/CommonODataObjectFactory.java    |  4 +-
 .../commons/api/domain/ODataInlineEntity.java   |  4 +-
 .../api/domain/ODataInlineEntitySet.java        |  4 +-
 .../olingo/commons/api/domain/ODataItem.java    |  6 +-
 .../olingo/commons/api/domain/ODataLink.java    |  4 +-
 .../commons/api/domain/ODataPrimitiveValue.java |  4 +-
 .../commons/api/domain/v3/ODataEntity.java      |  4 +-
 .../commons/api/domain/v3/ODataEntitySet.java   |  4 +-
 .../api/domain/v3/ODataObjectFactory.java       |  4 +-
 .../commons/api/domain/v4/ODataEntity.java      |  4 +-
 .../commons/api/domain/v4/ODataEntitySet.java   |  4 +-
 .../olingo/commons/api/domain/v4/ODataLink.java |  6 +-
 .../api/domain/v4/ODataObjectFactory.java       |  4 +-
 .../commons/api/edm/EdmPrimitiveTypeKind.java   |  4 +-
 .../commons/api/edm/EdmServiceMetadata.java     |  4 +-
 .../apache/olingo/commons/api/edm/EdmTerm.java  |  4 +-
 .../commons/api/edm/annotation/EdmApply.java    |  4 +-
 .../commons/api/edm/annotation/EdmRecord.java   |  4 +-
 .../api/edm/constants/ODataServiceVersion.java  |  4 +-
 .../olingo/commons/api/edm/geo/Geospatial.java  |  4 +-
 .../api/edm/geo/GeospatialCollection.java       |  4 +-
 .../olingo/commons/api/edm/geo/LineString.java  |  4 +-
 .../commons/api/edm/geo/MultiLineString.java    |  4 +-
 .../olingo/commons/api/edm/geo/MultiPoint.java  |  4 +-
 .../commons/api/edm/geo/MultiPolygon.java       |  4 +-
 .../olingo/commons/api/edm/geo/Polygon.java     |  4 +-
 .../olingo/commons/api/format/ODataFormat.java  |  4 +-
 .../api/serialization/ODataDeserializer.java    |  4 +-
 .../api/serialization/ODataSerializer.java      |  4 +-
 .../olingo/commons/api/data/ContextURLTest.java | 14 ++--
 .../commons/api/format/AcceptTypeTest.java      |  8 +-
 .../commons/api/format/ContentTypeTest.java     |  4 +-
 .../core/data/AbstractAnnotatedObject.java      |  6 +-
 .../commons/core/data/AbstractValuable.java     |  6 +-
 .../commons/core/data/DeletedEntityImpl.java    |  4 +-
 .../olingo/commons/core/data/DeltaLinkImpl.java |  4 +-
 .../olingo/commons/core/data/EntityImpl.java    |  8 +-
 .../olingo/commons/core/data/EntitySetImpl.java |  6 +-
 .../core/data/LinkedComplexValueImpl.java       |  6 +-
 .../core/data/v3/LinkCollectionImpl.java        |  6 +-
 .../olingo/commons/core/data/v4/DeltaImpl.java  |  6 +-
 .../domain/AbstractODataCollectionValue.java    |  8 +-
 .../core/domain/AbstractODataComplexValue.java  |  8 +-
 .../core/domain/AbstractODataEntity.java        |  8 +-
 .../core/domain/AbstractODataEntitySet.java     |  4 +-
 .../domain/AbstractODataPrimitiveValue.java     |  4 +-
 .../commons/core/domain/v3/ODataEntityImpl.java |  6 +-
 .../core/domain/v3/ODataEntitySetImpl.java      |  8 +-
 .../core/domain/v3/ODataObjectFactoryImpl.java  |  4 +-
 .../domain/v4/ODataCollectionValueImpl.java     |  8 +-
 .../core/domain/v4/ODataComplexValueImpl.java   | 10 +--
 .../core/domain/v4/ODataDeletedEntityImpl.java  |  4 +-
 .../commons/core/domain/v4/ODataDeltaImpl.java  |  8 +-
 .../core/domain/v4/ODataDeltaLinkImpl.java      |  8 +-
 .../commons/core/domain/v4/ODataEntityImpl.java |  8 +-
 .../core/domain/v4/ODataEntitySetImpl.java      |  8 +-
 .../core/domain/v4/ODataObjectFactoryImpl.java  |  4 +-
 .../core/domain/v4/ODataPropertyImpl.java       |  6 +-
 .../olingo/commons/core/edm/AbstractEdm.java    | 12 +--
 .../core/edm/AbstractEdmBindingTarget.java      |  4 +-
 .../core/edm/AbstractEdmEntityContainer.java    | 10 +--
 .../commons/core/edm/AbstractEdmEntityType.java | 10 +--
 .../commons/core/edm/AbstractEdmEnumType.java   | 12 +--
 .../commons/core/edm/AbstractEdmOperation.java  | 10 +--
 .../commons/core/edm/AbstractEdmSchema.java     |  6 +-
 .../core/edm/AbstractEdmStructuredType.java     |  8 +-
 .../core/edm/EdmActionImportInfoImpl.java       |  4 +-
 .../commons/core/edm/EdmEntitySetInfoImpl.java  |  4 +-
 .../core/edm/EdmFunctionImportInfoImpl.java     |  4 +-
 .../commons/core/edm/EdmSingletonInfoImpl.java  |  4 +-
 .../core/edm/EdmStructuredTypeHelper.java       |  4 +-
 .../olingo/commons/core/edm/FunctionMapKey.java |  6 +-
 ...mAnnotatableDynamicAnnotationExpression.java |  6 +-
 .../core/edm/annotation/EdmApplyImpl.java       |  4 +-
 .../core/edm/annotation/EdmCollectionImpl.java  |  4 +-
 .../primitivetype/AbstractGeospatialType.java   | 14 ++--
 .../commons/core/edm/primitivetype/EdmByte.java |  4 +-
 .../commons/core/edm/primitivetype/EdmDate.java |  4 +-
 .../core/edm/primitivetype/EdmDateTime.java     |  4 +-
 .../edm/primitivetype/EdmDateTimeOffset.java    |  4 +-
 .../core/edm/primitivetype/EdmDecimal.java      |  6 +-
 .../core/edm/primitivetype/EdmDouble.java       |  6 +-
 .../core/edm/primitivetype/EdmDuration.java     |  4 +-
 .../commons/core/edm/primitivetype/EdmGuid.java |  4 +-
 .../core/edm/primitivetype/EdmInt16.java        |  4 +-
 .../core/edm/primitivetype/EdmInt32.java        |  4 +-
 .../core/edm/primitivetype/EdmInt64.java        |  4 +-
 .../core/edm/primitivetype/EdmSByte.java        |  4 +-
 .../core/edm/primitivetype/EdmSingle.java       |  6 +-
 .../core/edm/primitivetype/EdmStream.java       |  4 +-
 .../core/edm/primitivetype/EdmString.java       |  4 +-
 .../core/edm/primitivetype/EdmTimeOfDay.java    |  4 +-
 .../core/serialization/AbstractAtomDealer.java  |  8 +-
 .../core/serialization/AtomDeserializer.java    | 32 ++++---
 .../serialization/AtomGeoValueDeserializer.java | 19 ++---
 .../serialization/AtomGeoValueSerializer.java   | 11 ++-
 .../core/serialization/AtomSerializer.java      | 18 ++--
 .../serialization/JsonDeltaDeserializer.java    | 17 ++--
 .../core/serialization/JsonDeserializer.java    | 37 ++++----
 .../serialization/JsonEntityDeserializer.java   | 29 ++++---
 .../serialization/JsonEntitySerializer.java     |  7 +-
 .../JsonEntitySetDeserializer.java              | 15 ++--
 .../serialization/JsonEntitySetSerializer.java  |  7 +-
 .../serialization/JsonGeoValueDeserializer.java | 11 ++-
 .../serialization/JsonGeoValueSerializer.java   |  5 +-
 .../JsonLinkCollectionDeserializer.java         | 17 ++--
 .../JsonODataErrorDeserializer.java             | 17 ++--
 .../JsonODataErrorDetailDeserializer.java       |  9 +-
 .../serialization/JsonPropertyDeserializer.java | 15 ++--
 .../serialization/JsonPropertySerializer.java   |  7 +-
 .../core/serialization/JsonSerializer.java      | 17 ++--
 .../apache/olingo/commons/core/DecoderTest.java |  4 +-
 .../apache/olingo/commons/core/EncoderTest.java |  4 +-
 .../commons/core/edm/ActionMapKeyTest.java      |  8 +-
 .../commons/core/edm/EdmImplCachingTest.java    | 26 +++---
 .../commons/core/edm/EdmImplCallCreateTest.java | 26 +++---
 .../commons/core/edm/FunctionMapKeyTest.java    |  8 +-
 .../primitivetype/CommonPrimitiveTypeTest.java  | 18 ++--
 .../core/edm/primitivetype/EdmBinaryTest.java   | 12 +--
 .../core/edm/primitivetype/EdmBooleanTest.java  |  4 +-
 .../core/edm/primitivetype/EdmByteTest.java     | 10 +--
 .../core/edm/primitivetype/EdmDateTest.java     |  8 +-
 .../primitivetype/EdmDateTimeOffsetTest.java    | 10 +--
 .../core/edm/primitivetype/EdmDecimalTest.java  | 10 +--
 .../core/edm/primitivetype/EdmDoubleTest.java   | 10 +--
 .../core/edm/primitivetype/EdmDurationTest.java |  8 +-
 .../core/edm/primitivetype/EdmGeoTest.java      | 14 ++--
 .../core/edm/primitivetype/EdmGuidTest.java     |  8 +-
 .../core/edm/primitivetype/EdmInt16Test.java    | 10 +--
 .../core/edm/primitivetype/EdmInt32Test.java    | 10 +--
 .../core/edm/primitivetype/EdmInt64Test.java    | 10 +--
 .../core/edm/primitivetype/EdmNullTest.java     |  4 +-
 .../core/edm/primitivetype/EdmSByteTest.java    | 10 +--
 .../core/edm/primitivetype/EdmSingleTest.java   | 10 +--
 .../core/edm/primitivetype/EdmStringTest.java   |  4 +-
 .../edm/primitivetype/EdmTimeOfDayTest.java     |  8 +-
 .../primitivetype/PrimitiveTypeBaseTest.java    |  6 +-
 .../core/edm/primitivetype/UInt7Test.java       |  6 +-
 .../olingo/server/api/ODataHttpHandler.java     |  4 +-
 .../apache/olingo/server/api/ODataRequest.java  |  4 +-
 .../server/api/edm/provider/Annotation.java     |  4 +-
 .../server/api/edm/provider/BindingTarget.java  |  4 +-
 .../server/api/edm/provider/ComplexType.java    |  4 +-
 .../server/api/edm/provider/EdmProvider.java    |  4 +-
 .../api/edm/provider/EntityContainer.java       |  4 +-
 .../server/api/edm/provider/EntitySet.java      |  4 +-
 .../server/api/edm/provider/EntityType.java     |  4 +-
 .../server/api/edm/provider/EnumType.java       |  4 +-
 .../api/edm/provider/NavigationProperty.java    |  4 +-
 .../server/api/edm/provider/Singleton.java      |  4 +-
 .../server/api/edm/provider/StructuredType.java |  4 +-
 .../olingo/server/api/edm/provider/Term.java    |  4 +-
 .../server/api/processor/DefaultProcessor.java  |  4 +-
 .../server/api/serializer/ODataSerializer.java  |  4 +-
 .../apache/olingo/server/api/uri/UriInfo.java   |  4 +-
 .../olingo/server/api/uri/UriInfoEntityId.java  |  4 +-
 .../olingo/server/api/uri/UriInfoResource.java  |  4 +-
 .../server/api/uri/UriResourceEntitySet.java    |  4 +-
 .../server/api/uri/UriResourceFunction.java     |  4 +-
 .../server/api/uri/UriResourceNavigation.java   |  4 +-
 .../uri/queryoption/expression/Enumeration.java |  4 +-
 .../expression/ExpressionVisitor.java           |  4 +-
 .../olingo/server/api/ODataRequestTest.java     |  4 +-
 .../olingo/server/core/ContentNegotiator.java   |  6 +-
 .../apache/olingo/server/core/ODataHandler.java |  6 +-
 .../server/core/ODataHttpHandlerImpl.java       | 21 +++--
 .../core/edm/provider/EdmBindingTargetImpl.java |  6 +-
 .../core/edm/provider/EdmComplexTypeImpl.java   |  6 +-
 .../edm/provider/EdmEntityContainerImpl.java    |  4 +-
 .../core/edm/provider/EdmEntitySetImpl.java     |  4 +-
 .../core/edm/provider/EdmEntityTypeImpl.java    |  8 +-
 .../core/edm/provider/EdmEnumTypeImpl.java      |  6 +-
 .../edm/provider/EdmFunctionImportImpl.java     |  4 +-
 .../server/core/edm/provider/EdmMemberImpl.java |  4 +-
 .../edm/provider/EdmNavigationPropertyImpl.java |  6 +-
 .../core/edm/provider/EdmOperationImpl.java     |  6 +-
 .../edm/provider/EdmOperationImportImpl.java    |  4 +-
 .../core/edm/provider/EdmParameterImpl.java     |  4 +-
 .../core/edm/provider/EdmPropertyImpl.java      |  4 +-
 .../core/edm/provider/EdmProviderImpl.java      | 14 ++--
 .../provider/EdmReferentialConstraintImpl.java  |  4 +-
 .../server/core/edm/provider/EdmSchemaImpl.java |  8 +-
 .../edm/provider/EdmServiceMetadataImpl.java    |  8 +-
 .../core/edm/provider/EdmSingletonImpl.java     |  4 +-
 .../provider/EdmStructuredTypeHelperImpl.java   |  6 +-
 .../edm/provider/EdmTypeDefinitionImpl.java     |  4 +-
 .../core/serializer/ODataXmlSerializerImpl.java | 11 ++-
 .../serializer/json/ODataErrorSerializer.java   |  7 +-
 .../serializer/json/ODataJsonSerializer.java    | 17 ++--
 .../json/ServiceDocumentJsonSerializer.java     |  7 +-
 .../xml/MetadataDocumentXmlSerializer.java      |  9 +-
 .../olingo/server/core/uri/UriInfoImpl.java     | 12 +--
 .../core/uri/UriResourceFunctionImpl.java       |  6 +-
 .../core/uri/UriResourceWithKeysImpl.java       |  6 +-
 .../uri/parser/CheckFullContextListener.java    |  4 +-
 .../olingo/server/core/uri/parser/Parser.java   |  6 +-
 .../server/core/uri/parser/UriContext.java      |  4 +-
 .../server/core/uri/parser/UriDecoder.java      |  6 +-
 .../core/uri/parser/UriParseTreeVisitor.java    |  6 +-
 .../core/uri/queryoption/ExpandItemImpl.java    |  4 +-
 .../core/uri/queryoption/ExpandOptionImpl.java  |  6 +-
 .../core/uri/queryoption/OrderByOptionImpl.java |  6 +-
 .../core/uri/queryoption/SelectOptionImpl.java  |  6 +-
 .../queryoption/expression/EnumerationImpl.java |  6 +-
 .../uri/queryoption/expression/MethodImpl.java  |  6 +-
 .../server/core/uri/validator/UriValidator.java |  6 +-
 .../server/core/ContentNegotiatorTest.java      | 22 ++---
 .../server/core/ODataHttpHandlerImplTest.java   | 14 ++--
 .../core/edm/provider/EdmActionImplTest.java    | 24 +++---
 .../edm/provider/EdmActionImportImplTest.java   | 12 +--
 .../edm/provider/EdmComplexTypeImplTest.java    | 22 ++---
 .../provider/EdmEntityContainerImplTest.java    | 22 ++---
 .../core/edm/provider/EdmEntitySetImplTest.java | 14 ++--
 .../edm/provider/EdmEntityTypeImplTest.java     | 22 ++---
 .../server/core/edm/provider/EdmEnumTest.java   | 20 ++---
 .../core/edm/provider/EdmFunctionImplTest.java  | 14 ++--
 .../edm/provider/EdmFunctionImportImplTest.java | 18 ++--
 .../edm/provider/EdmKeyPropertyRefImplTest.java | 14 ++--
 .../core/edm/provider/EdmMemberImplTest.java    |  6 +-
 .../core/edm/provider/EdmNamedImplTest.java     |  4 +-
 .../provider/EdmNavigationPropertyImplTest.java | 24 +++---
 .../core/edm/provider/EdmParameterImplTest.java | 12 +--
 .../core/edm/provider/EdmPropertyImplTest.java  | 16 ++--
 .../EdmProviderImplOverloadingTest.java         | 24 +++---
 .../core/edm/provider/EdmProviderImplTest.java  | 24 +++---
 .../edm/provider/EdmReturnTypeImplTest.java     | 14 ++--
 .../core/edm/provider/EdmSchemaImplTest.java    | 18 ++--
 .../provider/EdmServiceMetadataImplTest.java    | 16 ++--
 .../core/edm/provider/EdmSingletonImplTest.java | 14 ++--
 .../edm/provider/EdmTypeDefinitionImplTest.java | 10 +--
 .../core/edm/provider/EdmTypeImplTest.java      |  4 +-
 .../edm/provider/PrimitiveTypeBaseTest.java     |  6 +-
 .../json/ODataErrorSerializerTest.java          | 19 ++---
 .../olingo/server/tecsvc/TechnicalServlet.java  | 15 ++--
 .../olingo/server/tecsvc/data/DataProvider.java | 20 ++---
 .../tecsvc/processor/TechnicalProcessor.java    |  6 +-
 .../server/tecsvc/provider/ActionProvider.java  |  6 +-
 .../tecsvc/provider/ComplexTypeProvider.java    |  4 +-
 .../tecsvc/provider/ContainerProvider.java      |  8 +-
 .../server/tecsvc/provider/EdmTechProvider.java |  6 +-
 .../tecsvc/provider/EntityTypeProvider.java     |  4 +-
 .../tecsvc/provider/EnumTypeProvider.java       |  4 +-
 .../tecsvc/provider/FunctionProvider.java       |  8 +-
 .../server/tecsvc/provider/SchemaProvider.java  |  6 +-
 .../tecsvc/data/JsonDataProviderTest.java       |  6 +-
 .../olingo/server/core/ODataHandlerTest.java    | 14 ++--
 .../json/ODataJsonSerializerTest.java           |  6 +-
 .../serializer/json/ServiceDocumentTest.java    | 20 ++---
 .../serializer/xml/MetadataDocumentTest.java    | 18 ++--
 .../olingo/server/core/uri/RawUriTest.java      | 10 +--
 .../olingo/server/core/uri/UriInfoImplTest.java | 12 +--
 .../server/core/uri/UriResourceImplTest.java    | 14 ++--
 .../core/uri/antlr/TestFullResourcePath.java    |  6 +-
 .../core/uri/antlr/TestUriParserImpl.java       |  8 +-
 .../core/uri/queryoption/QueryOptionTest.java   | 10 +--
 .../queryoption/expression/ExpressionTest.java  | 10 +--
 .../core/uri/testutil/EdmTechTestProvider.java  |  6 +-
 .../core/uri/testutil/ExpandValidator.java      |  6 +-
 .../core/uri/testutil/FilterTreeToText.java     |  4 +-
 .../core/uri/testutil/FilterValidator.java      | 10 +--
 .../core/uri/testutil/ParseTreeToText.java      |  6 +-
 .../core/uri/testutil/ParserValidator.java      |  6 +-
 .../core/uri/testutil/ResourceValidator.java    | 12 +--
 .../core/uri/testutil/TestErrorLogger.java      |  8 +-
 .../core/uri/testutil/TestUriValidator.java     | 10 +--
 .../core/uri/testutil/TokenValidator.java       |  8 +-
 .../core/uri/validator/UriValidatorTest.java    |  8 +-
 1107 files changed, 3701 insertions(+), 11714 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/ext/client-core-android/src/main/java/org/apache/olingo/client/core/android/http/AndroidHttpClientFactory.java
----------------------------------------------------------------------
diff --git a/ext/client-core-android/src/main/java/org/apache/olingo/client/core/android/http/AndroidHttpClientFactory.java b/ext/client-core-android/src/main/java/org/apache/olingo/client/core/android/http/AndroidHttpClientFactory.java
index b6605e7..c11a38f 100644
--- a/ext/client-core-android/src/main/java/org/apache/olingo/client/core/android/http/AndroidHttpClientFactory.java
+++ b/ext/client-core-android/src/main/java/org/apache/olingo/client/core/android/http/AndroidHttpClientFactory.java
@@ -19,11 +19,12 @@
 package org.apache.olingo.client.core.android.http;
 
 import android.net.http.AndroidHttpClient;
-import java.net.URI;
 import org.apache.http.client.HttpClient;
 import org.apache.olingo.client.api.http.HttpMethod;
 import org.apache.olingo.client.core.http.AbstractHttpClientFactory;
 
+import java.net.URI;
+
 public class AndroidHttpClientFactory extends AbstractHttpClientFactory {
 
     private static final long serialVersionUID = -5224104561624556177L;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/Service.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/Service.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/Service.java
index 3611090..e20ab40 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/Service.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/Service.java
@@ -18,10 +18,6 @@
  */
 package org.apache.olingo.ext.proxy;
 
-import java.lang.reflect.Proxy;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
 import org.apache.olingo.client.api.CommonEdmEnabledODataClient;
 import org.apache.olingo.client.core.ODataClientFactory;
 import org.apache.olingo.commons.api.format.ODataFormat;
@@ -31,6 +27,10 @@ import org.apache.olingo.ext.proxy.commons.NonTransactionalPersistenceManagerImp
 import org.apache.olingo.ext.proxy.commons.TransactionalPersistenceManagerImpl;
 import org.apache.olingo.ext.proxy.context.Context;
 
+import java.lang.reflect.Proxy;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 /**
  * Entry point for proxy mode, gives access to entity container instances.
  *

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/AbstractEntityKey.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/AbstractEntityKey.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/AbstractEntityKey.java
index 8740d07..9c2494a 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/AbstractEntityKey.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/AbstractEntityKey.java
@@ -18,12 +18,13 @@
  */
 package org.apache.olingo.ext.proxy.api;
 
-import java.io.Serializable;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.io.Serializable;
+
 public abstract class AbstractEntityKey implements Serializable {
 
   private static final long serialVersionUID = 1662634743346775238L;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/AsyncCall.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/AsyncCall.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/AsyncCall.java
index eb05a4e..11c08e7 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/AsyncCall.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/AsyncCall.java
@@ -18,12 +18,13 @@
  */
 package org.apache.olingo.ext.proxy.api;
 
+import org.apache.olingo.client.api.Configuration;
+
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import org.apache.olingo.client.api.Configuration;
 
 public abstract class AsyncCall<V> implements Future<V> {
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/Search.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/Search.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/Search.java
index a4efc22..a03ed89 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/Search.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/Search.java
@@ -18,9 +18,10 @@
  */
 package org.apache.olingo.ext.proxy.api;
 
-import java.io.Serializable;
 import org.apache.olingo.client.api.uri.v4.URISearch;
 
+import java.io.Serializable;
+
 /**
  * Interface used to control search execution.
  *

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/EnumType.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/EnumType.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/EnumType.java
index 51afe79..590e562 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/EnumType.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/EnumType.java
@@ -18,11 +18,12 @@
  */
 package org.apache.olingo.ext.proxy.api.annotations;
 
+import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
 
 /**
  * Mark Java enum as EDM enum type.

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/Operation.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/Operation.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/Operation.java
index ad5a148..66b7b30 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/Operation.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/Operation.java
@@ -18,11 +18,12 @@
  */
 package org.apache.olingo.ext.proxy.api.annotations;
 
+import org.apache.olingo.ext.proxy.api.OperationType;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import org.apache.olingo.ext.proxy.api.OperationType;
 
 /**
  * Mark method as EDM function import.

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/Property.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/Property.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/Property.java
index 86da393..5b6a0a0 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/Property.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/Property.java
@@ -18,13 +18,14 @@
  */
 package org.apache.olingo.ext.proxy.api.annotations;
 
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.client.api.edm.StoreGeneratedPattern;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.client.api.edm.StoreGeneratedPattern;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
 
 /**
  * Bind POJO field to EDM property.

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java
index 5120b18..edf0eb6 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java
@@ -18,11 +18,6 @@
  */
 package org.apache.olingo.ext.proxy.commons;
 
-import java.lang.reflect.Proxy;
-import java.lang.reflect.Type;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
 import org.apache.commons.lang3.tuple.ImmutableTriple;
 import org.apache.commons.lang3.tuple.Triple;
 import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
@@ -42,6 +37,12 @@ import org.apache.olingo.ext.proxy.api.Sort;
 import org.apache.olingo.ext.proxy.api.StructuredType;
 import org.apache.olingo.ext.proxy.utils.ClassUtils;
 
+import java.lang.reflect.Proxy;
+import java.lang.reflect.Type;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
 public abstract class AbstractEntityCollectionInvocationHandler<
         T extends StructuredType, EC extends AbstractEntityCollection<T>>
         extends AbstractInvocationHandler {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java
index 83f53b9..d06bfcd 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java
@@ -18,17 +18,6 @@
  */
 package org.apache.olingo.ext.proxy.commons;
 
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Proxy;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
@@ -56,6 +45,18 @@ import org.apache.olingo.ext.proxy.context.Context;
 import org.apache.olingo.ext.proxy.utils.ClassUtils;
 import org.apache.olingo.ext.proxy.utils.CoreUtils;
 
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Proxy;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
 abstract class AbstractInvocationHandler implements InvocationHandler {
 
   private static final long serialVersionUID = 358520026931462958L;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java
index e68bfc1..50b1b54 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java
@@ -18,17 +18,6 @@
  */
 package org.apache.olingo.ext.proxy.commons;
 
-import java.io.InputStream;
-import java.lang.reflect.Proxy;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.olingo.client.api.communication.header.ODataPreferences;
 import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest;
@@ -52,6 +41,17 @@ import org.apache.olingo.ext.proxy.utils.CoreUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.InputStream;
+import java.lang.reflect.Proxy;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 abstract class AbstractPersistenceManager implements PersistenceManager {
 
   /**

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java
index b5204cf..b4b58d7 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java
@@ -18,16 +18,6 @@
  */
 package org.apache.olingo.ext.proxy.commons;
 
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Proxy;
-import java.lang.reflect.Type;
-import java.net.URI;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
 import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
@@ -48,6 +38,17 @@ import org.apache.olingo.ext.proxy.utils.ClassUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Proxy;
+import java.lang.reflect.Type;
+import java.net.URI;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 public abstract class AbstractStructuredInvocationHandler extends AbstractInvocationHandler {
 
   private static final long serialVersionUID = 2629912294765040037L;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatableInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatableInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatableInvocationHandler.java
index 890603a..5a36dd9 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatableInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatableInvocationHandler.java
@@ -18,14 +18,6 @@
  */
 package org.apache.olingo.ext.proxy.commons;
 
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import org.apache.olingo.commons.api.domain.v4.ODataAnnotation;
 import org.apache.olingo.commons.api.domain.v4.ODataEntity;
 import org.apache.olingo.commons.api.domain.v4.ODataLinkedComplexValue;
@@ -36,6 +28,15 @@ import org.apache.olingo.ext.proxy.api.annotations.Term;
 import org.apache.olingo.ext.proxy.context.AttachedEntityStatus;
 import org.apache.olingo.ext.proxy.utils.CoreUtils;
 
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public class AnnotatableInvocationHandler extends AbstractInvocationHandler implements Annotatable {
 
   private static final long serialVersionUID = 3111228269617223332L;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatationsInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatationsInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatationsInvocationHandler.java
index e009f6a..f87a0a5 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatationsInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatationsInvocationHandler.java
@@ -18,12 +18,13 @@
  */
 package org.apache.olingo.ext.proxy.commons;
 
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
 import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
 import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
 import org.apache.olingo.ext.proxy.utils.ClassUtils;
 
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
 public class AnnotatationsInvocationHandler extends AbstractInvocationHandler {
 
   private static final long serialVersionUID = -1993362719908718985L;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexFactoryInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexFactoryInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexFactoryInvocationHandler.java
index f17f760..be6d446 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexFactoryInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexFactoryInvocationHandler.java
@@ -18,12 +18,13 @@
  */
 package org.apache.olingo.ext.proxy.commons;
 
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
 import org.apache.olingo.ext.proxy.api.OperationExecutor;
 import org.apache.olingo.ext.proxy.api.annotations.Property;
 import org.apache.olingo.ext.proxy.utils.ClassUtils;
 
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
 class ComplexFactoryInvocationHandler extends AbstractInvocationHandler implements OperationExecutor {
 
   private static final long serialVersionUID = 2629912294765040027L;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java
index 4d1e61f..8d1c827 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java
@@ -18,13 +18,6 @@
  */
 package org.apache.olingo.ext.proxy.commons;
 
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.olingo.client.api.CommonEdmEnabledODataClient;
@@ -41,6 +34,14 @@ import org.apache.olingo.ext.proxy.context.AttachedEntityStatus;
 import org.apache.olingo.ext.proxy.utils.ClassUtils;
 import org.apache.olingo.ext.proxy.utils.CoreUtils;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
 public class ComplexInvocationHandler extends AbstractStructuredInvocationHandler {
 
   private static Pair<ODataComplexValue<? extends CommonODataProperty>, Class<?>> init(