Merge remote-tracking branch 'origin/dev' into dev

Author: sravanr

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

@@ -1138,18 +1138,18 @@ public void writeDefaultMetadata(String docId, Transaction transaction)
     public Format getContentFormat();
 
     /**
-     * Returns the categories of metadata to read, write, or patch.
+     * Returns the categories of metadata to read, write, patch, or search.
      * 
      * @return	the set of metadata categories
      */
     public Set<Metadata> getMetadataCategories();
     /**
-     * Specifies the categories of metadata to read, write, or patch.
+     * Specifies the categories of metadata to read, write, patch, or search.
      * @param categories	the set of metadata categories
      */
     public void setMetadataCategories(Set<Metadata> categories);
     /**
-     * Specifies the categories of metadata to read, write, or patch.
+     * Specifies the categories of metadata to read, write, patch, or search.
      * @param categories	the set of metadata categories
      */
     public void setMetadataCategories(Metadata... categories);

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

@@ -58,6 +58,11 @@ public T next() {
         return docPage.nextContent(handle).get();
     }
 
+    @Override
+    public void close() {
+        docPage.close();
+    }
+
     @Override
     public void remove() {
         throw new UnsupportedOperationException();

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

@@ -20,4 +20,7 @@
 /** Enables pagination over objects retrieved from the server and deserialized by 
  * PojoRepository read and search methods.
  */
-public interface PojoPage<T> extends Page<T> {}
+public interface PojoPage<T> extends Page<T> {
+    /** Frees the underlying resources, including the http connection. */
+    public void close();
+}