Save point: [skip ci]

* libreoffice

engines/base/src/main/java/org/alfresco/transform/base/TransformHandler.java

@@ -516,7 +516,7 @@ public class TransformHandler
                 throw new TransformException(BAD_REQUEST, "No transforms were able to handle the request: "+
                         sourceMimetype+" -> "+targetMimetype+transformOptions.entrySet().stream()
                             .map(entry -> entry.getKey()+"="+entry.getValue())
-                            .collect(Collectors.joining(", ", " with ", "")));
+                            .collect(Collectors.joining(", ", " ", "")));
             }
             return transformerName;
         }

engines/base/src/main/java/org/alfresco/transform/base/TransformRegistryImpl.java

@@ -32,7 +32,6 @@ import org.alfresco.transform.registry.TransformCache;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 
 import javax.annotation.PostConstruct;
 import java.util.Comparator;

engines/base/src/main/java/org/alfresco/transform/base/executors/JavaExecutor.java

@@ -0,0 +1,40 @@
+/*
+ * #%L
+ * Alfresco Transform Core
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * -
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ * -
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * -
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * -
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.transform.base.executors;
+
+import java.io.File;
+
+/**
+ * Basic interface for executing transformations inside Java/JVM.
+ *
+ * @author Cezar Leahu
+ * @author adavis
+ */
+public interface JavaExecutor
+{
+    void call(File sourceFile, File targetFile, String... args) throws Exception;
+}

engines/base/src/test/java/org/alfresco/transform/base/AbstractBaseTest.java

@@ -28,6 +28,8 @@ package org.alfresco.transform.base;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.alfresco.transform.base.clients.AlfrescoSharedFileStoreClient;
+import org.alfresco.transform.base.executors.CommandExecutor;
+import org.alfresco.transform.base.executors.RuntimeExec;
 import org.alfresco.transform.base.model.FileRefEntity;
 import org.alfresco.transform.base.model.FileRefResponse;
 import org.alfresco.transform.base.probes.ProbeTransform;
@@ -42,6 +44,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
@@ -68,7 +71,6 @@ import static org.springframework.http.HttpHeaders.ACCEPT;
 import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
 import static org.springframework.http.HttpStatus.BAD_REQUEST;
 import static org.springframework.http.HttpStatus.CREATED;
-import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
@@ -86,6 +88,8 @@ public abstract class AbstractBaseTest
     @TempDir
     public File tempDir;
 
+    @Autowired
+    protected TransformHandler transformHandler;
     @Autowired
     protected TransformController controller;
 
@@ -125,43 +129,32 @@ public abstract class AbstractBaseTest
     protected byte[] expectedTargetFileBytes;
 
     // Called by sub class
+    private CommandExecutor commandExecutor;
+    private RuntimeExec origTransformCommand;
+    private RuntimeExec origCheckCommand;
+
+    protected void setMockExternalCommandsOnTransformer(CommandExecutor commandExecutor, RuntimeExec mockTransformCommand,
+        RuntimeExec mockCheckCommand)
+    {
+        this.commandExecutor = commandExecutor;
+        origTransformCommand = (RuntimeExec) ReflectionTestUtils.getField(commandExecutor, "transformCommand");
+        origCheckCommand = (RuntimeExec) ReflectionTestUtils.getField(commandExecutor, "transformCommand");
+        ReflectionTestUtils.setField(commandExecutor, "transformCommand", mockTransformCommand);
+        ReflectionTestUtils.setField(commandExecutor, "checkCommand", mockCheckCommand);
+    }
+
+    protected void resetExternalCommandsOnTransformer()
+    {
+        ReflectionTestUtils.setField(commandExecutor, "transformCommand", origTransformCommand);
+        ReflectionTestUtils.setField(commandExecutor, "checkCommand", origCheckCommand);
+    }
+
     protected abstract void mockTransformCommand(String sourceExtension,
         String targetExtension, String sourceMimetype,
         boolean readTargetFileBytes) throws IOException;
 
-    protected ProbeTransform getProbeTestTransform()
-    {
-        return controller.probeTransform;
-    }
-
     protected abstract void updateTransformRequestWithSpecificOptions(TransformRequest transformRequest);
 
-//    static void assertConfig(String url, String expectedTransformers, String expectedOptions,
-//        MockMvc mockMvc, ObjectMapper objectMapper) throws Exception
-//    {
-//        TransformConfig config = objectMapper.readValue(
-//            mockMvc.perform(MockMvcRequestBuilders.get(url))
-//                   .andExpect(status().isOk())
-//                   .andExpect(header().string(CONTENT_TYPE, APPLICATION_JSON_VALUE))
-//                   .andReturn()
-//                   .getResponse()
-//                   .getContentAsString(), TransformConfig.class);
-//
-//        // Gets a list of transformerNames,coreVersion,optionNames
-//        assertEquals(expectedTransformers,
-//            config.getTransformers().stream()
-//                  .map(t -> t.getTransformerName()+","
-//                                +t.getCoreVersion()+","
-//                                +t.getTransformOptions().stream().sorted().collect(Collectors.joining(",")))
-//                  .sorted()
-//                  .collect(Collectors.joining("\n")));
-//
-//        assertEquals(expectedOptions,
-//            config.getTransformOptions().keySet().stream()
-//                  .sorted()
-//                  .collect(Collectors.joining(",")));
-//    }
-//
     /**
      * This method ends up being the core of the mock.
      * It copies content from an existing file in the resources folder to the desired location
@@ -301,14 +294,6 @@ public abstract class AbstractBaseTest
     }
 
     @Test
-    public void noTargetFileTest() throws Exception
-    {
-        mockMvc.perform(mockMvcRequest(ENDPOINT_TRANSFORM, sourceFile, "targetExtension", "xxx"))
-               .andExpect(status().is(INTERNAL_SERVER_ERROR.value()));
-    }
-
-    @Test
-    // Looks dangerous but is okay as we only use the final filename
     public void dotDotSourceFilenameTest() throws Exception
     {
         sourceFile = new MockMultipartFile("file", "../quick." + sourceExtension, sourceMimetype, sourceFileBytes);