Updated review comments and fixed indentation

Author: Nikhil Bhoski

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

@@ -2,15 +2,13 @@
 /**
  * Copyright 2019-2020 The MathWorks, Inc.
  * 
- * Build Interface has two default methods. MATLAB builders can override the 
- * default behavior.
+ * Build Interface has two default methods. MATLAB builders can override the default behavior.
  * 
  */
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.UUID;
-
 import hudson.EnvVars;
 import hudson.FilePath;
 import hudson.Launcher;
@@ -19,70 +17,79 @@
 import hudson.model.TaskListener;
 
 public interface MatlabBuild {
-    
+
     /**
-     * This Method decorates the launcher with MATLAB command provided and returns the Process 
+     * This Method decorates the launcher with MATLAB command provided and returns the Process
      * object to launch MATLAB with appropriate startup options like -r or -batch
-     * @param workspace Current build workspace 
+     * 
+     * @param workspace Current build workspace
      * @param launcher Current build launcher
-     * @param listener Current build listener 
+     * @param listener Current build listener
      * @param envVars Environment variables of the current build
-     * @param matlabCommand MATLAB command to execute on shell 
+     * @param matlabCommand MATLAB command to execute on shell
      * @return matlabLauncher returns the process launcher to run MATLAB commands
      */
-    default ProcStarter getProcessToRunMatlabCommand(FilePath workspace, Launcher launcher,TaskListener listener, EnvVars envVars, String matlabCommand,String uniqueName) throws IOException, InterruptedException {
-        //Get node specific tmp directory to copy matlab runner script
+    default ProcStarter getProcessToRunMatlabCommand(FilePath workspace, Launcher launcher,
+            TaskListener listener, EnvVars envVars, String matlabCommand, String uniqueName)
+            throws IOException, InterruptedException {
+        // Get node specific tmp directory to copy matlab runner script
         String tmpDir = getNodeSpecificTmpFolderPath();
         FilePath targetWorkspace = new FilePath(launcher.getChannel(), tmpDir);
         ProcStarter matlabLauncher;
-        if(launcher.isUnix()) {
-        	final String runnerScriptName = uniqueName+"/run_matlab_command.sh";
-            matlabLauncher = launcher.launch().pwd(workspace).envs(envVars).cmds(tmpDir+"/"+runnerScriptName,matlabCommand).stdout(listener);
-            
-            //Copy runner .sh for linux platform in workspace.
-            copyFileInWorkspace(MatlabBuilderConstants.SHELL_RUNNER_SCRIPT, runnerScriptName, targetWorkspace);
-        }else {
-        	final String runnerScriptName = uniqueName+"\\run_matlab_command.bat";
-            launcher = launcher.decorateByPrefix("cmd.exe","/C");
-            matlabLauncher = launcher.launch().pwd(workspace).envs(envVars).cmds(tmpDir+"\\"+runnerScriptName,"\""+matlabCommand+"\"").stdout(listener);
-            //Copy runner.bat for Windows platform in workspace.
-            copyFileInWorkspace(MatlabBuilderConstants.BAT_RUNNER_SCRIPT, runnerScriptName, targetWorkspace);
+        if (launcher.isUnix()) {
+            final String runnerScriptName = uniqueName + "/run_matlab_command.sh";
+            matlabLauncher = launcher.launch().pwd(workspace).envs(envVars)
+                    .cmds(tmpDir + "/" + runnerScriptName, matlabCommand).stdout(listener);
+
+            // Copy runner .sh for linux platform in workspace.
+            copyFileInWorkspace(MatlabBuilderConstants.SHELL_RUNNER_SCRIPT, runnerScriptName,
+                    targetWorkspace);
+        } else {
+            final String runnerScriptName = uniqueName + "\\run_matlab_command.bat";
+            launcher = launcher.decorateByPrefix("cmd.exe", "/C");
+            matlabLauncher = launcher.launch().pwd(workspace).envs(envVars)
+                    .cmds(tmpDir + "\\" + runnerScriptName, "\"" + matlabCommand + "\"")
+                    .stdout(listener);
+            // Copy runner.bat for Windows platform in workspace.
+            copyFileInWorkspace(MatlabBuilderConstants.BAT_RUNNER_SCRIPT, runnerScriptName,
+                    targetWorkspace);
         }
         return matlabLauncher;
     }
 
     /*
      * Method to copy given file from source to target node specific workspace.
      */
-    default void copyFileInWorkspace(String sourceFile, String targetFile,
-            FilePath targetWorkspace) throws IOException, InterruptedException {
+    default void copyFileInWorkspace(String sourceFile, String targetFile, FilePath targetWorkspace)
+            throws IOException, InterruptedException {
         final ClassLoader classLoader = getClass().getClassLoader();
         FilePath targetFilePath = new FilePath(targetWorkspace, targetFile);
         InputStream in = classLoader.getResourceAsStream(sourceFile);
         targetFilePath.copyFrom(in);
         // set executable permission
-        targetFilePath.chmod(0755);       
+        targetFilePath.chmod(0755);
     }
-    
-    default FilePath getNodeSpecificMatlabRunnerScript(Launcher launcher,String uniqueName) throws IOException, InterruptedException {
+
+    default FilePath getFilePathForUniqueFolder(Launcher launcher, String uniqueName)
+            throws IOException, InterruptedException {
         Computer cmp = Computer.currentComputer();
         String tmpDir = (String) cmp.getSystemProperties().get("java.io.tmpdir");
-        if(launcher.isUnix()) {
-            tmpDir = tmpDir+"/"+uniqueName;
-        }else {
-            tmpDir = tmpDir+"\\"+uniqueName;
+        if (launcher.isUnix()) {
+            tmpDir = tmpDir + "/" + uniqueName;
+        } else {
+            tmpDir = tmpDir + "\\" + uniqueName;
         }
-        return new FilePath(launcher.getChannel(), tmpDir);   
+        return new FilePath(launcher.getChannel(), tmpDir);
     }
-    
+
     default String getNodeSpecificTmpFolderPath() throws IOException, InterruptedException {
         Computer cmp = Computer.currentComputer();
         String tmpDir = (String) cmp.getSystemProperties().get("java.io.tmpdir");
         return tmpDir;
     }
-    
+
     default String getUniqueNameForRunnerFile() {
-    	return UUID.randomUUID().toString();
+        return UUID.randomUUID().toString();
     }
 
 }

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

@@ -7,7 +7,6 @@
  */
 
 import java.io.IOException;
-
 import javax.annotation.Nonnull;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -96,37 +95,38 @@ public boolean isApplicable(
     public void perform(@Nonnull Run<?, ?> build, @Nonnull FilePath workspace,
             @Nonnull Launcher launcher, @Nonnull TaskListener listener)
             throws InterruptedException, IOException {
-     
-            // Set the environment variable specific to the this build
-            setEnv(build.getEnvironment(listener));
 
-            // Invoke MATLAB command and transfer output to standard
-            // Output Console
+        // Set the environment variable specific to the this build
+        setEnv(build.getEnvironment(listener));
 
-            buildResult = execMatlabCommand(workspace, launcher, listener, getEnv());
+        // Invoke MATLAB command and transfer output to standard
+        // Output Console
 
-            if (buildResult != 0) {
-                build.setResult(Result.FAILURE);
-            }
+        buildResult = execMatlabCommand(workspace, launcher, listener, getEnv());
+
+        if (buildResult != 0) {
+            build.setResult(Result.FAILURE);
+        }
     }
 
     private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher,
             TaskListener listener, EnvVars envVars) throws IOException, InterruptedException {
-    	final String uniqueTmpFldrName = getUniqueNameForRunnerFile();
+        final String uniqueTmpFldrName = getUniqueNameForRunnerFile();
         ProcStarter matlabLauncher;
         try {
-            matlabLauncher = getProcessToRunMatlabCommand(workspace, launcher, listener, envVars,getCommand(),uniqueTmpFldrName);
+            matlabLauncher = getProcessToRunMatlabCommand(workspace, launcher, listener, envVars,
+                    getCommand(), uniqueTmpFldrName);
             return matlabLauncher.join();
         } catch (Exception e) {
             listener.getLogger().println(e.getMessage());
             return 1;
-        }finally {
-        	// Cleanup the runner File from tmp directory
-        	FilePath matlabRunnerScript = getNodeSpecificMatlabRunnerScript(launcher,uniqueTmpFldrName);
-            if(matlabRunnerScript.isDirectory()) {
+        } finally {
+            // Cleanup the runner File from tmp directory
+            FilePath matlabRunnerScript = getFilePathForUniqueFolder(launcher, uniqueTmpFldrName);
+            if (matlabRunnerScript.exists()) {
                 matlabRunnerScript.deleteRecursive();
             }
         }
-        
-    } 
+
+    }
 }