Refactoring: Move 'executeCommand' method to JschServer for seperation of concern

Author: Dokyeongyun

src/main/java/root/common/server/implement/JschServer.java

@@ -1,8 +1,11 @@
 package root.common.server.implement;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
+import org.apache.commons.io.IOUtils;
+
 import com.jcraft.jsch.Channel;
 import com.jcraft.jsch.ChannelExec;
 import com.jcraft.jsch.JSch;
@@ -97,6 +100,10 @@ public Channel openExecChannel(Session session, String command) {
 		}
 		return channel;
 	}
+	
+	private Channel openExecChannel(String command) {
+		return openExecChannel(session, command);
+	}
 
 	public InputStream connectChannel(Channel channel) {
 		InputStream in = null;
@@ -120,6 +127,15 @@ public String getServerName() {
 		return this.jschConnectionInfo.getServerName();
 	}
 
+	public String executeCommand(String command) throws JSchException, IOException {
+		Channel channel = openExecChannel(command);
+		InputStream in = connectChannel(channel);
+		String result = IOUtils.toString(in, "UTF-8");
+		disConnectChannel(channel);
+		disConnect(session);
+		return result.trim();
+	}
+	
 	public static boolean validateConn(Session session) {
 		if (session == null) {
 			log.error("JSch session is null");

src/main/java/root/core/repository/implement/LinuxServerMonitoringRepository.java

@@ -1,6 +1,5 @@
 package root.core.repository.implement;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.time.LocalDate;
 import java.util.ArrayList;
@@ -11,7 +10,6 @@
 import org.apache.commons.io.IOUtils;
 
 import com.jcraft.jsch.Channel;
-import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
 
 import lombok.extern.slf4j.Slf4j;
@@ -42,9 +40,9 @@ public String getServerName() {
 	public int getAlertLogFileLineCount(AlertLogCommand alc) {
 		int fileLineCnt = 0;
 		try {
-			String command = "cat " + alc.getReadFilePath() + " | wc -l";
-			String executeResult = executeCommand(command);
-			fileLineCnt = Integer.parseInt(executeResult.trim());
+			String command = String.format("cat %s | wc -l", alc.getReadFilePath());
+			String executeResult = jsch.executeCommand(command);
+			fileLineCnt = Integer.parseInt(executeResult);
 		} catch (Exception e) {
 			log.error(e.getMessage());
 		}
@@ -56,8 +54,8 @@ public int getAlertLogFileLineCount(AlertLogCommand alc) {
 	public String checkAlertLog(AlertLogCommand alc) {
 		String result = "";
 		try {
-			String command = "tail -" + alc.getReadLine() + " " + alc.getReadFilePath();
-			result = executeCommand(command);
+			String command = String.format("tail -%d %s", alc.getReadLine(), alc.getReadFilePath());
+			result = jsch.executeCommand(command);
 		} catch (Exception e) {
 			log.error(e.getMessage());
 		}
@@ -252,18 +250,4 @@ private String getAlertLogStringFromCertainDate(AlertLogCommand alc, String star
 
 		return fullAlertLogString;
 	}
-	
-	private String executeCommand(String command) throws JSchException, IOException {
-		String result = null;
-
-		Session session = jsch.getSession();
-		session.connect();
-		Channel channel = jsch.openExecChannel(session, command);
-		InputStream in = jsch.connectChannel(channel);
-		result = IOUtils.toString(in, "UTF-8");
-		jsch.disConnectChannel(channel);
-		jsch.disConnect(session);
-		
-		return result;
-	}
 }