From 6ec19115549047fdb3adb17be90c2fe87cc9967b Mon Sep 17 00:00:00 2001
From: Erik Knizat <erik.knizat@alfresco.com>
Date: Mon, 23 Mar 2020 12:25:40 +0000
Subject: [PATCH] Split source code between Spring and skinny

---
 .../alfresco-transform-misc-spring/pom.xml    |  6 ++
 .../alfresco-transform-misc/pom.xml           | 92 ++++++++++++++++++-
 .../AppleIWorksContentTransformer.java        |  0
 .../transformers/EMLTransformer.java          |  0
 .../HtmlParserContentTransformer.java         |  0
 .../OOXMLThumbnailContentTransformer.java     |  0
 .../transformers/SelectableTransformer.java   |  0
 .../transformers/SelectingTransformer.java    |  1 -
 .../StringExtractingContentTransformer.java   |  0
 .../TextToPdfContentTransformer.java          |  0
 .../src/main/resources/engine_config.json     | 80 ++++++++++++++++
 .../HtmlParserContentTransformerTest.java     | 22 ++---
 .../TextToPdfContentTransformerTest.java      | 28 +++---
 13 files changed, 201 insertions(+), 28 deletions(-)
 rename alfresco-transform-misc/{alfresco-transform-misc-spring => alfresco-transform-misc}/src/main/java/org/alfresco/transformer/transformers/AppleIWorksContentTransformer.java (100%)
 rename alfresco-transform-misc/{alfresco-transform-misc-spring => alfresco-transform-misc}/src/main/java/org/alfresco/transformer/transformers/EMLTransformer.java (100%)
 rename alfresco-transform-misc/{alfresco-transform-misc-spring => alfresco-transform-misc}/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.java (100%)
 rename alfresco-transform-misc/{alfresco-transform-misc-spring => alfresco-transform-misc}/src/main/java/org/alfresco/transformer/transformers/OOXMLThumbnailContentTransformer.java (100%)
 rename alfresco-transform-misc/{alfresco-transform-misc-spring => alfresco-transform-misc}/src/main/java/org/alfresco/transformer/transformers/SelectableTransformer.java (100%)
 rename alfresco-transform-misc/{alfresco-transform-misc-spring => alfresco-transform-misc}/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java (97%)
 rename alfresco-transform-misc/{alfresco-transform-misc-spring => alfresco-transform-misc}/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.java (100%)
 rename alfresco-transform-misc/{alfresco-transform-misc-spring => alfresco-transform-misc}/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.java (100%)
 create mode 100644 alfresco-transform-misc/alfresco-transform-misc/src/main/resources/engine_config.json
 rename alfresco-transform-misc/{alfresco-transform-misc-spring => alfresco-transform-misc}/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java (94%)
 rename alfresco-transform-misc/{alfresco-transform-misc-spring => alfresco-transform-misc}/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java (96%)

diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/pom.xml b/alfresco-transform-misc/alfresco-transform-misc-spring/pom.xml
index 4bf68400..ae28af5e 100644
--- a/alfresco-transform-misc/alfresco-transform-misc-spring/pom.xml
+++ b/alfresco-transform-misc/alfresco-transform-misc-spring/pom.xml
@@ -32,6 +32,12 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-transform-misc</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
index 09e1b383..ce039381 100644
--- a/alfresco-transform-misc/alfresco-transform-misc/pom.xml
+++ b/alfresco-transform-misc/alfresco-transform-misc/pom.xml
@@ -2,15 +2,103 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>alfresco-transform-misc</artifactId>
+    <name>Alfresco Miscellaneous Transformers</name>
+    <packaging>jar</packaging>
+
     <parent>
         <artifactId>alfresco-transform-core</artifactId>
         <groupId>org.alfresco</groupId>
         <version>2.1.2-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>alfresco-transform-misc</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-transformer-base</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-transformer-base</artifactId>
