Skip to content

Commit 11037e9

Browse files
committed
lint and closeOnCompletion
1 parent 9426d1d commit 11037e9

File tree

1 file changed

+19
-18
lines changed

1 file changed

+19
-18
lines changed

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryDatabaseMetaData.java

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -943,8 +943,7 @@ public ResultSet getProcedures(
943943

944944
Thread fetcherThread = new Thread(procedureFetcher, "getProcedures-fetcher-" + catalog);
945945
BigQueryJsonResultSet resultSet =
946-
BigQueryJsonResultSet.of(
947-
resultSchema, -1, queue, null, new Thread[] {fetcherThread});
946+
BigQueryJsonResultSet.of(resultSchema, -1, queue, null, new Thread[] {fetcherThread});
948947

949948
fetcherThread.start();
950949
LOG.info("Started background thread for getProcedures");
@@ -1206,8 +1205,7 @@ public ResultSet getProcedureColumns(
12061205
Thread fetcherThread =
12071206
new Thread(procedureColumnFetcher, "getProcedureColumns-fetcher-" + catalog);
12081207
BigQueryJsonResultSet resultSet =
1209-
BigQueryJsonResultSet.of(
1210-
resultSchema, -1, queue, null, new Thread[] {fetcherThread});
1208+
BigQueryJsonResultSet.of(resultSchema, -1, queue, null, new Thread[] {fetcherThread});
12111209

12121210
fetcherThread.start();
12131211
LOG.info("Started background thread for getProcedureColumns for catalog: " + catalog);
@@ -1868,8 +1866,7 @@ public ResultSet getTables(
18681866

18691867
Thread fetcherThread = new Thread(tableFetcher, "getTables-fetcher-" + effectiveCatalog);
18701868
BigQueryJsonResultSet resultSet =
1871-
BigQueryJsonResultSet.of(
1872-
resultSchema, -1, queue, null, new Thread[] {fetcherThread});
1869+
BigQueryJsonResultSet.of(resultSchema, -1, queue, null, new Thread[] {fetcherThread});
18731870

18741871
fetcherThread.start();
18751872
LOG.info("Started background thread for getTables");
@@ -2009,8 +2006,7 @@ public ResultSet getCatalogs() {
20092006
populateQueue(catalogRows, queue, schemaFields);
20102007
signalEndOfData(queue, schemaFields);
20112008

2012-
return BigQueryJsonResultSet.of(
2013-
catalogsSchema, catalogRows.size(), queue, null, new Thread[0]);
2009+
return BigQueryJsonResultSet.of(catalogsSchema, catalogRows.size(), queue, null, new Thread[0]);
20142010
}
20152011

20162012
Schema defineGetCatalogsSchema() {
@@ -2635,7 +2631,9 @@ Schema defineGetVersionColumnsSchema() {
26352631
@Override
26362632
public ResultSet getPrimaryKeys(String catalog, String schema, String table) throws SQLException {
26372633
String sql = readSqlFromFile(GET_PRIMARY_KEYS_SQL);
2638-
try(Statement stmt = this.connection.createStatement()) {
2634+
try {
2635+
Statement stmt = this.connection.createStatement();
2636+
stmt.closeOnCompletion();
26392637
String formattedSql = replaceSqlParameters(sql, catalog, schema, table);
26402638
return stmt.executeQuery(formattedSql);
26412639
} catch (SQLException e) {
@@ -2647,7 +2645,9 @@ public ResultSet getPrimaryKeys(String catalog, String schema, String table) thr
26472645
public ResultSet getImportedKeys(String catalog, String schema, String table)
26482646
throws SQLException {
26492647
String sql = readSqlFromFile(GET_IMPORTED_KEYS_SQL);
2650-
try(Statement stmt = this.connection.createStatement()) {
2648+
try {
2649+
Statement stmt = this.connection.createStatement();
2650+
stmt.closeOnCompletion();
26512651
String formattedSql = replaceSqlParameters(sql, catalog, schema, table);
26522652
return stmt.executeQuery(formattedSql);
26532653
} catch (SQLException e) {
@@ -2659,7 +2659,9 @@ public ResultSet getImportedKeys(String catalog, String schema, String table)
26592659
public ResultSet getExportedKeys(String catalog, String schema, String table)
26602660
throws SQLException {
26612661
String sql = readSqlFromFile(GET_EXPORTED_KEYS_SQL);
2662-
try(Statement stmt = this.connection.createStatement()) {
2662+
try {
2663+
Statement stmt = this.connection.createStatement();
2664+
stmt.closeOnCompletion();
26632665
String formattedSql = replaceSqlParameters(sql, catalog, schema, table);
26642666
return stmt.executeQuery(formattedSql);
26652667
} catch (SQLException e) {
@@ -2677,7 +2679,9 @@ public ResultSet getCrossReference(
26772679
String foreignTable)
26782680
throws SQLException {
26792681
String sql = readSqlFromFile(GET_CROSS_REFERENCE_SQL);
2680-
try(Statement stmt = this.connection.createStatement()) {
2682+
try {
2683+
Statement stmt = this.connection.createStatement();
2684+
stmt.closeOnCompletion();
26812685
String formattedSql =
26822686
replaceSqlParameters(
26832687
sql,
@@ -3704,8 +3708,7 @@ public ResultSet getSchemas(String catalog, String schemaPattern) {
37043708

37053709
Thread fetcherThread = new Thread(schemaFetcher, "getSchemas-fetcher-" + catalog);
37063710
BigQueryJsonResultSet resultSet =
3707-
BigQueryJsonResultSet.of(
3708-
resultSchema, -1, queue, null, new Thread[] {fetcherThread});
3711+
BigQueryJsonResultSet.of(resultSchema, -1, queue, null, new Thread[] {fetcherThread});
37093712

37103713
fetcherThread.start();
37113714
LOG.info("Started background thread for getSchemas");
@@ -3999,8 +4002,7 @@ public ResultSet getFunctions(String catalog, String schemaPattern, String funct
39994002

40004003
Thread fetcherThread = new Thread(functionFetcher, "getFunctions-fetcher-" + catalog);
40014004
BigQueryJsonResultSet resultSet =
4002-
BigQueryJsonResultSet.of(
4003-
resultSchema, -1, queue, null, new Thread[] {fetcherThread});
4005+
BigQueryJsonResultSet.of(resultSchema, -1, queue, null, new Thread[] {fetcherThread});
40044006

40054007
fetcherThread.start();
40064008
LOG.info("Started background thread for getFunctions");
@@ -4254,8 +4256,7 @@ public ResultSet getFunctionColumns(
42544256
Thread fetcherThread =
42554257
new Thread(functionColumnFetcher, "getFunctionColumns-fetcher-" + catalog);
42564258
BigQueryJsonResultSet resultSet =
4257-
BigQueryJsonResultSet.of(
4258-
resultSchema, -1, queue, null, new Thread[] {fetcherThread});
4259+
BigQueryJsonResultSet.of(resultSchema, -1, queue, null, new Thread[] {fetcherThread});
42594260

42604261
fetcherThread.start();
42614262
LOG.info("Started background thread for getFunctionColumns for catalog: " + catalog);

0 commit comments

Comments
 (0)