Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 422B410E18 for ; Wed, 21 Aug 2013 13:19:22 +0000 (UTC) Received: (qmail 4867 invoked by uid 500); 21 Aug 2013 13:19:21 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 4838 invoked by uid 500); 21 Aug 2013 13:19:21 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 4831 invoked by uid 99); 21 Aug 2013 13:19:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Aug 2013 13:19:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Aug 2013 13:19:19 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1BDB223888CD; Wed, 21 Aug 2013 13:18:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1516153 - in /cxf/trunk/rt/rs/extensions/search/src: main/java/org/apache/cxf/jaxrs/ext/search/SimpleSearchCondition.java test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java Date: Wed, 21 Aug 2013 13:18:58 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130821131858.1BDB223888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Wed Aug 21 13:18:57 2013 New Revision: 1516153 URL: http://svn.apache.org/r1516153 Log: [CXF-5198] Getting expressions with camel case supported when SearchBean is used Modified: cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SimpleSearchCondition.java cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java Modified: cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SimpleSearchCondition.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SimpleSearchCondition.java?rev=1516153&r1=1516152&r2=1516153&view=diff ============================================================================== --- cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SimpleSearchCondition.java (original) +++ cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SimpleSearchCondition.java Wed Aug 21 13:18:57 2013 @@ -154,7 +154,8 @@ public class SimpleSearchCondition im : ((SearchBean)condition).getKeySet(); for (String getter : keySet) { - ConditionType ct = getters2operators == null ? sharedType : getters2operators.get(getter); + ConditionType ct = getters2operators == null ? sharedType + : getters2operators.get(getter.toLowerCase()); if (ct == null) { continue; } Modified: cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java?rev=1516153&r1=1516152&r2=1516153&view=diff ============================================================================== --- cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java (original) +++ cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java Wed Aug 21 13:18:57 2013 @@ -59,6 +59,18 @@ public class SQLPrinterVisitorTest exten } @Test + public void testSQLCamelNameSearchBean() throws SearchParseException { + FiqlParser beanParser = new FiqlParser(SearchBean.class); + SearchCondition filter = beanParser.parse("theName==ami*;theLevel=gt=10"); + SQLPrinterVisitor visitor = new SQLPrinterVisitor("table"); + filter.accept(visitor); + String sql = visitor.getQuery(); + + assertTrue("SELECT * FROM table WHERE (theName LIKE 'ami%') AND (theLevel > '10')".equals(sql) + || "SELECT * FROM table WHERE (theLevel > '10') AND (theName LIKE 'ami%')".equals(sql)); + } + + @Test public void testSQL2() throws SearchParseException { SearchCondition filter = parser.parse("name==ami*,level=gt=10"); SQLPrinterVisitor visitor = new SQLPrinterVisitor("table");