Merge pull request #100 from ebean-orm/feature/lambda-detect

Remove ability to modify minConnections at runtime

Author: rbygrave

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

@@ -48,7 +48,7 @@ static DataSourceBuilder builder() {
   String name();
 
   /**
-   * Deprecated migrate to name().
+   * @deprecated migrate to {@link #name()}.
    */
   @Deprecated
   default String getName() {
@@ -106,7 +106,7 @@ default String getName() {
   PoolStatus status(boolean reset);
 
   /**
-   * Deprecated migrate to status().
+   * @deprecated migrate to {@link #status(boolean)}.
    */
   @Deprecated
   default PoolStatus getStatus(boolean reset) {
@@ -119,7 +119,7 @@ default PoolStatus getStatus(boolean reset) {
   SQLException dataSourceDownReason();
 
   /**
-   * Deprecated migrate to dataSourceDownReason().
+   * @deprecated  migrate to {@link #dataSourceDownReason()}
    */
   @Deprecated
   default SQLException getDataSourceDownReason() {
@@ -140,7 +140,7 @@ default SQLException getDataSourceDownReason() {
    * and not require a restart. We may want to increase the maxConnections if the
    * pool gets large and hits the warning levels.
    */
-  @Deprecated
+  @Deprecated(forRemoval = true)
   void setWarningSize(int warningSize);
 
   /**
@@ -149,7 +149,7 @@ default SQLException getDataSourceDownReason() {
    * Return the warning size. When the pool hits this size it can send a
    * warning message to an administrator.
    */
-  @Deprecated
+  @Deprecated(forRemoval = true)
   int getWarningSize();
 
 }

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

@@ -71,7 +71,7 @@ final class ConnectionPool implements DataSourcePool {
   private final AtomicBoolean dataSourceUp = new AtomicBoolean(false);
   private SQLException dataSourceDownReason;
   private final AtomicBoolean inWarningMode = new AtomicBoolean();
-  private int minConnections;
+  private final int minConnections;
   private int maxConnections;
   private int warningSize;
   private final int waitTimeoutMillis;
@@ -197,8 +197,8 @@ private void initialiseConnections() throws SQLException {
     }
 
     final var ro = readOnly ? "readOnly[true] " : "";
-    Log.info("DataSource [{0}] {1}autoCommit[{2}] transIsolation[{3}] min[{4}] max[{5}] in[{6}ms]",
-      name, ro, autoCommit, description(transactionIsolation), minConnections, maxConnections, (System.currentTimeMillis() - start));
+    Log.info("DataSource [{0}] {1}autoCommit[{2}] [{3}] min[{4}] max[{5}] in[{6}ms]",
+      name, ro, autoCommit, description(transactionIsolation), minConnections, maxConnections, (System.currentTimeMillis() - start), validateOnHeartbeat);
   }
 
   /**
@@ -440,25 +440,11 @@ public void setMaxSize(int max) {
     this.maxConnections = max;
   }
 
-  /**
-   * Return the max size this pool can grow to.
-   */
-  public int getMaxSize() {
+  int maxSize() {
     return maxConnections;
   }
 
-  /**
-   * Set the min size this pool should maintain.
-   */
-  public void setMinSize(int min) {
-    queue.setMinSize(min);
-    this.minConnections = min;
-  }
-
-  /**
-   * Return the min size this pool should maintain.
-   */
-  public int getMinSize() {
+  int minSize() {
     return minConnections;
   }
 

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

@@ -37,9 +37,9 @@ final class PooledConnectionQueue {
   private final long waitTimeoutMillis;
   private final long leakTimeMinutes;
   private final long maxAgeMillis;
+  private final int minSize;
   private int warningSize;
   private int maxSize;
-  private int minSize;
   /**
    * Number of threads in the wait queue.
    */
@@ -70,8 +70,8 @@ final class PooledConnectionQueue {
   PooledConnectionQueue(ConnectionPool pool) {
     this.pool = pool;
     this.name = pool.name();
-    this.minSize = pool.getMinSize();
-    this.maxSize = pool.getMaxSize();
+    this.minSize = pool.minSize();
+    this.maxSize = pool.maxSize();
     this.warningSize = pool.getWarningSize();
     this.waitTimeoutMillis = pool.waitTimeoutMillis();
     this.leakTimeMinutes = pool.leakTimeMinutes();
@@ -115,18 +115,6 @@ PoolStatus status(boolean reset) {
     }
   }
 
-  void setMinSize(int minSize) {
-    lock.lock();
-    try {
-      if (minSize > this.maxSize) {
-        throw new IllegalArgumentException("minSize " + minSize + " > maxSize " + this.maxSize);
-      }
-      this.minSize = minSize;
-    } finally {
-      lock.unlock();
-    }
-  }
-
   void setMaxSize(int maxSize) {
     lock.lock();
     try {