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

[14/14] git commit: White noise: ASF license header

White noise: ASF license header


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

Branch: refs/heads/olingo169
Commit: dabcb44db5da977e709929047b388da86a490dc3
Parents: e225173
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Feb 18 15:00:16 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Feb 18 15:00:16 2014 +0100

----------------------------------------------------------------------
 .../olingo/odata4/client/api/ODataConsumer.java | 18 +++++++++---------
 .../api/deserializer/AnnotationProperty.java    | 18 +++++++++---------
 .../client/api/deserializer/ComplexValue.java   | 18 +++++++++---------
 .../api/deserializer/ConsumerException.java     | 18 +++++++++---------
 .../odata4/client/api/deserializer/Entity.java  | 18 +++++++++---------
 .../client/api/deserializer/EntitySet.java      | 18 +++++++++---------
 .../api/deserializer/NavigationProperty.java    | 18 +++++++++---------
 .../client/api/deserializer/Property.java       | 18 +++++++++---------
 .../odata4/client/api/deserializer/Reader.java  | 18 +++++++++---------
 .../api/deserializer/StructuralProperty.java    | 18 +++++++++---------
 .../odata4/client/api/deserializer/Value.java   | 18 +++++++++---------
 .../odata4/client/core/ODataConsumerImpl.java   | 18 +++++++++---------
 .../deserializer/AnnotationPropertyImpl.java    | 18 +++++++++---------
 .../core/deserializer/ComplexValueImpl.java     | 18 +++++++++---------
 .../client/core/deserializer/EntityImpl.java    | 18 +++++++++---------
 .../core/deserializer/EntitySetBuilder.java     | 18 +++++++++---------
 .../client/core/deserializer/EntitySetImpl.java | 18 +++++++++---------
 .../client/core/deserializer/JsonReader.java    | 18 +++++++++---------
 .../deserializer/NavigationPropertyImpl.java    | 18 +++++++++---------
 .../core/deserializer/PrimitiveValue.java       | 18 +++++++++---------
 .../core/deserializer/PropertyCollection.java   | 18 +++++++++---------
 .../deserializer/PropertyCollectionBuilder.java | 18 +++++++++---------
 .../deserializer/StructuralPropertyImpl.java    | 18 +++++++++---------
 .../odata4/client/core/ODataConsumerTest.java   | 18 +++++++++---------
 .../deserializer/JsonReaderPerformance.java     | 18 +++++++++---------
 .../core/deserializer/JsonReaderTest.java       | 18 +++++++++---------
 .../client/core/testutil/StringHelper.java      | 18 +++++++++---------
 odata4-lib/odata4-commons-api/pom.xml           |  3 +++
 .../olingo/odata4/commons/api/edm/Edm.java      |  2 +-
 .../odata4/commons/api/edm/EdmAction.java       |  2 +-
 .../odata4/commons/api/edm/EdmActionImport.java |  2 +-
 .../odata4/commons/api/edm/EdmAnnotatable.java  |  2 +-
 .../odata4/commons/api/edm/EdmAnnotations.java  |  2 +-
 .../commons/api/edm/EdmBindingTarget.java       |  2 +-
 .../odata4/commons/api/edm/EdmComplexType.java  |  2 +-
 .../odata4/commons/api/edm/EdmElement.java      |  2 +-
 .../commons/api/edm/EdmEntityContainer.java     |  2 +-
 .../odata4/commons/api/edm/EdmEntitySet.java    |  2 +-
 .../commons/api/edm/EdmEntitySetInfo.java       |  2 +-
 .../odata4/commons/api/edm/EdmEntityType.java   |  2 +-
 .../odata4/commons/api/edm/EdmEnumType.java     |  2 +-
 .../odata4/commons/api/edm/EdmException.java    |  2 +-
 .../odata4/commons/api/edm/EdmFunction.java     |  2 +-
 .../commons/api/edm/EdmFunctionImport.java      |  2 +-
 .../commons/api/edm/EdmFunctionImportInfo.java  |  2 +-
 .../commons/api/edm/EdmKeyPropertyRef.java      |  2 +-
 .../odata4/commons/api/edm/EdmMappable.java     |  2 +-
 .../odata4/commons/api/edm/EdmMapping.java      |  2 +-
 .../odata4/commons/api/edm/EdmMember.java       |  2 +-
 .../olingo/odata4/commons/api/edm/EdmNamed.java |  2 +-
 .../commons/api/edm/EdmNavigationProperty.java  |  2 +-
 .../odata4/commons/api/edm/EdmOperation.java    |  2 +-
 .../commons/api/edm/EdmOperationImport.java     |  2 +-
 .../odata4/commons/api/edm/EdmParameter.java    |  2 +-
 .../commons/api/edm/EdmPrimitiveType.java       |  2 +-
 .../api/edm/EdmPrimitiveTypeException.java      |  2 +-
 .../odata4/commons/api/edm/EdmProperty.java     |  2 +-
 .../odata4/commons/api/edm/EdmReturnType.java   |  2 +-
 .../commons/api/edm/EdmServiceMetadata.java     |  2 +-
 .../odata4/commons/api/edm/EdmSingleton.java    |  2 +-
 .../commons/api/edm/EdmSingletonInfo.java       |  2 +-
 .../commons/api/edm/EdmStructuralType.java      |  2 +-
 .../olingo/odata4/commons/api/edm/EdmTerm.java  |  2 +-
 .../olingo/odata4/commons/api/edm/EdmType.java  |  2 +-
 .../commons/api/edm/EdmTypeDefinition.java      |  2 +-
 .../olingo/odata4/commons/api/edm/EdmTyped.java |  2 +-
 .../commons/api/edm/constants/EdmOnDelete.java  |  2 +-
 .../api/edm/constants/EdmTargetPath.java        |  2 +-
 .../commons/api/edm/constants/EdmTypeKind.java  |  2 +-
 .../api/edm/constants/ODataServiceVersion.java  |  2 +-
 .../odata4/commons/api/edm/package-info.java    | 13 +------------
 .../odata4/commons/api/edm/provider/Action.java |  2 +-
 .../commons/api/edm/provider/ActionImport.java  |  2 +-
 .../commons/api/edm/provider/AliasInfo.java     |  2 +-
 .../commons/api/edm/provider/Annotation.java    |  2 +-
 .../commons/api/edm/provider/BindingTarget.java |  2 +-
 .../commons/api/edm/provider/ComplexType.java   |  2 +-
 .../commons/api/edm/provider/EdmProvider.java   |  2 +-
 .../api/edm/provider/EntityContainer.java       |  2 +-
 .../api/edm/provider/EntityContainerInfo.java   |  2 +-
 .../commons/api/edm/provider/EntitySet.java     |  2 +-
 .../commons/api/edm/provider/EntitySetPath.java |  2 +-
 .../commons/api/edm/provider/EntityType.java    |  2 +-
 .../commons/api/edm/provider/EnumMember.java    |  2 +-
 .../commons/api/edm/provider/EnumType.java      |  2 +-
 .../commons/api/edm/provider/Expression.java    |  2 +-
 .../api/edm/provider/FullQualifiedName.java     |  2 +-
 .../commons/api/edm/provider/Function.java      |  2 +-
 .../api/edm/provider/FunctionImport.java        |  2 +-
 .../commons/api/edm/provider/Mapping.java       |  2 +-
 .../api/edm/provider/NavigationProperty.java    |  2 +-
 .../edm/provider/NavigationPropertyBinding.java |  2 +-
 .../commons/api/edm/provider/Operation.java     |  2 +-
 .../api/edm/provider/OperationImport.java       |  2 +-
 .../commons/api/edm/provider/Parameter.java     |  2 +-
 .../commons/api/edm/provider/Property.java      |  2 +-
 .../commons/api/edm/provider/PropertyRef.java   |  2 +-
 .../api/edm/provider/ReferentialConstraint.java |  2 +-
 .../commons/api/edm/provider/ReturnType.java    |  2 +-
 .../odata4/commons/api/edm/provider/Schema.java |  2 +-
 .../commons/api/edm/provider/Singleton.java     |  2 +-
 .../api/edm/provider/StructuralType.java        |  2 +-
 .../odata4/commons/api/edm/provider/Target.java |  2 +-
 .../odata4/commons/api/edm/provider/Term.java   |  2 +-
 .../api/edm/provider/TypeDefinition.java        |  2 +-
 .../exception/ODataApplicationException.java    |  2 +-
 .../commons/api/exception/ODataException.java   |  2 +-
 .../exception/ODataNotImplementedException.java |  2 +-
 .../commons/core/ODataCommonsCoreImpl.java      | 18 +++++++++---------
 .../odata4/commons/core/edm/ActionMapKey.java   | 18 +++++++++---------
 .../olingo/odata4/commons/core/edm/EdmImpl.java | 18 +++++++++---------
 .../odata4/commons/core/edm/FunctionMapKey.java | 18 +++++++++---------
 .../primitivetype/AbstractPrimitiveType.java    | 18 +++++++++---------
 .../core/edm/primitivetype/EdmBinary.java       | 18 +++++++++---------
 .../core/edm/primitivetype/EdmBoolean.java      | 18 +++++++++---------
 .../commons/core/edm/primitivetype/EdmByte.java | 18 +++++++++---------
 .../commons/core/edm/primitivetype/EdmDate.java | 18 +++++++++---------
 .../edm/primitivetype/EdmDateTimeOffset.java    | 18 +++++++++---------
 .../core/edm/primitivetype/EdmDecimal.java      | 18 +++++++++---------
 .../core/edm/primitivetype/EdmDouble.java       | 18 +++++++++---------
 .../core/edm/primitivetype/EdmDuration.java     | 18 +++++++++---------
 .../commons/core/edm/primitivetype/EdmGuid.java | 18 +++++++++---------
 .../core/edm/primitivetype/EdmInt16.java        | 18 +++++++++---------
 .../core/edm/primitivetype/EdmInt32.java        | 18 +++++++++---------
 .../core/edm/primitivetype/EdmInt64.java        | 18 +++++++++---------
 .../commons/core/edm/primitivetype/EdmNull.java | 18 +++++++++---------
 .../edm/primitivetype/EdmPrimitiveTypeKind.java | 18 +++++++++---------
 .../core/edm/primitivetype/EdmSByte.java        | 18 +++++++++---------
 .../core/edm/primitivetype/EdmSingle.java       | 18 +++++++++---------
 .../core/edm/primitivetype/EdmString.java       | 18 +++++++++---------
 .../core/edm/primitivetype/EdmTimeOfDay.java    | 18 +++++++++---------
 .../primitivetype/SingletonPrimitiveType.java   | 18 +++++++++---------
 .../commons/core/edm/primitivetype/Uint7.java   | 18 +++++++++---------
 .../core/edm/provider/EdmActionImpl.java        | 18 +++++++++---------
 .../core/edm/provider/EdmActionImportImpl.java  | 18 +++++++++---------
 .../core/edm/provider/EdmBindingTargetImpl.java | 18 +++++++++---------
 .../core/edm/provider/EdmComplexTypeImpl.java   | 18 +++++++++---------
 .../core/edm/provider/EdmElementImpl.java       | 18 +++++++++---------
 .../edm/provider/EdmEntityContainerImpl.java    | 18 +++++++++---------
 .../core/edm/provider/EdmEntitySetImpl.java     | 18 +++++++++---------
 .../core/edm/provider/EdmEntitySetInfoImpl.java | 18 +++++++++---------
 .../core/edm/provider/EdmEntityTypeImpl.java    | 18 +++++++++---------
 .../commons/core/edm/provider/EdmEnumImpl.java  | 18 +++++++++---------
 .../core/edm/provider/EdmFunctionImpl.java      | 18 +++++++++---------
 .../edm/provider/EdmFunctionImportImpl.java     | 18 +++++++++---------
 .../edm/provider/EdmFunctionImportInfoImpl.java | 18 +++++++++---------
 .../edm/provider/EdmKeyPropertyRefImpl.java     | 18 +++++++++---------
 .../core/edm/provider/EdmMemberImpl.java        | 18 +++++++++---------
 .../commons/core/edm/provider/EdmNamedImpl.java | 18 +++++++++---------
 .../edm/provider/EdmNavigationPropertyImpl.java | 18 +++++++++---------
 .../core/edm/provider/EdmOperationImpl.java     | 18 +++++++++---------
 .../edm/provider/EdmOperationImportImpl.java    | 18 +++++++++---------
 .../core/edm/provider/EdmParameterImpl.java     | 18 +++++++++---------
 .../core/edm/provider/EdmPropertyImpl.java      | 18 +++++++++---------
 .../core/edm/provider/EdmProviderImpl.java      | 18 +++++++++---------
 .../core/edm/provider/EdmReturnTypeImpl.java    | 18 +++++++++---------
 .../edm/provider/EdmServiceMetadataImpl.java    | 18 +++++++++---------
 .../core/edm/provider/EdmSingletonImpl.java     | 18 +++++++++---------
 .../core/edm/provider/EdmSingletonInfoImpl.java | 18 +++++++++---------
 .../edm/provider/EdmStructuralTypeImpl.java     | 18 +++++++++---------
 .../edm/provider/EdmTypeDefinitionImpl.java     | 18 +++++++++---------
 .../commons/core/edm/provider/EdmTypeImpl.java  | 18 +++++++++---------
 .../commons/core/edm/ActionMapKeyTest.java      | 18 +++++++++---------
 .../commons/core/edm/EdmImplCachingTest.java    | 18 +++++++++---------
 .../commons/core/edm/EdmImplCallCreateTest.java | 18 +++++++++---------
 .../commons/core/edm/FunctionMapKeyTest.java    | 18 +++++++++---------
 .../primitivetype/CommonPrimitiveTypeTest.java  | 18 +++++++++---------
 .../core/edm/primitivetype/EdmBinaryTest.java   | 18 +++++++++---------
 .../core/edm/primitivetype/EdmBooleanTest.java  | 18 +++++++++---------
 .../core/edm/primitivetype/EdmByteTest.java     | 18 +++++++++---------
 .../core/edm/primitivetype/EdmDateTest.java     | 18 +++++++++---------
 .../primitivetype/EdmDateTimeOffsetTest.java    | 18 +++++++++---------
 .../core/edm/primitivetype/EdmDecimalTest.java  | 18 +++++++++---------
 .../core/edm/primitivetype/EdmDoubleTest.java   | 18 +++++++++---------
 .../core/edm/primitivetype/EdmDurationTest.java | 18 +++++++++---------
 .../core/edm/primitivetype/EdmGuidTest.java     | 18 +++++++++---------
 .../core/edm/primitivetype/EdmInt16Test.java    | 18 +++++++++---------
 .../core/edm/primitivetype/EdmInt32Test.java    | 18 +++++++++---------
 .../core/edm/primitivetype/EdmInt64Test.java    | 18 +++++++++---------
 .../core/edm/primitivetype/EdmNullTest.java     | 18 +++++++++---------
 .../core/edm/primitivetype/EdmSByteTest.java    | 18 +++++++++---------
 .../core/edm/primitivetype/EdmSingleTest.java   | 18 +++++++++---------
 .../core/edm/primitivetype/EdmStringTest.java   | 18 +++++++++---------
 .../edm/primitivetype/EdmTimeOfDayTest.java     | 18 +++++++++---------
 .../primitivetype/PrimitiveTypeBaseTest.java    | 18 +++++++++---------
 .../core/edm/primitivetype/UInt7Test.java       | 18 +++++++++---------
 .../core/edm/provider/EdmActionImplTest.java    | 18 +++++++++---------
 .../edm/provider/EdmActionImportImplTest.java   | 18 +++++++++---------
 .../edm/provider/EdmComplexTypeImplTest.java    | 18 +++++++++---------
 .../provider/EdmEntityContainerImplTest.java    | 18 +++++++++---------
 .../core/edm/provider/EdmEntitySetImplTest.java | 18 +++++++++---------
 .../edm/provider/EdmEntitySetInfoImplTest.java  | 18 +++++++++---------
 .../edm/provider/EdmEntityTypeImplTest.java     | 18 +++++++++---------
 .../commons/core/edm/provider/EdmEnumTest.java  | 18 +++++++++---------
 .../core/edm/provider/EdmFunctionImplTest.java  | 18 +++++++++---------
 .../edm/provider/EdmFunctionImportImplTest.java | 18 +++++++++---------
 .../provider/EdmFunctionImportInfoImplTest.java | 18 +++++++++---------
 .../edm/provider/EdmKeyPropertyRefImplTest.java | 18 +++++++++---------
 .../core/edm/provider/EdmMemberImplTest.java    | 18 +++++++++---------
 .../core/edm/provider/EdmNamedImplTest.java     | 18 +++++++++---------
 .../provider/EdmNavigationPropertyImplTest.java | 18 +++++++++---------
 .../core/edm/provider/EdmParameterImplTest.java | 18 +++++++++---------
 .../core/edm/provider/EdmPropertyImplTest.java  | 18 +++++++++---------
 .../EdmProviderImplOverloadingTest.java         | 18 +++++++++---------
 .../core/edm/provider/EdmProviderImplTest.java  | 18 +++++++++---------
 .../edm/provider/EdmReturnTypeImplTest.java     | 18 +++++++++---------
 .../provider/EdmServiceMetadataImplTest.java    | 18 +++++++++---------
 .../core/edm/provider/EdmSingletonImplTest.java | 18 +++++++++---------
 .../edm/provider/EdmSingletonInfoImplTest.java  | 18 +++++++++---------
 .../edm/provider/EdmTypeDefinitionImplTest.java | 18 ++++++++++++++++++
 .../core/edm/provider/EdmTypeImplTest.java      | 18 +++++++++---------
 .../olingo/odata4/server/api/uri/UriInfo.java   | 19 +++++++++----------
 .../odata4/server/api/uri/UriInfoAll.java       | 19 +++++++++----------
 .../odata4/server/api/uri/UriInfoBatch.java     | 19 +++++++++----------
 .../odata4/server/api/uri/UriInfoCrossjoin.java | 19 +++++++++----------
 .../odata4/server/api/uri/UriInfoEntityId.java  | 19 +++++++++----------
 .../odata4/server/api/uri/UriInfoKind.java      | 19 +++++++++----------
 .../odata4/server/api/uri/UriInfoMetadata.java  | 19 +++++++++----------
 .../odata4/server/api/uri/UriInfoResource.java  | 18 +++++++++---------
 .../odata4/server/api/uri/UriInfoService.java   | 18 +++++++++---------
 .../odata4/server/api/uri/UriParameter.java     | 18 +++++++++---------
 .../odata4/server/api/uri/UriResource.java      | 18 +++++++++---------
 .../server/api/uri/UriResourceAction.java       | 18 +++++++++---------
 .../api/uri/UriResourceComplexProperty.java     | 18 +++++++++---------
 .../odata4/server/api/uri/UriResourceCount.java | 18 +++++++++---------
 .../server/api/uri/UriResourceEntitySet.java    | 18 +++++++++---------
 .../server/api/uri/UriResourceFunction.java     | 18 +++++++++---------
 .../odata4/server/api/uri/UriResourceIt.java    | 18 +++++++++---------
 .../odata4/server/api/uri/UriResourceKind.java  | 19 +++++++++----------
 .../server/api/uri/UriResourceLambdaAll.java    | 18 +++++++++---------
 .../server/api/uri/UriResourceLambdaAny.java    | 18 +++++++++---------
 .../server/api/uri/UriResourceLambdaRef.java    | 18 +++++++++---------
 .../server/api/uri/UriResourceNavigation.java   | 18 +++++++++---------
 .../server/api/uri/UriResourcePartTyped.java    | 19 +++++++++----------
 .../api/uri/UriResourcePrimitiveProperty.java   | 18 +++++++++---------
 .../server/api/uri/UriResourceProperty.java     | 18 +++++++++---------
 .../odata4/server/api/uri/UriResourceRef.java   | 18 +++++++++---------
 .../odata4/server/api/uri/UriResourceRoot.java  | 18 +++++++++---------
 .../server/api/uri/UriResourceSingleton.java    | 18 +++++++++---------
 .../api/uri/UriResourceStartingTypeFilter.java  | 18 +++++++++---------
 .../odata4/server/api/uri/UriResourceValue.java | 18 +++++++++---------
 .../server/api/uri/optiontree/OptionNode.java   | 18 +++++++++---------
 .../api/uri/optiontree/OptionProperty.java      | 18 +++++++++---------
 .../api/uri/queryoption/AliasQueryOption.java   | 18 +++++++++---------
 .../api/uri/queryoption/CustomQueryOption.java  | 18 +++++++++---------
 .../uri/queryoption/ExceptionVisitExpand.java   | 18 +++++++++---------
 .../server/api/uri/queryoption/ExpandItem.java  | 18 +++++++++---------
 .../api/uri/queryoption/ExpandOption.java       | 18 +++++++++---------
 .../api/uri/queryoption/FilterOption.java       | 18 +++++++++---------
 .../api/uri/queryoption/FormatOption.java       | 18 +++++++++---------
 .../server/api/uri/queryoption/IdOption.java    | 18 +++++++++---------
 .../api/uri/queryoption/InlineCountOption.java  | 18 +++++++++---------
 .../api/uri/queryoption/LevelsExpandOption.java | 18 +++++++++---------
 .../server/api/uri/queryoption/OrderByItem.java | 19 +++++++++----------
 .../api/uri/queryoption/OrderByOption.java      | 18 +++++++++---------
 .../server/api/uri/queryoption/QueryOption.java | 18 +++++++++---------
 .../api/uri/queryoption/SearchOption.java       | 18 +++++++++---------
 .../server/api/uri/queryoption/SelectItem.java  | 18 +++++++++---------
 .../api/uri/queryoption/SelectOption.java       | 18 +++++++++---------
 .../server/api/uri/queryoption/SkipOption.java  | 18 +++++++++---------
 .../api/uri/queryoption/SkipTokenOption.java    | 19 +++++++++----------
 .../uri/queryoption/SupportedQueryOptions.java  | 18 +++++++++---------
 .../api/uri/queryoption/SystemQueryOption.java  | 18 +++++++++---------
 .../server/api/uri/queryoption/TopOption.java   | 18 +++++++++---------
 .../queryoption/expression/AliasExpression.java | 18 +++++++++---------
 .../expression/BinaryExpression.java            | 18 +++++++++---------
 .../uri/queryoption/expression/Constant.java    | 18 +++++++++---------
 .../uri/queryoption/expression/Enumeration.java | 18 +++++++++---------
 .../expression/ExceptionVisitExpression.java    | 18 +++++++++---------
 .../uri/queryoption/expression/Expression.java  | 18 +++++++++---------
 .../expression/ExpressionVisitor.java           | 18 +++++++++---------
 .../uri/queryoption/expression/LambdaRef.java   | 18 +++++++++---------
 .../api/uri/queryoption/expression/Literal.java | 18 +++++++++---------
 .../api/uri/queryoption/expression/Member.java  | 18 +++++++++---------
 .../uri/queryoption/expression/MethodCall.java  | 18 +++++++++---------
 .../expression/SupportedBinaryOperators.java    | 18 +++++++++---------
 .../expression/SupportedConstants.java          | 18 +++++++++---------
 .../expression/SupportedMethodCalls.java        | 18 +++++++++---------
 .../expression/SupportedUnaryOperators.java     | 18 +++++++++---------
 .../uri/queryoption/expression/TypeLiteral.java | 18 +++++++++---------
 .../queryoption/expression/UnaryOperator.java   | 18 +++++++++---------
 .../expression/VisitableExression.java          | 18 +++++++++---------
 .../uri/queryoption/search/SearchBinary.java    | 18 +++++++++---------
 .../queryoption/search/SearchExpression.java    | 18 +++++++++---------
 .../api/uri/queryoption/search/SearchTerm.java  | 18 +++++++++---------
 .../api/uri/queryoption/search/SearchUnary.java | 18 +++++++++---------
 .../search/SupportedSearchBinaryOperators.java  | 18 +++++++++---------
 .../search/SupportedSearchUnaryOperators.java   | 18 +++++++++---------
 .../server/core/uri/UriParserException.java     | 18 +++++++++---------
 .../core/uri/UriParserSemanticException.java    | 18 +++++++++---------
 .../core/uri/UriParserSyntaxException.java      | 18 +++++++++---------
 .../server/core/uri/apiimpl/UriInfoImpl.java    | 18 +++++++++---------
 .../core/uri/apiimpl/UriParameterImpl.java      | 19 +++++++++----------
 .../core/uri/apiimpl/UriResourceActionImpl.java | 18 +++++++++---------
 .../apiimpl/UriResourceComplexPropertyImpl.java | 18 +++++++++---------
 .../core/uri/apiimpl/UriResourceCountImpl.java  | 18 +++++++++---------
 .../uri/apiimpl/UriResourceEntitySetImpl.java   | 19 +++++++++----------
 .../uri/apiimpl/UriResourceFunctionImpl.java    | 18 +++++++++---------
 .../core/uri/apiimpl/UriResourceImpl.java       | 18 +++++++++---------
 .../core/uri/apiimpl/UriResourceItImpl.java     | 18 +++++++++---------
 .../uri/apiimpl/UriResourceLambdaAllImpl.java   | 18 +++++++++---------
 .../uri/apiimpl/UriResourceLambdaAnyImpl.java   | 18 +++++++++---------
 .../uri/apiimpl/UriResourceLambdaVarImpl.java   | 18 +++++++++---------
 .../UriResourceNavigationPropertyImpl.java      | 18 +++++++++---------
 .../UriResourcePrimitivePropertyImpl.java       | 18 +++++++++---------
 .../core/uri/apiimpl/UriResourceRefImpl.java    | 18 +++++++++---------
 .../core/uri/apiimpl/UriResourceRootImpl.java   | 18 +++++++++---------
 .../uri/apiimpl/UriResourceSingletonImpl.java   | 18 +++++++++---------
 .../UriResourceStartingTypeFilterImpl.java      | 18 +++++++++---------
 .../core/uri/apiimpl/UriResourceTypedImpl.java  | 18 +++++++++---------
 .../core/uri/apiimpl/UriResourceValueImpl.java  | 18 +++++++++---------
 .../uri/apiimpl/UriResourceWithKeysImpl.java    | 18 +++++++++---------
 .../odata4/server/core/uri/parser/Parser.java   | 18 +++++++++---------
 .../odata4/server/core/uri/parser/RawUri.java   | 18 +++++++++---------
 .../server/core/uri/parser/UriContext.java      | 18 +++++++++---------
 .../server/core/uri/parser/UriDecoder.java      | 18 +++++++++---------
 .../core/uri/parser/UriParseTreeVisitor.java    | 20 +++++++++-----------
 .../uri/queryoption/AliasQueryOptionImpl.java   | 18 +++++++++---------
 .../uri/queryoption/CustomQueryOptionImpl.java  | 18 +++++++++---------
 .../core/uri/queryoption/ExpandItemImpl.java    | 19 +++++++++----------
 .../core/uri/queryoption/ExpandOptionImpl.java  | 18 +++++++++---------
 .../core/uri/queryoption/FilterOptionImpl.java  | 18 +++++++++---------
 .../core/uri/queryoption/FormatOptionImpl.java  | 18 +++++++++---------
 .../core/uri/queryoption/IdOptionImpl.java      | 18 +++++++++---------
 .../uri/queryoption/InlineCountOptionImpl.java  | 18 +++++++++---------
 .../core/uri/queryoption/LevelsOptionImpl.java  | 19 +++++++++----------
 .../core/uri/queryoption/OrderByItemImpl.java   | 19 +++++++++----------
 .../core/uri/queryoption/OrderByOptionImpl.java | 18 +++++++++---------
 .../core/uri/queryoption/QueryOptionImpl.java   | 18 +++++++++---------
 .../core/uri/queryoption/SearchOptionImpl.java  | 19 +++++++++----------
 .../core/uri/queryoption/SelectItemImpl.java    | 18 +++++++++---------
 .../core/uri/queryoption/SelectOptionImpl.java  | 18 +++++++++---------
 .../core/uri/queryoption/SkipOptionImpl.java    | 19 +++++++++----------
 .../uri/queryoption/SkipTokenOptionImpl.java    | 19 +++++++++----------
 .../uri/queryoption/SystemQueryOptionImpl.java  | 18 +++++++++---------
 .../core/uri/queryoption/TopOptionImpl.java     | 19 +++++++++----------
 .../uri/queryoption/expression/AliasImpl.java   | 18 +++++++++---------
 .../uri/queryoption/expression/BinaryImpl.java  | 18 +++++++++---------
 .../queryoption/expression/ConstantImpl.java    | 18 +++++++++---------
 .../queryoption/expression/EnumerationImpl.java | 18 +++++++++---------
 .../queryoption/expression/ExpressionImpl.java  | 18 +++++++++---------
 .../queryoption/expression/LambdaRefImpl.java   | 18 +++++++++---------
 .../uri/queryoption/expression/LiteralImpl.java | 18 +++++++++---------
 .../uri/queryoption/expression/MemberImpl.java  | 18 +++++++++---------
 .../queryoption/expression/MethodCallImpl.java  | 18 +++++++++---------
 .../queryoption/expression/TypeLiteralImpl.java | 18 +++++++++---------
 .../uri/queryoption/expression/UnaryImpl.java   | 18 +++++++++---------
 .../server/core/testutil/EdmTechProvider.java   | 18 +++++++++---------
 .../core/testutil/EdmTechTestProvider.java      | 18 +++++++++---------
 .../server/core/testutil/ExpandValidator.java   | 19 +++++++++----------
 .../server/core/testutil/FilterTreeToText.java  | 18 +++++++++---------
 .../server/core/testutil/FilterValidator.java   | 18 +++++++++---------
 .../server/core/testutil/ParseTreeToText.java   | 18 +++++++++---------
 .../odata4/server/core/testutil/ParserTest.java | 18 +++++++++---------
 .../server/core/testutil/ParserValidator.java   | 18 +++++++++---------
 .../server/core/testutil/TestErrorLogger.java   | 18 +++++++++---------
 .../server/core/testutil/TokenValidator.java    | 18 +++++++++---------
 .../server/core/testutil/UriLexerWithTrace.java | 18 +++++++++---------
 .../core/testutil/UriResourceValidator.java     | 18 +++++++++---------
 .../server/core/testutil/UriValidator.java      | 18 +++++++++---------
 .../odata4/server/core/testutil/Validator.java  | 18 +++++++++---------
 .../odata4/server/core/uri/RawUriTest.java      | 18 +++++++++---------
 .../odata4/server/core/uri/UriInfoImplTest.java | 18 +++++++++---------
 .../server/core/uri/UriParameterImplTest.java   | 18 +++++++++---------
 .../core/uri/antlr/TestFullResourcePath.java    | 18 +++++++++---------
 .../odata4/server/core/uri/antlr/TestLexer.java | 18 +++++++++---------
 .../server/core/uri/antlr/TestParser.java       | 18 +++++++++---------
 .../core/uri/antlr/TestUriParserImpl.java       | 18 +++++++++---------
 .../core/uri/queryoption/QueryOptionTest.java   | 18 +++++++++---------
 .../queryoption/expression/ExpressionTest.java  | 18 +++++++++---------
 370 files changed, 2693 insertions(+), 2706 deletions(-)
