Remove flexy-pool properties deprecated in 1.10.0 (#132)

Author: gavlyukovskiy

datasource-decorator-spring-boot-autoconfigure/src/main/java/com/github/gavlyukovskiy/boot/jdbc/decorator/flexypool/FlexyPoolConfiguration.java

@@ -78,21 +78,13 @@ static <T extends DataSource> List<ConnectionAcquisitionStrategyFactory<?, T>> m
             factoryClasses = Collections.emptyList();
         }
         if (!factoryClasses.contains(IncrementPoolOnTimeoutConnectionAcquisitionStrategy.Factory.class)) {
-            // check deprecated properties first
-            if (flexyPool.getAcquiringStrategy().getIncrementPool().getMaxOverflowPoolSize() != null) {
-                newFactories.add(new IncrementPoolOnTimeoutConnectionAcquisitionStrategy.Factory<>(
-                        flexyPool.getAcquiringStrategy().getIncrementPool().getMaxOverflowPoolSize(),
-                        flexyPool.getAcquiringStrategy().getIncrementPool().getTimeoutMillis()));
-            } else if (flexyPool.getAcquisitionStrategy().getIncrementPool().getMaxOvergrowPoolSize() > 0) {
+            if (flexyPool.getAcquisitionStrategy().getIncrementPool().getMaxOvergrowPoolSize() > 0) {
                 newFactories.add(new IncrementPoolOnTimeoutConnectionAcquisitionStrategy.Factory<>(
                         flexyPool.getAcquisitionStrategy().getIncrementPool().getMaxOvergrowPoolSize(), flexyPool.getAcquisitionStrategy().getIncrementPool().getTimeoutMillis()));
             }
         }
         if (!factoryClasses.contains(RetryConnectionAcquisitionStrategy.Factory.class)) {
-            // check deprecated properties first
-            if (flexyPool.getAcquiringStrategy().getRetry().getAttempts() != null) {
-                newFactories.add(new RetryConnectionAcquisitionStrategy.Factory<>(flexyPool.getAcquiringStrategy().getRetry().getAttempts()));
-            } else if (flexyPool.getAcquisitionStrategy().getRetry().getAttempts() > 0) {
+            if (flexyPool.getAcquisitionStrategy().getRetry().getAttempts() > 0) {
                 newFactories.add(new RetryConnectionAcquisitionStrategy.Factory<>(flexyPool.getAcquisitionStrategy().getRetry().getAttempts()));
             }
         }

datasource-decorator-spring-boot-autoconfigure/src/main/java/com/github/gavlyukovskiy/boot/jdbc/decorator/flexypool/FlexyPoolProperties.java

@@ -27,7 +27,6 @@
 public class FlexyPoolProperties {
 
     private AcquisitionStrategy acquisitionStrategy = new AcquisitionStrategy();
-    private AcquiringStrategy acquiringStrategy = new AcquiringStrategy();
 
     private Metrics metrics = new Metrics();
     private Threshold threshold = new Threshold();
@@ -48,16 +47,6 @@ public void setAcquisitionStrategy(AcquisitionStrategy acquisitionStrategy) {
         this.acquisitionStrategy = acquisitionStrategy;
     }
 
-    @Deprecated(since = "1.10.0", forRemoval = true)
-    public AcquiringStrategy getAcquiringStrategy() {
-        return acquiringStrategy;
-    }
-
-    @Deprecated(since = "1.10.0", forRemoval = true)
-    public void setAcquiringStrategy(AcquiringStrategy acquiringStrategy) {
-        this.acquiringStrategy = acquiringStrategy;
-    }
-
     public void setMetrics(Metrics metrics) {
         this.metrics = metrics;
     }
@@ -120,91 +109,6 @@ public void setTimeoutMillis(int timeoutMillis) {
         }
     }
 
-    @Deprecated(since = "1.10.0", forRemoval = true)
-    public static class AcquiringStrategy {
-        @Deprecated(since = "1.10.0", forRemoval = true)
-        private Retry retry = new Retry();
-        @Deprecated(since = "1.10.0", forRemoval = true)
-        private IncrementPool incrementPool = new IncrementPool();
-
-        @Deprecated(since = "1.10.0", forRemoval = true)
-        public Retry getRetry() {
-            return this.retry;
-        }
-
-        @Deprecated(since = "1.10.0", forRemoval = true)
-        public IncrementPool getIncrementPool() {
-            return this.incrementPool;
-        }
-
-        @Deprecated(since = "1.10.0", forRemoval = true)
-        public void setRetry(Retry retry) {
-            this.retry = retry;
-        }
-
-        @Deprecated(since = "1.10.0", forRemoval = true)
-        public void setIncrementPool(IncrementPool incrementPool) {
-            this.incrementPool = incrementPool;
-        }
-
-        public static class Retry {
-            @Deprecated(since = "1.10.0", forRemoval = true)
-            private Integer attempts;
-
-            @Deprecated(since = "1.10.0", forRemoval = true)
-            @DeprecatedConfigurationProperty(
-                    reason = "FlexyPool 3.0 has renamed this property",
-                    replacement = "decorator.datasource.flexy-pool.acquisition-strategy.retry.attempts",
-                    since = "1.10.0"
-            )
-            public Integer getAttempts() {
-                return this.attempts;
-            }
-
-            @Deprecated(since = "1.10.0", forRemoval = true)
-            public void setAttempts(int attempts) {
-                this.attempts = attempts;
-            }
-        }
-
-        public static class IncrementPool {
-            @Deprecated(since = "1.10.0", forRemoval = true)
-            private Integer maxOverflowPoolSize;
-            @Deprecated(since = "1.10.0", forRemoval = true)
-            private Integer timeoutMillis;
-
-            @Deprecated(since = "1.10.0", forRemoval = true)
-            @DeprecatedConfigurationProperty(
-                    reason = "FlexyPool 3.0 has renamed this property",
-                    replacement = "decorator.datasource.flexy-pool.acquisition-strategy.increment-pool.timeout-millis",
-                    since = "1.10.0"
-            )
-            public Integer getTimeoutMillis() {
-                return this.timeoutMillis;
-            }
-
-            @Deprecated(since = "1.10.0", forRemoval = true)
-            @DeprecatedConfigurationProperty(
-                    reason = "FlexyPool 3.0 has renamed this property",
-                    replacement = "decorator.datasource.flexy-pool.acquisition-strategy.increment-pool.max-overgrow-pool-size",
-                    since = "1.10.0"
-            )
-            public Integer getMaxOverflowPoolSize() {
-                return this.maxOverflowPoolSize;
-            }
-
-            @Deprecated(since = "1.10.0", forRemoval = true)
-            public void setTimeoutMillis(int timeoutMillis) {
-                this.timeoutMillis = timeoutMillis;
-            }
-
-            @Deprecated(since = "1.10.0", forRemoval = true)
-            public void setMaxOverflowPoolSize(int maxOverflowPoolSize) {
-                this.maxOverflowPoolSize = maxOverflowPoolSize;
-            }
-        }
-    }
-
     public static class Metrics {
         private Reporter reporter = new Reporter();
 
@@ -301,22 +205,6 @@ public void setAcquisition(long 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;
-            }
         }
     }
 }

