svn commit: r1417896 - in /cxf/branches/2.6.x-fixes: ./ rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/client/ rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/

[sergeyb]

Author: sergeyb
Date: Thu Dec  6 14:11:44 2012
New Revision: 1417896

URL: http://svn.apache.org/viewvc?rev=1417896&view=rev
Log:
Merged revisions 1417894 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1417894 | sergeyb | 2012-12-06 14:09:29 +0000 (Thu, 06 Dec 2012) | 1 line
  
  Adding a couple of shortcuts to SearchConditionBuilder
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    
cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/client/CompleteCondition.java
    
cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilder.java
    
cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1417894

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/client/CompleteCondition.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/client/CompleteCondition.java?rev=1417896&r1=1417895&r2=1417896&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/client/CompleteCondition.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/client/CompleteCondition.java
 Thu Dec  6 14:11:44 2012
@@ -25,9 +25,15 @@ public interface CompleteCondition {
     /** Conjunct current expression with another */
     PartialCondition and();
 
+    /** shortcut for and().is() */
+    Property and(String name);
+    
     /** Disjunct current expression with another */
     PartialCondition or();
 
+    /** shortcut for or().is() */
+    Property or(String name);
+    
     /** Finalize condition construction and build search condition query. */
     String query();
 }

Modified: 
cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilder.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilder.java?rev=1417896&r1=1417895&r2=1417896&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilder.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilder.java
 Thu Dec  6 14:11:44 2012
@@ -249,11 +249,19 @@ public class FiqlSearchConditionBuilder 
             result += FiqlParser.AND;
             return this;
         }
+        
+        public Property and(String name) {
+            return and().is(name);
+        }
 
         public PartialCondition or() {
             result += FiqlParser.OR;
             return this;
         }
+        
+        public Property or(String name) {
+            return or().is(name);
+        }
 
         public CompleteCondition and(CompleteCondition c1, CompleteCondition 
c2, CompleteCondition... cn) {
             result += "(" + ((Builder)c1).buildPartial(this) + FiqlParser.AND

Modified: 
cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java?rev=1417896&r1=1417895&r2=1417896&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java
 Thu Dec  6 14:11:44 2012
@@ -255,7 +255,13 @@ public class FiqlSearchConditionBuilderT
     public void testOrSimple() {
         String ret = 
b.is("foo").greaterThan(20).or().is("foo").lessThan(10).query();
         assertEquals("foo=gt=20,foo=lt=10", ret);
-    }    
+    }
+    
+    @Test
+    public void testOrSimpleShortcut() {
+        String ret = 
b.is("foo").greaterThan(20).or("foo").lessThan(10).query();
+        assertEquals("foo=gt=20,foo=lt=10", ret);
+    }
     
     @Test
     public void testAndSimple() {
@@ -264,6 +270,12 @@ public class FiqlSearchConditionBuilderT
     }
     
     @Test
+    public void testAndSimpleShortcut() {
+        String ret = 
b.is("foo").greaterThan(20).and("bar").equalTo("plonk").query();
+        assertEquals("foo=gt=20;bar==plonk", ret);
+    }
+    
+    @Test
     public void testOrComplex() {
         String ret = b.or(b.is("foo").equalTo("aaa"), 
b.is("bar").equalTo("bbb")).query();
         assertEquals("(foo==aaa,bar==bbb)", ret);