From 3245dcc1518e0acb690b42ea74dc8b1c1946e265 Mon Sep 17 00:00:00 2001 From: David Edwards Date: Wed, 8 Apr 2020 09:41:10 +0100 Subject: [PATCH] Revert "Revert "ATS-702/ATS-675 Change exception thrown by tranformers to TransformException"" This reverts commit ab0ab149569d514f03d7ea0620aa2c304065ecdc. --- .../org/alfresco/transformer/AIOController.java | 15 ++------------- .../transformers/AllInOneTransformer.java | 7 +++++-- .../transformers/ImageMagickAdapter.java | 3 ++- .../transformers/LibreOfficeAdapter.java | 3 ++- .../transformer/transformers/MiscAdapter.java | 6 ++++-- .../transformers/PdfRendererAdapter.java | 5 +++-- .../transformer/transformers/TikaAdapter.java | 4 +++- .../transformer/transformers/Transformer.java | 5 +++-- 8 files changed, 24 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 92badbb8..178da5bf 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 @@ -174,19 +174,8 @@ public class AIOController extends AbstractTransformerController debugLogTransform("Performing transform with parameters: ", sourceMimetype, targetMimetype, targetExtension, requestParameters); - try - { - transformer.transform(sourceFile, targetFile, sourceMimetype, targetMimetype, transformOptions); - } - catch (IllegalArgumentException e) - { - throw new TransformException(BAD_REQUEST.value(), e.getMessage(), e); - } - catch (Exception e) - { - throw new TransformException(INTERNAL_SERVER_ERROR.value(), e.getMessage(), e); - } - + transformer.transform(sourceFile, targetFile, sourceMimetype, targetMimetype, transformOptions); + 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 59b7d1c8..94af9ce6 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,8 +26,11 @@ */ 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; @@ -80,14 +83,14 @@ public class AllInOneTransformer implements Transformer @Override public void transform(File sourceFile, File targetFile, String sourceMimetype, String targetMimetype, - Map transformOptions) throws Exception + Map transformOptions) throws TransformException { String transformName = transformOptions.get(TRANSFORM_NAME_PARAMETER); Transformer transformer = transformerTransformMapping.get(transformName); if (transformer == null) { - throw new Exception("No transformer mapping for : transform:" + transformName + " sourceMimetype:" + throw new TransformException(BAD_REQUEST.value(),"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 9b57a22d..fa035b92 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 @@ -50,6 +50,7 @@ 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; @@ -73,7 +74,7 @@ public class ImageMagickAdapter extends AbstractTransformer @Override public void transform(File sourceFile, File targetFile, String sourceMimetype, String targetMimetype, - Map transformOptions) throws Exception + Map transformOptions) throws TransformException { 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 183fbf4d..af138610 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,6 +29,7 @@ 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 @@ -50,7 +51,7 @@ public class LibreOfficeAdapter extends AbstractTransformer @Override public void transform(File sourceFile, File targetFile, String sourceMimetype, String targetMimetype, - Map transformOptions) throws Exception + Map transformOptions) throws TransformException { 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 c397e71a..5e404e8f 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,6 +29,8 @@ 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"; @@ -48,8 +50,8 @@ public class MiscAdapter extends AbstractTransformer } @Override - public void transform(File sourceFile, File targetFile, String sourceMimetype, String targetMimetype, Map transformOptions) throws Exception + public void transform(File sourceFile, File targetFile, String sourceMimetype, String targetMimetype, + Map transformOptions) throws TransformException { 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 7d2b8e69..bd66cc3d 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 @@ -38,6 +38,7 @@ 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; @@ -59,8 +60,8 @@ public class PdfRendererAdapter extends AbstractTransformer } @Override - public void transform(File sourceFile, File targetFile, String sourceMimetype, String targetMimetype, - Map transformOptions) throws Exception + public void transform(File sourceFile, File targetFile, String sourceMimetype, String targetMimetype, + Map transformOptions) throws TransformException { 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 327159e8..9f553612 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,6 +26,7 @@ */ package org.alfresco.transformer.transformers; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.executors.TikaJavaExecutor; import java.io.File; @@ -55,7 +56,8 @@ public class TikaAdapter extends AbstractTransformer } @Override - public void transform(File sourceFile, File targetFile, String sourceMimetype, String targetMimetype, Map transformOptions) throws Exception + public void transform(File sourceFile, File targetFile, String sourceMimetype, String targetMimetype, + Map transformOptions) throws TransformException { 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 8faca730..2bf509bf 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,6 +28,7 @@ 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; @@ -49,10 +50,10 @@ public interface Transformer * @param sourceFile * @param targetFile * @param transformOptions - * @throws Exception + * @throws TransformException - if there was a problem internally */ void transform(File sourceFile, File targetFile, String sourceMimetype, - String targetMimetype, Map transformOptions) throws Exception; + String targetMimetype, Map transformOptions) throws TransformException; /**