+            <version>${project.version}</version>
+            <classifier>tests</classifier>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- needed? -->
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+        </dependency>
+
+        <!-- HtmlParserContentTransformer -->
+        <dependency>
+            <groupId>org.htmlparser</groupId>
+            <artifactId>htmlparser</artifactId>
+            <version>2.1</version>
+        </dependency>
+
+        <!-- AppleIWorksContentTransformer -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+        </dependency>
+
+        <!-- TextToPdfContentTransformer -->
+        <dependency>
+            <groupId>org.apache.pdfbox</groupId>
+            <artifactId>pdfbox-tools</artifactId>
+            <version>2.0.19</version>
+        </dependency>
+
+        <!-- OOXMLThumbnailContentTransformer -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>${dependency.poi.version}</version>
+        </dependency>
+
+        <!-- EMLTransformer -->
+        <dependency>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>javax.mail</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>4.1.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>license-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
 
 </project>
\ No newline at end of file
diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/AppleIWorksContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/AppleIWorksContentTransformer.java
similarity index 100%
rename from alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/AppleIWorksContentTransformer.java
rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/AppleIWorksContentTransformer.java
diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/EMLTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/EMLTransformer.java
similarity index 100%
rename from alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/EMLTransformer.java
rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/EMLTransformer.java
diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.java
similarity index 100%
rename from alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.java
rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.java
diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/OOXMLThumbnailContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/OOXMLThumbnailContentTransformer.java
similarity index 100%
rename from alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/OOXMLThumbnailContentTransformer.java
rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/OOXMLThumbnailContentTransformer.java
diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/SelectableTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectableTransformer.java
similarity index 100%
rename from alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/SelectableTransformer.java
rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectableTransformer.java
diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java
similarity index 97%
rename from alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java
rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java
index e0e9f93f..7f562e13 100644
--- a/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java
+++ b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java
@@ -47,7 +47,6 @@ import com.google.common.collect.ImmutableMap;
  *
  * @author eknizat
  */
