#21 - Refactor tidy internals only - BusyConnectionBuffer - method access and for loops for

Author: rbygrave

src/main/java/io/ebean/datasource/pool/BusyConnectionBuffer.java

@@ -37,35 +37,36 @@ class BusyConnectionBuffer {
    * @param capacity the initial capacity
    * @param growBy   the fixed amount to grow the buffer by.
    */
-  protected BusyConnectionBuffer(int capacity, int growBy) {
+  BusyConnectionBuffer(int capacity, int growBy) {
     this.slots = new PooledConnection[capacity];
     this.growBy = growBy;
   }
 
   /**
    * We can only grow (not shrink) the capacity.
    */
-  protected void setCapacity(int newCapacity) {
+  void setCapacity(int newCapacity) {
     if (newCapacity > slots.length) {
       PooledConnection[] current = this.slots;
       this.slots = new PooledConnection[newCapacity];
       System.arraycopy(current, 0, this.slots, 0, current.length);
     }
   }
 
+  @Override
   public String toString() {
     return Arrays.toString(slots);
   }
 
-  protected int getCapacity() {
+  int getCapacity() {
     return slots.length;
   }
 
-  protected int size() {
+  int size() {
     return size;
   }
 
-  protected boolean isEmpty() {
+  boolean isEmpty() {
     return size == 0;
   }
 
@@ -80,7 +81,7 @@ protected int add(PooledConnection pc) {
     return ++size;
   }
 
-  protected boolean remove(PooledConnection pc) {
+  boolean remove(PooledConnection pc) {
 
     int slotId = pc.getSlotId();
     if (slots[slotId] != pc) {
@@ -98,9 +99,9 @@ protected boolean remove(PooledConnection pc) {
    */
   void collectStatistics(PooledConnectionStatistics.LoadValues values, boolean reset) {
 
-    for (int i = 0; i < slots.length; i++) {
-      if (slots[i] != null) {
-        values.plus(slots[i].getStatistics().getValues(reset));
+    for (PooledConnection slot : slots) {
+      if (slot != null) {
+        values.plus(slot.getStatistics().getValues(reset));
       }
     }
   }
@@ -156,9 +157,8 @@ String getBusyConnectionInformation(boolean toLogger) {
 
     StringBuilder sb = new StringBuilder();
 
-    for (int i = 0; i < slots.length; i++) {
-      if (slots[i] != null) {
-        PooledConnection pc = slots[i];
+    for (PooledConnection pc : slots) {
+      if (pc != null) {
         if (toLogger) {
           logger.info("Busy Connection - {}", pc.getFullDescription());
         } else {

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

@@ -345,7 +345,7 @@ private void initialiseDatabase() throws SQLException {
    * Returns false.
    */
   @Override
-  public boolean isWrapperFor(Class<?> arg0) throws SQLException {
+  public boolean isWrapperFor(Class<?> arg0) {
     return false;
   }
 
@@ -392,7 +392,6 @@ public SQLException getDataSourceDownReason() {
    * Called when the pool hits the warning level.
    */
   protected void notifyWarning(String msg) {
-
     if (inWarningMode.compareAndSet(false, true)) {
       // send an Error to the event log...
       logger.warn(msg);
@@ -505,7 +504,7 @@ private void initConnection(Connection conn) throws SQLException {
       conn.setTransactionIsolation(transactionIsolation);
     }
     if (readOnly) {
-      conn.setReadOnly(readOnly);
+      conn.setReadOnly(true);
     }
     if (initSql != null) {
       for (String query : initSql) {
@@ -791,16 +790,13 @@ PooledConnection createConnectionForQueue(int connId) throws SQLException {
 
   /**
    * Close all the connections in the pool.
-   * <p>
    * <ul>
-   * <li>Checks that the database is up.
-   * <li>Resets the Alert level.
-   * <li>Closes busy connections that have not been used for some time (aka
-   * leaks).
-   * <li>This closes all the currently available connections.
-   * <li>Busy connections are closed when they are returned to the pool.
+   * <li>Checks that the database is up.</li>
+   * <li>Resets the Alert level.</li>
+   * <li>Closes busy connections that have not been used for some time (aka leaks).</li>
+   * <li>This closes all the currently available connections.</li>
+   * <li>Busy connections are closed when they are returned to the pool.</li>
    * </ul>
-   * </p>
    */
   public void reset() {
     queue.reset(leakTimeMinutes);
@@ -1042,7 +1038,7 @@ public static class Status implements PoolStatus {
     private final int waitCount;
     private final int hitCount;
 
-    protected Status(int minSize, int maxSize, int free, int busy, int waiting, int highWaterMark, int waitCount, int hitCount) {
+    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;