upgrade to flyway 7.3.0 (compile time only dependency)

Author: tomix26

build.gradle

@@ -209,8 +209,8 @@ project(':embedded-database-spring-test') {
         compile 'mysql:mysql-connector-java:8.0.22', optional
         compile 'org.mariadb.jdbc:mariadb-java-client:2.7.0', optional
 
-        compile 'org.flywaydb:flyway-core:5.0.7', optional
-        compile 'org.flywaydb.flyway-test-extensions:flyway-spring-test:5.0.0', optional
+        compile 'org.flywaydb:flyway-core:7.3.0', optional
+        compile 'org.flywaydb.flyway-test-extensions:flyway-spring-test:7.0.0', optional
         compile 'org.springframework.boot:spring-boot-starter-test:1.5.22.RELEASE', optional
         compile 'org.liquibase:liquibase-core:3.5.5', optional
 

embedded-database-spring-test/src/main/java/io/zonky/test/db/flyway/FlywayClassUtils.java

@@ -18,20 +18,15 @@
 
 import org.apache.commons.io.IOUtils;
 import org.flywaydb.core.Flyway;
-import org.flywaydb.core.api.FlywayException;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.ClassUtils;
 
-import static io.zonky.test.db.util.ReflectionUtils.getField;
-import static io.zonky.test.db.util.ReflectionUtils.invokeMethod;
-import static io.zonky.test.db.util.ReflectionUtils.invokeStaticMethod;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class FlywayClassUtils {
 
     private static final int flywayVersion = loadFlywayVersion();
-    private static final boolean flywayPro = loadFlywayPro();
 
     private FlywayClassUtils() {}
 
@@ -53,31 +48,7 @@ private static int loadFlywayVersion() {
         }
     }
 
-    private static boolean loadFlywayPro() {
-        if (flywayVersion < 50) {
-            return false;
-        }
-        try {
-            if (flywayVersion >= 60) {
-                Object flywayConfig = invokeStaticMethod(Flyway.class, "configure");
-                invokeMethod(flywayConfig, "undoSqlMigrationPrefix", "U");
-            } else if (flywayVersion >= 51) {
-                Object flywayConfig = getField(new Flyway(), "configuration");
-                invokeMethod(flywayConfig, "setUndoSqlMigrationPrefix", "U");
-            } else {
-                new Flyway().setUndoSqlMigrationPrefix("U");
-            }
-            return true;
-        } catch (FlywayException e) {
-            return false;
-        }
-    }
-
     public static int getFlywayVersion() {
         return flywayVersion;
     }
-
-    public static boolean isFlywayPro() {
-        return flywayPro;
-    }
 }

embedded-database-spring-test/src/main/java/io/zonky/test/db/flyway/FlywayWrapper.java

@@ -21,7 +21,6 @@
 import org.flywaydb.core.Flyway;
 import org.flywaydb.core.api.resolver.MigrationResolver;
 import org.flywaydb.core.api.resolver.ResolvedMigration;
-import org.flywaydb.core.internal.util.scanner.Scanner;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.util.ClassUtils;
 
@@ -51,7 +50,7 @@ public static FlywayWrapper newInstance() {
             Object config = invokeStaticMethod(Flyway.class, "configure");
             return new FlywayWrapper(invokeMethod(config, "load"));
         } else {
-            return new FlywayWrapper(new Flyway());
+            return new FlywayWrapper(invokeConstructor(Flyway.class));
         }
     }
 
@@ -100,7 +99,7 @@ public Collection<ResolvedMigration> getMigrations() {
                         "getConfiguration".equals(invocation.getMethod().getName()) ? config : invocation.proceed());
                 return invokeMethod(resolver, "resolveMigrations", contextInstance);
             } else {
-                return resolver.resolveMigrations();
+                return invokeMethod(resolver, "resolveMigrations");
             }
         } catch (ClassNotFoundException e) {
             throw new IllegalStateException("Class not found: " + e.getMessage());
@@ -129,7 +128,7 @@ private MigrationResolver createMigrationResolver(Flyway flyway) throws ClassNot
             Object placeholderReplacer = invokeMethod(flyway, "createPlaceholderReplacer");
             return invokeMethod(flyway, "createMigrationResolver", null, scanner, placeholderReplacer);
         } else if (flywayVersion >= 40) {
-            Scanner scanner = new Scanner(flyway.getClassLoader());
+            Object scanner = createScanner(flyway);
             return invokeMethod(flyway, "createMigrationResolver", null, scanner);
         } else {
             return invokeMethod(flyway, "createMigrationResolver", (Object) null);
@@ -191,7 +190,11 @@ private Object createScanner(Flyway flyway) throws ClassNotFoundException {
                     invokeMethod(config, "getEncoding"));
         }
         if (flywayVersion >= 51) {
-            return invokeConstructor(Scanner.class, config);
+            return invokeConstructor("org.flywaydb.core.internal.util.scanner.Scanner", config);
+        }
+        if (flywayVersion >= 40) {
+            return invokeConstructor("org.flywaydb.core.internal.util.scanner.Scanner",
+                    (Object) invokeMethod(config, "getClassLoader"));
         }
 
         throw new IllegalStateException("Unsupported flyway version: " + flywayVersion);

embedded-database-spring-test/src/main/java/io/zonky/test/db/flyway/OptimizedFlywayTestExecutionListener.java

@@ -42,7 +42,7 @@
 import java.util.List;
 import java.util.function.Function;
 
-import static org.springframework.asm.SpringAsmInfo.ASM_VERSION;
+import static org.springframework.asm.Opcodes.ASM6;
 import static org.springframework.util.ReflectionUtils.findMethod;
 
 public class OptimizedFlywayTestExecutionListener implements TestExecutionListener, Ordered {
@@ -157,7 +157,7 @@ private static class ClassTransformer extends ClassVisitor {
         private final Function<MethodVisitor, MethodVisitor> methodReplacer;
 
         private ClassTransformer(ClassWriter cw, Method method, Function<MethodVisitor, MethodVisitor> methodReplacer) {
-            super(ASM_VERSION, cw);
+            super(ASM6, cw);
             this.methodName = method.getName();
             this.methodDescriptor = Type.getMethodDescriptor(method);
             this.methodReplacer = methodReplacer;
@@ -181,7 +181,7 @@ private static class LocationsMigrationHandlingMethodReplacer extends MethodVisi
 
         private LocationsMigrationHandlingMethodReplacer(MethodVisitor writer) {
             // now, we're not passing the writer to the superclass for our radical changes
-            super(ASM_VERSION);
+            super(ASM6);
             this.writer = writer;
         }