Return-Path: X-Original-To: apmail-olingo-commits-archive@minotaur.apache.org Delivered-To: apmail-olingo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4DA64182B7 for ; Tue, 17 Nov 2015 15:04:13 +0000 (UTC) Received: (qmail 37789 invoked by uid 500); 17 Nov 2015 15:04:13 -0000 Delivered-To: apmail-olingo-commits-archive@olingo.apache.org Received: (qmail 37732 invoked by uid 500); 17 Nov 2015 15:04:12 -0000 Mailing-List: contact commits-help@olingo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@olingo.apache.org Delivered-To: mailing list commits@olingo.apache.org Received: (qmail 37498 invoked by uid 99); 17 Nov 2015 15:04:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Nov 2015 15:04:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7B488E0BB9; Tue, 17 Nov 2015 15:04:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mibo@apache.org To: commits@olingo.apache.org Date: Tue, 17 Nov 2015 15:04:30 -0000 Message-Id: <605a5ceb4c854ede8394007fc1ad7383@git.apache.org> In-Reply-To: <064b4b638f084019b2b9ad40b274de04@git.apache.org> References: <064b4b638f084019b2b9ad40b274de04@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [20/23] olingo-odata4 git commit: [OLINGO-568] Merge branch 'master' into OLINGO-568_SearchParser_Draft [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 Authored: Tue Nov 17 10:50:06 2015 +0100 Committer: Michael Bolz 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 ----------------------------------------------------------------------