Prepare for Spring Boot 4 (#159)

Author: gavlyukovskiy

datasource-decorator-spring-boot-autoconfigure/build.gradle.kts

@@ -12,7 +12,7 @@ dependencies {
 
     implementation(libs.spring.boot)
     implementation(libs.spring.boot.autoconfigure)
-    implementation(libs.spring.boot.starter.jdbc)
+    implementation(libs.spring.boot.jdbc)
 
     annotationProcessor(libs.spring.boot.configuration.processor)
 
@@ -28,7 +28,7 @@ dependencies {
     compileOnly(libs.flexy.pool.tomcatcp)
     compileOnly(libs.flexy.pool.micrometer.metrics)
 
-    compileOnly(libs.spring.boot.starter.actuator)
+    compileOnly(libs.spring.boot.actuator)
 
     // optional (compileOnly) dependencies for SQL formatting
     compileOnly(libs.hibernate.core)
@@ -37,6 +37,8 @@ dependencies {
     testImplementation(libs.junit.platform.launcher)
     testImplementation(libs.h2)
     testImplementation(libs.spring.boot.starter.test)
+    testImplementation(libs.spring.boot.flyway)
+    testImplementation(libs.spring.boot.jdbc.test)
 
     testImplementation(libs.p6spy)
     testImplementation(libs.datasource.proxy)
@@ -73,4 +75,4 @@ tasks {
     test {
         useJUnitPlatform()
     }
-}
+}

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

@@ -24,7 +24,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -60,4 +60,4 @@ public static DataSourceDecoratorBeanPostProcessor dataSourceDecoratorBeanPostPr
     public DataSourceNameResolver dataSourceNameResolver(ApplicationContext applicationContext) {
         return new DataSourceNameResolver(applicationContext);
     }
-}
+}

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

@@ -34,6 +34,7 @@
 import com.zaxxer.hikari.HikariDataSource;
 import org.apache.commons.dbcp2.BasicDataSource;
 import org.slf4j.Logger;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionMessage;
 import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
@@ -48,7 +49,6 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 
-import jakarta.annotation.PostConstruct;
 import javax.sql.DataSource;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -197,18 +197,19 @@ public FlexyPoolDataSourceDecorator flexyPoolDataSourceDecorator() {
     @Configuration(proxyBeanMethods = false)
     @ConditionalOnMissingBean(FlexyPoolDataSourceDecorator.class)
     @Conditional(FlexyPoolConfiguration.FlexyPoolConfigurationAvailableCondition.class)
-    static class PropertyFlexyConfiguration {
+    static class PropertyFlexyConfiguration implements InitializingBean {
 
         private static final Logger log = getLogger(PropertyFlexyConfiguration.class);
 
         @Autowired(required = false)
         private List<ConnectionAcquisitionStrategyFactory<?, javax.sql.DataSource>> connectionAcquisitionStrategyFactories;
 
-        @PostConstruct
-        public void warnIfAnyStrategyFound() {
+
+        @Override
+        public void afterPropertiesSet() {
             if (connectionAcquisitionStrategyFactories != null) {
                 log.warn("ConnectionAcquisitionStrategyFactory beans found in the context will not be applied to " +
-                        "FlexyDataSource due to property based configuration of FlexyPool");
+                         "FlexyDataSource due to property based configuration of FlexyPool");
             }
         }
 

datasource-decorator-spring-boot-autoconfigure/src/main/java/com/github/gavlyukovskiy/boot/jdbc/decorator/p6spy/P6SpyConfiguration.java

@@ -28,9 +28,9 @@
 import com.p6spy.engine.spy.option.P6OptionsSource;
 import com.p6spy.engine.spy.option.SpyDotProperties;
 import com.p6spy.engine.spy.option.SystemProperties;
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
 import org.slf4j.Logger;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -54,7 +54,7 @@
 // P6Spy is automatically configured by Spring Cloud Sleuth if exists
 @ConditionalOnMissingBean(type = "org.springframework.cloud.sleuth.autoconfig.instrument.jdbc.P6SpyConfiguration")
 @ConditionalOnClass(P6DataSource.class)
-public class P6SpyConfiguration {
+public class P6SpyConfiguration implements InitializingBean, DisposableBean {
 
     private static final Logger log = getLogger(P6SpyConfiguration.class);
 
@@ -66,8 +66,8 @@ public class P6SpyConfiguration {
 
     private Map<String, String> initialP6SpyOptions;
 
-    @PostConstruct
-    public void init() {
+    @Override
+    public void afterPropertiesSet() {
         P6SpyProperties p6spy = dataSourceDecoratorProperties.getP6spy();
         initialP6SpyOptions = findDefinedOptions();
         String customModuleList = initialP6SpyOptions.get("modulelist");
@@ -115,7 +115,7 @@ else if (p6spy.isMultiline()) {
         P6ModuleManager.getInstance().reload();
     }
 
-    @PreDestroy
+    @Override
     public void destroy() {
         P6SpyProperties p6spy = dataSourceDecoratorProperties.getP6spy();
         if (!initialP6SpyOptions.containsKey("modulelist")) {

datasource-decorator-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.imports renamed to datasource-decorator-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase.imports

@@ -27,8 +27,8 @@
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration;
+import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

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

@@ -41,7 +41,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

datasource-decorator-spring-boot-autoconfigure/src/test/java/com/github/gavlyukovskiy/boot/jdbc/decorator/dsproxy/ProxyDataSourceConfigurationTests.java

@@ -31,7 +31,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

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

@@ -34,7 +34,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

datasource-decorator-spring-boot-autoconfigure/src/test/java/com/github/gavlyukovskiy/boot/jdbc/decorator/p6spy/P6SpyConfigurationTests.java

@@ -3,7 +3,7 @@
 import com.github.gavlyukovskiy.boot.jdbc.decorator.DecoratedDataSource;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.JdbcTest;
+import org.springframework.boot.jdbc.test.autoconfigure.JdbcTest;
 import org.springframework.test.annotation.DirtiesContext;
 
 import javax.sql.DataSource;