diff --git a/pom.xml b/pom.xml index d920ee96..d2a68602 100644 --- a/pom.xml +++ b/pom.xml @@ -181,8 +181,8 @@ 3.1 true - 1.7 - 1.7 + 1.6 + 1.6 diff --git a/src/main/java/com/zaxxer/hikari/HikariConfig.java b/src/main/java/com/zaxxer/hikari/HikariConfig.java index a60f98c6..c7d30b61 100644 --- a/src/main/java/com/zaxxer/hikari/HikariConfig.java +++ b/src/main/java/com/zaxxer/hikari/HikariConfig.java @@ -121,11 +121,13 @@ public final class HikariConfig implements HikariConfigMBean throw new IllegalArgumentException("Property file " + propertyFileName + " was not found."); } - try ( FileInputStream fis = new FileInputStream(propFile) ) + try { + FileInputStream fis = new FileInputStream(propFile); Properties props = new Properties(); props.load(fis); PropertyBeanSetter.setTargetFromProperties(this, props); + fis.close(); } catch (IOException io) { @@ -419,7 +421,7 @@ public final class HikariConfig implements HikariConfigMBean int level = field.getInt(null); this.transactionIsolation = level; } - catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) + catch (Exception e) { throw new IllegalArgumentException("Invalid transaction isolation value: " + isolationLevel); } diff --git a/src/main/java/com/zaxxer/hikari/HikariPool.java b/src/main/java/com/zaxxer/hikari/HikariPool.java index 5c089685..e5c6b74d 100644 --- a/src/main/java/com/zaxxer/hikari/HikariPool.java +++ b/src/main/java/com/zaxxer/hikari/HikariPool.java @@ -113,7 +113,7 @@ public final class HikariPool implements HikariPoolMBean Class clazz = this.getClass().getClassLoader().loadClass(configuration.getConnectionCustomizerClassName()); this.connectionCustomizer = (IConnectionCustomizer) clazz.newInstance(); } - catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) + catch (Exception e) { throw new RuntimeException("Could not load connection customization class", e); } @@ -398,10 +398,15 @@ public final class HikariPool implements HikariPoolMBean if (initSql != null && initSql.length() > 0) { connection.setAutoCommit(true); - try (Statement statement = connection.createStatement()) + Statement statement = connection.createStatement(); + try { statement.execute(initSql); } + finally + { + statement.close(); + } } if (!shutdown) @@ -462,11 +467,16 @@ public final class HikariPool implements HikariPoolMBean return connection.isValid((int) TimeUnit.MILLISECONDS.toSeconds(timeoutMs)); } - try (Statement statement = connection.createStatement()) + Statement statement = connection.createStatement(); + try { statement.setQueryTimeout((int) TimeUnit.MILLISECONDS.toSeconds(timeoutMs)); statement.executeQuery(configuration.getConnectionTestQuery()); } + finally + { + statement.close(); + } } finally { diff --git a/src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java b/src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java index 75331544..09e4e6d9 100644 --- a/src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java +++ b/src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java @@ -72,7 +72,7 @@ public class ConcurrentBag(); + this.sharedList = new CopyOnWriteArraySet(); this.synchronizer = new Synchronizer(); this.threadList = new ThreadLocal>(); } @@ -92,7 +92,7 @@ public class ConcurrentBag list = threadList.get(); if (list == null) { - list = new LinkedList<>(); + list = new LinkedList(); threadList.set(list); } @@ -193,7 +193,7 @@ public class ConcurrentBag values(int state) { - ArrayList list = new ArrayList<>(sharedList.size()); + ArrayList list = new ArrayList(sharedList.size()); if (state == STATE_IN_USE || state == STATE_NOT_IN_USE) { for (T reference : sharedList) diff --git a/src/test/java/com/zaxxer/hikari/TestFastStatementList.java b/src/test/java/com/zaxxer/hikari/TestFastStatementList.java index 662888ac..4f3aac46 100644 --- a/src/test/java/com/zaxxer/hikari/TestFastStatementList.java +++ b/src/test/java/com/zaxxer/hikari/TestFastStatementList.java @@ -14,7 +14,7 @@ public class TestFastStatementList @Test public void testOverflow() { - ArrayList verifyList = new ArrayList<>(); + ArrayList verifyList = new ArrayList(); FastStatementList list = new FastStatementList(); for (int i = 0; i < 100; i++) diff --git a/src/test/java/com/zaxxer/hikari/osgi/OSGiBundleTest.java b/src/test/java/com/zaxxer/hikari/osgi/OSGiBundleTest.java index 8726ce4a..9612654b 100644 --- a/src/test/java/com/zaxxer/hikari/osgi/OSGiBundleTest.java +++ b/src/test/java/com/zaxxer/hikari/osgi/OSGiBundleTest.java @@ -24,9 +24,10 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import javax.inject.Inject; + import java.io.File; -import static junit.framework.Assert.assertNotNull; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.ops4j.pax.exam.CoreOptions.*;