Fixed flyway migrations compilation problems

sam-glendenning · Nov 5, 2021 · 0d9167a · 0d9167a
1 parent 1ca9d73
commit 0d9167a
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 25 deletions.
diff --git a/iam-persistence/src/main/java/db/migration/h2/V10_1__Password_Update.java b/iam-persistence/src/main/java/db/migration/h2/V10_1__Password_Update.java
@@ -20,9 +20,9 @@
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
-import it.infn.mw.iam.persistence.migrations.BaseJdbcTemplateFlywayMigration;
+import it.infn.mw.iam.persistence.migrations.BaseFlywayJavaMigrationAdapter;
 
-public class V10_1__Password_Update extends BaseJdbcTemplateFlywayMigration {
+public class V10_1__Password_Update extends BaseFlywayJavaMigrationAdapter {
 
   @Override
   public void migrate(JdbcTemplate jdbcTemplate) throws Exception {

diff --git a/iam-persistence/src/main/java/db/migration/h2/V10_2___CheckDuplicateEmails.java b/iam-persistence/src/main/java/db/migration/h2/V10_2___CheckDuplicateEmails.java
@@ -23,9 +23,9 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.support.rowset.SqlRowSet;
 
-import it.infn.mw.iam.persistence.migrations.BaseJdbcTemplateFlywayMigration;
+import it.infn.mw.iam.persistence.migrations.BaseFlywayJavaMigrationAdapter;
 
-public class V10_2___CheckDuplicateEmails extends BaseJdbcTemplateFlywayMigration {
+public class V10_2___CheckDuplicateEmails extends BaseFlywayJavaMigrationAdapter {
 
   public static final Logger LOG = LoggerFactory.getLogger(V10_2___CheckDuplicateEmails.class);
 

diff --git a/iam-persistence/src/main/java/db/migration/h2/V23___CreateGroupManagerAuthorities.java b/iam-persistence/src/main/java/db/migration/h2/V23___CreateGroupManagerAuthorities.java
@@ -17,7 +17,7 @@
 
 import org.springframework.jdbc.core.JdbcTemplate;
 
-import it.infn.mw.iam.persistence.migrations.BaseJdbcTemplateFlywayMigration;
+import it.infn.mw.iam.persistence.migrations.BaseFlywayJavaMigrationAdapter;
 import it.infn.mw.iam.persistence.migrations.CreateGroupManagerAuthorities;
 
 /**
@@ -26,7 +26,7 @@
  * will never be groups to migrate. See the test folder for the actual migration
  *
  */
-public class V23___CreateGroupManagerAuthorities extends BaseJdbcTemplateFlywayMigration {
+public class V23___CreateGroupManagerAuthorities extends BaseFlywayJavaMigrationAdapter {
 
   @Override
   public void migrate(JdbcTemplate jdbcTemplate) throws Exception {

diff --git a/iam-persistence/src/main/java/db/migration/h2/V34_2___RemoveOrphanTokens.java b/iam-persistence/src/main/java/db/migration/h2/V34_2___RemoveOrphanTokens.java
@@ -18,9 +18,9 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import db.migration.tasks.RemoveOrphanTokens;
-import it.infn.mw.iam.persistence.migrations.BaseJdbcTemplateFlywayMigration;
+import it.infn.mw.iam.persistence.migrations.BaseFlywayJavaMigrationAdapter;
 
-public class V34_2___RemoveOrphanTokens extends BaseJdbcTemplateFlywayMigration {
+public class V34_2___RemoveOrphanTokens extends BaseFlywayJavaMigrationAdapter {
 
   @Override
   public void migrate(JdbcTemplate jdbcTemplate) throws Exception {

diff --git a/iam-persistence/src/main/java/db/migration/mysql/V10_1__Password_Update.java b/iam-persistence/src/main/java/db/migration/mysql/V10_1__Password_Update.java
@@ -20,9 +20,9 @@
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
-import it.infn.mw.iam.persistence.migrations.BaseJdbcTemplateFlywayMigration;
+import it.infn.mw.iam.persistence.migrations.BaseFlywayJavaMigrationAdapter;
 
-public class V10_1__Password_Update extends BaseJdbcTemplateFlywayMigration {
+public class V10_1__Password_Update extends BaseFlywayJavaMigrationAdapter {
 
   @Override
   public void migrate(JdbcTemplate jdbcTemplate) throws Exception {

diff --git a/iam-persistence/src/main/java/db/migration/mysql/V10_2___CheckDuplicateEmails.java b/iam-persistence/src/main/java/db/migration/mysql/V10_2___CheckDuplicateEmails.java
@@ -23,9 +23,9 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.support.rowset.SqlRowSet;
 
-import it.infn.mw.iam.persistence.migrations.BaseJdbcTemplateFlywayMigration;
+import it.infn.mw.iam.persistence.migrations.BaseFlywayJavaMigrationAdapter;
 
-public class V10_2___CheckDuplicateEmails extends BaseJdbcTemplateFlywayMigration {
+public class V10_2___CheckDuplicateEmails extends BaseFlywayJavaMigrationAdapter {
 
   public static final Logger LOG = LoggerFactory.getLogger(V10_2___CheckDuplicateEmails.class);
 

diff --git a/iam-persistence/src/main/java/db/migration/mysql/V23___CreateGroupManagerAuthorities.java b/iam-persistence/src/main/java/db/migration/mysql/V23___CreateGroupManagerAuthorities.java
@@ -19,10 +19,10 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
 
-import it.infn.mw.iam.persistence.migrations.BaseJdbcTemplateFlywayMigration;
+import it.infn.mw.iam.persistence.migrations.BaseFlywayJavaMigrationAdapter;
 import it.infn.mw.iam.persistence.migrations.CreateGroupManagerAuthorities;
 
-public class V23___CreateGroupManagerAuthorities extends BaseJdbcTemplateFlywayMigration {
+public class V23___CreateGroupManagerAuthorities extends BaseFlywayJavaMigrationAdapter {
 
   public static final Logger LOG =
       LoggerFactory.getLogger(V23___CreateGroupManagerAuthorities.class);

diff --git a/iam-persistence/src/main/java/db/migration/mysql/V34_2___RemoveOrphanTokens.java b/iam-persistence/src/main/java/db/migration/mysql/V34_2___RemoveOrphanTokens.java
@@ -18,9 +18,9 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import db.migration.tasks.RemoveOrphanTokens;
-import it.infn.mw.iam.persistence.migrations.BaseJdbcTemplateFlywayMigration;
+import it.infn.mw.iam.persistence.migrations.BaseFlywayJavaMigrationAdapter;
 
-public class V34_2___RemoveOrphanTokens extends BaseJdbcTemplateFlywayMigration {
+public class V34_2___RemoveOrphanTokens extends BaseFlywayJavaMigrationAdapter {
 
   @Override
   public void migrate(JdbcTemplate jdbcTemplate) throws Exception {

diff --git a/iam-persistence/src/main/java/db/migration/tasks/RemoveOrphanTokens.java b/iam-persistence/src/main/java/db/migration/tasks/RemoveOrphanTokens.java
@@ -19,9 +19,9 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
 
-import it.infn.mw.iam.persistence.migrations.BaseJdbcTemplateFlywayMigration;
+import it.infn.mw.iam.persistence.migrations.BaseFlywayJavaMigrationAdapter;
 
-public class RemoveOrphanTokens extends BaseJdbcTemplateFlywayMigration {
+public class RemoveOrphanTokens extends BaseFlywayJavaMigrationAdapter {
 
   public static final Logger LOG = LoggerFactory.getLogger(RemoveOrphanTokens.class);
 

diff --git a/...ersistence/src/main/java/db/migration/test/V100000_1___CreateGroupManagerAuthorities.java b/...ersistence/src/main/java/db/migration/test/V100000_1___CreateGroupManagerAuthorities.java
@@ -15,12 +15,12 @@
  */
 package db.migration.test;
 
-import org.flywaydb.core.api.migration.spring.SpringJdbcMigration;
 import org.springframework.jdbc.core.JdbcTemplate;
 
+import it.infn.mw.iam.persistence.migrations.BaseFlywayJavaMigrationAdapter;
 import it.infn.mw.iam.persistence.migrations.CreateGroupManagerAuthorities;
 
-public class V100000_1___CreateGroupManagerAuthorities implements SpringJdbcMigration {
+public class V100000_1___CreateGroupManagerAuthorities extends BaseFlywayJavaMigrationAdapter {
 
   @Override
   public void migrate(JdbcTemplate jdbcTemplate) throws Exception {

diff --git a/iam-persistence/src/main/java/db/migration/test/V100000_3___RemoveOrphanTokens.java b/iam-persistence/src/main/java/db/migration/test/V100000_3___RemoveOrphanTokens.java
@@ -15,12 +15,12 @@
  */
 package db.migration.test;
 
-import org.flywaydb.core.api.migration.spring.SpringJdbcMigration;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import db.migration.tasks.RemoveOrphanTokens;
+import it.infn.mw.iam.persistence.migrations.BaseFlywayJavaMigrationAdapter;
 
-public class V100000_3___RemoveOrphanTokens implements SpringJdbcMigration {
+public class V100000_3___RemoveOrphanTokens extends BaseFlywayJavaMigrationAdapter {
 
   @Override
   public void migrate(JdbcTemplate jdbcTemplate) throws Exception {

diff --git a/...ions/BaseJdbcTemplateFlywayMigration.java → ...tions/BaseFlywayJavaMigrationAdapter.java b/...ions/BaseJdbcTemplateFlywayMigration.java → ...tions/BaseFlywayJavaMigrationAdapter.java
@@ -16,11 +16,21 @@
 package it.infn.mw.iam.persistence.migrations;
 
 import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.SingleConnectionDataSource;
 
-public abstract class BaseJdbcTemplateFlywayMigration extends BaseJavaMigration {
-
+public abstract class BaseFlywayJavaMigrationAdapter extends BaseJavaMigration {
 
+  protected JdbcTemplate templateFromContext(Context context) {
+    return new JdbcTemplate(new SingleConnectionDataSource(context.getConnection(), true));
+  }
 
+  @Override
+  public void migrate(Context context) throws Exception {
+    migrate(templateFromContext(context));
+  }
 
+  public abstract void migrate(JdbcTemplate jdbcTemplate) throws Exception;
 
 }
diff --git a/...ce/src/main/java/it/infn/mw/iam/persistence/migrations/CreateGroupManagerAuthorities.java b/...ce/src/main/java/it/infn/mw/iam/persistence/migrations/CreateGroupManagerAuthorities.java
@@ -20,7 +20,7 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.support.rowset.SqlRowSet;
 
-public class CreateGroupManagerAuthorities extends BaseJdbcTemplateFlywayMigration {
+public class CreateGroupManagerAuthorities extends BaseFlywayJavaMigrationAdapter {
 
   public static final Logger LOG = LoggerFactory.getLogger(CreateGroupManagerAuthorities.class);