From f5bacf92af990b6cebbeb53f190fd42d078f93d3 Mon Sep 17 00:00:00 2001 From: David Edwards Date: Wed, 8 Apr 2020 09:44:30 +0100 Subject: [PATCH] Revert "Revert "ATS-702 Remove incorrect error handling"" This reverts commit dcb32eb73fd925d07ffe2b6129bf4dc24147171b. --- .../alfresco/transformer/AIOController.java | 27 +++---------------- 1 file changed, 3 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 178da5bf..824bc12d 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 @@ -95,19 +95,7 @@ public class AIOController extends AbstractTransformerController final String transform = getTransformerName(sourceFile, sourceMimetype, targetMimetype, transformOptions); transformOptions.put(AllInOneTransformer.TRANSFORM_NAME_PARAMETER, transform); - 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); } @@ -127,16 +115,8 @@ public class AIOController extends AbstractTransformerController Map parameters = new HashMap<>(); parameters.put(AllInOneTransformer.TRANSFORM_NAME_PARAMETER, "misc"); parameters.put(SOURCE_ENCODING, "UTF-8"); - try - { - transformer.transform(sourceFile, targetFile, MIMETYPE_HTML, - MIMETYPE_TEXT_PLAIN, parameters); - } - catch(Exception e) - { - throw new TransformException(INTERNAL_SERVER_ERROR.value(), e.getMessage(), e); - } - + transformer.transform(sourceFile, targetFile, MIMETYPE_HTML, + MIMETYPE_TEXT_PLAIN, parameters); } }; } @@ -167,7 +147,6 @@ public class AIOController extends AbstractTransformerController final File sourceFile = createSourceFile(request, sourceMultipartFile); final File targetFile = createTargetFile(request, targetFilename); - final String transform = getTransformerName(sourceFile, sourceMimetype, targetMimetype, transformOptions); transformOptions.put(AllInOneTransformer.TRANSFORM_NAME_PARAMETER, transform);