StructuredQueryBuilder.word(...) or underlying cts:word-query doesn't work as I thought, it only queries direct child text whereas I wanted more a container query style. Based on that, I'll depend on existing containerQuery(query) and term(...) methods instead

Author: sammefford

src/main/java/com/marklogic/client/impl/PojoQueryBuilderImpl.java

@@ -105,7 +105,7 @@ public StructuredQueryDefinition value(String pojoField, String[] options,
             return value(jsonProperty(pojoField), null, options, weight, values);
         }
     }
-    public StructuredQueryDefinition word(String pojoField, String[] words) {
+    public StructuredQueryDefinition word(String pojoField, String... words) {
         if ( wrapQueries ) {
             return super.containerQuery(jsonProperty(classWrapper),
                 super.word(jsonProperty(pojoField), words));
@@ -123,12 +123,6 @@ public StructuredQueryDefinition word(String pojoField, String[] options,
             return super.word(jsonProperty(pojoField), null, options, weight, words);
         }
     }
-    public StructuredQueryDefinition word(String... words) {
-        return super.word(jsonProperty(classWrapper), words);
-    }
-    public StructuredQueryDefinition word(String[] options, double weight, String... words) {
-        return super.word(jsonProperty(classWrapper), null, options, weight, words);
-    }
 
     public String getRangeIndexType(String fieldName) {
         // map java types to acceptable Range Index types

src/main/java/com/marklogic/client/pojo/PojoQueryBuilder.java

@@ -25,11 +25,9 @@ public StructuredQueryDefinition range(String pojoField, String[] options,
     public StructuredQueryDefinition value(String pojoField, String... values);
     public StructuredQueryDefinition value(String pojoField, String[] options,
         double weight, String... values);
-    public StructuredQueryDefinition word(String pojoField, String[] words);
+    public StructuredQueryDefinition word(String pojoField, String... words);
     public StructuredQueryDefinition word(String pojoField, String[] options,
         double weight, String... words);
-    public StructuredQueryDefinition word(String... words);
-    public StructuredQueryDefinition word(String[] options, double weight, String... words);
 
     // All following method signatures copied from StructuredQueryBuilder since it has no interface we can extend
     public StructuredQueryDefinition and(StructuredQueryDefinition... queries);

src/test/java/com/marklogic/client/test/PojoFacadeTest.java

@@ -107,7 +107,7 @@ public void testC_QueryPojos() throws Exception {
 
 
         PojoQueryBuilder<City> qb = cities.getQueryBuilder();
-        QueryDefinition query = qb.word("Tungi", "Dalatando", "Chittagong");
+        QueryDefinition query = qb.term("Tungi", "Dalatando", "Chittagong");
         page = cities.search(query, 1);
         iterator = page.iterator();
         numRead = 0;
@@ -130,7 +130,7 @@ public void testC_QueryPojos() throws Exception {
         assertEquals("Failed to find number of records expected", 7, numRead);
         assertEquals("PojoPage failed to report number of records expected", numRead, page.size());
 
-        query = qb.containerQuery("alternateNames", qb.word("San", "Santo"));
+        query = qb.containerQuery("alternateNames", qb.term("San", "Santo"));
         page = cities.search(query, 1);
         iterator = page.iterator();
         numRead = 0;
@@ -143,6 +143,17 @@ public void testC_QueryPojos() throws Exception {
         assertEquals("Failed to find number of records expected", 11, numRead);
         assertEquals("PojoPage failed to report number of records expected", numRead, page.size());
 
+        query = qb.range("population", Operator.LT, 350000);
+        page = cities.search(query, 1);
+        iterator = page.iterator();
+        numRead = 0;
+        while ( iterator.hasNext() ) {
+            City city = iterator.next();
+            numRead++;
+        }
+        assertEquals("Failed to find number of records expected", 21, numRead);
+        assertEquals("PojoPage failed to report number of records expected", numRead, page.size());
+
         query = qb.geospatial(
             qb.geoField("latLong"),
             qb.circle(-34, -58, 1)
@@ -190,17 +201,6 @@ public void testC_QueryPojos() throws Exception {
         // when this works we'll find out how many we expect
         assertEquals("Failed to find number of records expected", -1, numRead);
         assertEquals("PojoPage failed to report number of records expected", numRead, page.size());
-
-        query = qb.range("population", Operator.LT, 350000);
-        page = cities.search(query, 1);
-        iterator = page.iterator();
-        numRead = 0;
-        while ( iterator.hasNext() ) {
-            City city = iterator.next();
-            numRead++;
-        }
-        assertEquals("Failed to find number of records expected", 21, numRead);
-        assertEquals("PojoPage failed to report number of records expected", numRead, page.size());
     }
 
     @Test
@@ -241,17 +241,16 @@ public void testD_PojosWithChildren() throws Exception {
         query = countriesQb.range("continent", Operator.EQ, "AS");
         assertEquals("Should find two cities", 2, cities.search(query, 1).getTotalSize());
 
-        // the following currently don't work even in the cts:search layer
-        // all countries containing the term "SA"
-        query = countriesQb.word("SA");
+        // all countries containing the term SA
+        query = countriesQb.containerQuery(countriesQb.term("SA"));
         assertEquals("Should find one city", 1, cities.search(query, 1).getTotalSize());
 
-        // all cities containing the term "SA"
-        query = qb.word("SA");
-        assertEquals("Should find two cities", 2, cities.search(query, 1).getTotalSize());
+        // all cities containing the term SA
+        query = qb.containerQuery(qb.term("SA"));
+        assertEquals("Should find two cities", 61, cities.search(query, 1).getTotalSize());
 
         // all countries containing the field "currencyName" with the term "peso"
-        query = countriesQb.word("currencyName", new String[]{"peso"});
+        query = countriesQb.word("currencyName", "peso");
         assertEquals("Should find one city", 1, cities.search(query, 1).getTotalSize());
     }