Release/0.6.1 (#3)

* Update version to 0.6.1.
* Suppress automatic module warnings in module-info.java files.
* Remove scope attribute when transforming Equal/NotEqual tags.
* Build out unit tests for preprocessing transformers.
* Fix regex matching logic in InlineBeanWriteTagTransformer.
* Build out support for additional command-line switches.
* Use a custom JSoup jar with Tag.convertTag() to preserve tag features when changing names.

Author: ThoughtProcess

.idea/modules.xml

@@ -7,13 +7,15 @@ plugins {
     id 'java'
 }
 
-version = '0.5.0-alpha.3'
+version = '0.6.1'
 
 repositories {
     // Use Maven Central for resolving dependencies.
     mavenCentral()
+    flatDir {
+        dirs("../../jsoup/target")
+    }
 }
-
 dependencies {
     constraints {
         // Define dependency versions as constraints

.idea/modules/jspServices/StrutsToSpringToolkit.jspServices.test.iml

@@ -17,7 +17,7 @@ tasks.named('jar', Jar) {
 dependencies {
     implementation 'org.apache.logging.log4j:log4j-core'
     implementation 'org.apache.logging.log4j:log4j-api'
-
+    implementation 'commons-io:commons-io'
     implementation project(':jspServices')
 }
 

buildSrc/src/main/groovy/com.rombalabs.strutstospringtoolkit.java-common-conventions.gradle

@@ -4,6 +4,12 @@
 import com.rombalabs.strutstospringtoolkit.jspservices.StrutsProcessor;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.commons.io.FileUtils;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+
+import static java.lang.System.exit;
 
 /*
  * This Java source file was generated by the Gradle 'init' task.
@@ -12,30 +18,72 @@ public class App {
 
     private static final Logger logger = LogManager.getLogger();
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws IOException {
 
         boolean rewriteInPlace = false;
+        boolean preprocessOnly = false;
+        boolean jsoupOnly = false;
+
         if(args.length < 1)
         {
-            logger.fatal("Please provide a file name as an argument.");
-            return;
+            printUsage();
+            exit(1);
         }
 
-        if(args.length == 2)
-        {
-            if (args[1].equals("--replace")) {
-                rewriteInPlace = true;
+        //TODO This is gross, use a proper CLI arguments library!
+        for (String arg : Arrays.stream(args).skip(1).toArray(String[]::new)) {
+            switch (arg) {
+                case "--replace":
+                    rewriteInPlace = true;
+                    break;
+
+                case "--preprocessOnly":
+                    preprocessOnly = true;
+                    break;
+
+                case "--jsoupOnly":
+                    jsoupOnly = true;
+                    break;
+
+                default:
+                    logger.fatal("Invalid argument: " + arg);
+                    printUsage();
+                    exit(1);
+                    return;
             }
-            else {
-                logger.fatal("Invalid argument.");
-                return;
+        }
+
+        String inputFile = args[0];
+        var outputPath = inputFile.replace(".jsp", "_converted.jsp");
+        logger.info("Storing output in " + (rewriteInPlace ? "temporary " : "") + "location: " + outputPath);
+        if (!jsoupOnly) {
+            var preProcessor = new PreProcessor();
+            preProcessor.processFile(inputFile, outputPath);
+        }
+
+        if (!preprocessOnly) {
+            if (jsoupOnly) {
+                outputPath = inputFile;
             }
+            var strutsProcessor = new StrutsProcessor();
+            strutsProcessor.processFile(outputPath, outputPath);
         }
 
-        var preProcessor = new PreProcessor();
-        var strutsProcessor = new StrutsProcessor();
+        if (rewriteInPlace) {
+            logger.info("Rewriting existing input file...");
+            File outputFile = new File(outputPath);
+            FileUtils.copyFile(outputFile, new File(inputFile));
+            FileUtils.delete(outputFile);
+        }
+
+    }
 
-        var outputFile = preProcessor.processFile(args[0], rewriteInPlace);
-        strutsProcessor.processFile(outputFile, true);
+    private static void printUsage() {
+        System.out.println("Usage:");
+        System.out.println("jspConverter [FILE] [OPTIONS]\n");
+        System.out.println("Options:");
+        System.out.println("\t--replace\tOverwrites the input file");
+        System.out.println("\t--preprocessOnly\tOnly runs the preprocessor (doesn't load the whole document as DOM).");
+        System.out.println("\t--jsoupOnly\tOnly runs the JSoup DOM processor.");
     }
 }

jspConverter/build.gradle

@@ -1,4 +1,6 @@
+@SuppressWarnings({ "requires-automatic", "requires-transitive-automatic" })
 module StrutsToSpringToolkit.jspConverter.main {
     requires org.apache.logging.log4j;
     requires StrutsToSpringToolkit.jspServices.main;
+    requires org.apache.commons.io;
 }

jspConverter/src/main/java/com/rombalabs/strutstospringtoolkit/jspconverter/App.java

@@ -9,7 +9,6 @@ plugins {
 tasks.named('jar') {
     manifest {
         attributes(
-//            'Automatic-Module-Name': 'jspConverterModule',
                 'Class-Path': configurations.runtimeClasspath.collect { it.getName() }.join(' '))
     }
 }
@@ -19,6 +18,8 @@ dependencies {
     implementation 'org.apache.logging.log4j:log4j-api'
     implementation 'commons-io:commons-io'
     implementation 'org.apache.commons:commons-lang3'
+    implementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: '2.1.1'
 
-    api group: 'org.jsoup', name: 'jsoup', version: '1.16.1'
-}
+    api group: 'org.jsoup', name: 'jsoup', version: '1.16.2-SNAPSHOT'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1'
+}

jspConverter/src/main/java/module-info.java

@@ -1,5 +1,5 @@
 package com.rombalabs.strutstospringtoolkit.jspservices;
 
 public interface FileProcessor {
-    String processFile(String filename, boolean rewrite);
+    String processFile(String filename, String outputFilePath);
 }

jspServices/build.gradle

@@ -5,7 +5,6 @@
 import com.rombalabs.strutstospringtoolkit.jspservices.transformers.preprocessing.HtmlTagTransformer;
 import com.rombalabs.strutstospringtoolkit.jspservices.transformers.preprocessing.InlineBeanWriteTagTransformer;
 import com.rombalabs.strutstospringtoolkit.jspservices.transformers.preprocessing.InlineScriptletTransformer;
-import org.apache.commons.io.FileUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -30,13 +29,11 @@ public PreProcessor() {
     }
 
     @Override
-    public String processFile(String filename, boolean rewrite) {
-        var outputPath = filename.replace(".jsp", "_converted.jsp");
+    public String processFile(String filename, String outputFilePath) {
         logger.info("Loading file " + filename);
-        logger.info("Storing output in " + (rewrite ? "temporary " : "") + "location: " + outputPath);
 
         try (var reader = new BufferedReader(new FileReader(filename))) {
-            try (var writer = new BufferedWriter(new FileWriter(outputPath))) {
+            try (var writer = new BufferedWriter(new FileWriter(outputFilePath))) {
                 String line;
                 while ((line = reader.readLine()) != null) {
                     var processedLine = processContent(line);
@@ -45,19 +42,13 @@ public String processFile(String filename, boolean rewrite) {
                 }
             }
 
-            if (rewrite) {
-                File outputFile = new File(outputPath);
-                FileUtils.copyFile(outputFile, new File(filename));
-                FileUtils.delete(outputFile);
-                outputPath = filename;
-            }
 
         } catch (IOException e) {
             logger.error("Failed to load file.", e);
             throw new RuntimeException(e);
         }
 
-        return outputPath;
+        return outputFilePath;
     }
 
     public String processContent(String content) {

jspServices/src/main/java/com/rombalabs/strutstospringtoolkit/jspservices/FileProcessor.java

@@ -52,7 +52,7 @@ public StrutsProcessor() {
     }
 
     @Override
-    public String processFile(String filename, boolean rewrite) {
+    public String processFile(String filename, String outputFilePath) {
         String content;
         try {
             logger.info("Loading file " + filename);
@@ -64,7 +64,7 @@ public String processFile(String filename, boolean rewrite) {
 
         var result = processContent(content);
 
-        return save(result, filename, rewrite);
+        return save(result, outputFilePath);
     }
 
     public Document processContent(String content) {
@@ -102,20 +102,16 @@ private Element processElement(Element targetElement) {
         return targetElement;
     }
 
-    private String save(Document doc, String originalFileName, boolean rewrite)
+    private String save(Document doc, String outputFileName)
     {
         try {
-            if (!rewrite)
-                originalFileName = originalFileName.replace(".jsp", "_converted.jsp");
-
-            logger.info("Saving output file to: " + originalFileName);
-            File convertedFile = new File(originalFileName);
+            logger.info("Saving output file to: " + outputFileName);
+            File convertedFile = new File(outputFileName);
             FileUtils.writeStringToFile(convertedFile, Parser.unescapeEntities(doc.html(), false), "UTF-8");
-            //FileUtils.writeStringToFile(convertedFile, doc.html(), "UTF-8");
         } catch (IOException e) {
             logger.fatal("Failed to save converted file...", e);
         }
 
-        return originalFileName;
+        return outputFileName;
     }
 }