Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/a57926bf Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/a57926bf Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/a57926bf Branch: refs/heads/olingo-266-tecsvc Commit: a57926bf8d76bbb8772079eaf3ae15ec89889de5 Parents: cf17331 35e8969 Author: fmartelli <[email protected]> Authored: Wed May 21 15:11:17 2014 +0200 Committer: fmartelli <[email protected]> Committed: Wed May 21 15:11:17 2014 +0200 ---------------------------------------------------------------------- .../commons/AbstractInvocationHandler.java | 30 ++- .../AbstractStructuredInvocationHandler.java | 4 +- .../commons/EntitySetInvocationHandler.java | 11 +- .../olingo/ext/proxy/commons/FilterImpl.java | 2 +- .../commons/OperationInvocationHandler.java | 5 +- .../olingo/ext/proxy/commons/SearchImpl.java | 2 +- .../java/org/apache/olingo/fit/V4Services.java | 31 ++- .../resources/V40/Accounts/102/entity.full.json | 34 +++ .../main/resources/V40/Accounts/102/entity.xml | 55 ++++ .../V40/Accounts/102/links/MyGiftCard.full.json | 15 ++ .../V40/Accounts/102/links/MyGiftCard.xml | 41 +++ .../MyPaymentInstruments(102901).full.json | 16 ++ .../102/links/MyPaymentInstruments(102901).xml | 40 +++ .../MyPaymentInstruments(102902).full.json | 16 ++ .../102/links/MyPaymentInstruments(102902).xml | 40 +++ .../102/links/MyPaymentInstruments.full.json | 62 +++++ .../Accounts/102/links/MyPaymentInstruments.xml | 95 +++++++ .../olingo/fit/v3/AbstractTestITCase.java | 4 +- .../fit/v3/ActionOverloadingTestITCase.java | 155 ++++------- .../apache/olingo/fit/v3/AsyncTestITCase.java | 8 +- .../apache/olingo/fit/v3/BatchTestITCase.java | 26 +- .../apache/olingo/fit/v3/CountTestITCase.java | 4 +- .../olingo/fit/v3/EntityCreateTestITCase.java | 16 +- .../olingo/fit/v3/EntityRetrieveTestITCase.java | 14 +- .../olingo/fit/v3/EntitySetTestITCase.java | 8 +- .../olingo/fit/v3/EntityUpdateTestITCase.java | 26 +- .../apache/olingo/fit/v3/ErrorTestITCase.java | 20 +- .../olingo/fit/v3/FilterFactoryTestITCase.java | 2 +- .../apache/olingo/fit/v3/FilterTestITCase.java | 2 +- .../apache/olingo/fit/v3/InvokeTestITCase.java | 120 ++------- .../olingo/fit/v3/KeyAsSegmentTestITCase.java | 6 +- .../apache/olingo/fit/v3/LinkTestITCase.java | 8 +- .../olingo/fit/v3/MediaEntityTestITCase.java | 12 +- .../olingo/fit/v3/OpenTypeTestITCase.java | 6 +- .../olingo/fit/v3/PrimitiveKeysTestITCase.java | 2 +- .../fit/v3/PropertyRetrieveTestITCase.java | 8 +- .../olingo/fit/v3/PropertyTestITCase.java | 16 +- .../olingo/fit/v3/PropertyValueTestITCase.java | 20 +- .../olingo/fit/v3/QueryOptionsTestITCase.java | 12 +- .../olingo/fit/v4/AbstractTestITCase.java | 4 +- .../apache/olingo/fit/v4/AsyncTestITCase.java | 6 +- .../apache/olingo/fit/v4/BatchTestITCase.java | 30 +-- .../fit/v4/BoundOperationInvokeTestITCase.java | 258 +++++++++++++------ .../apache/olingo/fit/v4/DeltaTestITCase.java | 2 +- .../olingo/fit/v4/DerivedTypeTestITCase.java | 8 +- .../olingo/fit/v4/EntityCreateTestITCase.java | 6 +- .../olingo/fit/v4/EntityRetrieveTestITCase.java | 20 +- .../olingo/fit/v4/EntitySetTestITCase.java | 8 +- .../olingo/fit/v4/EntityUpdateTestITCase.java | 8 +- .../olingo/fit/v4/ErrorResponseTestITCase.java | 2 +- .../olingo/fit/v4/FilterFactoryTestITCase.java | 2 +- .../olingo/fit/v4/KeyAsSegmentTestITCase.java | 4 +- .../olingo/fit/v4/MediaEntityTestITCase.java | 8 +- .../olingo/fit/v4/OpenTypeTestITCase.java | 6 +- .../fit/v4/OperationImportInvokeTestITCase.java | 96 ++----- .../olingo/fit/v4/PropertyTestITCase.java | 14 +- .../olingo/fit/v4/PropertyValueTestITCase.java | 20 +- .../olingo/fit/v4/QueryOptionsTestITCase.java | 22 +- .../olingo/fit/v4/SingletonTestITCase.java | 6 +- .../client/api/CommonEdmEnabledODataClient.java | 2 +- .../olingo/client/api/CommonODataClient.java | 4 +- .../api/communication/header/ODataHeaders.java | 31 +++ .../invoke/EdmEnabledInvokeRequestFactory.java | 65 ++++- .../request/invoke/InvokeRequestFactory.java | 64 ++++- .../client/api/v3/EdmEnabledODataClient.java | 2 +- .../olingo/client/api/v3/ODataClient.java | 2 +- .../client/api/v4/EdmEnabledODataClient.java | 2 +- .../olingo/client/api/v4/ODataClient.java | 2 +- .../olingo/client/core/AbstractODataClient.java | 3 +- .../communication/header/ODataHeadersImpl.java | 49 +--- .../request/AbstractODataRequest.java | 5 +- .../batch/v3/BatchRequestFactoryImpl.java | 2 +- .../batch/v4/BatchRequestFactoryImpl.java | 2 +- .../AbstractEdmEnabledInvokeRequestFactory.java | 172 +++++++++++++ .../invoke/AbstractInvokeRequestFactory.java | 55 +++- .../v3/EdmEnabledInvokeRequestFactoryImpl.java | 78 +----- .../invoke/v3/InvokeRequestFactoryImpl.java | 36 +-- .../v4/EdmEnabledInvokeRequestFactoryImpl.java | 78 +----- .../invoke/v4/InvokeRequestFactoryImpl.java | 36 +-- .../AbstractRetrieveRequestFactory.java | 6 +- .../v3/ODataLinkCollectionRequestImpl.java | 2 +- .../retrieve/v3/RetrieveRequestFactoryImpl.java | 2 +- .../retrieve/v4/RetrieveRequestFactoryImpl.java | 2 +- .../retrieve/v4/XMLMetadataRequestImpl.java | 2 +- .../apache/olingo/client/core/uri/URIUtils.java | 20 -- .../core/v3/EdmEnabledODataClientImpl.java | 2 +- .../olingo/client/core/v3/ODataClientImpl.java | 4 +- .../core/v4/EdmEnabledODataClientImpl.java | 2 +- .../olingo/client/core/v4/ODataClientImpl.java | 4 +- .../client/core/uri/v3/URIBuilderTest.java | 26 +- .../client/core/uri/v4/URIBuilderTest.java | 26 +- 91 files changed, 1399 insertions(+), 913 deletions(-) ----------------------------------------------------------------------
