More renamings

gavlyukovskiy · Nov 8, 2024 · fe77c33 · fe77c33
1 parent 586f802
commit fe77c33
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -219,29 +219,18 @@ With default setting you will start getting messages about acquiring and leasing
 2017-07-13 01:31:03.143  WARN 5432 --- [ool-1-worker-51] PoolOnTimeoutConnectionAcquisitionStrategy : Connection was acquired in 1502 millis, timeoutMillis is set to 500
 2017-07-13 01:31:03.143  INFO 5432 --- [ool-1-worker-51] PoolOnTimeoutConnectionAcquisitionStrategy : Pool size changed from previous value 10 to 11
 ```
-You can declare bean `MetricsFactory` and besides of JMX metrics will be exported to the metrics provider and to the logs:
-```text
-2017-07-13 02:07:04.265  INFO 5432 --- [rter-1-thread-1] c.v.f.metric.codahale.CodahaleMetrics    : type=HISTOGRAM, name=concurrentConnectionRequestsHistogram, count=4, min=0, max=1, mean=0.5, stddev=0.5, median=1.0, p75=1.0, p95=1.0, p98=1.0, p99=1.0, p999=1.0
-2017-07-13 02:07:04.265  INFO 5432 --- [rter-1-thread-1] c.v.f.metric.codahale.CodahaleMetrics    : type=HISTOGRAM, name=concurrentConnectionsHistogram, count=4, min=0, max=1, mean=0.5, stddev=0.5, median=1.0, p75=1.0, p95=1.0, p98=1.0, p99=1.0, p999=1.0
-2017-07-13 02:07:04.265  INFO 5432 --- [rter-1-thread-1] c.v.f.metric.codahale.CodahaleMetrics    : type=HISTOGRAM, name=maxPoolSizeHistogram, count=1, min=10, max=10, mean=10.0, stddev=0.0, median=10.0, p75=10.0, p95=10.0, p98=10.0, p99=10.0, p999=10.0
-2017-07-13 02:07:04.265  INFO 5432 --- [rter-1-thread-1] c.v.f.metric.codahale.CodahaleMetrics    : type=HISTOGRAM, name=overflowPoolSizeHistogram, count=0, min=0, max=0, mean=0.0, stddev=0.0, median=0.0, p75=0.0, p95=0.0, p98=0.0, p99=0.0, p999=0.0
-2017-07-13 02:07:04.265  INFO 5432 --- [rter-1-thread-1] c.v.f.metric.codahale.CodahaleMetrics    : type=HISTOGRAM, name=retryAttemptsHistogram, count=0, min=0, max=0, mean=0.0, stddev=0.0, median=0.0, p75=0.0, p95=0.0, p98=0.0, p99=0.0, p999=0.0
-2017-07-13 02:07:04.265  INFO 5432 --- [rter-1-thread-1] c.v.f.metric.codahale.CodahaleMetrics    : type=TIMER, name=connectionAcquireMillis, count=2, min=0.0, max=39.0, mean=19.5, stddev=19.5, median=39.0, p75=39.0, p95=39.0, p98=39.0, p99=39.0, p999=39.0, mean_rate=0.07135042014375073, m1=0.02490778899904623, m5=0.006288975787638508, m15=0.002179432534806779, rate_unit=events/second, duration_unit=milliseconds
-2017-07-13 02:07:04.265  INFO 5432 --- [rter-1-thread-1] c.v.f.metric.codahale.CodahaleMetrics    : type=TIMER, name=connectionLeaseMillis, count=2, min=3.0, max=7.0, mean=5.0, stddev=2.0, median=7.0, p75=7.0, p95=7.0, p98=7.0, p99=7.0, p999=7.0, mean_rate=0.07135743555785098, m1=0.02490778899904623, m5=0.006288975787638508, m15=0.002179432534806779, rate_unit=events/second, duration_unit=milliseconds
-2017-07-13 02:07:04.265  INFO 5432 --- [rter-1-thread-1] c.v.f.metric.codahale.CodahaleMetrics    : type=TIMER, name=overallConnectionAcquireMillis, count=2, min=0.0, max=39.0, mean=19.5, stddev=19.5, median=39.0, p75=39.0, p95=39.0, p98=39.0, p99=39.0, p999=39.0, mean_rate=0.07135462550886962, m1=0.02490778899904623, m5=0.006288975787638508, m15=0.002179432534806779, rate_unit=events/second, duration_unit=milliseconds
-```
 
 All beans of type `ConnectionAcquisitionStrategyFactory` are used to provide `ConnectionAcquisitionStrategy` for the pool.
 
 `MetricsFactory` and `ConnectionProxyFactory` beans can be used to customize metrics and connection decorators.
 
-`EventListener<? extends Event>` beans can be registered to subscribe on events of flexy-pool (e.g. `ConnectionAcquireTimeThresholdExceededEvent`, `ConnectionLeaseTimeThresholdExceededEvent`).
+`EventListener<? extends Event>` beans can be registered to subscribe on events of flexy-pool (e.g. `ConnectionAcquisitionTimeThresholdExceededEvent`, `ConnectionLeaseTimeThresholdExceededEvent`).
 
 You can configure your `FlexyPoolDataSource` by using bean `FlexyPoolConfigurationBuilderCustomizer` or properties:
 > [!NOTE]
 > Configuration below indicates al possible parameters together with their default values and **does not** need to be set explicitly
 ```properties
