Cleaned up DeploymentManager.java

Author: TechsCode

src/main/java/me/TechsCode/ReleaseServer/DeploymentManager.java

@@ -44,60 +44,64 @@ public void run() {
                             }
 
                             for (Deployment deployment : project.getDeployments()) {
-                                if (!deployment.isEnabled()) continue;
-
-                                Remote remote = deployment.getRemote();
+                                if (deployment.isEnabled()){
+                                    deploy(project, artifact, deployment);
+                                }
+                            }
+                        });
+            }
 
-                                try {
-                                    Properties config = new Properties();
-                                    config.put("StrictHostKeyChecking", "no");
+            this.previousReleases = artifacts.stream().map(a -> a.getRelease().getId()).collect(Collectors.toList());
 
-                                    Session session = jsch.getSession(remote.getUsername(), remote.getHostname(), remote.getPort());
-                                    session.setPassword(remote.getPassword());
-                                    session.setConfig(config);
-                                    session.connect();
+            try {
+                sleep(DELAY);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+    }
 
-                                    ChannelSftp sftp = (ChannelSftp) session.openChannel("sftp");
-                                    sftp.connect();
-                                    sftp.cd(deployment.getPath());
+    private void deploy(Project project, Artifact artifact, Deployment deployment){
+        Remote remote = deployment.getRemote();
 
-                                    for (File asset : artifact.getAssets()) {
-                                        sftp.put(new FileInputStream(asset), asset.getName(), ChannelSftp.OVERWRITE);
-                                    }
+        try {
+            Properties config = new Properties();
+            config.put("StrictHostKeyChecking", "no");
 
-                                    sftp.exit();
+            Session session = jsch.getSession(remote.getUsername(), remote.getHostname(), remote.getPort());
+            session.setPassword(remote.getPassword());
+            session.setConfig(config);
+            session.connect();
 
-                                    for (String command : deployment.getCommands()) {
-                                        ChannelExec channel = (ChannelExec) session.openChannel("exec");
-                                        channel.setCommand(command);
-                                        channel.connect();
+            ChannelSftp sftp = (ChannelSftp) session.openChannel("sftp");
+            sftp.connect();
+            sftp.cd(deployment.getPath());
 
-                                        StringWriter writer = new StringWriter();
-                                        IOUtils.copy(channel.getInputStream(), writer, StandardCharsets.UTF_8);
-                                        String output = writer.toString();
+            for (File asset : artifact.getAssets()) {
+                sftp.put(new FileInputStream(asset), asset.getName(), ChannelSftp.OVERWRITE);
+            }
 
-                                        System.out.println(output);
+            sftp.exit();
 
-                                        channel.disconnect();
-                                    }
+            for (String command : deployment.getCommands()) {
+                ChannelExec channel = (ChannelExec) session.openChannel("exec");
+                channel.setCommand(command);
+                channel.connect();
 
-                                    session.disconnect();
-                                    System.out.println("[" + project.getName() + "] Deployment of release [" + artifact.getReleaseTag() + "] to remote [" + remote.getHostname() + "] was successful");
-                                } catch (JSchException | SftpException | IOException e) {
-                                    System.out.println("[" + project.getName() + "] Error while deploying release [" + artifact.getReleaseTag() + "] to [" + remote.getHostname() + "]");
-                                    System.out.println(e.getMessage());
-                                }
-                            }
-                        });
-            }
+                StringWriter writer = new StringWriter();
+                IOUtils.copy(channel.getInputStream(), writer, StandardCharsets.UTF_8);
+                String output = writer.toString();
 
-            this.previousReleases = artifacts.stream().map(a -> a.getRelease().getId()).collect(Collectors.toList());
+                System.out.println(output);
 
-            try {
-                sleep(DELAY);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
+                channel.disconnect();
             }
+
+            session.disconnect();
+            System.out.println("[" + project.getName() + "] Deployment of release [" + artifact.getReleaseTag() + "] to remote [" + remote.getHostname() + "] was successful");
+        } catch (JSchException | SftpException | IOException e) {
+            System.out.println("[" + project.getName() + "] Error while deploying release [" + artifact.getReleaseTag() + "] to [" + remote.getHostname() + "]");
+            System.out.println(e.getMessage());
         }
     }
 }