datasource-decorator-spring-boot-autoconfigure/src/test/java/com/github/gavlyukovskiy/boot/jdbc/decorator/flexypool/FlexyPoolConfigurationTests.java

@@ -134,31 +134,6 @@ void testDecoratingHikariDataSourceWithCustomPropertyStrategies() {
         });
     }
 
-    @Test
-    @SuppressWarnings("unchecked")
-    void testDecoratingHikariDataSourceWithDeprecatedProperties() {
-        ApplicationContextRunner contextRunner = this.contextRunner.withPropertyValues("spring.datasource.type:" + HikariDataSource.class.getName(),
-                "decorator.datasource.flexy-pool.acquiring-strategy.increment-pool.max-overflow-pool-size:35",
-                "decorator.datasource.flexy-pool.acquiring-strategy.increment-pool.timeout-millis:10000",
-                "decorator.datasource.flexy-pool.acquiring-strategy.retry.attempts:5")
-                .withUserConfiguration(FlexyPoolHikariConfiguration.class);
-
-        contextRunner.run(context -> {
-            DataSource dataSource = context.getBean(DataSource.class);
-            FlexyPoolDataSource<HikariDataSource> flexyPoolDataSource = assertDataSourceOfType(dataSource, HikariDataSource.class);
-            IncrementPoolOnTimeoutConnectionAcquisitionStrategy<HikariDataSource> strategy1 =
-                    findStrategy(flexyPoolDataSource, IncrementPoolOnTimeoutConnectionAcquisitionStrategy.class);
-            assertThat(strategy1).isNotNull();
-            assertThat(strategy1).hasFieldOrPropertyWithValue("maxOvergrowPoolSize", 35);
-            assertThat(strategy1).hasFieldOrPropertyWithValue("timeoutMillis", 10000);
-
-            RetryConnectionAcquisitionStrategy<HikariDataSource> strategy2 =
-                    findStrategy(flexyPoolDataSource, RetryConnectionAcquisitionStrategy.class);
-            assertThat(strategy2).isNotNull();
-            assertThat(strategy2).hasFieldOrPropertyWithValue("retryAttempts", 5);
-        });
-    }
-
     @Test
     @SuppressWarnings("unchecked")
     void testDecoratingHikariDataSourceWithCustomBeanStrategies() {