#276 add Ordered interface to internal bean post processors to ensure…

… correct processing order
zonkyio · Nov 25, 2024 · 812c965 · 812c965
1 parent 49e474f
commit 812c965
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/...d-database-spring-test/src/main/java/io/zonky/test/db/flyway/FlywayDatabaseExtension.java b/...d-database-spring-test/src/main/java/io/zonky/test/db/flyway/FlywayDatabaseExtension.java
@@ -40,6 +40,7 @@
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.support.NameMatchMethodPointcutAdvisor;
 import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.core.Ordered;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -59,7 +60,7 @@
 
 import static com.google.common.base.Preconditions.checkState;
 
-public class FlywayDatabaseExtension implements BeanPostProcessor {
+public class FlywayDatabaseExtension implements BeanPostProcessor, Ordered {
 
     private static final FlywayVersion flywayVersion = FlywayClassUtils.getFlywayVersion();
 
@@ -68,6 +69,11 @@ public class FlywayDatabaseExtension implements BeanPostProcessor {
     protected final Multimap<DatabaseContext, Flyway> flywayBeans = HashMultimap.create();
     protected final BlockingQueue<FlywayOperation> pendingOperations = new LinkedBlockingQueue<>();
 
+    @Override
+    public int getOrder() {
+        return Ordered.HIGHEST_PRECEDENCE + 1;
+    }
+
     @Override
     public Object postProcessBeforeInitialization(Object bean, String beanName) {
         if (bean instanceof AopInfrastructureBean) {

diff --git a/...base-spring-test/src/main/java/io/zonky/test/db/flyway/FlywayPropertiesPostProcessor.java b/...base-spring-test/src/main/java/io/zonky/test/db/flyway/FlywayPropertiesPostProcessor.java
@@ -3,8 +3,14 @@
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.autoconfigure.flyway.FlywayProperties;
+import org.springframework.core.Ordered;
 
-public class FlywayPropertiesPostProcessor implements BeanPostProcessor {
+public class FlywayPropertiesPostProcessor implements BeanPostProcessor, Ordered {
+
+    @Override
+    public int getOrder() {
+        return Ordered.LOWEST_PRECEDENCE - 1;
+    }
 
     @Override
     public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {

diff --git a/...base-spring-test/src/main/java/io/zonky/test/db/liquibase/LiquibaseDatabaseExtension.java b/...base-spring-test/src/main/java/io/zonky/test/db/liquibase/LiquibaseDatabaseExtension.java
@@ -28,10 +28,16 @@
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.support.NameMatchMethodPointcutAdvisor;
 import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.core.Ordered;
 
 import static com.google.common.base.Preconditions.checkState;
 
-public class LiquibaseDatabaseExtension implements BeanPostProcessor {
+public class LiquibaseDatabaseExtension implements BeanPostProcessor, Ordered {
+
+    @Override
+    public int getOrder() {
+        return Ordered.HIGHEST_PRECEDENCE + 1;
+    }
 
     @Override
     public Object postProcessBeforeInitialization(Object bean, String beanName) {

diff --git a/...pring-test/src/main/java/io/zonky/test/db/liquibase/LiquibasePropertiesPostProcessor.java b/...pring-test/src/main/java/io/zonky/test/db/liquibase/LiquibasePropertiesPostProcessor.java
@@ -19,8 +19,14 @@
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties;
+import org.springframework.core.Ordered;
 
-public class LiquibasePropertiesPostProcessor implements BeanPostProcessor {
+public class LiquibasePropertiesPostProcessor implements BeanPostProcessor, Ordered {
+
+    @Override
+    public int getOrder() {
+        return Ordered.LOWEST_PRECEDENCE - 1;
+    }
 
     @Override
     public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {