Merge pull request #39 from zonkyio/repeatable-migrations

#36 Fix processing repeatable migrations

Author: tomix26

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

@@ -16,7 +16,6 @@
 
 package io.zonky.test.db.flyway;
 
-import com.google.common.collect.Iterables;
 import com.google.common.collect.ObjectArrays;
 import io.zonky.test.db.logging.EmbeddedDatabaseReporter;
 import org.aopalliance.intercept.MethodInterceptor;
@@ -39,7 +38,6 @@
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.test.context.TestContext;
 import org.springframework.util.ClassUtils;
-import org.springframework.util.CollectionUtils;
 
 import javax.sql.DataSource;
 import java.lang.annotation.Annotation;
@@ -221,20 +219,20 @@ protected static boolean isAppendable(Flyway flyway, FlywayTest annotation) thro
 
     protected static MigrationVersion findFirstVersion(Flyway flyway, String... locations) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
         Collection<ResolvedMigration> migrations = resolveMigrations(flyway, locations);
-        if (CollectionUtils.isEmpty(migrations)) {
-            return MigrationVersion.EMPTY;
-        } else {
-            return Iterables.getFirst(migrations, null).getVersion();
-        }
+        return migrations.stream()
+                .filter(migration -> migration.getVersion() != null)
+                .findFirst()
+                .map(ResolvedMigration::getVersion)
+                .orElse(MigrationVersion.EMPTY);
     }
 
     protected static MigrationVersion findLastVersion(Flyway flyway, String... locations) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
         Collection<ResolvedMigration> migrations = resolveMigrations(flyway, locations);
-        if (CollectionUtils.isEmpty(migrations)) {
-            return MigrationVersion.EMPTY;
-        } else {
-            return Iterables.getLast(migrations).getVersion();
-        }
+        return migrations.stream()
+                .filter(migration -> migration.getVersion() != null)
+                .reduce((first, second) -> second) // finds last item
+                .map(ResolvedMigration::getVersion)
+                .orElse(MigrationVersion.EMPTY);
     }
 
     protected static Collection<ResolvedMigration> resolveMigrations(Flyway flyway, String... locations) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {

embedded-database-spring-test/src/test/resources/db/migration/R__people_view.sql

@@ -0,0 +1 @@
+create or replace view test.people as select id, first_name from test.person;