Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4.git
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/7dedb25c Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/7dedb25c Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/7dedb25c Branch: refs/heads/master Commit: 7dedb25c3a8a5e7b6b8d7817c3b5a10a1eebc28c Parents: 8130360 36e45f0 Author: Archana Rai <[email protected]> Authored: Thu Jun 22 16:31:02 2017 +0530 Committer: Archana Rai <[email protected]> Committed: Thu Jun 22 16:31:02 2017 +0530 ---------------------------------------------------------------------- .../olingo/fit/tecsvc/http/BasicHttpITCase.java | 82 ++++++++++++++++++++ .../serializer/json/ODataJsonSerializer.java | 36 ++++++++- .../core/serializer/xml/ODataXmlSerializer.java | 15 +++- .../olingo/server/core/uri/parser/Parser.java | 16 ++-- .../TechnicalPrimitiveComplexProcessor.java | 16 +++- .../tecsvc/processor/TechnicalProcessor.java | 36 +++++++-- .../json/ODataJsonSerializerTest.java | 64 +++++++++++++++ 7 files changed, 245 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
