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