Set serverOS comboBox values and save setted value

Author: Dokyeongyun

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

@@ -174,8 +174,8 @@ public void saveDBConnectionInfo(String filePath, Map<String, JdbcConnectionInfo
 
 			log.info("[" + filePath + "] 파일 저장이 성공적으로 완료되었습니다.");
 		} catch (Exception e) {
-			e.printStackTrace();
 			log.error("[" + filePath + "] 파일 저장에 실패했습니다.");
+			log.error(e.getMessage());
 		}
 	}
 
@@ -189,7 +189,8 @@ public void saveServerConnectionInfo(String filePath, Map<String, JschConnection
 			serverNames += serverName + ",";
 
 			JschConnectionInfo jsch = serverConfig.get(serverName);
-			config.setProperty(serverName + ".server.servername", jsch.getServerName());
+			config.setProperty(serverName + ".server.name", jsch.getServerName());
+			config.setProperty(serverName + ".server.os", jsch.getServerOS().name());
 			config.setProperty(serverName + ".server.host", jsch.getHost());
 			config.setProperty(serverName + ".server.port", jsch.getPort());
 			config.setProperty(serverName + ".server.username", jsch.getUserName());
@@ -207,9 +208,8 @@ public void saveServerConnectionInfo(String filePath, Map<String, JschConnection
 			config.setProperty(serverName + ".server.alertlog.dateformat", dateFormat);
 			config.setProperty(serverName + ".server.alertlog.dateformatregex", dateFormatRegex);
 			config.setProperty(serverName + ".server.alertlog.filepath", jsch.getAlc().getReadFilePath());
-			config.setProperty(serverName + ".server.alertlog.readLine", 500);
+			config.setProperty(serverName + ".server.alertlog.readline", 500);
 		}
-
 		config.setProperty("servernames", serverNames.substring(0, serverNames.length() - 1));
 
 		PropertiesConfigurationLayout layout = config.getLayout();
@@ -245,8 +245,8 @@ public void saveServerConnectionInfo(String filePath, Map<String, JschConnection
 
 			log.info("[" + filePath + "] 파일 저장이 성공적으로 완료되었습니다.");
 		} catch (Exception e) {
-			e.printStackTrace();
 			log.error("[" + filePath + "] 파일 저장에 실패했습니다.");
+			log.error(e.getMessage());
 		}
 	}
 

src/main/java/root/javafx/Controller/SettingMenuController.java

@@ -29,6 +29,7 @@
 import javafx.stage.FileChooser.ExtensionFilter;
 import javafx.stage.Stage;
 import javafx.util.StringConverter;
+import lombok.extern.slf4j.Slf4j;
 import root.core.domain.JdbcConnectionInfo;
 import root.core.domain.JschConnectionInfo;
 import root.core.domain.MonitoringYN;
@@ -47,6 +48,7 @@
 import root.utils.AlertUtils;
 import root.utils.UnitUtils.FileSize;
 
