Merge branch 'OLINGO-864'
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/3c205f90 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/3c205f90 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/3c205f90 Branch: refs/heads/master Commit: 3c205f907e129fba303a283ff4f8ac9c094e768a Parents: 187c229 7b26cc6 Author: Ramesh Reddy <[email protected]> Authored: Fri Feb 12 09:23:09 2016 -0600 Committer: Ramesh Reddy <[email protected]> Committed: Fri Feb 12 09:23:09 2016 -0600 ---------------------------------------------------------------------- .../client/AbstractParamTecSvcITCase.java | 14 +++++ .../commons/core/edm/primitivetype/EdmDate.java | 5 +- .../edm/primitivetype/EdmDateTimeOffset.java | 62 ++++++++++++-------- .../core/edm/primitivetype/EdmTimeOfDay.java | 20 ++----- .../core/edm/primitivetype/EdmDateTest.java | 1 - .../primitivetype/EdmDateTimeOffsetTest.java | 9 ++- .../edm/primitivetype/EdmTimeOfDayTest.java | 23 ++++++-- .../olingo/server/tecsvc/data/DataCreator.java | 10 +++- .../server/tecsvc/data/DataProviderTest.java | 14 +++++ .../json/ODataJsonSerializerTest.java | 13 ++++ 10 files changed, 116 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/3c205f90/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/3c205f90/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java ----------------------------------------------------------------------
