Refactor rename methods in PoolStatus with deprecation

Migrate away from getters to accessors

Author: rbygrave

ebean-datasource-api/src/main/java/io/ebean/datasource/PoolStatus.java

@@ -8,40 +8,104 @@ public interface PoolStatus {
   /**
    * Return the pools minimum size.
    */
-  int getMinSize();
+  int minSize();
+
+  /**
+   * Deprecated migrate to minSize()
+   */
+  @Deprecated
+  default int getMinSize() {
+    return minSize();
+  }
 
   /**
    * Return the pools maximum size.
    */
-  int getMaxSize();
+  int maxSize();
+
+  /**
+   * Deprecated migrate to maxSize()
+   */
+  @Deprecated
+  default int getMaxSize() {
+    return maxSize();
+  }
 
   /**
    * Return number of free connections.
    */
-  int getFree();
+  int free();
+
+  /**
+   * Deprecated migrate to free()
+   */
+  @Deprecated
+  default int getFree() {
+    return free();
+  }
 
   /**
    * Return number of busy connections.
    */
-  int getBusy();
+  int busy();
+
+  /**
+   * Deprecated migrate to busy()
+   */
+  @Deprecated
+  default int getBusy() {
+    return busy();
+  }
 
   /**
    * Return the number of threads waiting for connections.
    */
-  int getWaiting();
+  int waiting();
+
+  /**
+   * Deprecated migrate to waiting()
+   */
+  @Deprecated
+  default int getWaiting() {
+    return waiting();
+  }
 
   /**
    * Return the busy connection high water mark.
    */
-  int getHighWaterMark();
+  int highWaterMark();
+
+  /**
+   * Deprecated migrate to waiting()
+   */
+  @Deprecated
+  default int getHighWaterMark() {
+    return highWaterMark();
+  }
 
   /**
    * Return the number of times threads had to wait for connections.
    */
-  int getWaitCount();
+  int waitCount();
+
+  /**
+   * Deprecated migrate to waitCount()
+   */
+  @Deprecated
+  default int getWaitCount() {
+    return waitCount();
+  }
 
   /**
    * Return the hit count against the pool.
    */
-  int getHitCount();
+  int hitCount();
+
+  /**
+   * Deprecated migrate to hitCount()
+   */
+  @Deprecated
+  default int getHitCount() {
+    return hitCount();
+  }
 }

ebean-datasource/src/main/java/io/ebean/datasource/pool/ConnectionPool.java