-# Increments pool size if connection acquire request has timed out
+# Increments pool size if connection acquisition request has timed out
 decorator.datasource.flexy-pool.acquisition-strategy.increment-pool.max-overgrow-pool-size=15
 decorator.datasource.flexy-pool.acquisition-strategy.increment-pool.timeout-millis=500
 
@@ -255,8 +244,8 @@ decorator.datasource.flexy-pool.metrics.reporter.jmx.auto-start=false
 # Millis between two consecutive log reports
 decorator.datasource.flexy-pool.metrics.reporter.log.millis=300000
 
-# Enable logging and publishing ConnectionAcquireTimeThresholdExceededEvent when a connection acquire request has timed out
-decorator.datasource.flexy-pool.threshold.connection.acquire=50
+# Enable logging and publishing ConnectionAcquisitionTimeThresholdExceededEvent when a connection acquisition request has timed out
+decorator.datasource.flexy-pool.threshold.connection.acquisition=50
 # Enable logging and publishing ConnectionLeaseTimeThresholdExceededEvent when a connection lease has exceeded the given time threshold
 decorator.datasource.flexy-pool.threshold.connection.lease=1000
 ```

diff --git a/...n/java/com/github/gavlyukovskiy/boot/jdbc/decorator/flexypool/FlexyPoolConfiguration.java b/...n/java/com/github/gavlyukovskiy/boot/jdbc/decorator/flexypool/FlexyPoolConfiguration.java
@@ -17,8 +17,6 @@
 package com.github.gavlyukovskiy.boot.jdbc.decorator.flexypool;
 
 import com.github.gavlyukovskiy.boot.jdbc.decorator.DataSourceDecoratorProperties;
-import com.github.gavlyukovskiy.boot.jdbc.decorator.flexypool.FlexyPoolProperties.AcquisitionStrategy.IncrementPool;
-import com.github.gavlyukovskiy.boot.jdbc.decorator.flexypool.FlexyPoolProperties.AcquisitionStrategy.Retry;
 import com.vladmihalcea.flexypool.FlexyPoolDataSource;
 import com.vladmihalcea.flexypool.adaptor.DBCP2PoolAdapter;
 import com.vladmihalcea.flexypool.adaptor.HikariCPPoolAdapter;
@@ -132,7 +130,7 @@ public FlexyPoolConfigurationBuilderCustomizer flexyPoolConfigurationBuilderCust
                 builder.setMetricLogReporterMillis(flexyPool.getMetrics().getReporter().getLog().getMillis());
                 builder.setJmxEnabled(flexyPool.getMetrics().getReporter().getJmx().isEnabled());
                 builder.setJmxAutoStart(flexyPool.getMetrics().getReporter().getJmx().isAutoStart());
-                builder.setConnectionAcquisitionTimeThresholdMillis(flexyPool.getThreshold().getConnection().getAcquire());
+                builder.setConnectionAcquisitionTimeThresholdMillis(flexyPool.getThreshold().getConnection().getAcquisition());
                 builder.setConnectionLeaseTimeThresholdMillis(flexyPool.getThreshold().getConnection().getLease());
                 if (metricsFactory != null) {
                     builder.setMetricsFactory(metricsFactory);

diff --git a/...main/java/com/github/gavlyukovskiy/boot/jdbc/decorator/flexypool/FlexyPoolProperties.java b/...main/java/com/github/gavlyukovskiy/boot/jdbc/decorator/flexypool/FlexyPoolProperties.java
@@ -17,7 +17,6 @@
 package com.github.gavlyukovskiy.boot.jdbc.decorator.flexypool;
 
 import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
 /**
  * Properties for configuring flexy-pool.
@@ -284,24 +283,40 @@ public void setConnection(Connection connection) {
         }
 
         public static class Connection {
-            private long acquire = 50L;
+            private long acquisition = 50L;
             private long lease = 1000L;
 
-            public long getAcquire() {
-                return this.acquire;
+            public long getAcquisition() {
+                return this.acquisition;
             }
 
             public long getLease() {
                 return this.lease;
             }
 
-            public void setAcquire(long acquire) {
-                this.acquire = acquire;
+            public void setAcquisition(long acquisition) {
+                this.acquisition = acquisition;
             }
 
             public void setLease(long lease) {
                 this.lease = lease;
             }
+
+            @Deprecated(since = "1.10.0", forRemoval = true)
+            @DeprecatedConfigurationProperty(
+                    reason = "FlexyPool 3.0 has renamed this property",
+                    replacement = "decorator.datasource.flexy-pool.threshold.connection.acquisition",
+                    since = "1.10.0"
+            )
+            public long getAcquire() {
+                return this.acquisition;
+            }
+
+
+            @Deprecated(since = "1.10.0", forRemoval = true)
+            public void setAcquire(long acquire) {
+                this.acquisition = acquire;
+            }
         }
     }
 }
diff --git a/samples/flexy-pool-sample/src/main/resources/application.yml b/samples/flexy-pool-sample/src/main/resources/application.yml
@@ -23,3 +23,6 @@ decorator:
         increment-pool:
           timeout-millis: 1000
           max-overgrow-pool-size: 15
+      threshold:
+        connection:
+          acquire: 100