Merge remote-tracking branch 'origin/OLINGO-834_RefactorUriParsing' into OLINGO-834_Filter_Parser
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/ef19c9be Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/ef19c9be Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/ef19c9be Branch: refs/heads/OLINGO-834_Filter_Parser Commit: ef19c9be1f6714b7c50aea3ff5623bb2d5857653 Parents: 7b23ad7 7bc932a Author: Christian Amend <[email protected]> Authored: Thu Dec 10 15:34:39 2015 +0100 Committer: Christian Amend <[email protected]> Committed: Thu Dec 10 15:34:39 2015 +0100 ---------------------------------------------------------------------- .../olingo/fit/tecsvc/client/BasicITCase.java | 2 +- .../core/edm/primitivetype/EdmBinary.java | 12 +- .../edm/provider/EdmActionImportImplTest.java | 2 +- .../core/edm/provider/EdmProviderImplTest.java | 4 +- .../core/edm/provider/EdmSchemaImplTest.java | 1 + .../apache/olingo/server/core/ErrorHandler.java | 8 +- .../olingo/server/core/ServiceDispatcher.java | 4 +- .../olingo/server/core/ServiceRequest.java | 6 +- .../apache/olingo/server/core/ODataHandler.java | 4 +- .../olingo/server/core/uri/UriHelperImpl.java | 9 +- .../uri/UriResourceNavigationPropertyImpl.java | 5 +- .../core/uri/UriResourceWithKeysImpl.java | 3 +- .../olingo/server/core/uri/parser/Parser.java | 202 +++--- .../core/uri/parser/ResourcePathParser.java | 692 +++++++++++++++++++ .../core/uri/parser/UriParseTreeVisitor.java | 2 +- .../server/core/uri/parser/UriTokenizer.java | 592 ++++++++++++++++ .../server/core/uri/validator/UriValidator.java | 74 +- .../core/uri/parser/UriTokenizerTest.java | 369 ++++++++++ .../uri/parser/search/SearchTokenizerTest.java | 1 - .../server/tecsvc/data/DataProviderTest.java | 4 +- .../server/core/PreconditionsValidatorTest.java | 25 +- .../serializer/utils/ContextURLHelperTest.java | 4 +- .../olingo/server/core/uri/UriHelperTest.java | 4 +- .../server/core/uri/UriResourceImplTest.java | 14 +- .../core/uri/antlr/TestFullResourcePath.java | 154 +++-- .../core/uri/antlr/TestUriParserImpl.java | 15 +- .../server/core/uri/parser/ParserTest.java | 4 +- .../core/uri/testutil/FilterValidator.java | 62 +- .../core/uri/testutil/ParserWithLogging.java | 5 +- .../core/uri/testutil/ResourceValidator.java | 13 +- .../core/uri/testutil/TestUriValidator.java | 14 +- .../core/uri/validator/UriValidatorTest.java | 17 +- 32 files changed, 1973 insertions(+), 354 deletions(-) ----------------------------------------------------------------------
