Small fixes

Added jakarta annotations; added new constructor to be compatible with Java; changed the visibility of a method, to avoid the need of extending the base class just to use it

VERSION

@@ -1 +1 @@
-1.5.0
+1.6.0

build.gradle

@@ -53,6 +53,9 @@ dependencies {
     implementation "org.codehaus.groovy:groovy:3.0.9"
     implementation "org.codehaus.groovy:groovy-sql:3.0.9"
 
+    // brings some standard annotations to be used
+    implementation 'jakarta.annotation:jakarta.annotation-api:3.0.0'
+
     // Use the latest Groovy version for Spock testing
     testImplementation "org.codehaus.groovy:groovy:3.0.9"
     testImplementation "org.codehaus.groovy:groovy-nio:3.0.9"

src/main/java/io/seqera/migtool/Dialect.java

@@ -1,6 +1,6 @@
 package io.seqera.migtool;
 
-import groovyjarjarantlr4.v4.runtime.misc.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.List;
 
 public enum Dialect {

src/main/java/io/seqera/migtool/Driver.java

@@ -1,6 +1,6 @@
 package io.seqera.migtool;
 
-import groovyjarjarantlr4.v4.runtime.misc.Nullable;
+import jakarta.annotation.Nullable;
 
 public enum Driver {
     MYSQL("com.mysql.cj.jdbc.Driver"),

src/main/java/io/seqera/migtool/MigRecord.java

@@ -40,6 +40,16 @@ static Language from(String fileName) {
     boolean isPatch;
     boolean isOverride;
 
+    /**
+     * This constructor is needed to be called from Java applications
+     * **/
+    public MigRecord(List<String> statements) {
+        this.statements = statements;
+    }
+
+    public MigRecord() {
+    }
+
     @Override
     public int compareTo(MigRecord other) {
         return this.rank - other.rank;
@@ -55,9 +65,13 @@ static MigRecord parseResourcePath(String path, Pattern pattern) {
 
         int p = path.lastIndexOf("/");
         String fileName = p==-1 ? path : path.substring(p+1);
-
+
+        return extractRankAndCreateRecord(pattern, fileName, readContent(path));
+    }
+
+    private static MigRecord extractRankAndCreateRecord(Pattern pattern, String fileName, String path) {
         Matcher m = pattern.matcher(fileName);
-        if( !m.matches() ) {
+        if (!m.matches()) {
             return null;
         }
 
@@ -69,34 +83,17 @@ static MigRecord parseResourcePath(String path, Pattern pattern) {
             return null;
         }
 
-        String content = readContent(path);
         int rank = Integer.parseInt(m.group(1));
 
-        return createRecord(fileName, rank, content);
+        return createRecord(fileName, rank, path);
     }
 
     static MigRecord parseFilePath(Path path, Pattern pattern) {
         if( pattern == null ) pattern = DEFAULT_PATTERN;
 
         String fileName = path.getFileName().toString();
 
-        Matcher m = pattern.matcher(fileName);
-        if( !m.matches() ) {
-            return null;
-        }
-
-        // We do not allow files with double fix or amend, ex. V01__organisation.fixed.fixed.sql
-        if (countMatch(fileName, OVERRIDE_PATTERN) > 1) {
-            return null;
-        }
-        if (countMatch(fileName, PATCH_PATTERN) > 1) {
-            return null;
-        }
-
-        String content = readContent(path);
-        int rank = Integer.parseInt(m.group(1));
-
-        return createRecord(fileName, rank, content);
+        return extractRankAndCreateRecord(pattern, fileName, readContent(path));
     }
 
     private static long countMatch(String name, Pattern pattern) {
@@ -144,10 +141,10 @@ private static List<String> getSqlStatements(String sql) {
         String[] tokens = sql.split(";");
         List<String> result = new ArrayList<>(tokens.length);
 
-        for( int i=0; i<tokens.length; i++) {
-            String clean = tokens[i].trim();
-            if( clean.length()>0 )
-                result.add( clean + ';' ) ;
+        for (String token : tokens) {
+            String clean = token.trim();
+            if (!clean.isEmpty())
+                result.add(clean + ';');
         }
 
         return result;

src/main/java/io/seqera/migtool/MigTool.java

@@ -460,7 +460,10 @@ private void runSqlMigration(MigRecord entry) {
         }
     }
 
-    protected void runGroovyMigration(MigRecord entry) {
+    /**
+     * Allows to run a single groovy migration. Usually used for testing purposes.
+     * **/
+    public void runGroovyMigration(MigRecord entry) {
         final long ts = System.currentTimeMillis();
 
         try (Connection conn = getConnection()) {