From e30cb5fda6ba2ae09c91ef61e69cba4689bcc8d9 Mon Sep 17 00:00:00 2001
From: David Edwards <david.edwards@alfresco.com>
Date: Wed, 8 Apr 2020 12:35:46 +0100
Subject: [PATCH] ATS-702 Fix error handling

---
 .../alfresco/transformer/AIOController.java   | 37 ++++++++-----------
 1 file changed, 15 insertions(+), 22 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 d17c8e0d..980fb08c 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
@@ -111,15 +111,9 @@ public class AIOController extends AbstractTransformerController
             {
                 Map<String, String> parameters = new HashMap<>();
                 parameters.put(SOURCE_ENCODING, "UTF-8");
-                try
-                {
-                    transformInternal( "misc", sourceFile, targetFile, MIMETYPE_HTML,
+                transformInternal( "misc", sourceFile, targetFile, MIMETYPE_HTML,
                             MIMETYPE_TEXT_PLAIN, parameters);
-                }
-                catch(Exception e)
-                {
-                    throw new TransformException(INTERNAL_SERVER_ERROR.value(), e.getMessage(), e);
-                }
+            
                 
             }
         };
@@ -152,20 +146,11 @@ public class AIOController extends AbstractTransformerController
         final File targetFile = createTargetFile(request, targetFilename);
 
         final String transform = getTransformerName(sourceFile, sourceMimetype, targetMimetype, transformOptions);
-        try 
-        {
-            debugLogTransform("Performing transform with parameters: ", sourceMimetype, targetMimetype,
-                    targetExtension, transformOptions);
-            transformInternal(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);
-        }
+        debugLogTransform("Performing transform with parameters: ", sourceMimetype, targetMimetype,
+                targetExtension, transformOptions);
+        transformInternal(transform, sourceFile, targetFile, sourceMimetype, targetMimetype, transformOptions);
+
+
 
         final ResponseEntity<Resource> body = createAttachment(targetFilename, targetFile);
         LogEntry.setTargetSize(targetFile.length());
@@ -229,6 +214,14 @@ public class AIOController extends AbstractTransformerController
             transformer.transform(sourceFile, targetFile, sourceMimetype, targetMimetype, optionsWithTransformName);
 
         }
+        catch (TransformException e)
+        {
+            throw e;
+        }
+        catch (IllegalArgumentException e)
+        {
+            throw new TransformException(BAD_REQUEST.value(), e.getMessage(), e);
+        }
         catch (Exception e)
         {
             throw new TransformException(INTERNAL_SERVER_ERROR.value(), "Failed transform - transform:"