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

Revert "Revert "Revert "ATS-702 Remove incorrect error handling"""

Browse Source 
This reverts commit f5bacf92af.
This commit is contained in:
David Edwards
2020-04-08 11:27:47 +01:00
parent 8295c71cd4
commit b656d3bfb8
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,7 +95,19 @@ public class AIOController extends AbstractTransformerController
final String transform = getTransformerName(sourceFile, sourceMimetype, targetMimetype, transformOptions); final String transform = getTransformerName(sourceFile, sourceMimetype, targetMimetype, transformOptions);
transformOptions.put(AllInOneTransformer.TRANSFORM_NAME_PARAMETER, transform); transformOptions.put(AllInOneTransformer.TRANSFORM_NAME_PARAMETER, transform);
try
{
transformer.transform(sourceFile, targetFile, sourceMimetype, targetMimetype, transformOptions); 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,9 +127,17 @@ public class AIOController extends AbstractTransformerController
Map<String, String> parameters = new HashMap<>(); Map<String, String> parameters = new HashMap<>();
parameters.put(AllInOneTransformer.TRANSFORM_NAME_PARAMETER, "misc"); parameters.put(AllInOneTransformer.TRANSFORM_NAME_PARAMETER, "misc");
parameters.put(SOURCE_ENCODING, "UTF-8"); parameters.put(SOURCE_ENCODING, "UTF-8");
try
{
transformer.transform(sourceFile, targetFile, MIMETYPE_HTML, transformer.transform(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);
}
}
}; };
} }
@@ -147,6 +167,7 @@ public class AIOController extends AbstractTransformerController
final File sourceFile = createSourceFile(request, sourceMultipartFile); final File sourceFile = createSourceFile(request, sourceMultipartFile);
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);
transformOptions.put(AllInOneTransformer.TRANSFORM_NAME_PARAMETER, transform); transformOptions.put(AllInOneTransformer.TRANSFORM_NAME_PARAMETER, transform);