Log combined messages

Author: BartChris

Kitodo-Command/src/main/java/org/kitodo/command/Command.java

@@ -17,6 +17,8 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Scanner;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -47,15 +49,17 @@ public CommandResult runCommand(String command) {
                     InputStream errorInputStream = process.getErrorStream()) {
                 List<String> outputMessage = inputStreamArrayToList(inputStream);
                 List<String> errorMessage = inputStreamArrayToList(errorInputStream);
+                List<String> combinedMessages = Stream.concat(outputMessage.stream(), errorMessage.stream())
+                        .collect(Collectors.toList());
                 int errCode = process.waitFor();
                 if (Integer.valueOf(errCode).equals(0)) {
                     commandResult = new CommandResult(command, true, outputMessage);
                     logger.info("Execution of Command {} was successful!: {}",
-                            commandResult.getCommand(), commandResult.getMessages());
+                            commandResult.getCommand(), combinedMessages);
                 } else {
                     commandResult = new CommandResult(command, false, errorMessage);
                     logger.error("Execution of Command {} failed!: {}",
-                            commandResult.getCommand(), commandResult.getMessages());
+                            commandResult.getCommand(), combinedMessages);
                 }
             }
         } catch (InterruptedException e) {