From 52efc7de3f377af14b12c9a2f1c5f8f2160a88d3 Mon Sep 17 00:00:00 2001 From: Dawson Date: Mon, 19 May 2025 10:31:54 -0400 Subject: [PATCH] Ensuring queries auto-close --- .../antivpn/database/sql/MySqlVPN.java | 46 +++++++++++-------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/Common/src/main/java/dev/brighten/antivpn/database/sql/MySqlVPN.java b/Common/src/main/java/dev/brighten/antivpn/database/sql/MySqlVPN.java index 39a9cea..148f0c8 100644 --- a/Common/src/main/java/dev/brighten/antivpn/database/sql/MySqlVPN.java +++ b/Common/src/main/java/dev/brighten/antivpn/database/sql/MySqlVPN.java @@ -286,19 +286,21 @@ public class MySqlVPN implements VPNDatabase { String query = "SELECT COUNT(1) IndexExists FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema=DATABASE()" + " AND table_name='whitelisted' AND index_name='uuid_1';"; - ResultSet rs = Query.prepare(query).executeQuery(); int id = 0; - while (rs.next()) { - id = rs.getInt("IndexExists"); - } - if (id == 0) { - Query.prepare("create index `uuid_1` on `whitelisted` (`uuid`)").execute(); + try(ResultSet rs = Query.prepare(query).executeQuery()) { + while (rs.next()) { + id = rs.getInt("IndexExists"); + } + if (id == 0) { + Query.prepare("create index `uuid_1` on `whitelisted` (`uuid`)").execute(); + } } id = 0; - responsesIndex: { - query = "SELECT COUNT(1) IndexExists FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema=DATABASE() " + - "AND table_name='responses' AND index_name='ip_1';"; - rs = Query.prepare(query).executeQuery(); + + // Responses index + query = "SELECT COUNT(1) IndexExists FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema=DATABASE() " + + "AND table_name='responses' AND index_name='ip_1';"; + try(ResultSet rs = Query.prepare(query).executeQuery()) { while (rs.next()) { id = rs.getInt("IndexExists"); } @@ -306,9 +308,11 @@ public class MySqlVPN implements VPNDatabase { Query.prepare("create index `ip_1` on `responses` (`ip`)").execute(); } id = 0; - query = "SELECT COUNT(1) IndexExists FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema=DATABASE() " + - "AND table_name='responses' AND index_name='proxy_1';"; - rs = Query.prepare(query).executeQuery(); + } + + query = "SELECT COUNT(1) IndexExists FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema=DATABASE() " + + "AND table_name='responses' AND index_name='proxy_1';"; + try(ResultSet rs = Query.prepare(query).executeQuery()) { while (rs.next()) { id = rs.getInt("IndexExists"); } @@ -316,9 +320,10 @@ public class MySqlVPN implements VPNDatabase { Query.prepare("create index `proxy_1` on `responses` (`proxy`)").execute(); } id = 0; - query = "SELECT COUNT(1) IndexExists FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema=DATABASE()" + - " AND table_name='responses' AND index_name='inserted_1';"; - rs = Query.prepare(query).executeQuery(); + } + query = "SELECT COUNT(1) IndexExists FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema=DATABASE()" + + " AND table_name='responses' AND index_name='inserted_1';"; + try(ResultSet rs = Query.prepare(query).executeQuery()) { while (rs.next()) { id = rs.getInt("IndexExists"); } @@ -327,10 +332,11 @@ public class MySqlVPN implements VPNDatabase { } id = 0; } - whitelistedIpsIndex: { - query = "SELECT COUNT(1) IndexExists FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema=DATABASE()" + - " AND table_name='whitelisted-ips' AND index_name='ip_1';"; - rs = Query.prepare(query).executeQuery(); + + //Whitelisted IPs index + query = "SELECT COUNT(1) IndexExists FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema=DATABASE()" + + " AND table_name='whitelisted-ips' AND index_name='ip_1';"; + try(ResultSet rs = Query.prepare(query).executeQuery()) { while (rs.next()) { id = rs.getInt("IndexExists"); }