@@ -867,55 +867,55 @@ public String toString() {
      * Return the min pool size.
      */
     @Override
-    public int getMinSize() {
+    public int minSize() {
       return minSize;
     }
 
     /**
      * Return the max pool size.
      */
     @Override
-    public int getMaxSize() {
+    public int maxSize() {
       return maxSize;
     }
 
     /**
      * Return the current number of free connections in the pool.
      */
     @Override
-    public int getFree() {
+    public int free() {
       return free;
     }
 
     /**
      * Return the current number of busy connections in the pool.
      */
     @Override
-    public int getBusy() {
+    public int busy() {
       return busy;
     }
 
     /**
      * Return the current number of threads waiting for a connection.
      */
     @Override
-    public int getWaiting() {
+    public int waiting() {
       return waiting;
     }
 
     /**
      * Return the high water mark of busy connections.
      */
     @Override
-    public int getHighWaterMark() {
+    public int highWaterMark() {
       return highWaterMark;
     }
 
     /**
      * Return the total number of times a thread had to wait.
      */
     @Override
-    public int getWaitCount() {
+    public int waitCount() {
       return waitCount;
     }
 
@@ -928,7 +928,7 @@ public int getWaitCount() {
      * </p>
      */
     @Override
-    public int getHitCount() {
+    public int hitCount() {
       return hitCount;
     }
 

ebean-datasource/src/test/java/io/ebean/datasource/pool/ConnectionPoolOfflineTest.java

@@ -41,24 +41,24 @@ public void testOffline() throws InterruptedException, SQLException {
     log.info("pool created ");
 
     waitFor(() -> {
-      assertEquals(0, pool.status(false).getFree());
-      assertEquals(0, pool.status(false).getBusy());
+      assertEquals(0, pool.status(false).free());
+      assertEquals(0, pool.status(false).busy());
       assertThat(pool.size()).isEqualTo(0);
     });
 
     pool.online();
     log.info("pool online");
     assertThat(pool.isOnline()).isTrue();
-    assertEquals(2, pool.status(false).getFree());
-    assertEquals(0, pool.status(false).getBusy());
+    assertEquals(2, pool.status(false).free());
+    assertEquals(0, pool.status(false).busy());
     assertThat(pool.size()).isEqualTo(2);
 
     pool.offline();
     log.info("pool offline");
     waitFor(() -> {
       assertThat(pool.isOnline()).isFalse();
-      assertEquals(0, pool.status(false).getFree());
-      assertEquals(0, pool.status(false).getBusy());
+      assertEquals(0, pool.status(false).free());
+      assertEquals(0, pool.status(false).busy());
       assertThat(pool.size()).isEqualTo(0);
     });
 
@@ -67,17 +67,17 @@ public void testOffline() throws InterruptedException, SQLException {
 
     waitFor(() -> {
       assertThat(pool.isOnline()).isTrue();
-      assertEquals(2, pool.status(false).getFree());
-      assertEquals(0, pool.status(false).getBusy());
+      assertEquals(2, pool.status(false).free());
+      assertEquals(0, pool.status(false).busy());
       assertThat(pool.size()).isEqualTo(2);
     });
 
     pool.shutdown();
 
     waitFor(() -> {
       assertThat(pool.isOnline()).isFalse();
-      assertEquals(0, pool.status(false).getFree());
-      assertEquals(0, pool.status(false).getBusy());
+      assertEquals(0, pool.status(false).free());
+      assertEquals(0, pool.status(false).busy());
       assertThat(pool.size()).isEqualTo(0);
     });
   }
@@ -126,19 +126,19 @@ public void offline_whenBusy_allowed() throws SQLException, InterruptedException
 
     Thread.sleep(200);
     System.out.println("-- taking pool offline (with a busy connection)");
-    assertEquals(1, pool.status(false).getBusy());
+    assertEquals(1, pool.status(false).busy());
     assertThat(pool.size()).isEqualTo(2);
 
     pool.offline();
-    assertEquals(0, pool.status(false).getFree());
-    assertEquals(1, pool.status(false).getBusy()); // still 1 busy connection
+    assertEquals(0, pool.status(false).free());
+    assertEquals(1, pool.status(false).busy()); // still 1 busy connection
     assertThat(pool.size()).isEqualTo(1);
 
     // wait to let busy connection finish and close
     waitFor(() -> {
       // all done now
-      assertEquals(0, pool.status(false).getFree());
-      assertEquals(0, pool.status(false).getBusy());
+      assertEquals(0, pool.status(false).free());
+      assertEquals(0, pool.status(false).busy());
       assertThat(pool.size()).isEqualTo(0);
     });
   }

ebean-datasource/src/test/java/io/ebean/datasource/pool/ConnectionPoolTest.java

@@ -40,28 +40,28 @@ void getConnection_expect_poolGrowsAboveMin() throws SQLException {
     Connection con1 = pool.getConnection();
     Connection con2 = pool.getConnection();
 
-    assertThat(pool.status(false).getBusy()).isEqualTo(2);
-    assertThat(pool.status(false).getFree()).isEqualTo(0);
+    assertThat(pool.status(false).busy()).isEqualTo(2);
+    assertThat(pool.status(false).free()).isEqualTo(0);
     assertThat(pool.size()).isEqualTo(2);
 
     Connection con3 = pool.getConnection();
-    assertThat(pool.status(false).getBusy()).isEqualTo(3);
-    assertThat(pool.status(false).getFree()).isEqualTo(0);
+    assertThat(pool.status(false).busy()).isEqualTo(3);
+    assertThat(pool.status(false).free()).isEqualTo(0);
     assertThat(pool.size()).isEqualTo(3);
 
     con2.close();
-    assertThat(pool.status(false).getBusy()).isEqualTo(2);
-    assertThat(pool.status(false).getFree()).isEqualTo(1);
+    assertThat(pool.status(false).busy()).isEqualTo(2);
+    assertThat(pool.status(false).free()).isEqualTo(1);
     assertThat(pool.size()).isEqualTo(3);
 
     con3.close();
-    assertThat(pool.status(false).getBusy()).isEqualTo(1);
-    assertThat(pool.status(false).getFree()).isEqualTo(2);
+    assertThat(pool.status(false).busy()).isEqualTo(1);
+    assertThat(pool.status(false).free()).isEqualTo(2);
     assertThat(pool.size()).isEqualTo(3);
 
     con1.close();
-    assertThat(pool.status(false).getBusy()).isEqualTo(0);
-    assertThat(pool.status(false).getFree()).isEqualTo(3);
+    assertThat(pool.status(false).busy()).isEqualTo(0);
+    assertThat(pool.status(false).free()).isEqualTo(3);
     assertThat(pool.size()).isEqualTo(3);
   }
 

ebean-datasource/src/test/java/io/ebean/datasource/pool/ConnectionPoolTrimIdleTest.java

@@ -45,10 +45,10 @@ public void test() throws SQLException, InterruptedException {
       con3.close();
       con4.close();
       assertThat(pool.size()).isEqualTo(4);
-      assertThat(pool.status(false).getFree()).isEqualTo(4);
+      assertThat(pool.status(false).free()).isEqualTo(4);
 
       waitFor(() -> {
-        assertThat(pool.status(false).getFree()).isEqualTo(1);
+        assertThat(pool.status(false).free()).isEqualTo(1);
         assertThat(pool.size()).isEqualTo(1);
       });
     } finally {
@@ -71,28 +71,28 @@ public void test_withDecreasingActivity_expect_trimToActivityLevel() throws SQLE
       }
 
       // start at 10 connections
-      assertThat(pool.status(false).getFree()).isEqualTo(10);
+      assertThat(pool.status(false).free()).isEqualTo(10);
       assertThat(pool.size()).isEqualTo(10);
 
       // keep 4 connections busy
       Timer timer0 = createTimer(pool, 4);
 
       waitFor(() -> {
-        assertThat(pool.status(false).getFree()).isEqualTo(4);
+        assertThat(pool.status(false).free()).isEqualTo(4);
       });
       timer0.cancel();
 
       // keep 2 connections busy
       Timer timer1 = createTimer(pool, 2);
 
       waitFor(() -> {
-        assertThat(pool.status(false).getFree()).isEqualTo(2);
+        assertThat(pool.status(false).free()).isEqualTo(2);
       });
       timer1.cancel();
 
       // Go Idle
       waitFor(() -> {
-        assertThat(pool.status(false).getFree()).isEqualTo(1);
+        assertThat(pool.status(false).free()).isEqualTo(1);
         assertThat(pool.size()).isEqualTo(1);
       });
     } finally {