JavaDoc fix and test cleanup, #1196

Author: lling

marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentManager.java

@@ -594,7 +594,7 @@ <T extends R> T read(DocumentDescriptor desc, DocumentMetadataReadHandle metadat
   DocumentPage search(QueryDefinition querydef, long start);
 
   /**
-   * Just like {@link QueryManager#search(QueryDefinition, SearchReadHandle, long) QueryManager.search}
+   * Just like {@link QueryManager#search(QueryDefinition, SearchReadHandle, long, String) QueryManager.search}
    * but return complete documents via iterable DocumentPage.  Retrieves up to getPageLength()
    * documents in each DocumentPage. If setMetadataCategories has
    * been called, populates metadata for each result in the format specified by
@@ -637,7 +637,7 @@ <T extends R> T read(DocumentDescriptor desc, DocumentMetadataReadHandle metadat
   DocumentPage search(QueryDefinition querydef, long start, Transaction transaction);
 
   /**
-   * Just like {@link QueryManager#search(QueryDefinition, SearchReadHandle, long, Transaction) QueryManager.search}
+   * Just like {@link QueryManager#search(QueryDefinition, SearchReadHandle, long, Transaction, String) QueryManager.search}
    * but return complete documents via iterable DocumentPage.  Retrieves up to getPageLength()
    * documents in each DocumentPage. If setMetadataCategories has
    * been called, populates metadata for each result in the format specified by
@@ -685,7 +685,7 @@ <T extends R> T read(DocumentDescriptor desc, DocumentMetadataReadHandle metadat
   DocumentPage search(QueryDefinition querydef, long start, SearchReadHandle searchHandle);
 
   /**
-   * Just like {@link QueryManager#search(QueryDefinition, SearchReadHandle, long) QueryManager.search}
+   * Just like {@link QueryManager#search(QueryDefinition, SearchReadHandle, long, String) QueryManager.search}
    * but return complete documents via iterable DocumentPage.  Retrieves up to getPageLength()
    * documents in each DocumentPage.  If searchHandle is not null,
    * requests a search response and populates searchHandle with it. If setMetadataCategories has
@@ -719,7 +719,7 @@ <T extends R> T read(DocumentDescriptor desc, DocumentMetadataReadHandle metadat
   DocumentPage search(QueryDefinition querydef, long start, SearchReadHandle searchHandle, Transaction transaction);
 
   /**
-   * Just like {@link QueryManager#search(QueryDefinition, SearchReadHandle, long, Transaction)}
+   * Just like {@link QueryManager#search(QueryDefinition, SearchReadHandle, long, Transaction, String)}
    * but return complete documents via iterable DocumentPage.  Retrieves up to getPageLength()
    * documents in each DocumentPage.  If searchHandle is not null,
    * requests a search response and populates searchHandle with it. If setMetadataCategories has

marklogic-client-api/src/test/java/com/marklogic/client/test/document/DocumentWriteOperationTest.java

@@ -322,39 +322,33 @@ public void DocumentQueryWithForest() {
         textDocumentManager.write(batch);
         StructuredQueryDefinition query = new StructuredQueryBuilder().collection(collectionName);
 
-        DocumentPage documentsF1 = textDocumentManager.search(query, 1, "java-unittest-1");
-        DocumentPage documentsF2 = textDocumentManager.search(query, 1, "java-unittest-2");
-        DocumentPage documentsF3 = textDocumentManager.search(query, 1, "java-unittest-3");
+        int forestCount = 3;
+        DocumentPage[] documents = new DocumentPage[forestCount];
+        ArrayList<Set<String>> sets = new ArrayList<Set<String>>();
 
-        long totalCount = documentsF1.getTotalSize() + documentsF2.getTotalSize() + documentsF3.getTotalSize();
-        assertEquals(30, totalCount);
-
-        Set<String> set1 = new HashSet<>();
-        Set<String> set2 = new HashSet<>();
-        Set<String> set3 = new HashSet<>();
-
-        for (DocumentRecord document : documentsF1) {
-            set1.add(document.getUri());
-        }
+        long totalCount = 0;
 
-        for (DocumentRecord document : documentsF2) {
-            set2.add(document.getUri());
-        }
+        for (int i = 0; i < forestCount; i++) {
+            documents[i] = textDocumentManager.search(query, 1, "java-unittest-" + String.valueOf(i+1));
+            totalCount += documents[i].getTotalSize();
+            sets.add(new HashSet<String>());
+            for (DocumentRecord document : documents[i]) {
+                sets.get(i).add(document.getUri());
+            }
 
-        for (DocumentRecord document : documentsF3) {
-            set3.add(document.getUri());
         }
+        assertEquals(30, totalCount);
 
-        Set<String> intersectSet = new HashSet<>(set1);
-        intersectSet.retainAll(set2);
+        Set<String> intersectSet = new HashSet<>(sets.get(0));
+        intersectSet.retainAll(sets.get(1));
         assertTrue(intersectSet.isEmpty());
 
-        intersectSet.addAll(set1);
-        intersectSet.retainAll(set3);
+        intersectSet.addAll(sets.get(0));
+        intersectSet.retainAll(sets.get(2));
         assertTrue(intersectSet.isEmpty());
 
-        intersectSet.addAll(set2);
-        intersectSet.retainAll(set3);
+        intersectSet.addAll(sets.get(1));
+        intersectSet.retainAll(sets.get(2));
         assertTrue(intersectSet.isEmpty());
     }