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/0d37336e Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/0d37336e Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/0d37336e Branch: refs/heads/master Commit: 0d37336eba84fbd6ea89279b5992c56777253462 Parents: 96bdba8 3190d00 Author: Ramesh Reddy <[email protected]> Authored: Fri Mar 25 10:32:02 2016 -0500 Committer: Ramesh Reddy <[email protected]> Committed: Fri Mar 25 10:32:02 2016 -0500 ---------------------------------------------------------------------- .../olingo/commons/core/edm/AbstractEdm.java | 3 - .../EntityCollectionSerializerOptions.java | 6 +- .../olingo/server/core/ODataDispatcher.java | 3 +- .../olingo/server/core/ODataHandlerImpl.java | 2 +- .../core/debug/DebugResponseHelperImpl.java | 42 +++++-------- .../olingo/server/core/debug/DebugTabUri.java | 16 +++-- .../serializer/BatchResponseSerializer.java | 4 +- .../core/serializer/utils/ResultHelper.java | 65 -------------------- .../olingo/server/core/uri/parser/Parser.java | 14 ++++- .../server/core/uri/parser/ParserHelper.java | 16 +++-- .../queryoption/expression/EnumerationImpl.java | 2 +- .../queryoption/expression/TypeLiteralImpl.java | 2 +- 12 files changed, 56 insertions(+), 119 deletions(-) ----------------------------------------------------------------------
