[OLINGO-564] Merge branch 'master' into OLINGO-564
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/3c099091 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/3c099091 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/3c099091 Branch: refs/heads/OLINGO-564 Commit: 3c0990910a5de761d7d142b7541bde9b13390c55 Parents: 2318953 d2b5449 Author: Michael Bolz <[email protected]> Authored: Tue Apr 28 12:56:08 2015 +0200 Committer: Michael Bolz <[email protected]> Committed: Tue Apr 28 12:56:08 2015 +0200 ---------------------------------------------------------------------- .../fit/tecsvc/client/ActionImportITCase.java | 296 +++++++++++++++++++ .../olingo/client/api/uri/SegmentType.java | 2 + .../olingo/client/api/uri/URIBuilder.java | 8 + .../olingo/client/core/uri/URIBuilderImpl.java | 11 +- .../client/core/uri/v4/URIBuilderTest.java | 4 +- .../apache/olingo/commons/api/data/Entity.java | 1 + .../olingo/server/core/ServiceHandler.java | 12 +- .../server/core/requests/BatchRequest.java | 23 +- .../server/core/requests/DataRequest.java | 5 + .../olingo/server/example/TripPinDataModel.java | 42 +++ .../olingo/server/example/TripPinHandler.java | 20 +- .../server/example/TripPinServiceTest.java | 27 ++ .../json/ODataJsonDeserializer.java | 16 + .../olingo/server/tecsvc/data/ActionData.java | 122 +++++--- .../olingo/server/tecsvc/data/DataCreator.java | 14 +- .../olingo/server/tecsvc/data/DataProvider.java | 20 ++ .../server/tecsvc/data/EntityActionResult.java | 43 +++ .../processor/TechnicalEntityProcessor.java | 117 ++++++-- .../TechnicalPrimitiveComplexProcessor.java | 76 +++-- .../tecsvc/processor/TechnicalProcessor.java | 15 + ...ataJsonDeserializerActionParametersTest.java | 16 + 21 files changed, 770 insertions(+), 120 deletions(-) ----------------------------------------------------------------------
