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 Merge changes

Browse Source 
[skip ci]
This commit is contained in:
David Edwards
2020-04-08 12:20:08 +01:00
parent 0e9bf13157
commit e00d0c9b71
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,9 +128,9 @@ public class AIOController extends AbstractTransformerController
@PostMapping(value = "/transform", consumes = MULTIPART_FORM_DATA_VALUE) @PostMapping(value = "/transform", consumes = MULTIPART_FORM_DATA_VALUE)
public ResponseEntity<Resource> transform(HttpServletRequest request, public ResponseEntity<Resource> transform(HttpServletRequest request,
@RequestParam("file") MultipartFile sourceMultipartFile, @RequestParam("file") MultipartFile sourceMultipartFile,
@RequestParam(TARGET_EXTENSION) String targetExtension,
@RequestParam(SOURCE_MIMETYPE) String sourceMimetype, @RequestParam(SOURCE_MIMETYPE) String sourceMimetype,
@RequestParam(TARGET_MIMETYPE) String targetMimetype, @RequestParam(TARGET_MIMETYPE) String targetMimetype,
@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)
{ {

12
alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerImageMagickTest.java
View File

@@ -29,7 +29,7 @@ package org.alfresco.transformer;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
import org.alfresco.transformer.transformers.AllInOneTransformer; import org.alfresco.transformer.AIOTransformRegistry;
import org.alfresco.transformer.transformers.ImageMagickAdapter; import org.alfresco.transformer.transformers.ImageMagickAdapter;
import org.alfresco.transformer.transformers.Transformer; import org.alfresco.transformer.transformers.Transformer;
import org.junit.Before; import org.junit.Before;
@@ -54,7 +54,7 @@ public class AIOControllerImageMagickTest extends ImageMagickControllerTestBase
static ImageMagickAdapter adapter; static ImageMagickAdapter adapter;
@Autowired @Autowired
AllInOneTransformer transformer; AIOTransformRegistry transformRegistry;
@SpyBean @SpyBean
AIOController controller; AIOController controller;
@@ -65,7 +65,7 @@ public class AIOControllerImageMagickTest extends ImageMagickControllerTestBase
adapter = new ImageMagickAdapter(); adapter = new ImageMagickAdapter();
} }
@Before @SuppressWarnings("unchecked") @Before
public void before() throws IOException, Exception public void before() throws IOException, Exception
{ {
adapter = new ImageMagickAdapter(); adapter = new ImageMagickAdapter();
@@ -73,11 +73,11 @@ public class AIOControllerImageMagickTest extends ImageMagickControllerTestBase
ReflectionTestUtils.setField(commandExecutor, "checkCommand", mockCheckCommand); ReflectionTestUtils.setField(commandExecutor, "checkCommand", mockCheckCommand);
ReflectionTestUtils.setField(adapter, "commandExecutor", commandExecutor); ReflectionTestUtils.setField(adapter, "commandExecutor", commandExecutor);
//Need to wire in the mocked adpater into the controller... //Need to wire in the mocked adpater into the controller...
if (ReflectionTestUtils.getField(transformer,"transformerTransformMapping") instanceof Map) if (ReflectionTestUtils.getField(transformRegistry,"transformerTransformMapping") instanceof Map)
{ {
Map<String,Transformer> transformers = (Map<String,Transformer>)ReflectionTestUtils.getField(transformer,"transformerTransformMapping"); Map<String,Transformer> transformers = transformRegistry.getTransformerTransformMapping();
transformers.replace("imagemagick", adapter); transformers.replace("imagemagick", adapter);
ReflectionTestUtils.setField(transformer, "transformerTransformMapping", transformers); ReflectionTestUtils.setField(transformRegistry, "transformerTransformMapping", transformers);
} }
mockTransformCommand("jpg", "png", "image/jpeg", true); mockTransformCommand("jpg", "png", "image/jpeg", true);

4
alfresco-transform-tika/alfresco-transform-tika/pom.xml
View File

@@ -49,6 +49,10 @@
<groupId>org.quartz-scheduler</groupId> <groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId> <artifactId>quartz</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>