From ab0ab149569d514f03d7ea0620aa2c304065ecdc Mon Sep 17 00:00:00 2001 From: David Edwards Date: Tue, 7 Apr 2020 20:23:44 +0100 Subject: [PATCH] Revert "ATS-702/ATS-675 Change exception thrown by tranformers to TransformException" This reverts commit 401fe68a5709a4804dd1b045d019d7ec9259cdfb. --- .../java/org/alfresco/transformer/AIOController.java | 12 ++++++++++-- .../transformers/AllInOneTransformer.java | 7 ++----- .../transformer/transformers/ImageMagickAdapter.java | 3 +-- .../transformer/transformers/LibreOfficeAdapter.java | 3 +-- .../transformer/transformers/MiscAdapter.java | 6 ++---- .../transformer/transformers/PdfRendererAdapter.java | 5 ++--- .../transformer/transformers/TikaAdapter.java | 4 +--- .../transformer/transformers/Transformer.java | 5 ++--- 8 files changed, 21 insertions(+), 24 deletions(-) diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java index e7ca3684..93b79ec0 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java @@ -173,8 +173,16 @@ public class AIOController extends AbstractTransformerController // TODO - remove this logginng debugLogTransform("After filtering props request with: ", sourceMimetype, targetMimetype, transformOptions); - transformer.transform(sourceFile, targetFile, sourceMimetype, targetMimetype, transformOptions); - + try + { + transformer.transform(sourceFile, targetFile, sourceMimetype, targetMimetype, transformOptions); + } + catch (Exception e) + { + logger.error(e.getMessage(), e); + } + + final ResponseEntity body = createAttachment(targetFilename, targetFile); LogEntry.setTargetSize(targetFile.length()); long time = LogEntry.setStatusCodeAndMessage(OK.value(), "Success"); diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/AllInOneTransformer.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/AllInOneTransformer.java index 94af9ce6..59b7d1c8 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/AllInOneTransformer.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/AllInOneTransformer.java @@ -26,11 +26,8 @@ */ package org.alfresco.transformer.transformers; -import static org.springframework.http.HttpStatus.BAD_REQUEST; - import org.alfresco.transform.client.model.config.TransformConfig; import org.alfresco.transform.client.model.config.TransformOption; -import org.alfresco.transform.exceptions.TransformException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -83,14 +80,14 @@ public class AllInOneTransformer implements Transformer @Override public void transform(File sourceFile, File targetFile, String sourceMimetype, String targetMimetype, - Map transformOptions) throws TransformException + Map transformOptions) throws Exception { String transformName = transformOptions.get(TRANSFORM_NAME_PARAMETER); Transformer transformer = transformerTransformMapping.get(transformName); if (transformer == null) { - throw new TransformException(BAD_REQUEST.value(),"No transformer mapping for : transform:" + transformName + " sourceMimetype:" + throw new Exception("No transformer mapping for : transform:" + transformName + " sourceMimetype:" + sourceMimetype + " targetMimetype:" + targetMimetype); } diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/ImageMagickAdapter.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/ImageMagickAdapter.java index d1900b7a..7935131d 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/ImageMagickAdapter.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/ImageMagickAdapter.java @@ -32,7 +32,6 @@ import static org.alfresco.transformer.util.Util.stringToLong; import java.io.File; import java.util.Map; -import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.ImageMagickOptionsBuilder; import org.alfresco.transformer.executors.ImageMagickCommandExecutor; @@ -77,7 +76,7 @@ public class ImageMagickAdapter extends AbstractTransformer @Override public void transform(File sourceFile, File targetFile, String sourceMimetype, String targetMimetype, - Map transformOptions) throws TransformException + Map transformOptions) throws Exception { final String options = ImageMagickOptionsBuilder diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/LibreOfficeAdapter.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/LibreOfficeAdapter.java index af138610..183fbf4d 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/LibreOfficeAdapter.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/LibreOfficeAdapter.java @@ -29,7 +29,6 @@ package org.alfresco.transformer.transformers; import java.io.File; import java.util.Map; -import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.executors.LibreOfficeJavaExecutor; public class LibreOfficeAdapter extends AbstractTransformer @@ -51,7 +50,7 @@ public class LibreOfficeAdapter extends AbstractTransformer @Override public void transform(File sourceFile, File targetFile, String sourceMimetype, String targetMimetype, - Map transformOptions) throws TransformException + Map transformOptions) throws Exception { javaExecutor.call(sourceFile, targetFile); } diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/MiscAdapter.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/MiscAdapter.java index 5e404e8f..c397e71a 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/MiscAdapter.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/MiscAdapter.java @@ -29,8 +29,6 @@ package org.alfresco.transformer.transformers; import java.io.File; import java.util.Map; -import org.alfresco.transform.exceptions.TransformException; - public class MiscAdapter extends AbstractTransformer { private static final String CONFIG_PREFIX = "misc"; @@ -50,8 +48,8 @@ public class MiscAdapter extends AbstractTransformer } @Override - public void transform(File sourceFile, File targetFile, String sourceMimetype, String targetMimetype, - Map transformOptions) throws TransformException + public void transform(File sourceFile, File targetFile, String sourceMimetype, String targetMimetype, Map transformOptions) throws Exception { String transformerName = transformOptions.get(TRANSFORM_NAME_PARAMETER); miscSelectingTransformer.transform(transformerName, sourceFile, targetFile, diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/PdfRendererAdapter.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/PdfRendererAdapter.java index 5dfdde07..f4514645 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/PdfRendererAdapter.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/PdfRendererAdapter.java @@ -32,7 +32,6 @@ import java.io.File; import java.util.Map; import org.alfresco.transformer.executors.PdfRendererCommandExecutor; -import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.PdfRendererOptionsBuilder; @@ -63,8 +62,8 @@ public class PdfRendererAdapter extends AbstractTransformer } @Override - public void transform(File sourceFile, File targetFile, String sourceMimetype, String targetMimetype, - Map transformOptions) throws TransformException + public void transform(File sourceFile, File targetFile, String sourceMimetype, String targetMimetype, + Map transformOptions) throws Exception { final String options = PdfRendererOptionsBuilder diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/TikaAdapter.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/TikaAdapter.java index 9f553612..327159e8 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/TikaAdapter.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/TikaAdapter.java @@ -26,7 +26,6 @@ */ package org.alfresco.transformer.transformers; -import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.executors.TikaJavaExecutor; import java.io.File; @@ -56,8 +55,7 @@ public class TikaAdapter extends AbstractTransformer } @Override - public void transform(File sourceFile, File targetFile, String sourceMimetype, String targetMimetype, - Map transformOptions) throws TransformException + public void transform(File sourceFile, File targetFile, String sourceMimetype, String targetMimetype, Map transformOptions) throws Exception { final String transform = transformOptions.get(TRANSFORM_NAME_PARAMETER); diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/Transformer.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/Transformer.java index dff2c456..0233f2fc 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/Transformer.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/Transformer.java @@ -28,7 +28,6 @@ package org.alfresco.transformer.transformers; import org.alfresco.transform.client.model.config.TransformConfig; -import org.alfresco.transform.exceptions.TransformException; import java.io.File; import java.util.Map; @@ -59,10 +58,10 @@ public interface Transformer * @param sourceFile * @param targetFile * @param transformOptions - * @throws TransformException - if there was a problem internally + * @throws Exception */ void transform(File sourceFile, File targetFile, String sourceMimetype, - String targetMimetype, Map transformOptions) throws TransformException; + String targetMimetype, Map transformOptions) throws Exception; /**