SNOW-1213117: Wrap connection, statement and result set in try with r…

…esources(4/4) (#1724)
snowflakedb · Apr 26, 2024 · ff0adbd · ff0adbd
1 parent 7cb73ff
commit ff0adbd
Show file tree

Hide file tree

Showing 18 changed files with 4,129 additions and 4,600 deletions.
diff --git a/src/test/java/net/snowflake/client/jdbc/ServiceNameTest.java b/src/test/java/net/snowflake/client/jdbc/ServiceNameTest.java
@@ -127,16 +127,21 @@ public void testAddServiceNameToRequestHeader() throws Throwable {
       props.setProperty(SFSessionProperty.USER.getPropertyKey(), "fakeuser");
       props.setProperty(SFSessionProperty.PASSWORD.getPropertyKey(), "fakepassword");
       props.setProperty(SFSessionProperty.INSECURE_MODE.getPropertyKey(), Boolean.TRUE.toString());
-      SnowflakeConnectionV1 con =
+      try (SnowflakeConnectionV1 con =
           new SnowflakeConnectionV1(
-              "jdbc:snowflake://http://fakeaccount.snowflakecomputing.com", props);
-      assertThat(con.getSfSession().getServiceName(), is(INITIAL_SERVICE_NAME));
+              "jdbc:snowflake://http://fakeaccount.snowflakecomputing.com", props)) {
+        assertThat(con.getSfSession().getServiceName(), is(INITIAL_SERVICE_NAME));
 
-      SnowflakeStatementV1 stmt = (SnowflakeStatementV1) con.createStatement();
-      stmt.execute("SELECT 1");
-      assertThat(
-          stmt.getConnection().unwrap(SnowflakeConnectionV1.class).getSfSession().getServiceName(),
-          is(NEW_SERVICE_NAME));
+        try (SnowflakeStatementV1 stmt = (SnowflakeStatementV1) con.createStatement()) {
+          stmt.execute("SELECT 1");
+          assertThat(
+              stmt.getConnection()
+                  .unwrap(SnowflakeConnectionV1.class)
+                  .getSfSession()
+                  .getServiceName(),
+              is(NEW_SERVICE_NAME));
+        }
+      }
     }
   }
 }
diff --git a/src/test/java/net/snowflake/client/jdbc/SnowflakeChunkDownloaderLatestIT.java b/src/test/java/net/snowflake/client/jdbc/SnowflakeChunkDownloaderLatestIT.java
@@ -37,19 +37,20 @@ public void testChunkDownloaderRetry() throws SQLException, InterruptedException
 
     SnowflakeChunkDownloader snowflakeChunkDownloaderSpy = null;
 
-    try (Connection connection = getConnection(properties)) {
-      Statement statement = connection.createStatement();
+    try (Connection connection = getConnection(properties);
+        Statement statement = connection.createStatement()) {
       // execute a query that will require chunk downloading
-      ResultSet resultSet =
+      try (ResultSet resultSet =
           statement.executeQuery(
-              "select seq8(), randstr(1000, random()) from table(generator(rowcount => 10000))");
-      List<SnowflakeResultSetSerializable> resultSetSerializables =
-          ((SnowflakeResultSet) resultSet).getResultSetSerializables(100 * 1024 * 1024);
-      SnowflakeResultSetSerializable resultSetSerializable = resultSetSerializables.get(0);
-      SnowflakeChunkDownloader downloader =
-          new SnowflakeChunkDownloader((SnowflakeResultSetSerializableV1) resultSetSerializable);
-      snowflakeChunkDownloaderSpy = Mockito.spy(downloader);
-      snowflakeChunkDownloaderSpy.getNextChunkToConsume();
+              "select seq8(), randstr(1000, random()) from table(generator(rowcount => 10000))")) {
+        List<SnowflakeResultSetSerializable> resultSetSerializables =
+            ((SnowflakeResultSet) resultSet).getResultSetSerializables(100 * 1024 * 1024);
+        SnowflakeResultSetSerializable resultSetSerializable = resultSetSerializables.get(0);
+        SnowflakeChunkDownloader downloader =
+            new SnowflakeChunkDownloader((SnowflakeResultSetSerializableV1) resultSetSerializable);
+        snowflakeChunkDownloaderSpy = Mockito.spy(downloader);
+        snowflakeChunkDownloaderSpy.getNextChunkToConsume();
+      }
     } catch (SnowflakeSQLException exception) {
       // verify that request was retried twice before reaching max retries
       Mockito.verify(snowflakeChunkDownloaderSpy, Mockito.times(2)).getResultStreamProvider();