Create Utilities class

Author: abhargav-mw

src/main/java/com/mathworks/ci/RunMatlabTestsBuilder.java

@@ -15,7 +15,6 @@
 import java.util.ArrayList;
 import java.util.Optional;
 import java.util.Arrays;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import hudson.EnvVars;
@@ -283,15 +282,6 @@ public String constructCommandForTest(FilePath scriptPath) {
         return runCommand;
     }
 
-    private String getCellArrayFrmList(List<String> listOfStr){
-        // Ignore empty string values in the list
-        Predicate<String> isEmpty = String::isEmpty;
-        Predicate<String> isNotEmpty = isEmpty.negate();
-        List<String> filteredListOfStr = listOfStr.stream().filter(isNotEmpty).collect(Collectors.toList());
-        filteredListOfStr.replaceAll(val -> "'" + val.replaceAll("'", "''") + "'");
-        return "{" + String.join(",", filteredListOfStr) + "}";
-    }
-
     // Concatenate the input arguments
     private String getInputArguments() {
 
@@ -311,10 +301,13 @@ private String getInputArguments() {
 
         args.forEach((key, val) -> inputArgsList.add("'" + key + "'" + "," + "'" + val + "'"));
 
-        // Add source folder options to argument
+        /*
+        * Add source folder options to argument.
+        * For source folder we create a MATLAB cell array and add it to input argument list.
+        * */
         SourceFolder sf = getSourceFolder();
         if(sf != null && !sf.getSourceFolderPaths().isEmpty()){
-            sf.addSourceToInputArgs(inputArgsList, getCellArrayFrmList(sf.getSourceFolderPaths().stream()
+            sf.addSourceToInputArgs(inputArgsList, Utilities.getCellArrayFrmList(sf.getSourceFolderPaths().stream()
                     .map(SourceFolderPaths::getSrcFolderPath)
                     .collect(Collectors.toList())));
         }

src/main/java/com/mathworks/ci/RunMatlabTestsStep.java

@@ -9,9 +9,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
 import org.jenkinsci.plugins.workflow.steps.Step;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
 import org.jenkinsci.plugins.workflow.steps.StepDescriptor;
@@ -157,17 +154,8 @@ private Map<String, String> getGenscriptArgs() {
         args.put("CoberturaCodeCoverage", getCodeCoverageCobertura());
         args.put("CoberturaModelCoverage", getModelCoverageCobertura());
         if(!getSourceFolder().isEmpty()){
-            args.put("SourceFolder", getCellArrayFrmList(getSourceFolder()));
+            args.put("SourceFolder", Utilities.getCellArrayFrmList(getSourceFolder()));
         }
         return args;
     }
-
-    private String getCellArrayFrmList(List<String> listOfStr){
-        // Ignore empty string values in the list
-        Predicate<String> isEmpty = String::isEmpty;
-        Predicate<String> isNotEmpty = isEmpty.negate();
-        List<String> filteredListOfStr = listOfStr.stream().filter(isNotEmpty).collect(Collectors.toList());
-        filteredListOfStr.replaceAll(val -> "'" + val.replaceAll("'", "''") + "'");
-        return "{" + String.join(",", filteredListOfStr) + "}";
-    }
 }

src/main/java/com/mathworks/ci/Utilities.java

@@ -0,0 +1,26 @@
+package com.mathworks.ci;
+
+/**
+ * Copyright 2020 The MathWorks, Inc.
+ *
+ * Utility class for common methods.
+ *
+ */
+
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+public class Utilities {
+
+    public static String getCellArrayFrmList(List<String> listOfStr){
+        // Ignore empty string values in the list
+        Predicate<String> isEmpty = String::isEmpty;
+        Predicate<String> isNotEmpty = isEmpty.negate();
+        List<String> filteredListOfStr = listOfStr.stream().filter(isNotEmpty).collect(Collectors.toList());
+
+        // Escape apostrophe for MATLAB
+        filteredListOfStr.replaceAll(val -> "'" + val.replaceAll("'", "''") + "'");
+        return "{" + String.join(",", filteredListOfStr) + "}";
+    }
+}