Flyway migration refactoring to avoid naming errors

iam-login-service/src/main/resources/application.yml

@@ -19,7 +19,10 @@ server:
     path: /error
 
   port: ${IAM_PORT:8080}
+
   tomcat:
+    additional-tld-skip-patterns:
+    - "*.jar"
     accesslog:
       enabled: ${IAM_TOMCAT_ACCESS_LOG_ENABLED:false}
       directory: ${IAM_TOMCAT_ACCESS_LOG_DIRECTORY:/tmp}

iam-persistence/src/main/java/db/migration/h2/V23___CreateGroupManagerAuthorities.java

@@ -17,8 +17,8 @@
 
 import org.springframework.jdbc.core.JdbcTemplate;
 
+import db.migration.tasks.CreateGroupManagerAuthorities;
 import it.infn.mw.iam.persistence.migrations.BaseFlywayJavaMigrationAdapter;
-import it.infn.mw.iam.persistence.migrations.CreateGroupManagerAuthorities;
 
 /**
  * 

iam-persistence/src/main/java/db/migration/mysql/V23___CreateGroupManagerAuthorities.java

@@ -19,8 +19,8 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
 
+import db.migration.tasks.CreateGroupManagerAuthorities;
 import it.infn.mw.iam.persistence.migrations.BaseFlywayJavaMigrationAdapter;
-import it.infn.mw.iam.persistence.migrations.CreateGroupManagerAuthorities;
 
 public class V23___CreateGroupManagerAuthorities extends BaseFlywayJavaMigrationAdapter {
 

iam-persistence/src/main/java/it/infn/mw/iam/persistence/migrations/CreateGroupManagerAuthorities.java → iam-persistence/src/main/java/db/migration/tasks/CreateGroupManagerAuthorities.java

@@ -13,14 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package it.infn.mw.iam.persistence.migrations;
+package db.migration.tasks;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.support.rowset.SqlRowSet;
 
-public class CreateGroupManagerAuthorities extends BaseFlywayJavaMigrationAdapter {
+import it.infn.mw.iam.persistence.migrations.SpringJdbcFlywayMigration;
+
+public class CreateGroupManagerAuthorities implements SpringJdbcFlywayMigration {
 
   public static final Logger LOG = LoggerFactory.getLogger(CreateGroupManagerAuthorities.class);
 

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.BaseFlywayJavaMigrationAdapter;
+import it.infn.mw.iam.persistence.migrations.SpringJdbcFlywayMigration;
 
-public class RemoveOrphanTokens extends BaseFlywayJavaMigrationAdapter {
+public class RemoveOrphanTokens implements SpringJdbcFlywayMigration {
 
   public static final Logger LOG = LoggerFactory.getLogger(RemoveOrphanTokens.class);
 

iam-persistence/src/main/java/db/migration/test/V100000_1___CreateGroupManagerAuthorities.java

@@ -17,8 +17,8 @@
 
 import org.springframework.jdbc.core.JdbcTemplate;
 
+import db.migration.tasks.CreateGroupManagerAuthorities;
 import it.infn.mw.iam.persistence.migrations.BaseFlywayJavaMigrationAdapter;
-import it.infn.mw.iam.persistence.migrations.CreateGroupManagerAuthorities;
 
 public class V100000_1___CreateGroupManagerAuthorities extends BaseFlywayJavaMigrationAdapter {
 

iam-persistence/src/main/java/it/infn/mw/iam/persistence/migrations/BaseFlywayJavaMigrationAdapter.java

@@ -20,7 +20,8 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.SingleConnectionDataSource;
 
-public abstract class BaseFlywayJavaMigrationAdapter extends BaseJavaMigration {
+public abstract class BaseFlywayJavaMigrationAdapter extends BaseJavaMigration
+    implements SpringJdbcFlywayMigration {
 
   protected JdbcTemplate templateFromContext(Context context) {
     return new JdbcTemplate(new SingleConnectionDataSource(context.getConnection(), true));
@@ -31,6 +32,4 @@ public void migrate(Context context) throws Exception {
     migrate(templateFromContext(context));
   }
 
-  public abstract void migrate(JdbcTemplate jdbcTemplate) throws Exception;
-
 }

iam-persistence/src/main/java/it/infn/mw/iam/persistence/migrations/SpringJdbcFlywayMigration.java

@@ -0,0 +1,9 @@
+package it.infn.mw.iam.persistence.migrations;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+
+@FunctionalInterface
+public interface SpringJdbcFlywayMigration {
+
+  void migrate(JdbcTemplate jdbcTemplate) throws Exception;
+}

iam-persistence/src/main/resources/db/migration/h2/V40___aup_updates.sql

@@ -1,2 +1,2 @@
-ALTER TABLE iam_aup MODIFY text LONGTEXT NULL;
+ALTER TABLE iam_aup ALTER COLUMN text LONGTEXT NULL;
 ALTER TABLE iam_aup ADD COLUMN url VARCHAR(256);