temp commit

Author: tomix26

embedded-database-spring-test/src/main/java/io/zonky/test/db/config/EmbeddedDatabaseAutoConfiguration.java

@@ -292,7 +292,7 @@ public BeanPostProcessor liquibasePropertiesPostProcessor() {
 
     @Bean
     @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
-    @ConditionalOnClass(name = "org.springframework.boot.sql.init.AbstractScriptDatabaseInitializer")
+    @ConditionalOnClass(name = "org.springframework.boot.jdbc.init.DataSourceScriptDatabaseInitializer")
     @ConditionalOnMissingBean(name = "springScriptDatabaseExtension")
     public SpringScriptDatabaseExtension springScriptDatabaseExtension(Environment environment) {
         return new SpringScriptDatabaseExtension(environment);

embedded-database-spring-test/src/main/java/io/zonky/test/db/init/SpringScriptDatabaseExtension.java

@@ -28,14 +28,12 @@
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.support.NameMatchMethodPointcutAdvisor;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.boot.sql.init.AbstractScriptDatabaseInitializer;
+import org.springframework.boot.jdbc.init.DataSourceScriptDatabaseInitializer;
 import org.springframework.core.Ordered;
 import org.springframework.core.env.Environment;
 
 import javax.sql.DataSource;
 
-import static com.google.common.base.Preconditions.checkState;
-
 public class SpringScriptDatabaseExtension implements BeanPostProcessor, Ordered {
 
     private final boolean enabled;
@@ -55,18 +53,18 @@ public Object postProcessBeforeInitialization(Object bean, String beanName) {
             return bean;
         }
 
-        if (bean instanceof AbstractScriptDatabaseInitializer) {
-            AbstractScriptDatabaseInitializer initializer = (AbstractScriptDatabaseInitializer) bean;
+        if (bean instanceof DataSourceScriptDatabaseInitializer) {
+            DataSourceScriptDatabaseInitializer initializer = (DataSourceScriptDatabaseInitializer) bean;
             DataSource dataSource = ReflectionUtils.getField(initializer, "dataSource");
             DatabaseContext context = AopProxyUtils.getDatabaseContext(dataSource);
 
             if (context != null) {
                 if (bean instanceof Advised && !((Advised) bean).isFrozen()) {
-                    ((Advised) bean).addAdvisor(0, createAdvisor(initializer));
+                    ((Advised) bean).addAdvisor(0, createAdvisor(initializer, context));
                     return bean;
                 } else {
                     ProxyFactory proxyFactory = new ProxyFactory(bean);
-                    proxyFactory.addAdvisor(createAdvisor(initializer));
+                    proxyFactory.addAdvisor(createAdvisor(initializer, context));
                     proxyFactory.setProxyTargetClass(true);
                     return proxyFactory.getProxy();
                 }
@@ -81,35 +79,36 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
         return bean;
     }
 
-    protected Advisor createAdvisor(AbstractScriptDatabaseInitializer initializer) {
-        Advice advice = new SpringScriptDatabaseExtensionInterceptor(initializer);
+    protected Advisor createAdvisor(DataSourceScriptDatabaseInitializer initializer, DatabaseContext context) {
+        Advice advice = new SpringScriptDatabaseExtensionInterceptor(initializer, context);
         NameMatchMethodPointcutAdvisor advisor = new NameMatchMethodPointcutAdvisor(advice);
         advisor.setMappedNames("afterPropertiesSet", "initializeDatabase");
         return advisor;
     }
 
     protected static class SpringScriptDatabaseExtensionInterceptor implements MethodInterceptor {
 
-        private final AbstractScriptDatabaseInitializer initializer;
+        private final DataSourceScriptDatabaseInitializer initializer;
+        private final DatabaseContext context;
 
-        protected SpringScriptDatabaseExtensionInterceptor(AbstractScriptDatabaseInitializer initializer) {
+        protected SpringScriptDatabaseExtensionInterceptor(DataSourceScriptDatabaseInitializer initializer,
+                                                           DatabaseContext context) {
             this.initializer = initializer;
+            this.context = context;
         }
 
         @Override
         public Object invoke(MethodInvocation invocation) throws Throwable {
-            String methodName = invocation.getMethod().getName();
-            if (!"afterPropertiesSet".equals(methodName) && !"initializeDatabase".equals(methodName)) {
-                return invocation.proceed();
+            switch (invocation.getMethod().getName()) {
+                case "afterPropertiesSet":
+                    context.apply(new SpringScriptDatabasePreparer(initializer));
+                    return null;
+                case "initializeDatabase":
+                    context.apply(new SpringScriptDatabasePreparer(initializer));
+                    return true;
+                default:
+                    return invocation.proceed();
             }
-
-            DataSource dataSource = ReflectionUtils.getField(initializer, "dataSource");
-            DatabaseContext context = AopProxyUtils.getDatabaseContext(dataSource);
-            checkState(context != null, "Data source context cannot be resolved");
-
-            context.apply(new SpringScriptDatabasePreparer(initializer));
-
-            return null;
         }
     }
 }

embedded-database-spring-test/src/main/java/io/zonky/test/db/init/SpringScriptDatabasePreparer.java

@@ -19,7 +19,7 @@
 import com.cedarsoftware.util.DeepEquals;
 import io.zonky.test.db.preparer.DatabasePreparer;
 import io.zonky.test.db.util.ReflectionUtils;
-import org.springframework.boot.sql.init.AbstractScriptDatabaseInitializer;
+import org.springframework.boot.jdbc.init.DataSourceScriptDatabaseInitializer;
 import org.springframework.util.ReflectionUtils.FieldFilter;
 
 import javax.sql.DataSource;
@@ -39,12 +39,12 @@ public class SpringScriptDatabasePreparer implements DatabasePreparer {
     private static final FieldFilter FIELD_FILTER =
             field -> !Modifier.isStatic(field.getModifiers()) && !EXCLUDED_FIELDS.contains(field.getName());
 
-    private final AbstractScriptDatabaseInitializer initializer;
-    private final ThreadLocalDataSource threadLocalDataSource;
+    private static final ThreadLocalDataSource threadLocalDataSource = new ThreadLocalDataSource();
 
-    public SpringScriptDatabasePreparer(AbstractScriptDatabaseInitializer initializer) {
+    private final DataSourceScriptDatabaseInitializer initializer;
+
+    public SpringScriptDatabasePreparer(DataSourceScriptDatabaseInitializer initializer) {
         this.initializer = initializer;
-        this.threadLocalDataSource = new ThreadLocalDataSource();
         ReflectionUtils.setField(initializer, "dataSource", threadLocalDataSource);
     }
 

…t/AbstractScriptDatabaseInitializer.java …DataSourceScriptDatabaseInitializer.javaspring-boot-4-stubs/src/main/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializer.java renamed to spring-boot-4-stubs/src/main/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializer.java spring-boot-4-stubs/src/main/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializer.java renamed to spring-boot-4-stubs/src/main/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializer.java

@@ -7,9 +7,9 @@
  * https://github.com/spring-projects/spring-boot
  */
 
-package org.springframework.boot.sql.init;
+package org.springframework.boot.jdbc.init;
 
-public class AbstractScriptDatabaseInitializer {
+public class DataSourceScriptDatabaseInitializer {
 
     public boolean initializeDatabase() {
         return false;