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

ATS-707: add transformName override (#228) [trigger release]

Browse Source 
* Provide a way for Legacy ACS transformers to specify the transform to perform
This commit is contained in:
eknizat 2020-04-20 13:47:22 +01:00 committed by GitHub
parent 205d1c76ec
commit 23e837609b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,6 +71,14 @@ public class AIOController extends AbstractTransformerController
{ {
private static final Logger logger = LoggerFactory.getLogger(AIOController.class); private static final Logger logger = LoggerFactory.getLogger(AIOController.class);
// This property can be sent by acs repository's legacy transformers to force a transform,
// instead of letting this T-Engine determine it based on the request parameters.
// This allows clients to specify transform names as they appear in the engine config files, for example:
// imagemagick, libreoffice, PdfBox, TikaAuto, ....
// See ATS-731.
@Deprecated
private static final String TRANSFORM_NAME_PROPERTY = "transformName";
@Autowired @Autowired
private AIOTransformRegistry transformRegistry; private AIOTransformRegistry transformRegistry;
@ -122,14 +130,17 @@ public class AIOController extends AbstractTransformerController
@RequestParam(TARGET_MIMETYPE) String targetMimetype, @RequestParam(TARGET_MIMETYPE) String targetMimetype,
@RequestParam(TARGET_EXTENSION) String targetExtension, @RequestParam(TARGET_EXTENSION) String targetExtension,
@RequestParam Map<String, String> requestParameters, @RequestParam Map<String, String> requestParameters,
@RequestParam (value = TEST_DELAY, required = false) Long testDelay) @RequestParam (value = TEST_DELAY, required = false) Long testDelay,
{
// The TRANSFORM_NAME_PROPERTY param allows ACS legacy transformers to specify which transform to use,
// It can be removed once legacy transformers are removed from ACS.
@RequestParam (value = TRANSFORM_NAME_PROPERTY, required = false) String requestTransformName)
{
debugLogTransform("Request parameters: ", sourceMimetype, targetMimetype, targetExtension, requestParameters); debugLogTransform("Request parameters: ", sourceMimetype, targetMimetype, targetExtension, requestParameters);
//Remove all required parameters from request parameters to get the list of options //Remove all required parameters from request parameters to get the list of options
List<String> optionsToFilter = Arrays.asList(SOURCE_EXTENSION, TARGET_EXTENSION, TARGET_MIMETYPE, List<String> optionsToFilter = Arrays.asList(SOURCE_EXTENSION, TARGET_EXTENSION, TARGET_MIMETYPE,
SOURCE_MIMETYPE, TEST_DELAY); SOURCE_MIMETYPE, TEST_DELAY, TRANSFORM_NAME_PROPERTY);
Map<String, String> transformOptions = new HashMap<>(requestParameters); Map<String, String> transformOptions = new HashMap<>(requestParameters);
transformOptions.keySet().removeAll(optionsToFilter); transformOptions.keySet().removeAll(optionsToFilter);
transformOptions.values().removeIf(v -> v.isEmpty()); transformOptions.values().removeIf(v -> v.isEmpty());
@ -140,7 +151,21 @@ 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); // Check if transformName was provided in the request (this can happen for ACS legacy transformers)
String transform = requestTransformName;
if (transform == null || transform.isEmpty())
{
if (logger.isDebugEnabled())
{
logger.debug("Using engine config to determine the transform name.");
}
transform = getTransformerName(sourceFile, sourceMimetype, targetMimetype, transformOptions);
}
else if (logger.isDebugEnabled())
{
logger.debug("Using transform name provided by the request.");
}
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);