[OLINGO-786] Merge branch 'master' into olingo786
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/507236dd Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/507236dd Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/507236dd Branch: refs/heads/master Commit: 507236dd8c453dcb5be189ff670c4f707378f003 Parents: 3ec5a16 b736c43 Author: Michael Bolz <[email protected]> Authored: Mon Oct 5 07:57:29 2015 +0200 Committer: Michael Bolz <[email protected]> Committed: Mon Oct 5 07:57:29 2015 +0200 ---------------------------------------------------------------------- .../client/AbstractParamTecSvcITCase.java | 18 + .../fit/tecsvc/client/AbstractTecSvcITCase.java | 28 +- .../fit/tecsvc/client/ActionImportITCase.java | 37 +- .../fit/tecsvc/client/AsyncSupportITCase.java | 24 +- .../fit/tecsvc/client/DeepInsertITCase.java | 886 +++++++++-------- .../fit/tecsvc/client/DeepInsertXmlITCase.java | 950 ------------------- .../ExpandWithSystemQueryOptionsITCase.java | 12 +- .../commons/api/edm/EdmNavigationProperty.java | 2 +- .../olingo/commons/api/edm/EdmParameter.java | 2 +- .../olingo/commons/api/edm/EdmProperty.java | 4 +- .../olingo/commons/api/edm/EdmReturnType.java | 2 +- .../apache/olingo/server/core/ODataImpl.java | 7 +- .../json/ODataJsonDeserializer.java | 389 +++----- .../deserializer/xml/ODataXmlDeserializer.java | 119 ++- .../core/serializer/xml/ODataXmlSerializer.java | 46 +- .../core/uri/parser/UriParseTreeVisitor.java | 280 +++--- .../uri/validator/UriValidationException.java | 4 +- .../server/core/uri/validator/UriValidator.java | 59 +- .../server-core-exceptions-i18n.properties | 1 + .../olingo/server/tecsvc/data/ActionData.java | 116 ++- .../olingo/server/tecsvc/data/DataProvider.java | 23 +- .../processor/TechnicalEntityProcessor.java | 9 +- .../server/tecsvc/provider/ActionProvider.java | 99 +- .../tecsvc/provider/ContainerProvider.java | 7 + .../tecsvc/provider/FunctionProvider.java | 2 +- .../server/tecsvc/provider/SchemaProvider.java | 1 + .../tecsvc/data/ActionDataProviderTest.java | 14 +- .../olingo/server/core/ODataHandlerTest.java | 24 +- .../server/core/PreconditionsValidatorTest.java | 2 +- .../AbstractODataDeserializerTest.java | 44 + .../json/AbstractODataDeserializerTest.java | 46 - .../json/ODataDeserializerDeepInsertTest.java | 125 +-- .../ODataDeserializerEntityCollectionTest.java | 205 ++-- ...ataJsonDeserializerActionParametersTest.java | 328 ++++--- .../json/ODataJsonDeserializerEntityTest.java | 678 ++++--------- ...DataXMLDeserializerActionParametersTest.java | 353 +++---- .../xml/ODataXmlDeserializerTest.java | 211 ++-- .../core/uri/antlr/TestFullResourcePath.java | 193 +++- .../core/uri/antlr/TestUriParserImpl.java | 11 +- 39 files changed, 2099 insertions(+), 3262 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/507236dd/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ContainerProvider.java ----------------------------------------------------------------------
