Add 'serverOS' field in JschServerConnectionInfo model

Dokyeongyun · Dokyeongyun · commit 50d2d0721fbe · 2022-04-17T18:19:55.000+09:00
diff --git a/src/main/java/root/core/domain/JschConnectionInfo.java b/src/main/java/root/core/domain/JschConnectionInfo.java
@@ -1,10 +1,12 @@
 package root.core.domain;
 
 import lombok.Data;
+import root.core.domain.enums.ServerOS;
 
 @Data
 public class JschConnectionInfo {
 	private String serverName;
+	private ServerOS serverOS;
 	private String host;
 	private int port;
 	private String userName;
@@ -15,29 +17,37 @@ public JschConnectionInfo() {
 		this.alc = new AlertLogCommand();
 	}
 
-	public JschConnectionInfo(String serverName, String host, int port, String userName, String password) {
+	public JschConnectionInfo(String serverName, ServerOS serverOS, String host, int port, String userName,
+			String password) {
 		this.serverName = serverName;
+		this.serverOS = serverOS;
 		this.host = host;
 		this.port = port;
 		this.userName = userName;
 		this.password = password;
 		this.alc = new AlertLogCommand();
 	}
 
-	public JschConnectionInfo(String serverName, String host, String port, String userName, String password) {
-		this(serverName, host, 22, userName, password);
+	public JschConnectionInfo(String serverName, ServerOS serverOS, String host, String port, String userName,
+			String password) {
+		this(serverName, serverOS, host, 22, userName, password);
 		this.setPort(port);
 	}
 
-	public JschConnectionInfo(String serverName, String host, int port, String userName, String password,
-			AlertLogCommand alc) {
-		this(serverName, host, port, userName, password);
+	public JschConnectionInfo(String serverName, ServerOS serverOS, String host, int port, String userName,
+			String password, AlertLogCommand alc) {
+		this(serverName, serverOS, host, port, userName, password);
 		this.alc = alc;
 	}
 
-	public JschConnectionInfo(String serverName, String host, String port, String userName, String password,
-			AlertLogCommand alc) {
-		this(serverName, host, 22, userName, password, alc);
+	public JschConnectionInfo(String serverName, ServerOS serverOS, String host, String port, String userName,
+			String password, AlertLogCommand alc) {
+		this(serverName, serverOS, host, 22, userName, password, alc);
+		this.setPort(port);
+	}
+
+	public JschConnectionInfo(String host, String port, String userName, String password) {
+		this("", null, host, 22, userName, password);
 		this.setPort(port);
 	}
 
diff --git a/src/main/java/root/core/domain/enums/ServerOS.java b/src/main/java/root/core/domain/enums/ServerOS.java
@@ -0,0 +1,5 @@
+package root.core.domain.enums;
+
+public enum ServerOS {
+	WINDOW, LINUX
+}
diff --git a/src/main/java/root/core/repository/implement/PropertyRepositoryImpl.java b/src/main/java/root/core/repository/implement/PropertyRepositoryImpl.java
@@ -33,6 +33,7 @@
 import root.core.domain.AlertLogCommand;
 import root.core.domain.JdbcConnectionInfo;
 import root.core.domain.JschConnectionInfo;
+import root.core.domain.enums.ServerOS;
 import root.core.repository.constracts.PropertyRepository;
 
 @Slf4j
@@ -529,11 +530,16 @@ public JdbcConnectionInfo getJdbcConnectionInfo(String dbName) {
 	@Override
 	public JschConnectionInfo getJschConnectionInfo(String serverName) {
 		String serverHost = connInfoConfig.getString(serverName + ".server.host");
+		ServerOS serverOS = null;
+		try {
+			serverOS = ServerOS.valueOf(connInfoConfig.getString(serverName + ".server.os"));	
+		} catch (Exception e) {
+		}
 		String serverPort = connInfoConfig.getString(serverName + ".server.port");
 		String serverUserName = connInfoConfig.getString(serverName + ".server.username");
 		String serverPassword = connInfoConfig.getString(serverName + ".server.password");
 		AlertLogCommand alc = getAlertLogCommand(serverName);
-		return new JschConnectionInfo(serverName.toUpperCase(), serverHost, serverPort, serverUserName, serverPassword,
+		return new JschConnectionInfo(serverName, serverOS, serverHost, serverPort, serverUserName, serverPassword,
 				alc);
 	}
 
diff --git a/src/main/java/root/javafx/CustomView/ServerConnInfoControl.java b/src/main/java/root/javafx/CustomView/ServerConnInfoControl.java
@@ -51,7 +51,7 @@ public ConnectionTestService getConnectionTestService(ConnectionInfoAP curAP) {
 		String id = ((TextField) curAP.lookup("#userTF")).getText();
 		String pw = ((PasswordField) curAP.lookup("#passwordPF")).getText();
 
-		return new ServerConnectService(new JschConnectionInfo("", host, port, id, pw));
+		return new ServerConnectService(new JschConnectionInfo(host, port, id, pw));
 	}
 
 	@Override
diff --git a/src/main/java/root/javafx/CustomView/ServerConnectionInfoAnchorPane.java b/src/main/java/root/javafx/CustomView/ServerConnectionInfoAnchorPane.java
@@ -14,6 +14,7 @@
 import lombok.EqualsAndHashCode;
 import root.core.domain.AlertLogCommand;
 import root.core.domain.JschConnectionInfo;
+import root.core.domain.enums.ServerOS;
 import root.core.repository.constracts.PropertyRepository;
 import root.core.repository.implement.PropertyRepositoryImpl;
 import root.javafx.DI.DependencyInjection;
@@ -28,6 +29,9 @@ public class ServerConnectionInfoAnchorPane extends ConnectionInfoAP {
 	@FXML
 	TextField serverNameTF;
 
+	@FXML
+	JFXComboBox<ServerOS> serverOSCB;
+
 	@FXML
 	TextField hostTF;
 
@@ -62,18 +66,19 @@ public ServerConnectionInfoAnchorPane() {
 	boolean isAnyEmptyInputForConnectionTest() {
 		return StringUtils.isAnyEmpty(hostTF.getText(), portTF.getText(), userTF.getText(), passwordPF.getText());
 	}
-	
+
 	public void init() {
 		// Set textFormatter
 		portTF.setTextFormatter(new NumberTextFormatter());
-		
+
 		// Set AlertLogDateFormat ComboBox values
 		alertLogDateFormatCB.getItems()
-		.addAll(propertyRepository.getCommonResources("server.setting.dateformat.combo"));
+				.addAll(propertyRepository.getCommonResources("server.setting.dateformat.combo"));
 	}
 
 	public void setInitialValue(JschConnectionInfo jsch) {
 		serverNameTF.setText(jsch.getServerName());
+		serverOSCB.getSelectionModel().select(jsch.getServerOS());
 		hostTF.setText(jsch.getHost());
 		portTF.setText(String.valueOf(jsch.getPort()));
 		userTF.setText(jsch.getUserName());
@@ -84,21 +89,22 @@ public void setInitialValue(JschConnectionInfo jsch) {
 
 	public JschConnectionInfo getInputValues() {
 		JschConnectionInfo jsch = new JschConnectionInfo();
-		jsch.setServerName(this.serverNameTF.getText());
-		jsch.setHost(this.hostTF.getText());
-		jsch.setPort(this.portTF.getText());
-		jsch.setUserName(this.userTF.getText());
-		jsch.setPassword(this.passwordPF.getText());
+		jsch.setServerName(serverNameTF.getText());
+		jsch.setServerOS(serverOSCB.getValue());
+		jsch.setHost(hostTF.getText());
+		jsch.setPort(portTF.getText());
+		jsch.setUserName(userTF.getText());
+		jsch.setPassword(passwordPF.getText());
 		AlertLogCommand alc = new AlertLogCommand();
-		alc.setReadFilePath(this.alertLogFilePathTF.getText());
-		alc.setDateFormat(this.alertLogDateFormatCB.getSelectionModel().getSelectedItem());
+		alc.setReadFilePath(alertLogFilePathTF.getText());
+		alc.setDateFormat(alertLogDateFormatCB.getSelectionModel().getSelectedItem());
 		jsch.setAlc(alc);
 		return jsch;
 	}
 
 	public boolean isAnyEmptyInput() {
-		return StringUtils.isAnyEmpty(hostTF.getText(), portTF.getText(), userTF.getText(), serverNameTF.getText(),
-				passwordPF.getText(), alertLogFilePathTF.getText(),
-				alertLogDateFormatCB.getSelectionModel().getSelectedItem());
+		return StringUtils.isAnyEmpty(serverOSCB.getSelectionModel().getSelectedItem().name(), hostTF.getText(),
+				portTF.getText(), userTF.getText(), serverNameTF.getText(), passwordPF.getText(),
+				alertLogFilePathTF.getText(), alertLogDateFormatCB.getSelectionModel().getSelectedItem());
 	}
 }
diff --git a/src/test/java/root/common/server/implement/JschServerTest.java b/src/test/java/root/common/server/implement/JschServerTest.java
@@ -20,6 +20,7 @@
 import com.jcraft.jsch.Session;
 
 import root.core.domain.JschConnectionInfo;
+import root.core.domain.enums.ServerOS;
 
 public class JschServerTest {
 
@@ -28,11 +29,12 @@ public class JschServerTest {
 	@BeforeAll
 	public static void setup() {
 		String serverName = "DKY SERVER";
+		ServerOS serverOS = ServerOS.WINDOW;
 		String host = "192.168.154.1";
 		String userName = "dky";
 		String port = "22";
 		String password = "ehruddbs1!";
-		jsch = new JschServer(new JschConnectionInfo(serverName, host, port, userName, password));
+		jsch = new JschServer(new JschConnectionInfo(serverName, serverOS, host, port, userName, password));
 	}
 
 	@Test
@@ -128,23 +130,23 @@ public void testGetServerName() {
 		String serverName = jsch.getServerName();
 		assertEquals(serverName, "DKY SERVER");
 	}
-	
+
 	@Test
 	public void testExecuteCommand_EchoCommand() throws Exception {
 		jsch.init();
 		Session session = jsch.getSession();
 		String result = jsch.executeCommand(session, "echo 1");
 		assertEquals("1", result.trim());
 	}
-	
+
 	@Test
 	public void testExecuteCommand_TailCommand() throws Exception {
 		jsch.init();
 		Session session = jsch.getSession();
 		String result = jsch.executeCommand(session, "tail -500 C://Users/aserv/Desktop/alert_DB.log");
 		assertNotEquals(result, "");
 	}
-	
+
 	@Test
 	public void testValidateConn_Valid() throws Exception {
 		jsch.init();

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public ConnectionTestService getConnectionTestService(ConnectionInfoAP curAP) {`
`51`	`51`	`String id = ((TextField) curAP.lookup("#userTF")).getText();`
`52`	`52`	`String pw = ((PasswordField) curAP.lookup("#passwordPF")).getText();`
`53`	`53`
`54`		`- return new ServerConnectService(new JschConnectionInfo("", host, port, id, pw));`
	`54`	`+ return new ServerConnectService(new JschConnectionInfo(host, port, id, pw));`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@Override`