From 7f9734e025ddd07be7243c134dac8e18f9b1f8a0 Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Wed, 29 Oct 2014 18:48:15 +0900
Subject: [PATCH] Minor code cleanup.

---
 .../zaxxer/hikari/metrics/CodaHaleMetricsTracker.java    | 9 +++++----
 .../java/com/zaxxer/hikari/metrics/IMetricsTracker.java  | 4 ++--
 .../java/com/zaxxer/hikari/metrics/MetricsTracker.java   | 3 ++-
 .../src/main/java/com/zaxxer/hikari/pool/HikariPool.java | 4 +---
 .../zaxxer/hikari/metrics/CodaHaleMetricsTracker.java    | 9 +++++----
 .../java/com/zaxxer/hikari/metrics/IMetricsTracker.java  | 4 ++--
 .../java/com/zaxxer/hikari/metrics/MetricsTracker.java   | 3 ++-
 .../src/main/java/com/zaxxer/hikari/pool/HikariPool.java | 4 +---
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/metrics/CodaHaleMetricsTracker.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/metrics/CodaHaleMetricsTracker.java
index 8fbe9151..8f5e3a74 100644
--- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/metrics/CodaHaleMetricsTracker.java
+++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/metrics/CodaHaleMetricsTracker.java
@@ -21,6 +21,7 @@ import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
 import com.zaxxer.hikari.pool.HikariPool;
 import com.zaxxer.hikari.pool.PoolBagEntry;
