From 6a46daa7c9d6f10e9fdd1125ace5eab5e02552fe Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Thu, 10 Oct 2013 23:42:31 +0900
Subject: [PATCH] Change named of some getter/setters

---
 .../java/com/zaxxer/hikari/HikariConfig.java  | 44 ++++++++++++-------
 .../java/com/zaxxer/hikari/CreationTest.java  |  2 +-
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zaxxer/hikari/HikariConfig.java b/src/main/java/com/zaxxer/hikari/HikariConfig.java
index 3b35ba44..f8c50107 100644
--- a/src/main/java/com/zaxxer/hikari/HikariConfig.java
+++ b/src/main/java/com/zaxxer/hikari/HikariConfig.java
@@ -3,6 +3,8 @@
  */
 package com.zaxxer.hikari;
 
+import java.util.concurrent.TimeUnit;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,6 +39,7 @@ public class HikariConfig
     private boolean isJdbc4connectionTest;
     private int maxLifetime;
     private int leakDetectionThreshold;
+    private int idleTimeout;
 
     /**
      * Default constructor
@@ -44,8 +47,9 @@ public class HikariConfig
     public HikariConfig()
     {
         acquireIncrement = 1;
-        connectionTimeout = Integer.MAX_VALUE;
         maxPoolSize = 1;
+        connectionTimeout = Integer.MAX_VALUE;
+        idleTimeout = (int) TimeUnit.MINUTES.toMillis(30);
         proxyFactoryType = "auto";
     }
 
@@ -77,18 +81,18 @@ public class HikariConfig
         this.acquireRetries = acquireRetries;
     }
 
-    public int getAcquireRetryDelayMs()
+    public int getAcquireRetryDelay()
     {
         return acquireRetryDelay;
     }
 
-    public void setAcquireRetryDelayMs(int acquireRetryDelay)
+    public void setAcquireRetryDelay(int acquireRetryDelayMs)
     {
-        if (acquireRetryDelay < 0)
+        if (acquireRetryDelayMs < 0)
         {
             throw new IllegalArgumentException("acquireRetryDelay cannot be negative");
         }
-        this.acquireRetryDelay = acquireRetryDelay;
+        this.acquireRetryDelay = acquireRetryDelayMs;
     }
 
     public String getConnectionTestQuery()
@@ -101,18 +105,18 @@ public class HikariConfig
         this.connectionTestQuery = connectionTestQuery;
     }
 
-    public int getConnectionTimeoutMs()
+    public int getConnectionTimeout()
     {
         return connectionTimeout;
     }
 
-    public void setConnectionTimeoutMs(int connectionTimeout)
+    public void setConnectionTimeout(int connectionTimeoutMs)
     {
-        if (connectionTimeout < 0)
+        if (connectionTimeoutMs < 0)
         {
             throw new IllegalArgumentException("connectionTimeout cannot be negative");
         }
-        this.connectionTimeout = connectionTimeout;
+        this.connectionTimeout = connectionTimeoutMs;
     }
 
     public String getConnectionUrl()
@@ -135,6 +139,16 @@ public class HikariConfig
         this.dataSourceClassName = className;
     }
 
+    public int getIdleTimeout()
+    {
+        return idleTimeout;
+    }
+
+    public void setIdleTimeout(int idleTimeoutMs)
+    {
+        this.idleTimeout = idleTimeoutMs;
+    }
+
     public boolean isJdbc4ConnectionTest()
     {
         return isJdbc4connectionTest;
@@ -145,24 +159,24 @@ public class HikariConfig
         this.isJdbc4connectionTest = useIsValid;
     }
 
-    public int getLeakDetectionThresholdMs()
+    public int getLeakDetectionThreshold()
     {
         return leakDetectionThreshold;
     }
 
-    public void setLeakDetectionThresholdMs(int leakDetectionThreshold)
+    public void setLeakDetectionThreshold(int leakDetectionThresholdMs)
     {
-        this.leakDetectionThreshold = leakDetectionThreshold; 
+        this.leakDetectionThreshold = leakDetectionThresholdMs; 
     }
 
-    public int getMaxLifetimeMs()
+    public int getMaxLifetime()
     {
         return maxLifetime;
     }
 
-    public void setMaxLifetimeMs(int maxLifetime)
+    public void setMaxLifetime(int maxLifetimeMs)
     {
-        this.maxLifetime = maxLifetime;
+        this.maxLifetime = maxLifetimeMs;
     }
 
     public int getMinimumPoolSize()
diff --git a/src/test/java/com/zaxxer/hikari/CreationTest.java b/src/test/java/com/zaxxer/hikari/CreationTest.java
index cf0fccbf..50f8c802 100644
--- a/src/test/java/com/zaxxer/hikari/CreationTest.java
+++ b/src/test/java/com/zaxxer/hikari/CreationTest.java
@@ -79,7 +79,7 @@ public class CreationTest
     {
         HikariConfig config = new HikariConfig();
         config.setMinimumPoolSize(1);
-        config.setMaxLifetimeMs(500);
+        config.setMaxLifetime(500);
         config.setConnectionTestQuery("VALUES 1");
         config.setDataSourceClassName("com.zaxxer.hikari.mocks.MockDataSource");
         config.setProxyFactoryType(System.getProperty("testProxy", "auto"));