From 421da5f3925b670df054fcee6a1ff734d681e0fb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 00:16:29 +0000 Subject: [PATCH 1/4] Bump license-maven-plugin from 1.20 to 2.0.0 Bumps [license-maven-plugin](https://github.com/mojohaus/license-maven-plugin) from 1.20 to 2.0.0. - [Release notes](https://github.com/mojohaus/license-maven-plugin/releases) - [Commits](https://github.com/mojohaus/license-maven-plugin/compare/license-maven-plugin-1.20...license-maven-plugin-2.0.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce0ceafe..85dceaf0 100644 --- a/pom.xml +++ b/pom.xml @@ -205,7 +205,7 @@ org.codehaus.mojo license-maven-plugin - 1.20 + 2.0.0 2005 Alfresco Software Limited From 34221402b6416031dcdc61cd65025e256ebd0af9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 00:15:54 +0000 Subject: [PATCH 2/4] Bump dependency.pdfbox.version from 2.0.15 to 2.0.16 Bumps `dependency.pdfbox.version` from 2.0.15 to 2.0.16. Updates `pdfbox` from 2.0.15 to 2.0.16 Updates `pdfbox-tools` from 2.0.15 to 2.0.16 Signed-off-by: dependabot-preview[bot] --- alfresco-docker-transform-misc/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/alfresco-docker-transform-misc/pom.xml b/alfresco-docker-transform-misc/pom.xml index ac0a2b63..17d38723 100644 --- a/alfresco-docker-transform-misc/pom.xml +++ b/alfresco-docker-transform-misc/pom.xml @@ -69,7 +69,7 @@ org.apache.pdfbox pdfbox-tools - 2.0.15 + 2.0.16 diff --git a/pom.xml b/pom.xml index 85dceaf0..aac1d345 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.8 latest - 2.0.15 + 2.0.16 7.17 8.39 3.0.1.1 From 4da81d99aac20ad58c42f66ded02e9d54d396db5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 11:41:35 +0000 Subject: [PATCH 3/4] Bump junrar from 1.0.1 to 4.0.0 Bumps [junrar](https://github.com/junrar/junrar) from 1.0.1 to 4.0.0. - [Release notes](https://github.com/junrar/junrar/releases) - [Commits](https://github.com/junrar/junrar/compare/junrar-1.0.1...junrar-4.0.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aac1d345..e2b60fd3 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ com.github.junrar junrar - 1.0.1 + 4.0.0 org.apache.commons From 28158ec48b15e9af9dd7f97e31f753596548d2e5 Mon Sep 17 00:00:00 2001 From: eknizat <26163420+eknizat@users.noreply.github.com> Date: Tue, 2 Jul 2019 10:13:33 +0100 Subject: [PATCH 4/4] REPO-4331: Update target file size check (#66) * REPO-4331: Transformers should not throw an exception when source and target files are empty --- .../transformers/SelectingTransformer.java | 16 +++++++++++++--- .../transformer/MiscControllerTest.java | 19 ++++++++++++++++++- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java b/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java index c3149970..077c2117 100644 --- a/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java +++ b/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; } } diff --git a/alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscControllerTest.java b/alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscControllerTest.java index 66d63619..bdf505b1 100644 --- a/alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscControllerTest.java +++ b/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 {