Merge branch 'OLINGO-1292' of https://github.com/shawkins/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/e839533b Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/e839533b Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/e839533b Branch: refs/heads/master Commit: e839533bb43b3c12f41a9123c07792d024fd4143 Parents: ebdf0d3 b09dde0 Author: Ramesh Reddy <[email protected]> Authored: Mon Sep 24 12:34:18 2018 -0500 Committer: Ramesh Reddy <[email protected]> Committed: Mon Sep 24 12:34:18 2018 -0500 ---------------------------------------------------------------------- .../json/ODataJsonDeserializer.java | 39 +++++++++++--------- .../serializer/json/ODataJsonSerializer.java | 25 +++++++++---- .../json/ODataJsonDeserializerEntityTest.java | 4 +- .../json/ODataJsonSerializerTest.java | 11 ++---- .../json/ODataJsonSerializerv01Test.java | 9 ++--- 5 files changed, 49 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e839533b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e839533b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java ----------------------------------------------------------------------