+@Slf4j
 public class SettingMenuController implements Initializable {
 
 	/* Dependency Injection */
@@ -90,12 +92,15 @@ public void initialize(URL location, ResourceBundle resources) {
 
 		// remember.properties 파일에서, 최근 사용된 설정파일 경로가 있다면 해당 설정파일을 불러온다.
 		String lastUsePropertiesFile = propService.getLastUseConnectionInfoFilePath();
+		log.debug("Last use properties file: " + lastUsePropertiesFile);
 		if (lastUsePropertiesFile != null) {
 			loadSelectedConfigFile(lastUsePropertiesFile);
 
 			// [설정] - [모니터링 여부 설정] - Preset 변경 Event
 			monitoringPresetComboBox.valueProperty().addListener((options, oldValue, newValue) -> {
-				loadMonitoringConfigFile(propService.getMonitoringPresetFilePath(newValue));
+				if(newValue != null) {
+					loadMonitoringConfigFile(propService.getMonitoringPresetFilePath(newValue));	
+				}
 			});
 		} else {
 			setVisible(noConnInfoConfigAP, true);
@@ -246,6 +251,7 @@ private void loadSelectedConfigFile(String absoluteFilePath) {
 	 * @param filePath
 	 */
 	private void loadMonitoringConfigFile(String filePath) {
+		log.debug("Load monitoring config file: " + filePath);
 		monitoringElementsVBox.getChildren().clear();
 
 		String presetConfigFileName = monitoringPresetComboBox.getSelectionModel().getSelectedItem();

src/main/java/root/javafx/CustomView/ServerConnInfoControl.java

@@ -7,6 +7,7 @@
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.PasswordField;
 import javafx.scene.control.TextField;
+import lombok.extern.slf4j.Slf4j;
 import root.core.domain.JschConnectionInfo;
 import root.core.repository.constracts.PropertyRepository;
 import root.core.repository.implement.PropertyRepositoryImpl;
@@ -15,6 +16,7 @@
 import root.javafx.Service.ServerConnectService;
 import root.utils.AlertUtils;
 
+@Slf4j
 public class ServerConnInfoControl implements ConnInfoControl<JschConnectionInfo> {
 
 	/* Dependency Injection */
@@ -31,7 +33,8 @@ public boolean save(String configFilePath, Collection<StatefulAP> statefulAP) {
 				return false;
 			}
 			JschConnectionInfo jsch = serverConnAP.getInputValues();
-			config.put(jsch.getServerName().toUpperCase(), jsch);
+			config.put(jsch.getServerName(), jsch);
+			log.debug(jsch.toString());
 		}
 
 		propertyRepository.saveServerConnectionInfo(configFilePath, config);

src/main/java/root/javafx/CustomView/ServerConnectionInfoAnchorPane.java

@@ -12,6 +12,7 @@
 import javafx.scene.control.TextField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.extern.slf4j.Slf4j;
 import root.core.domain.AlertLogCommand;
 import root.core.domain.JschConnectionInfo;
 import root.core.domain.enums.ServerOS;
@@ -21,6 +22,7 @@
 
 @EqualsAndHashCode(callSuper = false)
 @Data
+@Slf4j
 public class ServerConnectionInfoAnchorPane extends ConnectionInfoAP {
 
 	/* Dependency Injection */
@@ -74,6 +76,9 @@ public void init() {
 		// Set AlertLogDateFormat ComboBox values
 		alertLogDateFormatCB.getItems()
 				.addAll(propertyRepository.getCommonResources("server.setting.dateformat.combo"));
+		
+		// Set ServerOS ComboBox values
+		serverOSCB.getItems().addAll(ServerOS.values());
 	}
 
 	public void setInitialValue(JschConnectionInfo jsch) {
@@ -90,7 +95,7 @@ public void setInitialValue(JschConnectionInfo jsch) {
 	public JschConnectionInfo getInputValues() {
 		JschConnectionInfo jsch = new JschConnectionInfo();
 		jsch.setServerName(serverNameTF.getText());
-		jsch.setServerOS(serverOSCB.getValue());
+		jsch.setServerOS(serverOSCB.getSelectionModel().getSelectedItem());
 		jsch.setHost(hostTF.getText());
 		jsch.setPort(portTF.getText());
 		jsch.setUserName(userTF.getText());
@@ -103,7 +108,13 @@ public JschConnectionInfo getInputValues() {
 	}
 
 	public boolean isAnyEmptyInput() {
-		return StringUtils.isAnyEmpty(serverOSCB.getSelectionModel().getSelectedItem().name(), hostTF.getText(),
+		ServerOS serverOS = serverOSCB.getSelectionModel().getSelectedItem();
+		if(serverOS == null) {
+			log.info("ServerOS input is not valid");
+			return true;
+		}
+		
+		return StringUtils.isAnyEmpty(serverOS.name(), hostTF.getText(),
 				portTF.getText(), userTF.getText(), serverNameTF.getText(), passwordPF.getText(),
 				alertLogFilePathTF.getText(), alertLogDateFormatCB.getSelectionModel().getSelectedItem());
 	}