From a06345e290e83c6d91e15f849db3311509320994 Mon Sep 17 00:00:00 2001 From: adhiggs <38925938+adhiggs@users.noreply.github.com> Date: Fri, 31 Jan 2025 18:27:05 -0800 Subject: [PATCH 1/4] Update SpannerSample.java Encapsulates both statements in a try-with-resources statement --- .../com/example/spanner/SpannerSample.java | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/samples/snippets/src/main/java/com/example/spanner/SpannerSample.java b/samples/snippets/src/main/java/com/example/spanner/SpannerSample.java index d406225c28b..610fb02593d 100644 --- a/samples/snippets/src/main/java/com/example/spanner/SpannerSample.java +++ b/samples/snippets/src/main/java/com/example/spanner/SpannerSample.java @@ -679,26 +679,27 @@ static void readOnlyTransaction(DatabaseClient dbClient) { // ReadOnlyTransaction must be closed by calling close() on it to release resources held by it. // We use a try-with-resource block to automatically do so. try (ReadOnlyTransaction transaction = dbClient.readOnlyTransaction()) { - ResultSet queryResultSet = + try (ResultSet queryResultSet = transaction.executeQuery( - Statement.of("SELECT SingerId, AlbumId, AlbumTitle FROM Albums")); + Statement.of("SELECT SingerId, AlbumId, AlbumTitle FROM Albums")) { while (queryResultSet.next()) { System.out.printf( "%d %d %s\n", queryResultSet.getLong(0), queryResultSet.getLong(1), queryResultSet.getString(2)); } - try (ResultSet readResultSet = - transaction.read( - "Albums", KeySet.all(), Arrays.asList("SingerId", "AlbumId", "AlbumTitle"))) { - while (readResultSet.next()) { - System.out.printf( - "%d %d %s\n", - readResultSet.getLong(0), readResultSet.getLong(1), readResultSet.getString(2)); - } + } // queryResultSet.close() is automatically called here + try (ResultSet readResultSet = + transaction.read( + "Albums", KeySet.all(), Arrays.asList("SingerId", "AlbumId", "AlbumTitle"))) { + while (readResultSet.next()) { + System.out.printf( + "%d %d %s\n", + readResultSet.getLong(0), readResultSet.getLong(1), readResultSet.getString(2)); } - } - } - // [END spanner_read_only_transaction] + } // readResultSet.close() is automatically called here + } // transaction.close() is automatically called here +} +// [END spanner_read_only_transaction] // [START spanner_read_stale_data] static void readStaleData(DatabaseClient dbClient) { From c962cd2e1733f76e1716c536d5c8d827f4960e5b Mon Sep 17 00:00:00 2001 From: adhiggs <38925938+adhiggs@users.noreply.github.com> Date: Wed, 14 May 2025 10:51:12 -0700 Subject: [PATCH 2/4] Update SpannerSample.java --- .../src/main/java/com/example/spanner/SpannerSample.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/src/main/java/com/example/spanner/SpannerSample.java b/samples/snippets/src/main/java/com/example/spanner/SpannerSample.java index 610fb02593d..be7355b8d19 100644 --- a/samples/snippets/src/main/java/com/example/spanner/SpannerSample.java +++ b/samples/snippets/src/main/java/com/example/spanner/SpannerSample.java @@ -681,7 +681,7 @@ static void readOnlyTransaction(DatabaseClient dbClient) { try (ReadOnlyTransaction transaction = dbClient.readOnlyTransaction()) { try (ResultSet queryResultSet = transaction.executeQuery( - Statement.of("SELECT SingerId, AlbumId, AlbumTitle FROM Albums")) { + Statement.of("SELECT SingerId, AlbumId, AlbumTitle FROM Albums"))) { while (queryResultSet.next()) { System.out.printf( "%d %d %s\n", From 9b8a930fa62693fa4c1daf57dc7697f73e1ffb23 Mon Sep 17 00:00:00 2001 From: adhiggs <38925938+adhiggs@users.noreply.github.com> Date: Tue, 27 May 2025 14:37:56 -0700 Subject: [PATCH 3/4] Update SpannerSample.java Fix spacing linter errors --- .../com/example/spanner/SpannerSample.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/samples/snippets/src/main/java/com/example/spanner/SpannerSample.java b/samples/snippets/src/main/java/com/example/spanner/SpannerSample.java index be7355b8d19..6f7d2d67e2f 100644 --- a/samples/snippets/src/main/java/com/example/spanner/SpannerSample.java +++ b/samples/snippets/src/main/java/com/example/spanner/SpannerSample.java @@ -682,24 +682,24 @@ static void readOnlyTransaction(DatabaseClient dbClient) { try (ResultSet queryResultSet = transaction.executeQuery( Statement.of("SELECT SingerId, AlbumId, AlbumTitle FROM Albums"))) { - while (queryResultSet.next()) { - System.out.printf( + while (queryResultSet.next()) { + System.out.printf( "%d %d %s\n", queryResultSet.getLong(0), queryResultSet.getLong(1), queryResultSet.getString(2)); - } - } // queryResultSet.close() is automatically called here - try (ResultSet readResultSet = + } + } // queryResultSet.close() is automatically called here + try (ResultSet readResultSet = transaction.read( "Albums", KeySet.all(), Arrays.asList("SingerId", "AlbumId", "AlbumTitle"))) { - while (readResultSet.next()) { - System.out.printf( + while (readResultSet.next()) { + System.out.printf( "%d %d %s\n", readResultSet.getLong(0), readResultSet.getLong(1), readResultSet.getString(2)); - } - } // readResultSet.close() is automatically called here - } // transaction.close() is automatically called here -} -// [END spanner_read_only_transaction] + } + } // readResultSet.close() is automatically called here + } // transaction.close() is automatically called here + } + // [END spanner_read_only_transaction] // [START spanner_read_stale_data] static void readStaleData(DatabaseClient dbClient) { From 258df5c337b43b4596063031e29ccae1d23e285a Mon Sep 17 00:00:00 2001 From: adhiggs <38925938+adhiggs@users.noreply.github.com> Date: Thu, 29 May 2025 11:21:54 -0700 Subject: [PATCH 4/4] Update SpannerSample.java Clear Linter errors for indent --- .../main/java/com/example/spanner/SpannerSample.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/snippets/src/main/java/com/example/spanner/SpannerSample.java b/samples/snippets/src/main/java/com/example/spanner/SpannerSample.java index 6f7d2d67e2f..a01b00c0f6c 100644 --- a/samples/snippets/src/main/java/com/example/spanner/SpannerSample.java +++ b/samples/snippets/src/main/java/com/example/spanner/SpannerSample.java @@ -684,17 +684,17 @@ static void readOnlyTransaction(DatabaseClient dbClient) { Statement.of("SELECT SingerId, AlbumId, AlbumTitle FROM Albums"))) { while (queryResultSet.next()) { System.out.printf( - "%d %d %s\n", - queryResultSet.getLong(0), queryResultSet.getLong(1), queryResultSet.getString(2)); + "%d %d %s\n", + queryResultSet.getLong(0), queryResultSet.getLong(1), queryResultSet.getString(2)); } } // queryResultSet.close() is automatically called here try (ResultSet readResultSet = - transaction.read( + transaction.read( "Albums", KeySet.all(), Arrays.asList("SingerId", "AlbumId", "AlbumTitle"))) { while (readResultSet.next()) { System.out.printf( - "%d %d %s\n", - readResultSet.getLong(0), readResultSet.getLong(1), readResultSet.getString(2)); + "%d %d %s\n", + readResultSet.getLong(0), readResultSet.getLong(1), readResultSet.getString(2)); } } // readResultSet.close() is automatically called here } // transaction.close() is automatically called here