Load MonitoringYN list in monitoring preset configuration file

Author: Dokyeongyun

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

@@ -5,6 +5,7 @@
 
 import root.core.domain.JdbcConnectionInfo;
 import root.core.domain.JschConnectionInfo;
+import root.core.domain.MonitoringYN;
 
 public interface PropertyService {
 
@@ -43,6 +44,22 @@ public interface PropertyService {
 	 */
 	String getLastUsePresetFileName(String filePath);
 
+	/**
+	 * 모니터링여부 Preset 설정파일을 읽어 DB 모니터링 여부 리스트를 반환한다.
+	 * 
+	 * @param presetConfigFileName
+	 * @return
+	 */
+	List<MonitoringYN> getDBMonitoringYnList(String presetConfigFileName);
+	
+	/**
+	 * 모니터링여부 Preset 설정파일을 읽어 Server 모니터링 여부 리스트를 반환한다.
+	 * 
+	 * @param presetConfigFileName
+	 * @return
+	 */
+	List<MonitoringYN> getServerMonitoringYnList(String presetConfigFileName);
+
 	Map<String, String> getMonitoringPresetMap();
 
 	List<String> getMonitoringPresetFilePathList();

src/main/java/root/core/service/implement/FilePropertyService.java

@@ -11,8 +11,13 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
+import org.apache.commons.lang3.StringUtils;
+
 import root.core.domain.JdbcConnectionInfo;
 import root.core.domain.JschConnectionInfo;
+import root.core.domain.MonitoringYN;
+import root.core.domain.MonitoringYN.MonitoringTypeAndYN;
+import root.core.domain.enums.MonitoringType;
 import root.core.repository.constracts.PropertyRepository;
 import root.core.service.contracts.PropertyService;
 
@@ -59,19 +64,73 @@ public void loadMonitoringInfoConfig(String filePath) {
 		propRepo.loadMonitoringInfoConfig(filePath);
 	}
 
+	/**
+	 * 최근 사용된 모니터링 여부 Preset 설정파일명을 반환한다.
+	 */
 	@Override
 	public String getLastUsePresetFileName(String filePath) {
 		return propRepo.getLastUseMonitoringPresetName(filePath);
 	}
 
+	@Override
+	public List<MonitoringYN> getDBMonitoringYnList(String presetConfigFileName) {
+		String presetConfigFilePath = propRepo.getMonitoringPresetMap().get(presetConfigFileName);
+
+		// Load
+		loadMonitoringInfoConfig(presetConfigFilePath);
+
+		List<String> dbAliasList = Arrays.asList(propRepo.getMonitoringDBNames());
+		List<MonitoringType> monitoringTypeList = Arrays.asList(MonitoringType.values()).stream()
+				.filter(t -> t.getCategory().equals("DB")).collect(Collectors.toList());
+
+		return getMonitoringYNList(dbAliasList, monitoringTypeList);
+	}
+
+	@Override
+	public List<MonitoringYN> getServerMonitoringYnList(String presetConfigFileName) {
+		String presetConfigFilePath = propRepo.getMonitoringPresetMap().get(presetConfigFileName);
+
+		// Load
+		loadMonitoringInfoConfig(presetConfigFilePath);
+
+		List<String> serverAliasList = Arrays.asList(propRepo.getMonitoringServerNames());
+		List<MonitoringType> monitoringTypeList = Arrays.asList(MonitoringType.values()).stream()
+				.filter(t -> t.getCategory().equals("SERVER")).collect(Collectors.toList());
+
+		return getMonitoringYNList(serverAliasList, monitoringTypeList);
+	}
+
+	private List<MonitoringYN> getMonitoringYNList(List<String> aliasList, List<MonitoringType> monitoringTypeList) {
+		System.out.println(aliasList);
+		System.out.println(monitoringTypeList);
+
+		List<MonitoringYN> result = new ArrayList<>();
+		for (String serverAlias : aliasList) {
+			MonitoringYN monitoringYn = new MonitoringYN(serverAlias);
+			List<MonitoringTypeAndYN> list = new ArrayList<>();
+			for (MonitoringType monitoringType : monitoringTypeList) {
+				String yn = propRepo.getMonitoringConfigResource(serverAlias + "." + monitoringType.getName());
+				if (!StringUtils.isEmpty(yn)) {
+					list.add(new MonitoringTypeAndYN(monitoringType, yn.equals("Y") ? true : false));
+				} else {
+					list.add(new MonitoringTypeAndYN(monitoringType, false));
+				}
+			}
+			monitoringYn.setMonitoringTypeList(list);
+			result.add(monitoringYn);
+		}
+
+		return result;
+	}
+
 	@Override
 	public Map<String, String> getMonitoringPresetMap() {
 		return StreamSupport
 				.stream(Spliterators.spliteratorUnknownSize(propRepo.getConfiguration("connInfoConfig").getKeys(),
 						Spliterator.ORDERED), false)
 				.filter(key -> key.matches(MONITORING_PRESET_KEY)).collect(Collectors.toUnmodifiableMap(key -> {
 					Matcher m = MONITORING_PRESET_KEY_PATTERN.matcher(key);
-					return m.matches() ? m.group(1) : null;
+					return m.matches() ? m.group(1) : "";
 				}, key -> propRepo.getMonitoringConfigResource(key)));
 	}
 

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

@@ -2,15 +2,11 @@
 
 import java.io.File;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.ResourceBundle;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.apache.commons.configuration2.PropertiesConfiguration;
 import org.apache.commons.lang3.StringUtils;
@@ -38,15 +34,10 @@
 import javafx.stage.FileChooser.ExtensionFilter;
 import javafx.stage.Stage;
 import javafx.util.StringConverter;
-import root.core.domain.ASMDiskUsage;
-import root.core.domain.AlertLog;
-import root.core.domain.ArchiveUsage;
 import root.core.domain.JdbcConnectionInfo;
 import root.core.domain.JschConnectionInfo;
 import root.core.domain.MonitoringYN;
 import root.core.domain.MonitoringYN.MonitoringTypeAndYN;
-import root.core.domain.OSDiskUsage;
-import root.core.domain.TableSpaceUsage;
 import root.core.domain.enums.MonitoringType;
 import root.core.domain.enums.RoundingDigits;
 import root.core.domain.enums.UsageUIType;
@@ -107,16 +98,6 @@ public class SettingMenuController implements Initializable {
 	JFXComboBox<UsageUIType> usageUICB;
 
 	/* Common Data */
-	private static final Map<Class<?>, String> DB_MONITORING_CONTENTS = new HashMap<>();
-	private static final Map<Class<?>, String> SERVER_MONITORING_CONTENTS = new HashMap<>();
-	static {
-		DB_MONITORING_CONTENTS.put(ArchiveUsage.class, "Archive Usage");
-		DB_MONITORING_CONTENTS.put(TableSpaceUsage.class, "TableSpace Usage");
-		DB_MONITORING_CONTENTS.put(ASMDiskUsage.class, "ASM Disk Usage");
-		SERVER_MONITORING_CONTENTS.put(OSDiskUsage.class, "OS Disk Usage");
-		SERVER_MONITORING_CONTENTS.put(AlertLog.class, "Alert Log");
-	}
-
 	List<JdbcConnectionInfo> jdbcConnInfoList;
 	List<JschConnectionInfo> jschConnInfoList;
 
@@ -295,21 +276,21 @@ private void loadSelectedConfigFile(String absoluteFilePath) {
 			int startIdx = absoluteFilePath.lastIndexOf("\\config");
 			String filePath = startIdx == -1 ? absoluteFilePath : "." + absoluteFilePath.substring(startIdx);
 
-			// 2. 파일경로에서 접속정보 프로퍼티파일을 읽는다.
+			// 2. fileChooserText의 텍스트를 현재 선택된 파일경로로 변경한다.
+			fileChooserText.setText(filePath);
+
+			// 3. 파일경로에서 접속정보 프로퍼티파일을 읽는다.
 			propRepo.loadConnectionInfoConfig(filePath);
 
-			// 3. 프로퍼티파일에 작성된 내용에 따라 동적 요소를 생성한다.
+			// 4. 프로퍼티파일에 작성된 내용에 따라 동적 요소를 생성한다.
 			createSettingDynamicElements();
 
 			// TODO move this logic to PropertyService
-			// 4. remember.properties 파일에 최근 사용된 설정파일 경로를 저장한다.
+			// 5. remember.properties 파일에 최근 사용된 설정파일 경로를 저장한다.
 			PropertiesConfiguration rememberConfig = propRepo.getConfiguration("rememberConfig");
 			rememberConfig.setProperty("filepath.config.lastuse", filePath.replace("\\", "/"));
 			propRepo.save(rememberConfig.getString("filepath.config.remember"), rememberConfig);
 
-			// 5. fileChooserText의 텍스트를 현재 선택된 파일경로로 변경한다.
-			fileChooserText.setText(filePath);
-
 		} catch (Exception e) {
 			e.printStackTrace();
 			// 6. 파일 load가 실패 시, Alert 메시지를 띄운다.
@@ -327,12 +308,12 @@ private void loadSelectedConfigFile(String absoluteFilePath) {
 	private void loadMonitoringConfigFile(String filePath) {
 		monitoringElementsVBox.getChildren().clear();
 
-		propRepo.loadMonitoringInfoConfig(filePath);
+		String presetConfigFileName = monitoringPresetComboBox.getSelectionModel().getSelectedItem();
 
-		String[] dbNames = propRepo.getMonitoringDBNames();
-		String[] serverNames = propRepo.getMonitoringServerNames();
+		List<MonitoringYN> dbYnList = propService.getDBMonitoringYnList(presetConfigFileName);
+		List<MonitoringYN> serverYnList = propService.getServerMonitoringYnList(presetConfigFileName);
 
-		createMonitoringElements(monitoringElementsVBox);
+		createMonitoringElements(monitoringElementsVBox, dbYnList, serverYnList);
 	}
 
 	/**
@@ -396,25 +377,10 @@ public void saveMonitoringSettings(ActionEvent e) {
 	 * 모니터링 여부 설정할 요소들 동적 생성
 	 * 
 	 * @param rootVBox
-	 * @param monitoringElements
-	 * @param monitoringAlias
+	 * @param dbYnList
+	 * @param serverYnList
 	 */
-	private void createMonitoringElements(VBox rootVBox) {
-
-		List<MonitoringYN> dbYnList = new ArrayList<>();
-		List<MonitoringTypeAndYN> childList = new ArrayList<>();
-		childList.add(new MonitoringTypeAndYN(MonitoringType.ARCHIVE, false));
-		childList.add(new MonitoringTypeAndYN(MonitoringType.TABLE_SPACE, true));
-		childList.add(new MonitoringTypeAndYN(MonitoringType.ASM_DISK, false));
-		dbYnList.add(new MonitoringYN("ERP", childList));
-		dbYnList.add(new MonitoringYN("ERP2", childList));
-		dbYnList.add(new MonitoringYN("ERP3", childList));
-
-		List<MonitoringYN> serverYnList = new ArrayList<>();
-		List<MonitoringTypeAndYN> childList2 = new ArrayList<>();
-		childList2.add(new MonitoringTypeAndYN(MonitoringType.OS_DISK, true));
-		childList2.add(new MonitoringTypeAndYN(MonitoringType.ALERT_LOG, true));
-		serverYnList.add(new MonitoringYN("DBERP1", childList2));
+	private void createMonitoringElements(VBox rootVBox, List<MonitoringYN> dbYnList, List<MonitoringYN> serverYnList) {
 
 		MonitoringYNVBox monitoringYNVBox = new MonitoringYNVBox();
 		for (MonitoringYN dbYn : dbYnList) {
@@ -425,7 +391,7 @@ private void createMonitoringElements(VBox rootVBox) {
 			}
 		}
 		monitoringYNVBox.initSelection(dbYnList);
-	
+
 		for (MonitoringYN serverYn : serverYnList) {
 			for (MonitoringTypeAndYN typeAndYn : serverYn.getMonitoringTypeList()) {
 				MonitoringType type = typeAndYn.getMonitoringType();