Save point: [skip ci]

* ongoing aio tests

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}

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
+//    @BeforeEach @Override
-    public void before() throws IOException
+//    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

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

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<String> 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<String, CustomTransformer> customTransformersByName = new HashMap<>();
+    private final Map<String, CustomTransformer> customTransformersByName = new HashMap<>();
 
     @PostConstruct
     private void init()
@@ -385,8 +384,8 @@ public class TransformHandler
     public Map<String, String> cleanTransformOptions(Map<String, String> requestParameters)
     {
         Map<String, String> transformOptions = new HashMap<>(requestParameters);
-        transformOptions.keySet().removeAll(NON_TRANSFORM_OPTION_REQUEST_PARAMETERS);
+        NON_TRANSFORM_OPTION_REQUEST_PARAMETERS.forEach(transformOptions.keySet()::remove);
-        transformOptions.values().removeIf(v -> v.isEmpty());
+        transformOptions.values().removeIf(String::isEmpty);
         return transformOptions;
     }
 

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
+        final MockHttpServletRequestBuilder builder = super.mockMvcRequest(url, sourceFile, params)
-            .mockMvcRequest(url, sourceFile, params)
             .param("sourceEncoding", sourceEncoding)
             .param("targetMimetype", targetMimetype)
             .param("sourceMimetype", sourceMimetype);