[OLINGO-568] Merge branch 'OLINGO-568_SearchParser_Draft'
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/1a59a580 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/1a59a580 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/1a59a580 Branch: refs/heads/master Commit: 1a59a5804b16c714f5c9354ddd5b2c4a93987c1e Parents: be3b10a 6235f3a Author: Michael Bolz <[email protected]> Authored: Tue Nov 17 15:31:44 2015 +0100 Committer: Michael Bolz <[email protected]> Committed: Tue Nov 17 15:31:44 2015 +0100 ---------------------------------------------------------------------- .../tecsvc/client/SystemQueryOptionITCase.java | 42 +- .../queryoption/search/SearchExpression.java | 14 +- .../api/uri/queryoption/search/SearchUnary.java | 5 +- .../olingo/server/core/uri/parser/Parser.java | 15 +- .../uri/parser/search/SearchBinaryImpl.java | 56 ++ .../uri/parser/search/SearchExpressionImpl.java | 58 ++ .../core/uri/parser/search/SearchParser.java | 196 +++++++ .../parser/search/SearchParserException.java | 54 ++ .../uri/parser/search/SearchQueryToken.java | 26 + .../core/uri/parser/search/SearchTermImpl.java | 39 ++ .../core/uri/parser/search/SearchTokenizer.java | 571 +++++++++++++++++++ .../parser/search/SearchTokenizerException.java | 47 ++ .../core/uri/parser/search/SearchUnaryImpl.java | 46 ++ .../core/uri/queryoption/SearchOptionImpl.java | 7 +- .../search/SearchParserAndTokenizerTest.java | 198 +++++++ .../uri/parser/search/SearchParserTest.java | 248 ++++++++ .../uri/parser/search/SearchTokenizerTest.java | 500 ++++++++++++++++ .../processor/TechnicalEntityProcessor.java | 2 + .../tecsvc/processor/TechnicalProcessor.java | 3 +- .../queryoptions/options/SearchHandler.java | 93 +++ .../core/uri/antlr/TestFullResourcePath.java | 19 +- 21 files changed, 2211 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1a59a580/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java ---------------------------------------------------------------------- diff --cc lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java index c5857c7,d6cb557..d12b853 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java @@@ -58,7 -55,7 +58,8 @@@ import org.apache.olingo.server.core.ur import org.apache.olingo.server.core.uri.antlr.UriParserParser.OrderByEOFContext; import org.apache.olingo.server.core.uri.antlr.UriParserParser.PathSegmentEOFContext; import org.apache.olingo.server.core.uri.antlr.UriParserParser.SelectEOFContext; + import org.apache.olingo.server.core.uri.parser.search.SearchParser; +import org.apache.olingo.server.core.uri.queryoption.AliasQueryOptionImpl; import org.apache.olingo.server.core.uri.queryoption.CountOptionImpl; import org.apache.olingo.server.core.uri.queryoption.CustomQueryOptionImpl; import org.apache.olingo.server.core.uri.queryoption.ExpandOptionImpl; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1a59a580/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java ----------------------------------------------------------------------
