inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-07-31 17:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

ATS-702 Fix error handling

Browse Source
This commit is contained in:
David Edwards
2020-04-08 12:35:46 +01:00
parent e00d0c9b71
commit e30cb5fda6
1 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java
View File

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