Merge pull request #252 from Dokyeongyun/develop

2022.05.15. ~ 2022.05.19. Merge

Author: Dokyeongyun

Core/src/main/java/root/core/domain/exceptions/PropertyNotFoundException.java

@@ -0,0 +1,9 @@
+package root.core.domain.exceptions;
+
+public class PropertyNotFoundException extends Exception {
+	private static final long serialVersionUID = 196259383529491976L;
+	
+	public PropertyNotFoundException(String message) {
+		super(message);
+	}
+}

Core/src/main/java/root/core/repository/constracts/PropertyRepository.java

@@ -8,30 +8,32 @@
 import root.common.database.implement.JdbcConnectionInfo;
 import root.common.server.implement.AlertLogCommand;
 import root.common.server.implement.JschConnectionInfo;
+import root.core.domain.exceptions.PropertyNotFoundException;
+import root.core.domain.exceptions.PropertyNotLoadedException;
 
 public interface PropertyRepository {
 
 	boolean isFileExist(String filePath);
 
-	PropertiesConfiguration getConfiguration(String config);
+	PropertiesConfiguration getConfiguration(String config) throws PropertyNotLoadedException;
 
 	void save(String filePath, PropertiesConfiguration config);
 
 	void saveDBConnectionInfo(String filePath, Map<String, JdbcConnectionInfo> config);
 
 	void saveServerConnectionInfo(String filePath, Map<String, JschConnectionInfo> config);
 
-	void saveCommonConfig(Map<String, Object> values);
+	void saveCommonConfig(Map<String, Object> values) throws PropertyNotLoadedException;
 
-	void saveCommonConfig(String key, String value);
+	void saveCommonConfig(String key, String value) throws PropertyNotLoadedException;
 
-	void loadCombinedConfiguration();
+	void loadCombinedConfiguration() throws PropertyNotFoundException;
 
 	void loadConnectionInfoConfig(String filePath);
 
 	void loadMonitoringInfoConfig(String filePath);
 
-	String[] getConnectionInfoFileNames();
+	String[] getConnectionInfoFileNames() throws PropertyNotFoundException;
 
 	String getCommonResource(String key);
 

Core/src/main/java/root/core/service/contracts/PropertyService.java

@@ -10,6 +10,8 @@
 import root.core.domain.enums.MonitoringType;
 import root.core.domain.enums.RoundingDigits;
 import root.core.domain.enums.UsageUIType;
+import root.core.domain.exceptions.PropertyNotFoundException;
+import root.core.domain.exceptions.PropertyNotLoadedException;
 import root.utils.UnitUtils.FileSize;
 
 public interface PropertyService {
@@ -25,8 +27,9 @@ public interface PropertyService {
 	 * 모니터링 접속정보 설정파일의 경로를 반환한다.
 	 * 
 	 * @return
+	 * @throws PropertyNotFoundException 
 	 */
-	List<String> getConnectionInfoList();
+	List<String> getConnectionInfoList() throws PropertyNotFoundException;
 
 	/**
 	 * 최근 사용된 접속정보 설정파일의 경로를 반환한다.
@@ -65,13 +68,13 @@ public interface PropertyService {
 	 */
 	List<MonitoringYN> getServerMonitoringYnList(String presetConfigFileName);
 
-	Map<String, String> getMonitoringPresetMap();
+	Map<String, String> getMonitoringPresetMap() throws PropertyNotLoadedException;
 
-	List<String> getMonitoringPresetFilePathList();
+	List<String> getMonitoringPresetFilePathList() throws PropertyNotLoadedException;
 
-	List<String> getMonitoringPresetNameList();
+	List<String> getMonitoringPresetNameList() throws PropertyNotLoadedException;
 
-	String getMonitoringPresetFilePath(String presetName);
+	String getMonitoringPresetFilePath(String presetName) throws PropertyNotLoadedException;
 
 	List<String> getMonitoringDBNameList();
 
@@ -122,30 +125,32 @@ public interface PropertyService {
 	 * @param key   설정정보 키
 	 * @param value 설정정보 값
 	 */
-	void saveCommonConfig(String key, String value);
+	void saveCommonConfig(String key, String value) throws PropertyNotLoadedException;
 
 	/**
 	 * 최근 사용한 접속정보 설정정보를 저장한다.
 	 * 
 	 * @param filePath
+	 * @throws PropertyNotLoadedException 
 	 */
-	void saveLastUseConnectionInfoSetting(String filePath);
+	void saveLastUseConnectionInfoSetting(String filePath) throws PropertyNotLoadedException;
 
 	/**
 	 * 접속정보 설정을 추가한다.
 	 * 
 	 * @param filePath
 	 * @return
+	 * @throws PropertyNotLoadedException 
 	 */
-	String addConnectionInfoSetting(String filePath);
+	String addConnectionInfoSetting(String filePath) throws PropertyNotLoadedException;
 
 	/**
 	 * 모니터링여부 Preset 설정을 추가한다.
 	 * 
 	 * @param connInfoSetting
 	 * @param presetName
 	 */
-	void addMonitoringPreset(String connInfoSetting, String presetName);
+	void addMonitoringPreset(String connInfoSetting, String presetName) throws PropertyNotLoadedException;
 
 	/**
 	 * 모니터링여부 Preset 설정을 저장한다.

DBMonitoringWindowApp/src/main/java/root/applications/ConsoleApp.java

@@ -17,6 +17,7 @@
 import root.common.server.implement.JschServer;
 import root.core.batch.DBCheckBatch;
 import root.core.batch.ServerCheckBatch;
+import root.core.domain.exceptions.PropertyNotLoadedException;
 import root.core.repository.constracts.DBCheckRepository;
 import root.core.repository.constracts.PropertyRepository;
 import root.core.repository.constracts.ServerMonitoringRepository;
@@ -98,8 +99,13 @@ public static void main(String[] args) throws IOException {
 		while (true) {
 			System.out.println(String.format("사용하실 모니터링여부 설정을 선택해주세요."));
 
-			List<String> presetNames = propService.getMonitoringPresetNameList();
-			if (presetNames.size() == 0) {
+			List<String> presetNames = null;
+			try {
+				presetNames = propService.getMonitoringPresetNameList();
+			} catch (PropertyNotLoadedException e) {
+				e.printStackTrace();
+			}
+			if (presetNames == null || presetNames.size() == 0) {
 				System.out.println("모니터링여부 설정파일이 존재하지 않습니다. 프로그램을 종료합니다.");
 				return;
 			}

DBMonitoringWindowApp/src/main/java/root/applications/Program.java

@@ -3,12 +3,15 @@
 import javafx.application.Application;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
+import javafx.scene.control.Alert.AlertType;
 import javafx.stage.Stage;
 import lombok.extern.slf4j.Slf4j;
+import root.core.domain.exceptions.PropertyNotFoundException;
 import root.core.repository.constracts.PropertyRepository;
 import root.javafx.Controller.HomeController;
 import root.javafx.Controller.LeftMenuController;
 import root.javafx.DI.DependencyInjection;
+import root.javafx.utils.AlertUtils;
 import root.repository.implement.PropertyRepositoryImpl;
 
 @Slf4j
@@ -26,7 +29,12 @@ public void start(Stage primaryStage) throws Exception {
 		setUpDependecyInjector();
 
 		// configuration load
-		propRepo.loadCombinedConfiguration();
+		try {
+			propRepo.loadCombinedConfiguration();	
+		} catch (PropertyNotFoundException e) {
+			AlertUtils.showAlert(AlertType.ERROR, "설정 파일 Load", "설정 파일 읽기에 실패했습니다. 설정파일을 확인해주세요.");
+			return;
+		}
 
 		// fxml load
 		System.setProperty("prism.lcdtext", "false"); // 안티앨리어싱 (Font 부드럽게)

DBMonitoringWindowApp/src/main/java/root/javafx/Controller/AlertLogMonitoringMenuController.java

@@ -1,5 +1,6 @@
 package root.javafx.Controller;
 
+import java.io.IOException;
 import java.net.URL;
 import java.time.LocalDate;
 import java.util.HashMap;
@@ -20,6 +21,7 @@
 import javafx.fxml.Initializable;
 import javafx.geometry.Insets;
 import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.Button;
 import javafx.scene.control.DatePicker;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.ScrollPane.ScrollBarPolicy;
@@ -35,6 +37,7 @@
 import root.common.server.implement.ServerOS;
 import root.core.domain.AlertLog;
 import root.core.domain.Log;
+import root.core.domain.exceptions.PropertyNotFoundException;
 import root.core.repository.constracts.ServerMonitoringRepository;
 import root.core.service.contracts.PropertyService;
 import root.core.usecase.constracts.ServerMonitoringUsecase;
@@ -44,7 +47,9 @@
 import root.javafx.CustomView.NumberTextFormatter;
 import root.javafx.CustomView.TagBar;
 import root.javafx.CustomView.dateCell.DisableAfterTodayDateCell;
+import root.javafx.DI.DependencyInjection;
 import root.javafx.utils.AlertUtils;
+import root.javafx.utils.SceneUtils;
 import root.repository.implement.LinuxServerMonitoringRepository;
 import root.repository.implement.PropertyRepositoryImpl;
 import root.repository.implement.ReportFileRepo;
@@ -90,6 +95,15 @@ public class AlertLogMonitoringMenuController implements Initializable {
 
 	@FXML
 	AnchorPane summaryNodataAP;
+	
+	@FXML
+	AnchorPane topMenuBar;
+	
+	@FXML
+	AnchorPane noPropertyFileAP;
+	
+	@FXML
+	Button fileOpenBtn;
 
 	TagBar tagBar = new TagBar();
 
@@ -107,19 +121,34 @@ public AlertLogMonitoringMenuController() {
 	public void initialize(URL location, ResourceBundle resources) {
 
 		// 접속정보 설정 프로퍼티 파일
-		List<String> connInfoFiles = propService.getConnectionInfoList();
-		if (connInfoFiles != null && connInfoFiles.size() != 0) {
-			// Connection Info ComboBox
-			runConnInfoFileComboBox.getItems().addAll(connInfoFiles);
-			runConnInfoFileComboBox.getSelectionModel().selectFirst();
-
-			// remember.properties 파일에서, 최근 사용된 설정파일 경로가 있다면 해당 설정파일을 불러온다.
-			String lastUseConnInfoFilePath = propService.getLastUseConnectionInfoFilePath();
-			if (lastUseConnInfoFilePath != null) {
-				runConnInfoFileComboBox.getSelectionModel().select(lastUseConnInfoFilePath);
+		List<String> connInfoFiles;
+		try {
+			connInfoFiles = propService.getConnectionInfoList();
+			if (connInfoFiles != null && connInfoFiles.size() != 0) {
+				// Connection Info ComboBox
+				runConnInfoFileComboBox.getItems().addAll(connInfoFiles);
+				runConnInfoFileComboBox.getSelectionModel().selectFirst();
+
+				// remember.properties 파일에서, 최근 사용된 설정파일 경로가 있다면 해당 설정파일을 불러온다.
+				String lastUseConnInfoFilePath = propService.getLastUseConnectionInfoFilePath();
+				if (lastUseConnInfoFilePath != null) {
+					runConnInfoFileComboBox.getSelectionModel().select(lastUseConnInfoFilePath);
+				}
+
+				System.out.println(propService.getMonitoringServerNameList());
+				if(propService.getMonitoringServerNameList().size() == 0) {
+					setNoPropertyUIVisible(true);	
+				} else {
+					setNoPropertyUIVisible(false);
+				}
+				
+			} else {
+				setNoPropertyUIVisible(true);
+				return;
 			}
-		} else {
-			AlertUtils.showAlert(AlertType.INFORMATION, "접속정보 설정", "설정된 접속정보가 없습니다.\n[설정]메뉴로 이동합니다.");
+		} catch (PropertyNotFoundException e) {
+			log.error(e.getMessage());
+			setNoPropertyUIVisible(true);
 			return;
 		}
 
@@ -387,4 +416,32 @@ private void updateStatusMessage(String message) {
 		statusTextUpdateThread.setDaemon(true);
 		statusTextUpdateThread.start();
 	}
+	
+	/**
+	 * 설정 메뉴로 이동
+	 * 
+	 * @param e
+	 * @throws IOException
+	 */
+	public void goSettingMenu(ActionEvent e) throws IOException {
+		SceneUtils.movePage(DependencyInjection.load("/fxml/SettingMenu.fxml"));
+	}
+	
+	/**
+	 * 접속정보 설정파일 열기
+	 * 
+	 * @param e
+	 */
+	public void openPropertiesFile(ActionEvent e) {
+	}
+	
+	/**
+	 * 접속정보 설정 파일이 없을 때 UI Visible 변경
+	 * 
+	 * @param isVisible
+	 */
+	private void setNoPropertyUIVisible(boolean isVisible) {
+		noPropertyFileAP.setVisible(isVisible);
+		topMenuBar.setVisible(!isVisible);
+	}
 }