SNOW-1213117: Wrap connection, statement and result set in try with resources(3/4) (#1723)

Author: sfc-gh-ext-simba-jy

src/test/java/net/snowflake/client/jdbc/PutFileWithSpaceIncludedIT.java

@@ -11,6 +11,7 @@
 import java.io.FileOutputStream;
 import java.sql.Connection;
 import java.sql.ResultSet;
+import java.sql.Statement;
 import net.snowflake.client.TestUtil;
 import net.snowflake.client.category.TestCategoryOthers;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
@@ -49,52 +50,52 @@ public void putFileWithSpaceIncluded() throws Exception {
     TarArchiveEntry tarEntry;
     while ((tarEntry = tis.getNextTarEntry()) != null) {
       File outputFile = new File(dataFolder, tarEntry.getName());
-      FileOutputStream fos = new FileOutputStream(outputFile);
-      IOUtils.copy(tis, fos);
-      fos.close();
+      try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+        IOUtils.copy(tis, fos);
+      }
     }
 
-    try (Connection con = getConnection()) {
-      con.createStatement()
-          .execute(
-              "create or replace stage snow13400 url='s3://"
-                  + SF_AWS_USER_BUCKET
-                  + "/snow13400'"
-                  + "credentials=(AWS_KEY_ID='"
-                  + AWS_KEY_ID
-                  + "' AWS_SECRET_KEY='"
-                  + AWS_SECRET_KEY
-                  + "')");
+    try (Connection con = getConnection();
+        Statement statement = con.createStatement()) {
+      try {
+        statement.execute(
+            "create or replace stage snow13400 url='s3://"
+                + SF_AWS_USER_BUCKET
+                + "/snow13400'"
+                + "credentials=(AWS_KEY_ID='"
+                + AWS_KEY_ID
+                + "' AWS_SECRET_KEY='"
+                + AWS_SECRET_KEY
+                + "')");
 
-      {
-        ResultSet resultSet =
-            con.createStatement()
-                .executeQuery(
-                    "put file://"
-                        + dataFolder.getCanonicalPath()
-                        + "/* @snow13400 auto_compress=false");
-        int cnt = 0;
-        while (resultSet.next()) {
-          cnt++;
+        try (ResultSet resultSet =
+            statement.executeQuery(
+                "put file://"
+                    + dataFolder.getCanonicalPath()
+                    + "/* @snow13400 auto_compress=false")) {
+          int cnt = 0;
+          while (resultSet.next()) {
+            cnt++;
+          }
+          assertEquals(cnt, 1);
         }
-        assertEquals(cnt, 1);
-      }
-      con.createStatement().execute("create or replace table snow13400(a string)");
-      con.createStatement().execute("copy into snow13400 from @snow13400");
-      {
-        ResultSet resultSet = con.createStatement().executeQuery("select * from snow13400");
-        int cnt = 0;
-        String output = null;
-        while (resultSet.next()) {
-          output = resultSet.getString(1);
-          cnt++;
+        statement.execute("create or replace table snow13400(a string)");
+        statement.execute("copy into snow13400 from @snow13400");
+        try (ResultSet resultSet = con.createStatement().executeQuery("select * from snow13400")) {
+          int cnt = 0;
+          String output = null;
+          while (resultSet.next()) {
+            output = resultSet.getString(1);
+            cnt++;
+          }
+          assertEquals(cnt, 1);
+          assertEquals(output, "hello");
         }
-        assertEquals(cnt, 1);
-        assertEquals(output, "hello");
+      } finally {
+        statement.execute("rm @snow13400");
+        statement.execute("drop stage if exists snow13400");
+        statement.execute("drop table if exists snow13400");
       }
-      con.createStatement().execute("rm @snow13400");
-      con.createStatement().execute("drop stage if exists snow13400");
-      con.createStatement().execute("drop table if exists snow13400");
     }
   }
 }

src/test/java/net/snowflake/client/jdbc/PutUnescapeBackslashIT.java

@@ -38,10 +38,6 @@ public void testPutFileUnescapeBackslashes() throws Exception {
     String remoteSubDir = "testPut";
     String testDataFileName = "testdata.txt";
 
-    Connection connection = null;
-    Statement statement = null;
-    ResultSet resultSet = null;
-    Writer writer = null;
     Path topDataDir = null;
     try {
       topDataDir = Files.createTempDirectory("testPutFileUnescapeBackslashes");
@@ -53,39 +49,36 @@ public void testPutFileUnescapeBackslashes() throws Exception {
 
       // create a test data
       File dataFile = new File(subDir.toFile(), testDataFileName);
-      writer =
+      try (Writer writer =
           new BufferedWriter(
-              new OutputStreamWriter(new FileOutputStream(dataFile.getCanonicalPath()), "UTF-8"));
-      writer.write("1,test1");
-      writer.close();
-
+              new OutputStreamWriter(new FileOutputStream(dataFile.getCanonicalPath()), "UTF-8"))) {
+        writer.write("1,test1");
+      }
       // run PUT command
-      connection = getConnection();
-      statement = connection.createStatement();
-      String sql =
-          String.format("PUT 'file://%s' @~/%s/", dataFile.getCanonicalPath(), remoteSubDir);
+      try (Connection connection = getConnection();
+          Statement statement = connection.createStatement()) {
+        try {
+          String sql =
+              String.format("PUT 'file://%s' @~/%s/", dataFile.getCanonicalPath(), remoteSubDir);
 
-      // Escape backslashes. This must be done by the application.
-      sql = sql.replaceAll("\\\\", "\\\\\\\\");
-      statement.execute(sql);
+          // Escape backslashes. This must be done by the application.
+          sql = sql.replaceAll("\\\\", "\\\\\\\\");
+          statement.execute(sql);
 
-      resultSet =
-          connection.createStatement().executeQuery(String.format("LS @~/%s/", remoteSubDir));
-      while (resultSet.next()) {
-        assertThat(
-            "File name doesn't match",
-            resultSet.getString(1),
-            startsWith(String.format("%s/%s", remoteSubDir, testDataFileName)));
+          try (ResultSet resultSet =
+              connection.createStatement().executeQuery(String.format("LS @~/%s/", remoteSubDir))) {
+            while (resultSet.next()) {
+              assertThat(
+                  "File name doesn't match",
+                  resultSet.getString(1),
+                  startsWith(String.format("%s/%s", remoteSubDir, testDataFileName)));
+            }
+          }
+        } finally {
+          statement.execute(String.format("RM @~/%s", remoteSubDir));
+        }
       }
-
     } finally {
-      if (connection != null) {
-        connection.createStatement().execute(String.format("RM @~/%s", remoteSubDir));
-      }
-      closeSQLObjects(resultSet, statement, connection);
-      if (writer != null) {
-        writer.close();
-      }
       FileUtils.deleteDirectory(topDataDir.toFile());
     }
   }

src/test/java/net/snowflake/client/jdbc/ResultSet0IT.java

@@ -12,7 +12,6 @@
 import java.sql.Statement;
 import java.util.Properties;
 import net.snowflake.client.category.TestCategoryResultSet;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.experimental.categories.Category;
 
@@ -23,79 +22,69 @@ public class ResultSet0IT extends BaseJDBCTest {
 
   public Connection init(int injectSocketTimeout) throws SQLException {
     Connection connection = BaseJDBCTest.getConnection(injectSocketTimeout);
-
-    Statement statement = connection.createStatement();
-    statement.execute(
-        "alter session set "
-            + "TIMEZONE='America/Los_Angeles',"
-            + "TIMESTAMP_TYPE_MAPPING='TIMESTAMP_LTZ',"
-            + "TIMESTAMP_OUTPUT_FORMAT='DY, DD MON YYYY HH24:MI:SS TZHTZM',"
-            + "TIMESTAMP_TZ_OUTPUT_FORMAT='DY, DD MON YYYY HH24:MI:SS TZHTZM',"
-            + "TIMESTAMP_LTZ_OUTPUT_FORMAT='DY, DD MON YYYY HH24:MI:SS TZHTZM',"
-            + "TIMESTAMP_NTZ_OUTPUT_FORMAT='DY, DD MON YYYY HH24:MI:SS TZHTZM'");
-    statement.close();
+    try (Statement statement = connection.createStatement()) {
+      statement.execute(
+          "alter session set "
+              + "TIMEZONE='America/Los_Angeles',"
+              + "TIMESTAMP_TYPE_MAPPING='TIMESTAMP_LTZ',"
+              + "TIMESTAMP_OUTPUT_FORMAT='DY, DD MON YYYY HH24:MI:SS TZHTZM',"
+              + "TIMESTAMP_TZ_OUTPUT_FORMAT='DY, DD MON YYYY HH24:MI:SS TZHTZM',"
+              + "TIMESTAMP_LTZ_OUTPUT_FORMAT='DY, DD MON YYYY HH24:MI:SS TZHTZM',"
+              + "TIMESTAMP_NTZ_OUTPUT_FORMAT='DY, DD MON YYYY HH24:MI:SS TZHTZM'");
+    }
     return connection;
   }
 
   public Connection init() throws SQLException {
     Connection conn = BaseJDBCTest.getConnection(BaseJDBCTest.DONT_INJECT_SOCKET_TIMEOUT);
-    Statement stmt = conn.createStatement();
-    stmt.execute("alter session set jdbc_query_result_format = '" + queryResultFormat + "'");
-    stmt.close();
+    try (Statement stmt = conn.createStatement()) {
+      stmt.execute("alter session set jdbc_query_result_format = '" + queryResultFormat + "'");
+    }
     return conn;
   }
 
   public Connection init(Properties paramProperties) throws SQLException {
     Connection conn =
         BaseJDBCTest.getConnection(DONT_INJECT_SOCKET_TIMEOUT, paramProperties, false, false);
-    Statement stmt = conn.createStatement();
-    stmt.execute("alter session set jdbc_query_result_format = '" + queryResultFormat + "'");
-    stmt.close();
+    try (Statement stmt = conn.createStatement()) {
+      stmt.execute("alter session set jdbc_query_result_format = '" + queryResultFormat + "'");
+    }
     return conn;
   }
 
   @Before
   public void setUp() throws SQLException {
-    Connection con = init();
-
-    // TEST_RS
-    con.createStatement().execute("create or replace table test_rs (colA string)");
-    con.createStatement().execute("insert into test_rs values('rowOne')");
-    con.createStatement().execute("insert into test_rs values('rowTwo')");
-    con.createStatement().execute("insert into test_rs values('rowThree')");
-
-    // ORDERS_JDBC
-    Statement statement = con.createStatement();
-    statement.execute(
-        "create or replace table orders_jdbc"
-            + "(C1 STRING NOT NULL COMMENT 'JDBC', "
-            + "C2 STRING, C3 STRING, C4 STRING, C5 STRING, C6 STRING, "
-            + "C7 STRING, C8 STRING, C9 STRING) "
-            + "stage_file_format = (field_delimiter='|' "
-            + "error_on_column_count_mismatch=false)");
-    // put files
-    assertTrue(
-        "Failed to put a file",
-        statement.execute(
-            "PUT file://" + getFullPathFileInResource(TEST_DATA_FILE) + " @%orders_jdbc"));
-    assertTrue(
-        "Failed to put a file",
-        statement.execute(
-            "PUT file://" + getFullPathFileInResource(TEST_DATA_FILE_2) + " @%orders_jdbc"));
-
-    int numRows = statement.executeUpdate("copy into orders_jdbc");
-
-    assertEquals("Unexpected number of rows copied: " + numRows, 73, numRows);
-
-    con.close();
-  }
-
-  @After
-  public void tearDown() throws SQLException {
-    Connection con = init();
-    con.createStatement().execute("drop table if exists orders_jdbc");
-    con.createStatement().execute("drop table if exists test_rs");
-    con.close();
+    try (Connection con = init();
+        Statement statement = con.createStatement()) {
+
+      // TEST_RS
+      statement.execute("create or replace table test_rs (colA string)");
+      statement.execute("insert into test_rs values('rowOne')");
+      statement.execute("insert into test_rs values('rowTwo')");
+      statement.execute("insert into test_rs values('rowThree')");
+
+      // ORDERS_JDBC
+      statement.execute(
+          "create or replace table orders_jdbc"
+              + "(C1 STRING NOT NULL COMMENT 'JDBC', "
+              + "C2 STRING, C3 STRING, C4 STRING, C5 STRING, C6 STRING, "
+              + "C7 STRING, C8 STRING, C9 STRING) "
+              + "stage_file_format = (field_delimiter='|' "
+              + "error_on_column_count_mismatch=false)");
+      // put files
+      assertTrue(
+          "Failed to put a file",
+          statement.execute(
+              "PUT file://" + getFullPathFileInResource(TEST_DATA_FILE) + " @%orders_jdbc"));
+      assertTrue(
+          "Failed to put a file",
+          statement.execute(
+              "PUT file://" + getFullPathFileInResource(TEST_DATA_FILE_2) + " @%orders_jdbc"));
+
+      int numRows = statement.executeUpdate("copy into orders_jdbc");
+
+      assertEquals("Unexpected number of rows copied: " + numRows, 73, numRows);
+    }
   }
 
   ResultSet numberCrossTesting() throws SQLException {

src/test/java/net/snowflake/client/jdbc/ResultSetAlreadyClosedIT.java

@@ -21,9 +21,9 @@
 public class ResultSetAlreadyClosedIT extends BaseJDBCTest {
   @Test
   public void testQueryResultSetAlreadyClosed() throws Throwable {
-    try (Connection connection = getConnection()) {
-      Statement statement = connection.createStatement();
-      ResultSet resultSet = statement.executeQuery("select 1");
+    try (Connection connection = getConnection();
+        Statement statement = connection.createStatement();
+        ResultSet resultSet = statement.executeQuery("select 1")) {
       checkAlreadyClosed(resultSet);
     }
   }
@@ -45,9 +45,10 @@ public void testMetadataResultSetAlreadyClosed() throws Throwable {
 
   @Test
   public void testEmptyResultSetAlreadyClosed() throws Throwable {
-    ResultSet resultSet = new SnowflakeResultSetV1.EmptyResultSet();
-    checkAlreadyClosed(resultSet);
-    checkAlreadyClosedEmpty(resultSet);
+    try (ResultSet resultSet = new SnowflakeResultSetV1.EmptyResultSet()) {
+      checkAlreadyClosed(resultSet);
+      checkAlreadyClosedEmpty(resultSet);
+    }
   }
 
   private void checkAlreadyClosed(ResultSet resultSet) throws SQLException {

src/test/java/net/snowflake/client/jdbc/ResultSetArrowForce0MultiTimeZone.java

@@ -57,12 +57,12 @@ Connection init(String table, String column, String values) throws SQLException
               + "TIMESTAMP_TZ_OUTPUT_FORMAT='DY, DD MON YYYY HH24:MI:SS TZHTZM',"
               + "TIMESTAMP_LTZ_OUTPUT_FORMAT='DY, DD MON YYYY HH24:MI:SS TZHTZM',"
               + "TIMESTAMP_NTZ_OUTPUT_FORMAT='DY, DD MON YYYY HH24:MI:SS TZHTZM'");
-    }
 
-    con.createStatement()
-        .execute("alter session set jdbc_query_result_format" + " = '" + queryResultFormat + "'");
-    con.createStatement().execute("create or replace table " + table + " " + column);
-    con.createStatement().execute("insert into " + table + " values " + values);
+      statement.execute(
+          "alter session set jdbc_query_result_format" + " = '" + queryResultFormat + "'");
+      statement.execute("create or replace table " + table + " " + column);
+      statement.execute("insert into " + table + " values " + values);
+    }
     return con;
   }