[OLINGO-811] Merge branch 'master' into OLINGO-811_CountForExpand
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/969f1768 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/969f1768 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/969f1768 Branch: refs/heads/OLINGO-811_CountForExpand Commit: 969f1768e5d00bcd1dfadc95728cfeaf8370b435 Parents: 8bd685b 639362c Author: mibo <[email protected]> Authored: Sun Nov 15 08:57:49 2015 +0100 Committer: mibo <[email protected]> Committed: Sun Nov 15 08:57:49 2015 +0100 ---------------------------------------------------------------------- .../olingo/fit/tecsvc/client/BasicITCase.java | 8 +- .../tecsvc/client/FilterSystemQueryITCase.java | 2 +- .../batch/BatchDeserializerException.java | 2 - .../olingo/server/core/uri/antlr/UriParser.g4 | 8 +- .../batch/HttpRequestStatusLine.java | 15 +- .../json/ODataJsonDeserializer.java | 8 +- .../deserializer/xml/ODataXmlDeserializer.java | 188 +- .../serializer/json/ODataJsonSerializer.java | 7 +- .../server-core-exceptions-i18n.properties | 1 - .../batch/BatchRequestParserTest.java | 61 +- .../json/ODataJsonDeserializerBasicTest.java | 51 +- .../olingo/server/tecsvc/data/DataCreator.java | 1052 +-- .../olingo/server/tecsvc/data/DataProvider.java | 51 +- .../tecsvc/provider/ComplexTypeProvider.java | 2 +- .../tecsvc/provider/EntityTypeProvider.java | 8 +- .../tecsvc/provider/PropertyProvider.java | 9 +- .../json/ODataJsonDeserializerEntityTest.java | 67 +- .../xml/ODataXmlDeserializerTest.java | 4 +- .../json/ODataJsonSerializerTest.java | 60 +- .../serializer/xml/ODataXmlSerializerTest.java | 2 - .../core/uri/antlr/TestFullResourcePath.java | 6114 +++++++++--------- ...tityETMixEnumDefCollCompWithEnumStrings.json | 24 + 22 files changed, 3972 insertions(+), 3772 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/969f1768/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/969f1768/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/969f1768/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java ----------------------------------------------------------------------