-@Component
 public class SelectingTransformer
 {
     private static final Logger logger = LoggerFactory.getLogger(SelectingTransformer.class);
diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.java
similarity index 100%
rename from alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.java
rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.java
diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.java
similarity index 100%
rename from alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.java
rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.java
diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/resources/engine_config.json b/alfresco-transform-misc/alfresco-transform-misc/src/main/resources/engine_config.json
new file mode 100644
index 00000000..5948332f
--- /dev/null
+++ b/alfresco-transform-misc/alfresco-transform-misc/src/main/resources/engine_config.json
@@ -0,0 +1,80 @@
+{
+  "transformOptions": {
+    "textToPdfOptions": [
+      {"value": {"name": "pageLimit"}},
+      {"value": {"name": "sourceEncoding"}}
+    ],
+    "stringOptions": [
+      {"value": {"name": "sourceEncoding"}},
+      {"value": {"name": "targetEncoding"}}
+    ],
+    "htmlOptions": [
+      {"value": {"name": "sourceEncoding"}}
+    ]
+  },
+  "transformers": [
+    {
+      "transformerName": "html",
+      "supportedSourceAndTargetList": [
+        {"sourceMediaType": "text/html",                                     "targetMediaType": "text/plain"}
+      ],
+      "transformOptions": [
+        "htmlOptions"
+      ]
+    },
+    {
+      "transformerName": "string",
+      "supportedSourceAndTargetList": [
+        {"sourceMediaType": "text/plain",                                    "targetMediaType": "text/plain"},
+        {"sourceMediaType": "text/mediawiki",                                "targetMediaType": "text/plain"},
+        {"sourceMediaType": "text/css",                                      "targetMediaType": "text/plain"},
+        {"sourceMediaType": "text/csv",                                      "targetMediaType": "text/plain"},
+        {"sourceMediaType": "text/xml",                                      "targetMediaType": "text/plain"},
+        {"sourceMediaType": "text/html",                     "priority": 55, "targetMediaType": "text/plain"},
+        {"sourceMediaType": "text/richtext",                                 "targetMediaType": "text/plain"},
+        {"sourceMediaType": "text/sgml",                                     "targetMediaType": "text/plain"},
+        {"sourceMediaType": "text/tab-separated-values",                     "targetMediaType": "text/plain"},
+        {"sourceMediaType": "text/x-setext",                                 "targetMediaType": "text/plain"},
+        {"sourceMediaType": "text/x-java-source",                            "targetMediaType": "text/plain"},
+        {"sourceMediaType": "text/x-jsp",                                    "targetMediaType": "text/plain"},
+        {"sourceMediaType": "text/x-markdown",                               "targetMediaType": "text/plain"},
+        {"sourceMediaType": "text/calendar",                                 "targetMediaType": "text/plain"},
+        {"sourceMediaType": "application/x-javascript",                      "targetMediaType": "text/plain"},
+        {"sourceMediaType": "application/dita+xml",                          "targetMediaType": "text/plain"}
+      ],
+      "transformOptions": [
+        "stringOptions"
+      ]
+    },
+    {
+      "transformerName": "appleIWorks",
+      "supportedSourceAndTargetList": [
+        {"sourceMediaType": "application/vnd.apple.keynote",                 "targetMediaType": "image/jpeg"},
+        {"sourceMediaType": "application/vnd.apple.numbers",                 "targetMediaType": "image/jpeg"},
+        {"sourceMediaType": "application/vnd.apple.pages",                   "targetMediaType": "image/jpeg"}
+      ],
+      "transformOptions": [
+      ]
+    },
+    {
+      "transformerName": "textToPdf",
+      "supportedSourceAndTargetList": [
+        {"sourceMediaType": "text/plain",                    "priority": 55, "targetMediaType": "application/pdf"},
+        {"sourceMediaType": "text/csv",                                      "targetMediaType": "application/pdf"},
+        {"sourceMediaType": "application/dita+xml",                          "targetMediaType": "application/pdf"},
+        {"sourceMediaType": "text/xml",                                      "targetMediaType": "application/pdf"}
+      ],
+      "transformOptions": [
+        "textToPdfOptions"
+      ]
+    },
+    {
+      "transformerName": "rfc822",
+      "supportedSourceAndTargetList": [
+        {"sourceMediaType": "message/rfc822",                                "targetMediaType": "text/plain"}
+      ],
+      "transformOptions": [
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java b/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java
similarity index 94%
rename from alfresco-transform-misc/alfresco-transform-misc-spring/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java
rename to alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java
index 3141e96c..b75fc053 100644
--- a/alfresco-transform-misc/alfresco-transform-misc-spring/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java
+++ b/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java
@@ -26,8 +26,11 @@
  */
 package org.alfresco.transformer.transformers;
 
-import static org.alfresco.transformer.transformers.StringExtractingContentTransformer.SOURCE_ENCODING;
-import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Import;
+//import org.springframework.test.context.junit4.SpringRunner;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -36,21 +39,18 @@ import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.context.junit4.SpringRunner;
+import static org.alfresco.transformer.transformers.StringExtractingContentTransformer.SOURCE_ENCODING;
+import static org.junit.Assert.assertEquals;
 
-@RunWith(SpringRunner.class)
-@Import(HtmlParserContentTransformer.class)
+//@RunWith(SpringRunner.class)
+//@Import(HtmlParserContentTransformer.class)
 public class HtmlParserContentTransformerTest
 {
     private static final String SOURCE_MIMETYPE = "text/html";
     private static final String TARGET_MIMETYPE = "text/plain";
 
-    @Autowired
-    HtmlParserContentTransformer transformer;
+//    @Autowired
+    HtmlParserContentTransformer transformer = new HtmlParserContentTransformer();
 
     /**
      * Checks that we correctly handle text in different encodings,
diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java b/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java
similarity index 96%
rename from alfresco-transform-misc/alfresco-transform-misc-spring/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java
rename to alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java
index 70acf5e8..ab5c3204 100644
--- a/alfresco-transform-misc/alfresco-transform-misc-spring/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java
+++ b/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java
@@ -26,8 +26,14 @@
  */
 package org.alfresco.transformer.transformers;
 
-import static org.alfresco.transformer.transformers.TextToPdfContentTransformer.PAGE_LIMIT;
-import static org.junit.Assert.assertEquals;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.text.PDFTextStripper;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Import;
+
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -36,21 +42,15 @@ import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.text.PDFTextStripper;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.context.junit4.SpringRunner;
+import static org.alfresco.transformer.transformers.TextToPdfContentTransformer.PAGE_LIMIT;
+import static org.junit.Assert.assertEquals;
 
-@RunWith(SpringRunner.class)
-@Import(TextToPdfContentTransformer.class)
+//@RunWith(SpringRunner.class)
+//@Import(TextToPdfContentTransformer.class)
 public class TextToPdfContentTransformerTest
 {
-    @Autowired
-    TextToPdfContentTransformer transformer;
+//    @Autowired
+    TextToPdfContentTransformer transformer = new TextToPdfContentTransformer();
 
     @Before
     public void setUp()