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/d2b5449f Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/d2b5449f Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/d2b5449f Branch: refs/heads/master Commit: d2b5449f79b12eb0e6053e47d88fbb0751f616e8 Parents: b78343b 87fa79a Author: Ramesh Reddy <[email protected]> Authored: Mon Apr 27 11:16:46 2015 -0500 Committer: Ramesh Reddy <[email protected]> Committed: Mon Apr 27 11:16:46 2015 -0500 ---------------------------------------------------------------------- .../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 + .../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 + 15 files changed, 651 insertions(+), 110 deletions(-) ----------------------------------------------------------------------
