Wrap Statement and ResultSet in try-with-resource blocks

Author: bwaldvogel

src/main/java/de/cronn/liquibase/ext/postgres/ModifyPostgresEnumTypeChange.java

@@ -2,6 +2,7 @@
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -95,9 +96,9 @@ public SqlStatement[] generateStatements(Database database) {
 		statements.addAll(Arrays.asList(createPostgresEnumTypeChange.generateStatements(database)));
 
 		JdbcConnection jdbcConnection = (JdbcConnection) database.getConnection();
-		try {
-			String defaultSchemaName = database.getDefaultSchemaName();
-			ResultSet resultSet = jdbcConnection.createStatement().executeQuery(SELECT_ALL_ENUM_USAGES_QUERY.formatted(defaultSchemaName, getName()));
+		String defaultSchemaName = database.getDefaultSchemaName();
+		try (Statement statement = jdbcConnection.createStatement();
+			 ResultSet resultSet = statement.executeQuery(SELECT_ALL_ENUM_USAGES_QUERY.formatted(defaultSchemaName, getName()))) {
 			while (resultSet.next()) {
 				String tableName = resultSet.getString("table_name");
 				String columnName = resultSet.getString("column_name");

src/main/java/de/cronn/liquibase/ext/postgres/diff/PostgresEnumTypeSnapshotGenerator.java

@@ -3,6 +3,7 @@
 import java.sql.Array;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -41,11 +42,10 @@ protected void addTo(DatabaseObject foundObject, DatabaseSnapshot snapshot) thro
 			return;
 		}
 		if (snapshot.getDatabase().getConnection() instanceof JdbcConnection jdbcConnection) {
-			try {
-				Schema schema = foundObject.getSchema();
-				String schemaName = schema.getName();
-				ResultSet resultSet = jdbcConnection.createStatement().executeQuery(COLLECT_ENUMS_QUERY.formatted(schemaName));
-
+			Schema schema = foundObject.getSchema();
+			String schemaName = schema.getName();
+			try (Statement statement = jdbcConnection.createStatement();
+				 ResultSet resultSet = statement.executeQuery(COLLECT_ENUMS_QUERY.formatted(schemaName))) {
 				while (resultSet.next()) {
 					String typeName = resultSet.getString("name");
 					List<String> values = collectValues(resultSet.getArray("values"));