Fix | Comments

Author: rene-ye

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement.java

@@ -70,7 +70,7 @@ String getClassNameInternal() {
         return "SQLServerCallableStatement";
     }
 
-    Map<String,Integer> map = new ConcurrentHashMap<>();
+    Map<String, Integer> map = new ConcurrentHashMap<>();
     AtomicInteger ai = new AtomicInteger(0);
 
     /**
@@ -1304,7 +1304,7 @@ private int findColumn(String columnName) throws SQLServerException {
             l = parameterNames.size();
         }
         if (l == 0) { // Server didn't return anything, user might not have access
-            map.putIfAbsent(columnName,ai.incrementAndGet());
+            map.putIfAbsent(columnName, ai.incrementAndGet());
             return map.get(columnName);// attempting to look up the first column will return no access exception
         }
 

src/test/java/com/microsoft/sqlserver/jdbc/callablestatement/CallableMixedTest.java

@@ -6,7 +6,6 @@
 
 import java.sql.CallableStatement;
 import java.sql.Connection;
-import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -90,14 +89,12 @@ public void datatypestest() throws Exception {
     @Tag("xAzureSQLDW")
     @Tag("xAzureSQLMI")
     public void noPrivilegeTest() throws SQLException {
-        try (Connection c = getConnection();
-                Statement stmt = c.createStatement()) {
+        try (Connection c = getConnection(); Statement stmt = c.createStatement()) {
             String tableName = RandomUtil.getIdentifier("jdbc_priv");
             String procName = RandomUtil.getIdentifier("priv_proc");
             String user = "priv_user" + UUID.randomUUID();
             String pass = "priv_pass" + UUID.randomUUID();
 
-
             stmt.execute(
                     "CREATE TABLE " + AbstractSQLGenerator.escapeIdentifier(tableName) + " (id int, name varchar(50))");
             stmt.execute("CREATE PROC " + AbstractSQLGenerator.escapeIdentifier(procName)
@@ -113,11 +110,9 @@ public void noPrivilegeTest() throws SQLException {
             } catch (SQLException e) {
                 assertTrue(e.getMessage().matches(TestResource.formatErrorMsg("R_NoPrivilege")));
             } finally {
-                TestUtils.dropProcedureIfExists(procName, stmt);
-                TestUtils.dropTableIfExists(tableName, stmt);
-                stmt.close();
-                c.close();
                 try (Connection c2 = getConnection(); Statement stmt2 = c2.createStatement()) {
+                    TestUtils.dropProcedureIfExists(procName, stmt2);
+                    TestUtils.dropTableIfExists(tableName, stmt2);
                     stmt2.execute("DROP USER " + AbstractSQLGenerator.escapeIdentifier(user));
                     stmt2.execute("DROP LOGIN " + AbstractSQLGenerator.escapeIdentifier(user));
                 }