[OLINGO-642] Merge branch 'master' into OLINGO-642_OSGi-Sample
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/d53574d4 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/d53574d4 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/d53574d4 Branch: refs/heads/OLINGO-642_OSGi-Sample Commit: d53574d4d0e0085ae5709d01e8e15ae6ecca739c Parents: e59b508 44ec578 Author: Michael Bolz <[email protected]> Authored: Wed Jun 10 10:58:50 2015 +0200 Committer: Michael Bolz <[email protected]> Committed: Wed Jun 10 10:58:50 2015 +0200 ---------------------------------------------------------------------- .../fit/tecsvc/client/BatchClientITCase.java | 10 +- .../fit/tecsvc/client/ConditionalITCase.java | 35 +++ .../tecsvc/client/PrimitiveComplexITCase.java | 18 +- .../tecsvc/client/SystemQueryOptionITCase.java | 14 +- .../fit/tecsvc/http/BasicBatchITCase.java | 2 +- .../apache/olingo/fit/v4/OAuth2TestITCase.java | 44 ++- .../response/ODataLinkOperationResponse.java | 29 -- .../retrieve/EdmMetadataRequestImpl.java | 31 ++- .../retrieve/XMLMetadataRequestImpl.java | 21 +- .../olingo/server/api/CustomETagSupport.java | 50 ---- .../olingo/server/api/EtagInformation.java | 74 ----- .../org/apache/olingo/server/api/OData.java | 28 +- .../olingo/server/api/ODataHttpHandler.java | 1 + .../server/api/ODataLibraryException.java | 159 +++++++++++ .../server/api/ODataTranslatedException.java | 159 ----------- .../olingo/server/api/ServiceMetadata.java | 6 + .../olingo/server/api/batch/BatchFacade.java | 88 +++--- .../api/deserializer/DeserializerException.java | 4 +- .../server/api/etag/CustomETagSupport.java | 51 ++++ .../olingo/server/api/etag/ETagHelper.java | 66 +++++ .../server/api/etag/PreconditionException.java | 54 ++++ .../api/etag/ServiceMetadataETagSupport.java | 45 ++++ .../ActionComplexCollectionProcessor.java | 9 +- .../api/processor/ActionComplexProcessor.java | 9 +- .../ActionEntityCollectionProcessor.java | 9 +- .../api/processor/ActionEntityProcessor.java | 9 +- .../ActionPrimitiveCollectionProcessor.java | 9 +- .../api/processor/ActionPrimitiveProcessor.java | 9 +- .../api/processor/ActionVoidProcessor.java | 6 +- .../server/api/processor/BatchProcessor.java | 15 +- .../processor/ComplexCollectionProcessor.java | 20 +- .../server/api/processor/ComplexProcessor.java | 20 +- .../CountComplexCollectionProcessor.java | 6 +- .../CountEntityCollectionProcessor.java | 6 +- .../CountPrimitiveCollectionProcessor.java | 6 +- .../server/api/processor/DefaultProcessor.java | 62 ++++- .../server/api/processor/DeltaProcessor.java | 4 +- .../processor/EntityCollectionProcessor.java | 6 +- .../server/api/processor/EntityProcessor.java | 27 +- .../api/processor/MediaEntityProcessor.java | 23 +- .../server/api/processor/MetadataProcessor.java | 6 +- .../processor/PrimitiveCollectionProcessor.java | 21 +- .../api/processor/PrimitiveProcessor.java | 19 +- .../api/processor/PrimitiveValueProcessor.java | 6 +- .../processor/ReferenceCollectionProcessor.java | 11 +- .../api/processor/ReferenceProcessor.java | 18 +- .../api/processor/ServiceDocumentProcessor.java | 6 +- .../server/api/serializer/ODataSerializer.java | 88 +++--- .../api/serializer/SerializerException.java | 4 +- .../olingo/server/api/uri/UriInfoCrossjoin.java | 54 ++++ .../server/api/TranslatedExceptionsTest.java | 4 +- .../olingo/server/core/OData4HttpHandler.java | 4 +- .../server/core/RequestURLHierarchyVisitor.java | 35 +++ .../olingo/server/core/ServiceDispatcher.java | 6 +- .../olingo/server/core/ServiceHandler.java | 82 +++--- .../olingo/server/core/ServiceRequest.java | 4 +- .../core/legacy/ProcessorServiceHandler.java | 60 ++--- .../server/core/requests/ActionRequest.java | 4 +- .../server/core/requests/BatchRequest.java | 6 +- .../server/core/requests/DataRequest.java | 20 +- .../server/core/requests/FunctionRequest.java | 4 +- .../server/core/requests/MediaRequest.java | 4 +- .../server/core/requests/MetadataRequest.java | 4 +- .../core/requests/ServiceDocumentRequest.java | 4 +- .../server/core/responses/CountResponse.java | 4 +- .../server/core/responses/EntityResponse.java | 4 +- .../core/responses/EntitySetResponse.java | 4 +- .../server/core/responses/MetadataResponse.java | 6 +- .../core/responses/NoContentResponse.java | 4 +- .../core/responses/PrimitiveValueResponse.java | 4 +- .../server/core/responses/PropertyResponse.java | 10 +- .../core/responses/ServiceDocumentResponse.java | 8 +- .../server/core/responses/ServiceResponse.java | 4 +- .../core/responses/ServiceResponseVisior.java | 20 +- .../server/core/responses/StreamResponse.java | 4 +- .../olingo/server/example/TripPinHandler.java | 50 ++-- .../server/example/TripPinServiceTest.java | 3 +- .../server/core/ContentNegotiatorException.java | 4 +- .../apache/olingo/server/core/EtagParser.java | 86 ------ .../olingo/server/core/ODataDispatcher.java | 81 +++--- .../server/core/ODataExceptionHelper.java | 31 ++- .../apache/olingo/server/core/ODataHandler.java | 13 +- .../server/core/ODataHandlerException.java | 4 +- .../server/core/ODataHttpHandlerImpl.java | 12 +- .../apache/olingo/server/core/ODataImpl.java | 37 +-- .../core/PreconditionRequiredException.java | 50 ---- .../server/core/PreconditionsValidator.java | 138 ---------- .../olingo/server/core/ServiceMetadataImpl.java | 15 +- .../core/batchhandler/BatchFacadeImpl.java | 58 ++++ .../core/batchhandler/BatchFascadeImpl.java | 54 ---- .../server/core/batchhandler/BatchHandler.java | 8 +- .../core/batchhandler/BatchPartHandler.java | 8 +- .../json/ODataJsonDeserializer.java | 13 +- .../olingo/server/core/etag/ETagHelperImpl.java | 72 +++++ .../server/core/etag/ETagInformation.java | 74 +++++ .../olingo/server/core/etag/ETagParser.java | 86 ++++++ .../core/etag/PreconditionsValidator.java | 128 +++++++++ .../serializer/json/ODataJsonSerializer.java | 75 ++++-- .../json/ServiceDocumentJsonSerializer.java | 33 ++- .../serializer/xml/ODataXmlSerializerImpl.java | 12 +- .../core/uri/parser/UriParseTreeVisitor.java | 17 +- .../core/uri/parser/UriParserException.java | 4 +- .../uri/validator/UriValidationException.java | 4 +- .../server-core-exceptions-i18n.properties | 4 +- .../olingo/server/core/EtagParserTest.java | 131 --------- .../olingo/server/core/ExceptionHelperTest.java | 137 ++++++++++ .../server/core/ODataHttpHandlerImplTest.java | 4 +- .../core/TranslatedExceptionSubclassesTest.java | 16 +- .../batchhandler/MockedBatchHandlerTest.java | 4 +- .../json/ODataJsonDeserializerBasicTest.java | 114 ++++++++ .../olingo/server/core/etag/ETagHelperTest.java | 79 ++++++ .../olingo/server/core/etag/ETagParserTest.java | 129 +++++++++ .../xml/MetadataDocumentXmlSerializerTest.java | 2 +- .../olingo/server/tecsvc/ETagSupport.java | 11 +- .../server/tecsvc/MetadataETagSupport.java | 40 +++ .../olingo/server/tecsvc/TechnicalServlet.java | 18 +- .../olingo/server/tecsvc/data/DataProvider.java | 19 +- .../server/tecsvc/data/RequestValidator.java | 91 +++---- .../processor/TechnicalActionProcessor.java | 25 +- .../processor/TechnicalBatchProcessor.java | 8 +- .../processor/TechnicalEntityProcessor.java | 152 +++++------ .../TechnicalPrimitiveComplexProcessor.java | 66 +++-- .../tecsvc/processor/TechnicalProcessor.java | 50 +--- .../expression/operand/TypedOperand.java | 20 +- .../expression/operand/UntypedOperand.java | 9 +- .../expression/operand/VisitorOperand.java | 2 + .../operation/MethodCallOperator.java | 14 +- .../expression/primitive/EdmNull.java | 88 ++---- .../server/core/PreconditionsValidatorTest.java | 209 ++++++++++---- .../json/ODataJsonSerializerTest.java | 270 ++++++++++--------- .../serializer/json/ServiceDocumentTest.java | 108 ++------ .../serializer/xml/MetadataDocumentTest.java | 5 +- .../core/uri/testutil/TestUriValidator.java | 4 +- .../server/sample/processor/CarsProcessor.java | 2 +- 134 files changed, 2793 insertions(+), 1998 deletions(-) ----------------------------------------------------------------------
