Merge remote-tracking branch 'origin/master'

alfresco-docker-transform-misc/pom.xml

@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>pdfbox-tools</artifactId>
-            <version>2.0.15</version>
+            <version>2.0.16</version>
         </dependency>
 
         <!-- OOXMLThumbnailContentTransformer -->

alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java

@@ -63,7 +63,7 @@ public class SelectingTransformer
         transformers.add(new HtmlParserContentTransformer());
         transformers.add(new StringExtractingContentTransformer());
         transformers.add(new TextToPdfContentTransformer());
-//        transformers.add(new OOXMLThumbnailContentTransformer()); // Doesn't work with java 11, comment put and disabled test
+//        transformers.add(new OOXMLThumbnailContentTransformer()); // Doesn't work with java 11, transformer and test disabled
     }
 
     /**
@@ -90,10 +90,15 @@ public class SelectingTransformer
         {
             throw new TransformException(INTERNAL_SERVER_ERROR.value(), getMessage(e));
         }
-        if (!targetFile.exists() || targetFile.length() == 0)
+        if (!targetFile.exists())
         {
             throw new TransformException(INTERNAL_SERVER_ERROR.value(),
-                    "Transformer failed to create an output file");
+                    "Transformer failed to create an output file. Target file does not exist.");
+        }
+        if (sourceFile.length() > 0 && targetFile.length() == 0)
+        {
+            throw new TransformException(INTERNAL_SERVER_ERROR.value(),
+                    "Transformer failed to create an output file. Target file is empty but source file was not empty.");
         }
     }
 
@@ -104,6 +109,11 @@ public class SelectingTransformer
         {
             if (transformer.isTransformable(sourceMimetype, targetMimetype, parameters))
             {
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Using " + transformer.getClass().getName()
+                            + " to transform from " + sourceMimetype + " to " + targetMimetype );
+                }
                 return transformer;
             }
         }

alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscControllerTest.java

@@ -155,7 +155,7 @@ public class MiscControllerTest extends AbstractTransformerControllerTest
     }
 
     @Test
-    public void testStringtoString() throws Exception
+    public void testStringToString() throws Exception
     {
         String expected = null;
         byte[] content = null;
@@ -181,6 +181,23 @@ public class MiscControllerTest extends AbstractTransformerControllerTest
         assertTrue("The content did not include \""+expected, contentResult.contains(expected));
     }
 
+    @Test
+    public void testEmptyTextFileReturnsEmptyFile() throws Exception
+    {
+        // Use empty content to create an empty source file
+        byte[] content  = new byte[0];
+
+        MvcResult result = sendText("txt",
+                "UTF-8",
+                MIMETYPE_TEXT_PLAIN,
+                "txt",
+                MIMETYPE_TEXT_PLAIN,
+                "UTF-8",
+                content);
+
+        assertEquals("Returned content should be empty for an empty source file", 0, result.getResponse().getContentLength());
+    }
+
     @Test
     public void textToPdf() throws Exception
     {

pom.xml

@@ -18,7 +18,7 @@
     <properties>
         <java.version>1.8</java.version>
         <image.tag>latest</image.tag>
-        <dependency.pdfbox.version>2.0.15</dependency.pdfbox.version>
+        <dependency.pdfbox.version>2.0.16</dependency.pdfbox.version>
         <dependency.alfresco-core.version>7.17</dependency.alfresco-core.version>
         <dependency.alfresco-data-model.version>8.39</dependency.alfresco-data-model.version>
         <dependency.alfresco-jodconverter-core.version>3.0.1.1</dependency.alfresco-jodconverter-core.version>
@@ -150,7 +150,7 @@
             <dependency>
                 <groupId>com.github.junrar</groupId>
                 <artifactId>junrar</artifactId>
-                <version>1.0.1</version>
+                <version>4.0.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -206,7 +206,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>license-maven-plugin</artifactId>
-                    <version>1.20</version>
+                    <version>2.0.0</version>
                     <configuration>
                         <inceptionYear>2005</inceptionYear>
                         <organizationName>Alfresco Software Limited</organizationName>