----------------------------------------------------------------------


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/dabcb44d/odata4-lib/odata4-commons-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/pom.xml b/odata4-lib/odata4-commons-api/pom.xml
index afec9ab..bef9fd3 100644
--- a/odata4-lib/odata4-commons-api/pom.xml
+++ b/odata4-lib/odata4-commons-api/pom.xml
@@ -33,4 +33,7 @@
     <version>0.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
+    <properties>
+        <netbeans.hint.license>apache20</netbeans.hint.license>
+    </properties>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/dabcb44d/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Edm.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Edm.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Edm.java
index 0be8559..0ddc0e4 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Edm.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Edm.java
@@ -1,4 +1,4 @@
-/*
+/* 
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/dabcb44d/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAction.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAction.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAction.java
index 3e0195b..69632ec 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAction.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAction.java
@@ -1,4 +1,4 @@
-/*
+/* 
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/dabcb44d/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmActionImport.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmActionImport.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmActionImport.java
index 4e8b0c9..ff6f519 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmActionImport.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmActionImport.java
@@ -1,4 +1,4 @@
-/*
+/* 
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/dabcb44d/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotatable.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotatable.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotatable.java
index 1e37a54..ac3187f 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotatable.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotatable.java
@@ -1,4 +1,4 @@
-/*
+/* 
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information