[OLINGO-568] Merge branch 'master' into OLINGO-568_SearchParser_Draft arser_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/c0adc020 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/c0adc020 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/c0adc020 Branch: refs/heads/master Commit: c0adc020b22ed728aaed1659fc8485e4c214141f Parents: 9ff30e7 6614aea Author: Michael Bolz <[email protected]> Authored: Tue Nov 17 10:50:06 2015 +0100 Committer: Michael Bolz <[email protected]> Committed: Tue Nov 17 10:50:06 2015 +0100 ---------------------------------------------------------------------- .../commons/core/edm/EdmEnumTypeImpl.java | 47 ++++++-- .../server/core/edm/provider/EdmEnumTest.java | 16 ++- .../core/uri/parser/UriParseTreeVisitor.java | 18 ++- .../TechnicalPrimitiveComplexProcessor.java | 8 +- .../expression/ExpressionVisitorImpl.java | 9 +- .../expression/operand/UntypedOperand.java | 19 +--- .../queryoptions/options/FilterHandler.java | 2 +- .../queryoptions/options/OrderByHandler.java | 4 +- .../core/uri/antlr/TestFullResourcePath.java | 113 +++++++++++++++---- 9 files changed, 170 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c0adc020/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java ----------------------------------------------------------------------
