Update QueryRequest usage to include try-with-resources block

Author: cezarfx

README.md

@@ -437,15 +437,14 @@ public class Quickstart {
 
             /*
              * Perform a query using iterable and iterator
-             */
-            QueryRequest queryRequest = new QueryRequest()
-                .setStatement("select * from " + tableName);
-
-            /*
+             *
              * To ensure the query resources are closed properly, use
              * try-with-resources statement.
              */
-            try (QueryIterableResult results =
+            try (
+                QueryRequest queryRequest = new QueryRequest()
+                    .setStatement("select * from " + tableName);
+                QueryIterableResult results =
                     handle.queryIterable(queryRequest)) {
                 System.out.println("Query results:");
                 for (MapValue res : results) {
@@ -456,23 +455,25 @@ public class Quickstart {
             /*
              * Perform a query using partial results
              */
-            queryRequest = new QueryRequest()
-                .setStatement("select * from " + tableName);
-
-            /*
-             * Because a query can return partial results execution must occur
-             * in a loop, accumulating or processing results
-             */
-            ArrayList<MapValue> results = new ArrayList<MapValue>();
-            do {
-                QueryResult queryResult = handle.query(queryRequest);
-                results.addAll(queryResult.getResults());
-            } while (!queryRequest.isDone());
-            System.out.println("Query results again:");
-            for (MapValue res : results) {
-                System.out.println("\t" + res);
+            try (
+                QueryRequest queryRequest = new QueryRequest()
+                    .setStatement("select * from " + tableName) ) {
+
+                /*
+                 * Because a query can return partial results execution must occur
+                 * in a loop, accumulating or processing results
+                 */
+                ArrayList<MapValue> results = new ArrayList<MapValue>();
+                do {
+                    QueryResult queryResult = handle.query(queryRequest);
+                    results.addAll(queryResult.getResults());
+                } while (!queryRequest.isDone());
+                System.out.println("Query results again:");
+                for (MapValue res : results) {
+                    System.out.println("\t" + res);
+                }
             }
-
+            
             /*
              * Drop the table
              */

driver/src/main/java/oracle/nosql/driver/ops/QueryIterableResult.java

@@ -33,10 +33,12 @@
  * <pre>
  * NoSQLHandle handle = ...;
  *
- * QueryRequest qreq = new QueryRequest().setStatement("select * from foo");
+ * try (QueryRequest qreq = new QueryRequest()
+ *          .setStatement("select * from foo") ) {
  *
- * for (MapValue row : handle.queryIterable(qreq)) {
- *     // do something with row
+ *     for (MapValue row : handle.queryIterable(qreq)) {
+ *         // do something with row
+ *     }
  * }
  * </pre>
  *

driver/src/main/java/oracle/nosql/driver/ops/QueryRequest.java

@@ -73,7 +73,7 @@
  * of the rows read satisfied the query conditions).
  * <p>
  * If an application wishes to terminate query execution before retrieving all
- * of the query results, it should call {@link #close} in order to release any
+ * the query results, it should call {@link #close} in order to release any
  * local resources held by the query. This also allows the application to reuse
  * the QueryRequest instance to run the same query from the beginning or a
  * different query.

examples/src/main/java/BasicTableExample.java

@@ -139,9 +139,10 @@ public static void main(String[] args) {
                 " \"audience_segment\": { " +
                 " \"sports_lover\":\"2020-05-10\", " +
                 " \"foodie\":\"2020-06-01\"}})";
-            QueryRequest queryRequest = new QueryRequest();
-            queryRequest.setStatement(insertQuery);
-            try (QueryIterableResult results =
+            try (
+                QueryRequest queryRequest = new QueryRequest()
+                    .setStatement(insertQuery);
+                QueryIterableResult results =
                 handle.queryIterable(queryRequest)) {
                 System.out.println("Inserted row via query, result:");
                 for (MapValue qval : results) {
@@ -195,9 +196,10 @@ public static void main(String[] args) {
             String query = "SELECT * from " + tableName +
                 " WHERE cookie_id = 456";
 
-            queryRequest = new QueryRequest();
-            queryRequest.setStatement(query);
-            try (QueryIterableResult results =
+            try (
+                QueryRequest queryRequest = new QueryRequest()
+                    .setStatement(query);
+                QueryIterableResult results =
                      handle.queryIterable(queryRequest)) {
                 System.out.println("Query results for " + query + ": ");
                 for (MapValue qval : results) {

examples/src/main/java/DocSnippets.java

@@ -358,15 +358,27 @@ static void yetMore(NoSQLHandle handle) {
 
         /* Snippet start "Query iterable/iterator" */
 
-        QueryRequest qreq = new QueryRequest();
-        qreq.setStatement("select * from MyTable");
-
-        try (QueryIterableResult qir = handle.queryIterable(qreq)) {
+        try (
+            QueryRequest qreq = new QueryRequest()
+                .setStatement("select * from MyTable");
+            QueryIterableResult qir = handle.queryIterable(qreq)) {
              for( MapValue row : qir) {
                  // do something with row
              }
         }
 
         /* ------ Snippet end -------*/
+
+        /* Snippet start "QueryIterableResult iterable/iterator" */
+
+        try (QueryRequest qreq = new QueryRequest()
+                 .setStatement("select * from foo") ) {
+
+            for (MapValue row : handle.queryIterable(qreq)) {
+              // do something with row
+            }
+        }
+
+        /* ------ Snippet end -------*/
     }
 }