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 2016/03/04 21:36:48 UTC
[05/39] olingo-odata4 git commit: [OLINGO-832] Merge branch 'master'
into OLINGO-832_StreamSerializerPoC
[OLINGO-832] Merge branch 'master' into OLINGO-832_StreamSerializerPoC
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/c02215e2
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/c02215e2
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/c02215e2
Branch: refs/heads/OLINGO-856_ODataHandlerInAPI
Commit: c02215e2ef1eaec9cecc8ab9f188a4538d8164e3
Parents: 0cc2199 b9512ed
Author: Michael Bolz <mi...@sap.com>
Authored: Mon Jan 25 14:18:13 2016 +0100
Committer: Michael Bolz <mi...@sap.com>
Committed: Mon Jan 25 14:18:13 2016 +0100
----------------------------------------------------------------------
dist/android-lib/pom.xml | 2 +-
dist/client-lib/pom.xml | 2 +-
dist/javadoc/pom.xml | 2 +-
dist/pom.xml | 2 +-
dist/server-lib/pom.xml | 2 +-
dist/server-lib/src/main/resources/LICENSE | 67 -
dist/server-lib/src/main/resources/NOTICE | 31 +-
ext/client-android/pom.xml | 2 +-
ext/client-proxy/pom.xml | 2 +-
ext/karaf/karaf-features/pom.xml | 2 +-
.../src/main/resources/features.xml | 1 -
ext/karaf/karaf-fit/pom.xml | 2 +-
.../osgi/itests/server/CarServiceTest.java | 2 +-
ext/karaf/pom.xml | 2 +-
ext/pojogen-maven-plugin/pom.xml | 2 +-
ext/pom.xml | 2 +-
fit/pom.xml | 10 +-
.../org/apache/olingo/fit/AbstractServices.java | 46 -
.../apache/olingo/fit/metadata/Association.java | 70 -
.../olingo/fit/metadata/AssociationSet.java | 74 -
.../apache/olingo/fit/metadata/Container.java | 13 -
.../apache/olingo/fit/metadata/Metadata.java | 110 +-
.../olingo/fit/metadata/NavigationProperty.java | 27 -
.../org/apache/olingo/fit/metadata/Schema.java | 14 -
.../org/apache/olingo/fit/methods/MERGE.java | 33 -
.../org/apache/olingo/fit/utils/Constants.java | 60 +-
.../olingo/fit/base/EntityUpdateTestITCase.java | 2 +-
.../olingo/fit/tecsvc/client/BasicITCase.java | 2 +-
.../tecsvc/client/FilterSystemQueryITCase.java | 34 +-
.../tecsvc/client/OrderBySystemQueryITCase.java | 4 +-
.../tecsvc/client/SystemQueryOptionITCase.java | 2 +-
.../olingo/fit/tecsvc/http/BasicHttpITCase.java | 4 +-
lib/client-api/pom.xml | 6 +-
.../ODataClientErrorException.java | 9 +-
.../api/domain/ClientEntitySetIterator.java | 7 +-
.../client/api/domain/ClientLinkType.java | 6 +-
.../olingo/client/api/uri/SegmentType.java | 6 +-
lib/client-core/pom.xml | 23 +-
.../retrieve/RetrieveRequestFactoryImpl.java | 9 +-
.../client/core/edm/ClientCsdlXMLMetadata.java | 3 +-
.../client/core/edm/xml/ClientCsdlAction.java | 4 +-
.../core/edm/xml/ClientCsdlActionImport.java | 4 +-
.../core/edm/xml/ClientCsdlAnnotation.java | 3 +-
.../core/edm/xml/ClientCsdlAnnotations.java | 4 +-
.../core/edm/xml/ClientCsdlComplexType.java | 4 +-
.../core/edm/xml/ClientCsdlDataServices.java | 4 +-
.../client/core/edm/xml/ClientCsdlEdmx.java | 4 +-
.../core/edm/xml/ClientCsdlEntityContainer.java | 4 +-
.../core/edm/xml/ClientCsdlEntityKey.java | 4 +-
.../core/edm/xml/ClientCsdlEntitySet.java | 4 +-
.../core/edm/xml/ClientCsdlEntityType.java | 4 +-
.../core/edm/xml/ClientCsdlEnumMember.java | 4 +-
.../client/core/edm/xml/ClientCsdlEnumType.java | 4 +-
.../client/core/edm/xml/ClientCsdlFunction.java | 4 +-
.../core/edm/xml/ClientCsdlFunctionImport.java | 4 +-
.../client/core/edm/xml/ClientCsdlInclude.java | 4 +-
.../edm/xml/ClientCsdlIncludeAnnotations.java | 4 +-
.../edm/xml/ClientCsdlNavigationProperty.java | 4 +-
.../ClientCsdlNavigationPropertyBinding.java | 4 +-
.../client/core/edm/xml/ClientCsdlOnDelete.java | 4 +-
.../core/edm/xml/ClientCsdlParameter.java | 4 +-
.../client/core/edm/xml/ClientCsdlProperty.java | 4 +-
.../core/edm/xml/ClientCsdlPropertyRef.java | 4 +-
.../core/edm/xml/ClientCsdlReference.java | 4 +-
.../xml/ClientCsdlReferentialConstraint.java | 4 +-
.../core/edm/xml/ClientCsdlReturnType.java | 4 +-
.../client/core/edm/xml/ClientCsdlSchema.java | 4 +-
.../core/edm/xml/ClientCsdlSingleton.java | 4 +-
.../client/core/edm/xml/ClientCsdlTerm.java | 4 +-
.../core/edm/xml/ClientCsdlTypeDefinition.java | 4 +-
.../edm/xml/annotation/ClientCsdlApply.java | 3 +-
.../core/edm/xml/annotation/ClientCsdlCast.java | 3 +-
.../xml/annotation/ClientCsdlCollection.java | 3 +-
.../annotation/ClientCsdlDynamicExpression.java | 3 +-
.../core/edm/xml/annotation/ClientCsdlIsOf.java | 3 +-
.../annotation/ClientCsdlLabeledElement.java | 3 +-
.../core/edm/xml/annotation/ClientCsdlNull.java | 3 +-
.../xml/annotation/ClientCsdlPropertyValue.java | 3 +-
.../edm/xml/annotation/ClientCsdlRecord.java | 3 +-
.../edm/xml/annotation/ClientCsdlUrlRef.java | 3 +-
.../core/serialization/AbstractAtomDealer.java | 3 +-
.../olingo/client/core/uri/URIBuilderImpl.java | 4 +-
.../olingo/client/core/uri/URIBuilderTest.java | 15 +-
lib/commons-api/pom.xml | 7 +-
.../commons/api/data/AbstractODataObject.java | 25 +
.../olingo/commons/api/data/Annotatable.java | 30 -
.../olingo/commons/api/data/Annotation.java | 18 +
.../olingo/commons/api/data/ComplexValue.java | 17 +
.../apache/olingo/commons/api/data/Delta.java | 17 +
.../olingo/commons/api/data/DeltaLink.java | 25 +
.../apache/olingo/commons/api/data/Entity.java | 40 +
.../commons/api/data/EntityCollection.java | 27 +-
.../apache/olingo/commons/api/data/Link.java | 37 +
.../apache/olingo/commons/api/data/Linked.java | 17 +
.../olingo/commons/api/data/Parameter.java | 18 +
.../olingo/commons/api/data/Property.java | 18 +
.../olingo/commons/api/data/Valuable.java | 27 +-
.../commons/api/edm/EdmBindingTarget.java | 2 +-
.../olingo/commons/api/edm/EdmMapping.java | 7 +
.../commons/api/edm/FullQualifiedName.java | 19 +-
.../edm/annotation/EdmConstantExpression.java | 8 +-
.../commons/api/edm/geo/ComposedGeospatial.java | 32 +-
.../olingo/commons/api/edm/geo/Geospatial.java | 37 +-
.../api/edm/geo/GeospatialCollection.java | 10 +-
.../olingo/commons/api/edm/geo/LineString.java | 8 +-
.../commons/api/edm/geo/MultiLineString.java | 8 +-
.../olingo/commons/api/edm/geo/MultiPoint.java | 8 +-
.../commons/api/edm/geo/MultiPolygon.java | 8 +-
.../olingo/commons/api/edm/geo/Point.java | 72 +-
.../olingo/commons/api/edm/geo/Polygon.java | 38 +-
.../apache/olingo/commons/api/edm/geo/SRID.java | 49 +-
.../api/edm/provider/CsdlAbstractEdmItem.java | 25 +-
.../commons/api/edm/provider/CsdlAction.java | 2 -
.../api/edm/provider/CsdlActionImport.java | 2 -
.../api/edm/provider/CsdlAnnotation.java | 2 -
.../api/edm/provider/CsdlAnnotations.java | 2 -
.../api/edm/provider/CsdlBindingTarget.java | 27 +-
.../api/edm/provider/CsdlComplexType.java | 2 -
.../api/edm/provider/CsdlEntityContainer.java | 2 -
.../commons/api/edm/provider/CsdlEntitySet.java | 8 +-
.../api/edm/provider/CsdlEntityType.java | 2 -
.../api/edm/provider/CsdlEnumMember.java | 2 -
.../commons/api/edm/provider/CsdlEnumType.java | 2 -
.../commons/api/edm/provider/CsdlFunction.java | 2 -
.../api/edm/provider/CsdlFunctionImport.java | 2 -
.../commons/api/edm/provider/CsdlMapping.java | 21 +
.../edm/provider/CsdlNavigationProperty.java | 2 -
.../provider/CsdlNavigationPropertyBinding.java | 2 -
.../commons/api/edm/provider/CsdlOnDelete.java | 2 -
.../commons/api/edm/provider/CsdlOperation.java | 2 -
.../api/edm/provider/CsdlOperationImport.java | 2 -
.../commons/api/edm/provider/CsdlParameter.java | 2 -
.../commons/api/edm/provider/CsdlProperty.java | 2 -
.../api/edm/provider/CsdlPropertyRef.java | 2 -
.../edm/provider/CsdlReferentialConstraint.java | 2 -
.../api/edm/provider/CsdlReturnType.java | 2 -
.../commons/api/edm/provider/CsdlSchema.java | 2 -
.../commons/api/edm/provider/CsdlSingleton.java | 16 +-
.../api/edm/provider/CsdlStructuralType.java | 2 -
.../commons/api/edm/provider/CsdlTerm.java | 2 -
.../api/edm/provider/CsdlTypeDefinition.java | 2 -
.../provider/annotation/CsdlAnnotationPath.java | 1 -
.../api/edm/provider/annotation/CsdlApply.java | 3 +-
.../api/edm/provider/annotation/CsdlCast.java | 1 -
.../edm/provider/annotation/CsdlCollection.java | 1 -
.../annotation/CsdlConstantExpression.java | 3 -
.../annotation/CsdlDynamicExpression.java | 2 -
.../edm/provider/annotation/CsdlExpression.java | 2 -
.../api/edm/provider/annotation/CsdlIf.java | 2 -
.../api/edm/provider/annotation/CsdlIsOf.java | 2 -
.../provider/annotation/CsdlLabeledElement.java | 4 +-
.../annotation/CsdlLabeledElementReference.java | 1 -
.../CsdlLogicalOrComparisonExpression.java | 2 -
.../annotation/CsdlNavigationPropertyPath.java | 1 -
.../api/edm/provider/annotation/CsdlNull.java | 2 -
.../api/edm/provider/annotation/CsdlPath.java | 1 -
.../provider/annotation/CsdlPropertyPath.java | 1 -
.../provider/annotation/CsdlPropertyValue.java | 5 +-
.../api/edm/provider/annotation/CsdlRecord.java | 1 -
.../api/edm/provider/annotation/CsdlUrlRef.java | 3 +-
lib/commons-core/pom.xml | 24 +-
.../core/edm/AbstractEdmBindingTarget.java | 12 +-
.../olingo/commons/core/edm/EdmTypeInfo.java | 10 +-
.../primitivetype/AbstractGeospatialType.java | 49 +-
.../core/edm/primitivetype/EdmBinary.java | 12 +-
.../edm/primitivetype/EdmDateTimeOffset.java | 8 +-
.../commons/core/edm/EdmImplCachingTest.java | 3 +-
.../primitivetype/EdmDateTimeOffsetTest.java | 16 +-
.../edm/primitivetype/EdmTimeOfDayTest.java | 26 +-
.../edm/provider/EdmActionImportImplTest.java | 2 +-
.../core/edm/provider/EdmMappingTest.java | 42 +-
.../core/edm/provider/EdmProviderImplTest.java | 4 +-
.../core/edm/provider/EdmSchemaImplTest.java | 1 +
lib/pom.xml | 2 +-
lib/server-api/pom.xml | 2 +-
.../apache/olingo/server/api/HttpHeaders.java | 4 +-
.../org/apache/olingo/server/api/OData.java | 6 +-
.../server/api/ODataApplicationException.java | 4 +-
.../olingo/server/api/ODataHttpHandler.java | 4 +-
.../server/api/ODataLibraryException.java | 4 +-
.../apache/olingo/server/api/ODataRequest.java | 6 +-
.../apache/olingo/server/api/ODataResponse.java | 5 +-
.../olingo/server/api/ODataServerError.java | 4 +-
.../olingo/server/api/ServiceMetadata.java | 4 +-
.../olingo/server/api/batch/BatchFacade.java | 106 +-
.../olingo/server/api/batch/package-info.java | 4 +-
.../server/api/debug/DebugInformation.java | 16 +-
.../server/api/debug/DebugResponseHelper.java | 4 +-
.../olingo/server/api/debug/DebugSupport.java | 9 +-
.../server/api/debug/DefaultDebugSupport.java | 8 +-
.../server/api/debug/RuntimeMeasurement.java | 12 +-
.../olingo/server/api/debug/package-info.java | 4 +-
.../api/deserializer/DeserializerException.java | 4 +-
.../api/deserializer/DeserializerResult.java | 4 +-
.../deserializer/FixedFormatDeserializer.java | 12 +-
.../api/deserializer/ODataDeserializer.java | 10 +-
.../batch/BatchDeserializerException.java | 14 +-
.../api/deserializer/batch/BatchOptions.java | 8 +-
.../deserializer/batch/BatchRequestPart.java | 4 +-
.../deserializer/batch/ODataResponsePart.java | 8 +-
.../api/deserializer/batch/package-info.java | 4 +-
.../server/api/deserializer/package-info.java | 4 +-
.../server/api/etag/CustomETagSupport.java | 4 +-
.../olingo/server/api/etag/ETagHelper.java | 22 +-
.../server/api/etag/PreconditionException.java | 4 +-
.../api/etag/ServiceMetadataETagSupport.java | 6 +-
.../olingo/server/api/etag/package-info.java | 4 +-
.../apache/olingo/server/api/package-info.java | 4 +-
.../olingo/server/api/prefer/Preferences.java | 13 +-
.../server/api/prefer/PreferencesApplied.java | 16 +-
.../olingo/server/api/prefer/package-info.java | 4 +-
.../ActionComplexCollectionProcessor.java | 4 +-
.../api/processor/ActionComplexProcessor.java | 4 +-
.../ActionEntityCollectionProcessor.java | 4 +-
.../api/processor/ActionEntityProcessor.java | 4 +-
.../ActionPrimitiveCollectionProcessor.java | 4 +-
.../api/processor/ActionPrimitiveProcessor.java | 4 +-
.../api/processor/ActionVoidProcessor.java | 4 +-
.../server/api/processor/BatchProcessor.java | 4 +-
.../processor/ComplexCollectionProcessor.java | 4 +-
.../server/api/processor/ComplexProcessor.java | 4 +-
.../CountComplexCollectionProcessor.java | 4 +-
.../CountEntityCollectionProcessor.java | 4 +-
.../CountPrimitiveCollectionProcessor.java | 4 +-
.../server/api/processor/DefaultProcessor.java | 4 +-
.../server/api/processor/DeltaProcessor.java | 30 +-
.../processor/EntityCollectionProcessor.java | 4 +-
.../server/api/processor/EntityProcessor.java | 6 +-
.../server/api/processor/ErrorProcessor.java | 6 +-
.../api/processor/MediaEntityProcessor.java | 4 +-
.../server/api/processor/MetadataProcessor.java | 4 +-
.../processor/PrimitiveCollectionProcessor.java | 4 +-
.../api/processor/PrimitiveProcessor.java | 6 +-
.../api/processor/PrimitiveValueProcessor.java | 6 +-
.../olingo/server/api/processor/Processor.java | 4 +-
.../processor/ReferenceCollectionProcessor.java | 4 +-
.../api/processor/ReferenceProcessor.java | 4 +-
.../api/processor/ServiceDocumentProcessor.java | 4 +-
.../server/api/processor/package-info.java | 5 +-
.../serializer/BatchSerializerException.java | 7 +-
.../serializer/ComplexSerializerOptions.java | 10 +-
.../serializer/CustomContentTypeSupport.java | 4 +-
.../EntityCollectionSerializerOptions.java | 8 +-
.../api/serializer/EntitySerializerOptions.java | 8 +-
.../api/serializer/FixedFormatSerializer.java | 6 +-
.../server/api/serializer/ODataSerializer.java | 52 +-
.../serializer/PrimitiveSerializerOptions.java | 10 +-
.../PrimitiveValueSerializerOptions.java | 4 +-
.../ReferenceCollectionSerializerOptions.java | 12 +-
.../serializer/ReferenceSerializerOptions.java | 4 +-
.../api/serializer/RepresentationType.java | 4 +-
.../api/serializer/SerializerException.java | 4 +-
.../server/api/serializer/SerializerResult.java | 4 +-
.../server/api/serializer/package-info.java | 4 +-
.../apache/olingo/server/api/uri/UriHelper.java | 10 +-
.../apache/olingo/server/api/uri/UriInfo.java | 6 +-
.../olingo/server/api/uri/UriInfoAll.java | 6 +-
.../olingo/server/api/uri/UriInfoBatch.java | 6 +-
.../olingo/server/api/uri/UriInfoCrossjoin.java | 8 +-
.../olingo/server/api/uri/UriInfoEntityId.java | 4 +-
.../olingo/server/api/uri/UriInfoKind.java | 4 +-
.../olingo/server/api/uri/UriInfoMetadata.java | 4 +-
.../olingo/server/api/uri/UriInfoResource.java | 4 +-
.../olingo/server/api/uri/UriInfoService.java | 6 +-
.../olingo/server/api/uri/UriParameter.java | 4 +-
.../olingo/server/api/uri/UriResource.java | 4 +-
.../server/api/uri/UriResourceAction.java | 4 +-
.../api/uri/UriResourceComplexProperty.java | 4 +-
.../olingo/server/api/uri/UriResourceCount.java | 6 +-
.../server/api/uri/UriResourceEntitySet.java | 4 +-
.../server/api/uri/UriResourceFunction.java | 4 +-
.../olingo/server/api/uri/UriResourceIt.java | 4 +-
.../olingo/server/api/uri/UriResourceKind.java | 4 +-
.../server/api/uri/UriResourceLambdaAll.java | 4 +-
.../server/api/uri/UriResourceLambdaAny.java | 4 +-
.../api/uri/UriResourceLambdaVariable.java | 4 +-
.../server/api/uri/UriResourceNavigation.java | 4 +-
.../server/api/uri/UriResourcePartTyped.java | 6 +-
.../api/uri/UriResourcePrimitiveProperty.java | 6 +-
.../server/api/uri/UriResourceProperty.java | 4 +-
.../olingo/server/api/uri/UriResourceRef.java | 6 +-
.../olingo/server/api/uri/UriResourceRoot.java | 6 +-
.../server/api/uri/UriResourceSingleton.java | 4 +-
.../olingo/server/api/uri/UriResourceValue.java | 6 +-
.../olingo/server/api/uri/package-info.java | 6 +-
.../api/uri/queryoption/AliasQueryOption.java | 4 +-
.../server/api/uri/queryoption/CountOption.java | 4 +-
.../api/uri/queryoption/CustomQueryOption.java | 6 +-
.../server/api/uri/queryoption/ExpandItem.java | 5 +-
.../api/uri/queryoption/ExpandOption.java | 4 +-
.../api/uri/queryoption/FilterOption.java | 4 +-
.../api/uri/queryoption/FormatOption.java | 4 +-
.../server/api/uri/queryoption/IdOption.java | 4 +-
.../api/uri/queryoption/LevelsExpandOption.java | 4 +-
.../server/api/uri/queryoption/OrderByItem.java | 4 +-
.../api/uri/queryoption/OrderByOption.java | 4 +-
.../server/api/uri/queryoption/QueryOption.java | 4 +-
.../api/uri/queryoption/SearchOption.java | 4 +-
.../server/api/uri/queryoption/SelectItem.java | 4 +-
.../api/uri/queryoption/SelectOption.java | 4 +-
.../server/api/uri/queryoption/SkipOption.java | 4 +-
.../api/uri/queryoption/SkipTokenOption.java | 4 +-
.../api/uri/queryoption/SystemQueryOption.java | 4 +-
.../uri/queryoption/SystemQueryOptionKind.java | 4 +-
.../server/api/uri/queryoption/TopOption.java | 4 +-
.../api/uri/queryoption/expression/Alias.java | 4 +-
.../api/uri/queryoption/expression/Binary.java | 4 +-
.../expression/BinaryOperatorKind.java | 4 +-
.../uri/queryoption/expression/Enumeration.java | 4 +-
.../uri/queryoption/expression/Expression.java | 6 +-
.../expression/ExpressionVisitException.java | 4 +-
.../expression/ExpressionVisitor.java | 4 +-
.../uri/queryoption/expression/LambdaRef.java | 4 +-
.../api/uri/queryoption/expression/Literal.java | 10 +-
.../api/uri/queryoption/expression/Member.java | 4 +-
.../api/uri/queryoption/expression/Method.java | 4 +-
.../uri/queryoption/expression/MethodKind.java | 4 +-
.../uri/queryoption/expression/TypeLiteral.java | 4 +-
.../api/uri/queryoption/expression/Unary.java | 4 +-
.../expression/UnaryOperatorKind.java | 4 +-
.../expression/VisitableExpression.java | 4 +-
.../queryoption/expression/package-info.java | 4 +-
.../api/uri/queryoption/package-info.java | 4 +-
.../uri/queryoption/search/SearchBinary.java | 4 +-
.../search/SearchBinaryOperatorKind.java | 31 +-
.../queryoption/search/SearchExpression.java | 18 +-
.../api/uri/queryoption/search/SearchTerm.java | 4 +-
.../api/uri/queryoption/search/SearchUnary.java | 5 +-
.../search/SearchUnaryOperatorKind.java | 24 +-
.../uri/queryoption/search/package-info.java | 4 +-
.../olingo/server/api/ODataRequestTest.java | 4 +-
.../server/api/TranslatedExceptionsTest.java | 4 +-
.../api/prefer/PreferencesAppliedTest.java | 22 +-
lib/server-core-ext/pom.xml | 10 +-
.../apache/olingo/server/core/ErrorHandler.java | 8 +-
.../olingo/server/core/ServiceDispatcher.java | 4 +-
.../olingo/server/core/ServiceRequest.java | 6 +-
.../server/core/responses/EntityResponse.java | 39 +-
.../olingo/server/example/TripPinDataModel.java | 4 +-
lib/server-core/pom.xml | 60 +-
.../olingo/server/core/uri/antlr/UriLexer.g4 | 424 --
.../olingo/server/core/uri/antlr/UriParser.g4 | 447 --
.../olingo/server/core/ContentNegotiator.java | 18 +-
.../server/core/ContentNegotiatorException.java | 4 +-
.../server/core/DefaultRedirectProcessor.java | 4 +-
.../olingo/server/core/ODataDispatcher.java | 132 +-
.../server/core/ODataExceptionHelper.java | 14 +-
.../apache/olingo/server/core/ODataHandler.java | 22 +-
.../server/core/ODataHandlerException.java | 6 +-
.../server/core/ODataHttpHandlerImpl.java | 8 +-
.../apache/olingo/server/core/ODataImpl.java | 10 +-
.../olingo/server/core/RedirectProcessor.java | 4 +-
.../olingo/server/core/ServiceMetadataImpl.java | 8 +-
.../core/batchhandler/BatchFacadeImpl.java | 8 +-
.../server/core/batchhandler/BatchHandler.java | 4 +-
.../core/batchhandler/BatchPartHandler.java | 6 +-
.../BatchReferenceRewriter.java | 4 +-
.../core/debug/DebugResponseHelperImpl.java | 118 +-
.../olingo/server/core/debug/DebugTab.java | 5 +-
.../olingo/server/core/debug/DebugTabBody.java | 12 +-
.../server/core/debug/DebugTabRequest.java | 28 +-
.../server/core/debug/DebugTabResponse.java | 14 +-
.../server/core/debug/DebugTabRuntime.java | 34 +-
.../server/core/debug/DebugTabServer.java | 14 +-
.../server/core/debug/DebugTabStacktrace.java | 24 +-
.../olingo/server/core/debug/DebugTabUri.java | 74 +-
.../core/debug/ExpressionJsonVisitor.java | 12 +-
.../server/core/debug/ServerCoreDebugger.java | 12 +-
.../deserializer/DeserializerResultImpl.java | 4 +-
.../FixedFormatDeserializerImpl.java | 10 +-
.../core/deserializer/batch/BatchBodyPart.java | 8 +-
.../deserializer/batch/BatchChangeSetPart.java | 4 +-
.../deserializer/batch/BatchLineReader.java | 44 +-
.../core/deserializer/batch/BatchParser.java | 10 +-
.../deserializer/batch/BatchParserCommon.java | 14 +-
.../core/deserializer/batch/BatchPart.java | 4 +-
.../deserializer/batch/BatchQueryOperation.java | 4 +-
.../batch/BatchRequestTransformator.java | 20 +-
.../batch/BatchTransformatorCommon.java | 8 +-
.../server/core/deserializer/batch/Header.java | 4 +-
.../core/deserializer/batch/HeaderField.java | 4 +-
.../batch/HttpRequestStatusLine.java | 6 +-
.../server/core/deserializer/batch/Line.java | 4 +-
.../deserializer/helper/ExpandTreeBuilder.java | 18 +-
.../helper/ExpandTreeBuilderImpl.java | 4 +-
.../json/ODataJsonDeserializer.java | 113 +-
.../deserializer/xml/ODataXmlDeserializer.java | 40 +-
.../olingo/server/core/etag/ETagHelperImpl.java | 8 +-
.../server/core/etag/ETagInformation.java | 4 +-
.../olingo/server/core/etag/ETagParser.java | 22 +-
.../core/etag/PreconditionsValidator.java | 14 +-
.../olingo/server/core/prefer/PreferParser.java | 40 +-
.../server/core/prefer/PreferencesImpl.java | 13 +-
.../serializer/AbstractODataSerializer.java | 7 +-
.../serializer/AsyncResponseSerializer.java | 18 +-
.../serializer/BatchResponseSerializer.java | 45 +-
.../serializer/FixedFormatSerializerImpl.java | 6 +-
.../core/serializer/SerializerResultImpl.java | 4 +-
.../serializer/json/ODataErrorSerializer.java | 4 +-
.../serializer/json/ODataJsonSerializer.java | 94 +-
.../json/ServiceDocumentJsonSerializer.java | 12 +-
.../serializer/utils/CircleStreamBuffer.java | 4 +-
.../serializer/utils/ContentTypeHelper.java | 16 +-
.../serializer/utils/ContextURLBuilder.java | 22 +-
.../core/serializer/utils/ContextURLHelper.java | 17 +-
.../serializer/utils/ExpandSelectHelper.java | 4 +-
.../xml/MetadataDocumentXmlSerializer.java | 38 +-
.../core/serializer/xml/ODataXmlSerializer.java | 27 +-
.../xml/ServiceDocumentXmlSerializer.java | 12 +-
.../olingo/server/core/uri/UriHelperImpl.java | 17 +-
.../olingo/server/core/uri/UriInfoImpl.java | 4 +-
.../server/core/uri/UriParameterImpl.java | 4 +-
.../server/core/uri/UriResourceActionImpl.java | 52 +-
.../uri/UriResourceComplexPropertyImpl.java | 22 +-
.../server/core/uri/UriResourceCountImpl.java | 14 +-
.../core/uri/UriResourceEntitySetImpl.java | 25 +-
.../core/uri/UriResourceFunctionImpl.java | 54 +-
.../olingo/server/core/uri/UriResourceImpl.java | 10 +-
.../server/core/uri/UriResourceItImpl.java | 35 +-
.../core/uri/UriResourceLambdaAllImpl.java | 35 +-
.../core/uri/UriResourceLambdaAnyImpl.java | 34 +-
.../core/uri/UriResourceLambdaVarImpl.java | 38 +-
.../uri/UriResourceNavigationPropertyImpl.java | 30 +-
.../uri/UriResourcePrimitivePropertyImpl.java | 24 +-
.../server/core/uri/UriResourceRefImpl.java | 14 +-
.../server/core/uri/UriResourceRootImpl.java | 35 +-
.../core/uri/UriResourceSingletonImpl.java | 25 +-
.../uri/UriResourceStartingTypeFilterImpl.java | 37 +-
.../server/core/uri/UriResourceTypedImpl.java | 16 +-
.../server/core/uri/UriResourceValueImpl.java | 13 +-
.../core/uri/UriResourceWithKeysImpl.java | 7 +-
.../uri/parser/CheckFullContextListener.java | 60 -
.../server/core/uri/parser/ExpandParser.java | 282 +
.../core/uri/parser/ExpressionParser.java | 1245 ++++
.../server/core/uri/parser/FilterParser.java | 56 +
.../server/core/uri/parser/OrderByParser.java | 61 +
.../olingo/server/core/uri/parser/Parser.java | 680 +-
.../server/core/uri/parser/ParserHelper.java | 477 ++
.../olingo/server/core/uri/parser/RawUri.java | 46 -
.../core/uri/parser/ResourcePathParser.java | 397 ++
.../server/core/uri/parser/SearchParser.java | 108 +
.../server/core/uri/parser/SelectParser.java | 234 +
.../server/core/uri/parser/UriContext.java | 113 -
.../server/core/uri/parser/UriDecoder.java | 101 +-
.../core/uri/parser/UriParseTreeVisitor.java | 2545 --------
.../core/uri/parser/UriParserException.java | 4 +-
.../uri/parser/UriParserSemanticException.java | 31 +-
.../uri/parser/UriParserSyntaxException.java | 6 +-
.../server/core/uri/parser/UriTokenizer.java | 1406 ++++
.../uri/parser/search/SearchBinaryImpl.java | 7 +-
.../uri/parser/search/SearchExpressionImpl.java | 4 +-
.../core/uri/parser/search/SearchParser.java | 62 +-
.../parser/search/SearchParserException.java | 6 +-
.../uri/parser/search/SearchQueryToken.java | 9 +-
.../core/uri/parser/search/SearchTermImpl.java | 6 +-
.../core/uri/parser/search/SearchTokenizer.java | 174 +-
.../parser/search/SearchTokenizerException.java | 6 +-
.../core/uri/parser/search/SearchUnaryImpl.java | 6 +-
.../uri/queryoption/AliasQueryOptionImpl.java | 4 +-
.../core/uri/queryoption/CountOptionImpl.java | 4 +-
.../uri/queryoption/CustomQueryOptionImpl.java | 4 +-
.../core/uri/queryoption/ExpandItemImpl.java | 8 +-
.../core/uri/queryoption/ExpandOptionImpl.java | 4 +-
.../core/uri/queryoption/FilterOptionImpl.java | 4 +-
.../core/uri/queryoption/FormatOptionImpl.java | 4 +-
.../core/uri/queryoption/IdOptionImpl.java | 4 +-
.../core/uri/queryoption/LevelsOptionImpl.java | 4 +-
.../core/uri/queryoption/OrderByItemImpl.java | 12 +-
.../core/uri/queryoption/OrderByOptionImpl.java | 4 +-
.../core/uri/queryoption/QueryOptionImpl.java | 4 +-
.../core/uri/queryoption/SearchOptionImpl.java | 6 +-
.../core/uri/queryoption/SelectItemImpl.java | 4 +-
.../core/uri/queryoption/SelectOptionImpl.java | 4 +-
.../core/uri/queryoption/SkipOptionImpl.java | 4 +-
.../uri/queryoption/SkipTokenOptionImpl.java | 4 +-
.../uri/queryoption/SystemQueryOptionImpl.java | 4 +-
.../core/uri/queryoption/TopOptionImpl.java | 4 +-
.../uri/queryoption/expression/AliasImpl.java | 20 +-
.../uri/queryoption/expression/BinaryImpl.java | 40 +-
.../queryoption/expression/EnumerationImpl.java | 36 +-
.../queryoption/expression/ExpressionImpl.java | 25 -
.../queryoption/expression/LambdaRefImpl.java | 21 +-
.../uri/queryoption/expression/LiteralImpl.java | 29 +-
.../uri/queryoption/expression/MemberImpl.java | 31 +-
.../uri/queryoption/expression/MethodImpl.java | 110 +-
.../queryoption/expression/TypeLiteralImpl.java | 21 +-
.../uri/queryoption/expression/UnaryImpl.java | 30 +-
.../uri/validator/UriValidationException.java | 9 +-
.../server/core/uri/validator/UriValidator.java | 272 +-
.../server-core-exceptions-i18n.properties | 22 +-
.../server/core/ContentNegotiatorTest.java | 8 +-
.../olingo/server/core/ExceptionHelperTest.java | 6 +-
.../server/core/ODataHttpHandlerImplTest.java | 6 +-
.../olingo/server/core/ODataImplTest.java | 4 +-
.../core/TranslatedExceptionSubclassesTest.java | 4 +-
.../batchhandler/MockedBatchHandlerTest.java | 4 +-
.../server/core/debug/AbstractDebugTabTest.java | 8 +-
.../server/core/debug/DebugTabBodyTest.java | 4 +-
.../server/core/debug/DebugTabRequestTest.java | 4 +-
.../server/core/debug/DebugTabResponseTest.java | 4 +-
.../server/core/debug/DebugTabServerTest.java | 6 +-
.../core/debug/ServerCoreDebuggerTest.java | 6 +-
.../FixedFormatDeserializerTest.java | 4 +-
.../deserializer/batch/BatchLineReaderTest.java | 4 +-
.../batch/BatchParserCommonTest.java | 4 +-
.../batch/BatchRequestParserTest.java | 16 +-
.../core/deserializer/batch/HeaderTest.java | 4 +-
.../batch/HttpRequestStatusLineTest.java | 4 +-
.../json/ODataJsonDeserializerBasicTest.java | 4 +-
.../olingo/server/core/etag/ETagHelperTest.java | 4 +-
.../olingo/server/core/etag/ETagParserTest.java | 4 +-
.../server/core/prefer/PreferencesTest.java | 8 +-
.../serializer/AsyncResponseSerializerTest.java | 18 +-
.../serializer/BatchResponseSerializerTest.java | 20 +-
.../serializer/FixedFormatSerializerTest.java | 4 +-
.../json/ServerErrorSerializerTest.java | 8 +-
.../utils/CircleStreamBufferTest.java | 5 +-
.../serializer/utils/ContextURLBuilderTest.java | 4 +-
.../xml/MetadataDocumentXmlSerializerTest.java | 205 +-
.../xml/ServerErrorXmlSerializerTest.java | 18 +-
.../xml/ServiceDocumentXmlSerializerTest.java | 24 +-
.../olingo/server/core/uri/UriInfoImplTest.java | 202 +
.../core/uri/parser/ExpressionParserTest.java | 271 +
.../server/core/uri/parser/LexerTest.java | 318 +
.../server/core/uri/parser/UriDecoderTest.java | 95 +
.../core/uri/parser/UriTokenizerTest.java | 657 ++
.../search/SearchParserAndTokenizerTest.java | 139 +-
.../uri/parser/search/SearchParserTest.java | 29 +-
.../uri/parser/search/SearchTokenizerTest.java | 121 +-
.../src/test/resources/simplelogger.properties | 20 -
lib/server-tecsvc/pom.xml | 2 +-
.../server/tecsvc/data/DataProviderTest.java | 4 +-
lib/server-test/pom.xml | 11 +-
.../server/core/PreconditionsValidatorTest.java | 25 +-
.../serializer/utils/ContextURLHelperTest.java | 4 +-
.../olingo/server/core/uri/UriHelperTest.java | 4 +-
.../olingo/server/core/uri/UriInfoImplTest.java | 212 -
.../server/core/uri/UriResourceImplTest.java | 172 +-
.../core/uri/antlr/TestFullResourcePath.java | 6009 ------------------
.../olingo/server/core/uri/antlr/TestLexer.java | 303 -
.../core/uri/antlr/TestUriParserImpl.java | 1177 ----
.../server/core/uri/parser/ParserTest.java | 60 +-
.../server/core/uri/parser/RawUriTest.java | 150 -
.../core/uri/parser/TestFullResourcePath.java | 5906 +++++++++++++++++
.../core/uri/parser/TestUriParserImpl.java | 1047 +++
.../core/uri/queryoption/QueryOptionTest.java | 20 +-
.../queryoption/expression/ExpressionTest.java | 143 +-
.../core/uri/testutil/ExpandValidator.java | 19 +-
.../core/uri/testutil/FilterValidator.java | 112 +-
.../core/uri/testutil/ParserWithLogging.java | 56 -
.../core/uri/testutil/ResourceValidator.java | 14 +-
.../core/uri/testutil/TestErrorLogger.java | 105 -
.../core/uri/testutil/TestUriValidator.java | 52 +-
.../core/uri/testutil/TokenValidator.java | 193 -
.../core/uri/testutil/UriLexerWithTrace.java | 85 -
.../core/uri/validator/UriValidatorTest.java | 21 +-
.../src/test/resources/simplelogger.properties | 20 -
pom.xml | 16 +-
samples/client/pom.xml | 2 +-
samples/osgi/server/README.txt | 10 +-
samples/osgi/server/pom.xml | 2 +-
samples/pom.xml | 2 +-
samples/server/pom.xml | 2 +-
samples/tutorials/p0_all/pom.xml | 4 +-
samples/tutorials/p10_media/pom.xml | 4 +-
samples/tutorials/p11_batch/pom.xml | 4 +-
samples/tutorials/p12_deep_insert/pom.xml | 4 +-
.../p12_deep_insert_preparation/pom.xml | 4 +-
samples/tutorials/p1_read/pom.xml | 4 +-
samples/tutorials/p2_readep/pom.xml | 4 +-
samples/tutorials/p3_write/pom.xml | 4 +-
samples/tutorials/p4_navigation/pom.xml | 4 +-
samples/tutorials/p5_queryoptions-tcs/pom.xml | 4 +-
samples/tutorials/p6_queryoptions-es/pom.xml | 4 +-
samples/tutorials/p7_queryoptions-o/pom.xml | 4 +-
samples/tutorials/p8_queryoptions-f/pom.xml | 4 +-
samples/tutorials/p9_action/pom.xml | 4 +-
samples/tutorials/p9_action_preparation/pom.xml | 4 +-
samples/tutorials/pom.xml | 2 +-
579 files changed, 16609 insertions(+), 16456 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c02215e2/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntityCollection.java
----------------------------------------------------------------------
diff --cc lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntityCollection.java
index e2aee4e,743d437..d3ec8e8
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntityCollection.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntityCollection.java
@@@ -26,14 -25,11 +26,11 @@@ import java.util.List
/**
* Data representation for a collection of single entities.
*/
-public class EntityCollection extends AbstractODataObject {
+public class EntityCollection extends AbstractODataObject implements Iterable<Entity> {
- private Integer count;
-
private final List<Entity> entities = new ArrayList<Entity>();
-
+ private Integer count;
private URI next;
-
private URI deltaLink;
/**
@@@ -100,7 -96,24 +97,29 @@@
}
@Override
+ public Iterator<Entity> iterator() {
+ return this.entities.iterator();
+ }
++
++ @Override
+ public boolean equals(final Object o) {
+ if (!super.equals(o)) {
+ return false;
+ }
+ final EntityCollection other = (EntityCollection) o;
+ return entities.equals(other.entities)
+ && (count == null ? other.count == null : count.equals(other.count))
+ && (next == null ? other.next == null : next.equals(other.next))
+ && (deltaLink == null ? other.deltaLink == null : deltaLink.equals(other.deltaLink));
+ }
+
+ @Override
+ public int hashCode() {
+ int result = super.hashCode();
+ result = 31 * result + entities.hashCode();
+ result = 31 * result + (count == null ? 0 : count.hashCode());
+ result = 31 * result + (next == null ? 0 : next.hashCode());
+ result = 31 * result + (deltaLink == null ? 0 : deltaLink.hashCode());
+ return result;
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c02215e2/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataResponse.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c02215e2/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/SerializerResult.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c02215e2/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c02215e2/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c02215e2/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/SerializerResultImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c02215e2/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
----------------------------------------------------------------------
diff --cc lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
index ce0258c,a912862..7f84319
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
@@@ -767,13 -767,13 +767,13 @@@ public class ODataJsonSerializer extend
}
- void writeContextURL(final ContextURL contextURL, JsonGenerator json) throws IOException {
- private void writeContextURL(final ContextURL contextURL, final JsonGenerator json) throws IOException {
++ void writeContextURL(final ContextURL contextURL, final JsonGenerator json) throws IOException {
if (!isODataMetadataNone && contextURL != null) {
json.writeStringField(Constants.JSON_CONTEXT, ContextURLBuilder.create(contextURL).toASCIIString());
}
}
- void writeMetadataETag(final ServiceMetadata metadata, JsonGenerator json) throws IOException {
- private void writeMetadataETag(final ServiceMetadata metadata, final JsonGenerator json) throws IOException {
++ void writeMetadataETag(final ServiceMetadata metadata, final JsonGenerator json) throws IOException {
if (!isODataMetadataNone
&& metadata != null
&& metadata.getServiceMetadataETagSupport() != null
@@@ -783,7 -783,7 +783,7 @@@
}
}
- void writeCount(final EntityCollection entityCollection, JsonGenerator json) throws IOException {
- private void writeCount(final EntityCollection entityCollection, final JsonGenerator json) throws IOException {
++ void writeCount(final EntityCollection entityCollection, final JsonGenerator json) throws IOException {
if (entityCollection.getCount() != null) {
if (isIEEE754Compatible) {
json.writeStringField(Constants.JSON_COUNT, entityCollection.getCount().toString());
@@@ -793,7 -793,7 +793,7 @@@
}
}
- void writeNextLink(final EntityCollection entitySet, JsonGenerator json) throws IOException {
- private void writeNextLink(final EntityCollection entitySet, final JsonGenerator json) throws IOException {
++ void writeNextLink(final EntityCollection entitySet, final JsonGenerator json) throws IOException {
if (entitySet.getNext() != null) {
json.writeStringField(Constants.JSON_NEXT_LINK, entitySet.getNext().toASCIIString());
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c02215e2/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/utils/CircleStreamBuffer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c02215e2/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c02215e2/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizerTest.java
----------------------------------------------------------------------