Refactoring: Separate the concerns of JSchServer and Server Repository

Author: Dokyeongyun

src/main/java/root/core/repository/constracts/ServerMonitoringRepository.java

@@ -2,21 +2,13 @@
 
 import java.util.List;
 
-import com.jcraft.jsch.Session;
-
 import root.core.domain.AlertLog;
 import root.core.domain.AlertLogCommand;
 import root.core.domain.OSDiskUsage;
 
 public interface ServerMonitoringRepository {
 	String getServerName();
 
-	Session getSession();
-
-	Session connectSession(Session session);
-
-	void disConnectSession(Session session);
-
 	int getAlertLogFileLineCount(AlertLogCommand alc);
 
 	String checkAlertLog(AlertLogCommand alc);

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

@@ -10,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;
@@ -37,39 +36,18 @@ public String getServerName() {
 		return jsch.getServerName();
 	}
 
-	@Override
-	public Session getSession() {
-		return jsch.getSession();
-	}
-
-	@Override
-	public Session connectSession(Session session) {
-		try {
-			session.connect();
-		} catch (JSchException e) {
-			log.error(e.getMessage());
-		}
-		return session;
-	}
-
-	@Override
-	public void disConnectSession(Session session) {
-		if (session.isConnected() == true && session != null) {
-			session.disconnect();
-		}
-	}
-
 	@Override
 	public int getAlertLogFileLineCount(AlertLogCommand alc) {
 		int fileLineCnt = 0;
 		try {
-			Session session = this.getSession();
-			session = this.connectSession(session);
+			Session session = jsch.getSession();
+			session.connect();
 			Channel channel = jsch.openExecChannel(session, "cat " + alc.getReadFilePath() + " | wc -l");
 			InputStream in = jsch.connectChannel(channel);
 			String result = IOUtils.toString(in, "UTF-8");
 			fileLineCnt = Integer.parseInt(result.trim());
 			jsch.disConnectChannel(channel);
+			jsch.disConnect(session);
 		} catch (Exception e) {
 			log.error(e.getMessage());
 		}
@@ -81,13 +59,14 @@ public int getAlertLogFileLineCount(AlertLogCommand alc) {
 	public String checkAlertLog(AlertLogCommand alc) {
 		String result = "";
 		try {
-			Session session = this.getSession();
-			session = this.connectSession(session);
+			Session session = jsch.getSession();
+			session.connect();
 			String command = "tail -" + alc.getReadLine() + " " + alc.getReadFilePath();
 			Channel channel = jsch.openExecChannel(session, command);
 			InputStream in = jsch.connectChannel(channel);
 			result = IOUtils.toString(in, "UTF-8");
 			jsch.disConnectChannel(channel);
+			jsch.disConnect(session);
 		} catch (Exception e) {
 			log.error(e.getMessage());
 		}
@@ -176,13 +155,14 @@ public AlertLog checkAlertLogDuringPeriod(AlertLogCommand alc, String startDate,
 	public List<OSDiskUsage> checkOSDiskUsage() {
 		List<OSDiskUsage> list = new ArrayList<>();
 		try {
-			Session session = this.getSession();
-			session = this.connectSession(session);
+			Session session = jsch.getSession();
+			session.connect();
 			Channel channel = jsch.openExecChannel(session, "df --block-size=K -P");
 			InputStream in = jsch.connectChannel(channel);
 			String result = IOUtils.toString(in, "UTF-8");
 			list = stringToOsDiskUsageList(result);
 			jsch.disConnectChannel(channel);
+			jsch.disConnect(session);
 		} catch (Exception e) {
 			log.error(e.getMessage());
 		}

src/test/java/root/core/repository/implement/LinuxServerMonitoringRepositoryTest.java

@@ -71,7 +71,7 @@ public void checkAlertLogTest() {
 		AlertLogCommand alc = mock(AlertLogCommand.class);
 		InputStream in = new ByteArrayInputStream(alertLogString.getBytes());
 
-		when(repo.getSession()).thenReturn(session);
+		when(jsch.getSession()).thenReturn(session);
 		String command = "tail -" + alc.getReadLine() + " " + alc.getReadFilePath();
 		when(jsch.openExecChannel(session, command)).thenReturn(channel);
 		when(jsch.connectChannel(channel)).thenReturn(in);
@@ -89,7 +89,7 @@ public void getAlertLogFileLineCountTest() {
 		AlertLogCommand alc = mock(AlertLogCommand.class);
 		InputStream in = new ByteArrayInputStream("26".getBytes());
 
-		when(repo.getSession()).thenReturn(session);
+		when(jsch.getSession()).thenReturn(session);
 		when(jsch.openExecChannel(session, "cat " + alc.getReadFilePath() + " | wc -l")).thenReturn(channel);
 		when(jsch.connectChannel(channel)).thenReturn(in);
 		doNothing().when(jsch).disConnectChannel(channel);
@@ -113,7 +113,7 @@ public void checkAlertLogDuringPeriod() {
 		InputStream in = new ByteArrayInputStream(alertLogString.getBytes());
 		InputStream in2 = new ByteArrayInputStream("26".getBytes());
 
-		when(repo.getSession()).thenReturn(session);
+		when(jsch.getSession()).thenReturn(session);
 		when(jsch.openExecChannel(session, "cat " + alc.getReadFilePath() + " | wc -l")).thenReturn(channel2);
 		when(jsch.connectChannel(channel2)).thenReturn(in2);
 		doNothing().when(jsch).disConnectChannel(channel2);