Add getName() to DataSourcePool API

Author: rbygrave

src/main/java/org/avaje/datasource/pool/ConnectionPool.java

@@ -293,6 +293,7 @@ public <T> T unwrap(Class<T> arg0) throws SQLException {
   /**
    * Return the dataSource name.
    */
+  @Override
   public String getName() {
     return name;
   }
@@ -874,15 +875,16 @@ public void setPstmtCacheSize(int pstmtCacheSize) {
    * hitCount, waitCount and highWaterMark are reset.
    * </p>
    */
+  @Override
   public PoolStatus getStatus(boolean reset) {
     return queue.getStatus(reset);
   }
 
   /**
    * Return the aggregated load statistics collected on all the connections in the pool.
    */
+  @Override
   public PoolStatistics getStatistics(boolean reset) {
-
     return queue.getStatistics(reset);
   }
 
@@ -900,7 +902,6 @@ private void deregisterDriver() {
 
   public static class Status implements PoolStatus {
 
-    private final String name;
     private final int minSize;
     private final int maxSize;
     private final int free;
@@ -910,9 +911,7 @@ public static class Status implements PoolStatus {
     private final int waitCount;
     private final int hitCount;
 
-    protected Status(String name, int minSize, int maxSize, int free, int busy, int waiting, int highWaterMark,
-                     int waitCount, int hitCount) {
-      this.name = name;
+    protected Status(int minSize, int maxSize, int free, int busy, int waiting, int highWaterMark, int waitCount, int hitCount) {
       this.minSize = minSize;
       this.maxSize = maxSize;
       this.free = free;
@@ -928,14 +927,6 @@ public String toString() {
           + "] highWaterMark[" + highWaterMark + "] waitCount[" + waitCount + "] hitCount[" + hitCount + "]";
     }
 
-    /**
-     * Return the DataSource name.
-     */
-    @Override
-    public String getName() {
-      return name;
-    }
-
     /**
      * Return the min pool size.
      */

src/main/java/org/avaje/datasource/pool/PooledConnectionQueue.java

@@ -115,7 +115,7 @@ public class PooledConnectionQueue {
   }
 
   private PoolStatus createStatus() {
-    return new Status(name, minSize, maxSize, freeList.size(), busyList.size(), waitingThreads, highWaterMark, waitCount, hitCount);
+    return new Status(minSize, maxSize, freeList.size(), busyList.size(), waitingThreads, highWaterMark, waitCount, hitCount);
   }
 
   public String toString() {