From 1c6641a5f1171cbff411d5b9348f014312711276 Mon Sep 17 00:00:00 2001 From: alandavis Date: Wed, 27 Jul 2022 11:54:08 +0100 Subject: [PATCH] Save point: [skip ci] * ongoing aio tests --- .../main/resources/application-default.yaml | 21 +++++++++++++++++++ .../transform/aio/AIOImageMagickTest.java | 10 ++++----- .../org/alfresco/transform/aio/AIOTest.java | 12 +++++++++++ .../transform/base/TransformHandler.java | 9 ++++---- .../application-default.yaml | 0 .../org/alfresco/transform/misc/MiscTest.java | 3 +-- 6 files changed, 43 insertions(+), 12 deletions(-) rename engines/libreoffice/src/main/resources/{ => libreoffice}/application-default.yaml (100%) diff --git a/engines/aio/src/main/resources/application-default.yaml b/engines/aio/src/main/resources/application-default.yaml index be48db07..a57aa716 100644 --- a/engines/aio/src/main/resources/application-default.yaml +++ b/engines/aio/src/main/resources/application-default.yaml @@ -1,2 +1,23 @@ queue: engineRequestQueue: ${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.aio.acs} +transform: + core: + version: @project.version@ + pdfrenderer: + exe: ${PDFRENDERER_EXE:/usr/bin/alfresco-pdf-renderer} + libreoffice: + path: ${LIBREOFFICE_HOME:/opt/libreoffice7.2} + maxTasksPerProcess: ${LIBREOFFICE_MAX_TASKS_PER_PROCESS:200} + timeout: ${LIBREOFFICE_TIMEOUT:1200000} + portNumbers: ${LIBREOFFICE_PORT_NUMBERS:8100} + templateProfileDir: ${LIBREOFFICE_TEMPLATE_PROFILE_DIR:} + isEnabled: ${LIBREOFFICE_IS_ENABLED:true} + imagemagick: + root: ${IMAGEMAGICK_ROOT:/usr/lib64/ImageMagick-7.0.10} + dyn: ${IMAGEMAGICK_DYN:/usr/lib64/ImageMagick-7.0.10/lib} + exe: ${IMAGEMAGICK_EXE:/usr/bin/convert} + coders: ${IMAGEMAGICK_CODERS:} + config: ${IMAGEMAGICK_CONFIG:} + tika: + pdfBox: + notExtractBookmarksTextDefault: ${PDFBOX_NOTEXTRACTBOOKMARKS_DEFAULT:false} \ No newline at end of file diff --git a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOImageMagickTest.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOImageMagickTest.java index 922554fa..dbad03eb 100644 --- a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOImageMagickTest.java +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOImageMagickTest.java @@ -43,11 +43,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue; */ public class AIOImageMagickTest extends ImageMagickTest { - @Autowired TransformRegistryImpl transformRegistry; +// @Autowired TransformRegistryImpl transformRegistry; - @BeforeEach @Override - public void before() throws IOException - { +// @BeforeEach @Override +// public void before() throws IOException +// { // ReflectionTestUtils.setField(commandExecutor, "transformCommand", mockTransformCommand); // ReflectionTestUtils.setField(commandExecutor, "checkCommand", mockCheckCommand); // //Need to wire in the mocked commandExecutor into the controller... @@ -55,7 +55,7 @@ public class AIOImageMagickTest extends ImageMagickTest // transformers.replace("imagemagick", commandExecutor); // // mockTransformCommand("jpg", "png", "image/jpeg", true); - } +// } // @Test // @Override diff --git a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOTest.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOTest.java index 9433436f..ccf6923e 100644 --- a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOTest.java +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOTest.java @@ -34,6 +34,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.http.ResponseEntity; +import org.springframework.mock.web.MockMultipartFile; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; import java.io.IOException; @@ -50,6 +52,16 @@ public class AIOTest extends AbstractBaseTest @Autowired private String coreVersion; + @Override + // Add extra required parameters to the request. + protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, + String... params) + { + return super.mockMvcRequest(url, sourceFile, params) + .param("targetMimetype", targetMimetype) + .param("sourceMimetype", sourceMimetype); + } + //@Override protected void mockTransformCommand(String sourceExtension, String targetExtension, String sourceMimetype, boolean readTargetFileBytes) throws IOException diff --git a/engines/base/src/main/java/org/alfresco/transform/base/TransformHandler.java b/engines/base/src/main/java/org/alfresco/transform/base/TransformHandler.java index 8b5fb75d..cf00a760 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/TransformHandler.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/TransformHandler.java @@ -94,7 +94,6 @@ import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; public class TransformHandler { private static final Logger logger = LoggerFactory.getLogger(TransformHandler.class); - private static final List NON_TRANSFORM_OPTION_REQUEST_PARAMETERS = Arrays.asList(SOURCE_EXTENSION, TARGET_EXTENSION, TARGET_MIMETYPE, SOURCE_MIMETYPE, DIRECT_ACCESS_URL); @@ -113,10 +112,10 @@ public class TransformHandler @Autowired private TransformerDebug transformerDebug; - private AtomicInteger httpRequestCount = new AtomicInteger(1); + private final AtomicInteger httpRequestCount = new AtomicInteger(1); private TransformEngine transformEngine; private ProbeTransform probeTransform; - private Map customTransformersByName = new HashMap<>(); + private final Map customTransformersByName = new HashMap<>(); @PostConstruct private void init() @@ -385,8 +384,8 @@ public class TransformHandler public Map cleanTransformOptions(Map requestParameters) { Map transformOptions = new HashMap<>(requestParameters); - transformOptions.keySet().removeAll(NON_TRANSFORM_OPTION_REQUEST_PARAMETERS); - transformOptions.values().removeIf(v -> v.isEmpty()); + NON_TRANSFORM_OPTION_REQUEST_PARAMETERS.forEach(transformOptions.keySet()::remove); + transformOptions.values().removeIf(String::isEmpty); return transformOptions; } diff --git a/engines/libreoffice/src/main/resources/application-default.yaml b/engines/libreoffice/src/main/resources/libreoffice/application-default.yaml similarity index 100% rename from engines/libreoffice/src/main/resources/application-default.yaml rename to engines/libreoffice/src/main/resources/libreoffice/application-default.yaml diff --git a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscTest.java b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscTest.java index 9362b8f8..a005246c 100644 --- a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscTest.java +++ b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscTest.java @@ -96,8 +96,7 @@ public class MiscTest extends AbstractBaseTest protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, String... params) { - final MockHttpServletRequestBuilder builder = super - .mockMvcRequest(url, sourceFile, params) + final MockHttpServletRequestBuilder builder = super.mockMvcRequest(url, sourceFile, params) .param("sourceEncoding", sourceEncoding) .param("targetMimetype", targetMimetype) .param("sourceMimetype", sourceMimetype);