Merge branch 'olingo-1009'
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/038a4821 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/038a4821 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/038a4821 Branch: refs/heads/master Commit: 038a4821a8da0be0ed556234873c47d9ef744a1d Parents: b1db030 68969d5 Author: Ramesh Reddy <[email protected]> Authored: Wed Sep 7 10:19:15 2016 -0500 Committer: Ramesh Reddy <[email protected]> Committed: Wed Sep 7 10:19:15 2016 -0500 ---------------------------------------------------------------------- .../serializer/json/ODataJsonSerializer.java | 86 ++++++++++---- .../serializer/utils/ExpandSelectHelper.java | 14 ++- .../core/serializer/xml/ODataXmlSerializer.java | 116 +++++++++++++------ .../json/ODataJsonSerializerTest.java | 48 ++++++++ 4 files changed, 201 insertions(+), 63 deletions(-) ----------------------------------------------------------------------
