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

ATS-731: Remove depreciated workaround

Browse Source
This commit is contained in:
kristian
2020-05-20 16:53:17 +01:00
parent 24e9328b86
commit 82de937e73
1 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,14 +71,6 @@ 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;
@@ -135,11 +127,7 @@ public class AIOController extends AbstractTransformerController
@RequestParam(SOURCE_MIMETYPE) String sourceMimetype, @RequestParam(SOURCE_MIMETYPE) String sourceMimetype,
@RequestParam(TARGET_MIMETYPE) String targetMimetype, @RequestParam(TARGET_MIMETYPE) String targetMimetype,
@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)
{ {
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
@@ -149,7 +137,7 @@ public class AIOController extends AbstractTransformerController
//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, TRANSFORM_NAME_PROPERTY); SOURCE_MIMETYPE, TEST_DELAY);
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());
@@ -164,17 +152,7 @@ public class AIOController extends AbstractTransformerController
getProbeTestTransform().incrementTransformerCount(); getProbeTestTransform().incrementTransformerCount();
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())
{
transform = getTransformerName(sourceFile, sourceMimetype, targetMimetype, transformOptions);
}
else if (logger.isDebugEnabled())
{
logger.debug("Using transform name provided in the request: " + requestTransformName);
}
transformInternal(transform, sourceFile, targetFile, sourceMimetype, targetMimetype, transformOptions); transformInternal(transform, sourceFile, targetFile, sourceMimetype, targetMimetype, transformOptions);
final ResponseEntity<Resource> body = createAttachment(targetFilename, targetFile); final ResponseEntity<Resource> body = createAttachment(targetFilename, targetFile);