better method name

pull/499/head
Nitin 9 years ago
parent a491250ba1
commit fdce10f7db

@ -42,7 +42,7 @@ import com.codahale.metrics.health.HealthCheckRegistry;
import com.zaxxer.hikari.metrics.MetricsTrackerFactory; import com.zaxxer.hikari.metrics.MetricsTrackerFactory;
import com.zaxxer.hikari.util.PropertyElf; import com.zaxxer.hikari.util.PropertyElf;
import static com.zaxxer.hikari.util.UtilityElf.nullOrNotEmpty; import static com.zaxxer.hikari.util.UtilityElf.getNullIfEmpty;
public class HikariConfig implements HikariConfigMXBean public class HikariConfig implements HikariConfigMXBean
{ {
@ -749,14 +749,14 @@ public class HikariConfig implements HikariConfigMXBean
validateNumerics(); validateNumerics();
// treat empty property as null // treat empty property as null
catalog = nullOrNotEmpty(catalog); catalog = getNullIfEmpty(catalog);
connectionInitSql = nullOrNotEmpty(connectionInitSql); connectionInitSql = getNullIfEmpty(connectionInitSql);
connectionTestQuery = nullOrNotEmpty(connectionTestQuery); connectionTestQuery = getNullIfEmpty(connectionTestQuery);
transactionIsolationName = nullOrNotEmpty(transactionIsolationName); transactionIsolationName = getNullIfEmpty(transactionIsolationName);
dataSourceClassName = nullOrNotEmpty(dataSourceClassName); dataSourceClassName = getNullIfEmpty(dataSourceClassName);
dataSourceJndiName = nullOrNotEmpty(dataSourceJndiName); dataSourceJndiName = getNullIfEmpty(dataSourceJndiName);
driverClassName = nullOrNotEmpty(driverClassName); driverClassName = getNullIfEmpty(driverClassName);
jdbcUrl = nullOrNotEmpty(jdbcUrl); jdbcUrl = getNullIfEmpty(jdbcUrl);
if (poolName == null) { if (poolName == null) {
poolName = "HikariPool-" + POOL_NUMBER.getAndIncrement(); poolName = "HikariPool-" + POOL_NUMBER.getAndIncrement();

@ -35,7 +35,7 @@ public final class UtilityElf
* *
* @return null if string is null or empty * @return null if string is null or empty
*/ */
public static String nullOrNotEmpty(final String text) public static String getNullIfEmpty(final String text)
{ {
return text == null ? null : text.trim().isEmpty() ? null : text.trim(); return text == null ? null : text.trim().isEmpty() ? null : text.trim();
} }

@ -41,13 +41,16 @@ public class ShutdownTest
@Before @Before
public void beforeTest() public void beforeTest()
{ {
TestElf.setSlf4jLogLevel(ShutdownTest.class, Level.DEBUG); TestElf.setSlf4jLogLevel(PoolBase.class, Level.DEBUG);
TestElf.setSlf4jLogLevel(HikariPool.class, Level.DEBUG);
StubConnection.count.set(0); StubConnection.count.set(0);
} }
@After @After
public void afterTest() public void afterTest()
{ {
TestElf.setSlf4jLogLevel(PoolBase.class, Level.WARN);
TestElf.setSlf4jLogLevel(HikariPool.class, Level.WARN);
StubConnection.slowCreate = false; StubConnection.slowCreate = false;
} }

Loading…
Cancel
Save