+import com.zaxxer.hikari.util.PoolUtilities;
 
 public final class CodaHaleMetricsTracker extends MetricsTracker
 {
@@ -39,18 +40,18 @@ public final class CodaHaleMetricsTracker extends MetricsTracker
 
    /** {@inheritDoc} */
    @Override
-   public Context recordConnectionRequest(long requestTime)
+   public Context recordConnectionRequest(final long requestTime)
    {
       return new Context(connectionObtainTimer);
    }
 
    /** {@inheritDoc} */
    @Override
-   public void recordConnectionUsage(long usageMilleseconds)
+   public void recordConnectionUsage(final PoolBagEntry bagEntry)
    {
-      connectionUsage.update(usageMilleseconds);
+      connectionUsage.update(PoolUtilities.elapsedTimeMs(bagEntry.lastOpenTime));
    }
-
+   
    public Timer getConnectionAcquisitionTimer()
    {
       return connectionObtainTimer;
diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/metrics/IMetricsTracker.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/metrics/IMetricsTracker.java
index db8a6458..35567391 100644
--- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/metrics/IMetricsTracker.java
+++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/metrics/IMetricsTracker.java
@@ -38,9 +38,9 @@ public interface IMetricsTracker
     * This method is called when a Connection is closed, with the total time in milliseconds
     * that the Connection was out of the pool.
     *
-    * @param usageMilleseconds the Connection usage time in milliseconds
+    * @param bagEntry the entry to calculate usage for
     */
-   void recordConnectionUsage(long usageMilleseconds);
+   void recordConnectionUsage(PoolBagEntry bagEntry);
 
    /**
     * Get the current number of idle connections.
diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/metrics/MetricsTracker.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/metrics/MetricsTracker.java
index 6c268990..7a2a4e06 100644
--- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/metrics/MetricsTracker.java
+++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/metrics/MetricsTracker.java
@@ -17,6 +17,7 @@
 package com.zaxxer.hikari.metrics;
 
 import com.zaxxer.hikari.pool.HikariPool;
+import com.zaxxer.hikari.pool.PoolBagEntry;
 
 /**
  * This class only supports realtime, not historical metrics.
@@ -43,7 +44,7 @@ public class MetricsTracker implements IMetricsTracker
 
    /** {@inheritDoc} */
    @Override
-   public void recordConnectionUsage(long usageMilleseconds)
+   public void recordConnectionUsage(final PoolBagEntry bagEntry)
    {
    }
 
diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
index 5ff7506c..d069c824 100644
--- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
+++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
@@ -216,9 +216,7 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener
     */
    public void releaseConnection(final PoolBagEntry bagEntry, final boolean isBroken)
    {
-      if (isRecordMetrics) {
-         metricsTracker.recordConnectionUsage(elapsedTimeMs(bagEntry.lastOpenTime));
-      }
+      metricsTracker.recordConnectionUsage(bagEntry);
 
       if (isBroken || isShutdown) {
          LOGGER.debug("Connection returned to pool {} is broken, or the pool has been shut down.  Closing connection.", configuration.getPoolName());
diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/metrics/CodaHaleMetricsTracker.java b/hikaricp/src/main/java/com/zaxxer/hikari/metrics/CodaHaleMetricsTracker.java
index 8fbe9151..8f5e3a74 100644
--- a/hikaricp/src/main/java/com/zaxxer/hikari/metrics/CodaHaleMetricsTracker.java
+++ b/hikaricp/src/main/java/com/zaxxer/hikari/metrics/CodaHaleMetricsTracker.java
@@ -21,6 +21,7 @@ import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
 import com.zaxxer.hikari.pool.HikariPool;
 import com.zaxxer.hikari.pool.PoolBagEntry;
+import com.zaxxer.hikari.util.PoolUtilities;
 
 public final class CodaHaleMetricsTracker extends MetricsTracker
 {
@@ -39,18 +40,18 @@ public final class CodaHaleMetricsTracker extends MetricsTracker
 
    /** {@inheritDoc} */
    @Override
-   public Context recordConnectionRequest(long requestTime)
+   public Context recordConnectionRequest(final long requestTime)
    {
       return new Context(connectionObtainTimer);
    }
 
    /** {@inheritDoc} */
    @Override
-   public void recordConnectionUsage(long usageMilleseconds)
+   public void recordConnectionUsage(final PoolBagEntry bagEntry)
    {
-      connectionUsage.update(usageMilleseconds);
+      connectionUsage.update(PoolUtilities.elapsedTimeMs(bagEntry.lastOpenTime));
    }
-
+   
    public Timer getConnectionAcquisitionTimer()
    {
       return connectionObtainTimer;
diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/metrics/IMetricsTracker.java b/hikaricp/src/main/java/com/zaxxer/hikari/metrics/IMetricsTracker.java
index db8a6458..35567391 100644
--- a/hikaricp/src/main/java/com/zaxxer/hikari/metrics/IMetricsTracker.java
+++ b/hikaricp/src/main/java/com/zaxxer/hikari/metrics/IMetricsTracker.java
@@ -38,9 +38,9 @@ public interface IMetricsTracker
     * This method is called when a Connection is closed, with the total time in milliseconds
     * that the Connection was out of the pool.
     *
-    * @param usageMilleseconds the Connection usage time in milliseconds
+    * @param bagEntry the entry to calculate usage for
     */
-   void recordConnectionUsage(long usageMilleseconds);
+   void recordConnectionUsage(PoolBagEntry bagEntry);
 
    /**
     * Get the current number of idle connections.
diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/metrics/MetricsTracker.java b/hikaricp/src/main/java/com/zaxxer/hikari/metrics/MetricsTracker.java
index 6c268990..7a2a4e06 100644
--- a/hikaricp/src/main/java/com/zaxxer/hikari/metrics/MetricsTracker.java
+++ b/hikaricp/src/main/java/com/zaxxer/hikari/metrics/MetricsTracker.java
@@ -17,6 +17,7 @@
 package com.zaxxer.hikari.metrics;
 
 import com.zaxxer.hikari.pool.HikariPool;
+import com.zaxxer.hikari.pool.PoolBagEntry;
 
 /**
  * This class only supports realtime, not historical metrics.
@@ -43,7 +44,7 @@ public class MetricsTracker implements IMetricsTracker
 
    /** {@inheritDoc} */
    @Override
-   public void recordConnectionUsage(long usageMilleseconds)
+   public void recordConnectionUsage(final PoolBagEntry bagEntry)
    {
    }
 
diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
index 15780317..b886ff23 100644
--- a/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
+++ b/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
@@ -213,9 +213,7 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener
     */
    public void releaseConnection(final PoolBagEntry bagEntry, final boolean isBroken)
    {
-      if (isRecordMetrics) {
-         metricsTracker.recordConnectionUsage(elapsedTimeMs(bagEntry.lastOpenTime));
-      }
+      metricsTracker.recordConnectionUsage(bagEntry);
 
       if (isBroken || isShutdown) {
          LOGGER.debug("Connection returned to pool {} is broken, or the pool has been shut down.  Closing connection.", configuration.getPoolName());