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

Revert "ATS-702 Remove incorrect error handling"

Browse Source 
This reverts commit e551647327.
This commit is contained in:
David Edwards
2020-04-07 20:23:33 +01:00
parent e551647327
commit dcb32eb73f
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,7 +98,16 @@ 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);
transformer.transform(sourceFile, targetFile, sourceMimetype, targetMimetype, transformOptions);
try
{
transformer.transform(sourceFile, targetFile, sourceMimetype, targetMimetype, transformOptions);
}
catch (Exception e)
{
logger.error(e.getMessage(), e);
}
} }
@@ -118,8 +127,16 @@ 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");
transformer.transform(sourceFile, targetFile, MIMETYPE_HTML, try
MIMETYPE_TEXT_PLAIN, parameters); {
transformer.transform(sourceFile, targetFile, MIMETYPE_HTML,
MIMETYPE_TEXT_PLAIN, parameters);
}
catch(Exception e)
{
logger.error(e.getMessage(), e);
}
} }
}; };
} }
@@ -147,6 +164,8 @@ 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);
// TODO Currently sourceMimetype and targetMimetype could be an empty string how does this affect getting the name?
// not all controllers take these from the request? Do requests intended for these transforms provide these?
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);