Merge pull request #176 from Dokyeongyun/ft-220228-settingMenuRefactoring

Ft 220228 setting menu refactoring

Author: Dokyeongyun

src/main/java/root/core/domain/MonitoringYN.java

@@ -0,0 +1,32 @@
+package root.core.domain;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import root.core.domain.enums.MonitoringType;
+
+@AllArgsConstructor
+@Data
+public class MonitoringYN {
+
+	private String monitoringAlias;
+	private List<MonitoringTypeAndYN> monitoringTypeList;
+
+	public MonitoringYN(String monitoringAlias) {
+		this.monitoringAlias = monitoringAlias;
+	}
+
+	public List<MonitoringType> getDistinctMonitoringTypes() {
+		return monitoringTypeList.stream().map(type -> type.getMonitoringType()).distinct()
+				.collect(Collectors.toList());
+	}
+
+	@AllArgsConstructor
+	@Data
+	public static class MonitoringTypeAndYN {
+		private MonitoringType monitoringType;
+		private boolean isMonitoring;
+	}
+}

src/main/java/root/core/domain/enums/MonitoringType.java

@@ -0,0 +1,18 @@
+package root.core.domain.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum MonitoringType {
+
+	ARCHIVE("DB", "Archive"), TABLE_SPACE("DB", "TableSpace"), ASM_DISK("DB", "ASM Disk"), OS_DISK("SERVER", "OS Disk"),
+	ALERT_LOG("SERVER", "Alert Log");
+
+	private String category;
+	private String name;
+
+	MonitoringType(String category, String name) {
+		this.category = category;
+		this.name = name;
+	}
+}

src/main/java/root/core/domain/enums/RoundingDigits.java

@@ -0,0 +1,37 @@
+package root.core.domain.enums;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import lombok.Getter;
+
+@Getter
+public enum RoundingDigits {
+
+	ONE(1), TWO(2), THREE(3), FOUR(4), FIVE(5);
+
+	private int digits;
+
+	private RoundingDigits(int digits) {
+		this.digits = digits;
+	}
+
+	private static final Map<Integer, RoundingDigits> roundingDigitsMap = Collections.unmodifiableMap(
+			Stream.of(values()).collect(Collectors.toMap(RoundingDigits::getDigits, Function.identity())));
+
+	public static RoundingDigits find(final int digits) {
+		return Optional.ofNullable(roundingDigitsMap.get(digits)).orElse(TWO);
+	}
+
+	public static RoundingDigits find(final String digits) {
+		try {
+			return find(Integer.parseInt(digits));
+		} catch (NumberFormatException e) {
+			return TWO;
+		}
+	}
+}

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

@@ -2,8 +2,11 @@
 
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.ArrayUtils;
@@ -22,16 +25,17 @@
 import root.core.domain.ASMDiskUsage;
 import root.core.domain.ArchiveUsage;
 import root.core.domain.MonitoringResult;
+import root.core.domain.MonitoringYN;
 import root.core.domain.OSDiskUsage;
 import root.core.domain.TableSpaceUsage;
+import root.core.domain.MonitoringYN.MonitoringTypeAndYN;
+import root.core.domain.enums.MonitoringType;
 import root.core.repository.implement.PropertyRepositoryImpl;
 import root.core.service.contracts.PropertyService;
 import root.core.service.implement.FilePropertyService;
 import root.javafx.CustomView.CustomTreeTableView;
 import root.javafx.CustomView.CustomTreeView;
 import root.javafx.CustomView.MonitoringTableView;
-import root.javafx.Model.DBMonitoringYN;
-import root.javafx.Model.ServerMonitoringYN;
 
 public class RunMenuController implements Initializable {
 
@@ -113,14 +117,28 @@ public void initialize(URL location, ResourceBundle resources) {
 			connInfoFileListComboBox.getSelectionModel().select(lastUseConnInfoFile);
 		}
 
+		List<MonitoringYN> list = new ArrayList<>();
+		List<MonitoringTypeAndYN> childList = new ArrayList<>();
+		childList.add(new MonitoringTypeAndYN(MonitoringType.ARCHIVE, true));
+		childList.add(new MonitoringTypeAndYN(MonitoringType.TABLE_SPACE, true));
+		childList.add(new MonitoringTypeAndYN(MonitoringType.ASM_DISK, true));
+		list.add(new MonitoringYN("DB1", childList));
+		
+		List<MonitoringYN> list2 = new ArrayList<>();
+		List<MonitoringTypeAndYN> childList2 = new ArrayList<>();
+		childList2.add(new MonitoringTypeAndYN(MonitoringType.OS_DISK, false));
+		childList2.add(new MonitoringTypeAndYN(MonitoringType.ALERT_LOG, false));
+		list2.add(new MonitoringYN("SERVER1", childList2));
+		addMonitoringPresetPreview(list, list2);
+
 		/* 2. 모니터링 여부 설정 */
 		// 2-1. 모니터링 여부 Preset 콤보박스 아이템 설정
 		String curConnInfoFile = connInfoFileListComboBox.getSelectionModel().getSelectedItem();
 		propService.loadMonitoringInfoConfig(curConnInfoFile);
 		List<String> presetFileList = propService.getMonitoringPresetNameList();
 		if (presetFileList == null || presetFileList.size() == 0) {
 			// TODO 모니터링 여부 Preset 설정파일이 없는 경우
-//			addMonitoringPresetPreview();
+			addMonitoringPresetPreview(list, list2);
 		} else {
 			presetFileListComboBox.getItems().addAll(presetFileList);
 		}	
@@ -229,27 +247,31 @@ private void addMonitoringConnInfoPreview(List<String> dbNameList, List<String>
 	/**
 	 * 설정된 모니터링 여부 Preset을 보여주는 TreeTableView를 생성 및 추가한다.
 	 * 
-	 * @param dbPresetList
-	 * @param serverPresetList
+	 * @param monitoringYNList
 	 */
-	private void addMonitoringPresetPreview(List<DBMonitoringYN> dbPresetList,
-			List<ServerMonitoringYN> serverPresetList) {
+	private void addMonitoringPresetPreview(List<MonitoringYN> dbYnList, List<MonitoringYN> serverYnList) {
+
+		Set<MonitoringType> dbMonitoringTypeList = new HashSet<>();
+		dbYnList.stream().map(m -> m.getDistinctMonitoringTypes()).collect(Collectors.toList())
+				.forEach(type -> dbMonitoringTypeList.addAll(type));
+
+		Set<MonitoringType> serverMonitoringTypeList = new HashSet<>();
+		serverYnList.stream().map(m -> m.getDistinctMonitoringTypes()).collect(Collectors.toList())
+				.forEach(type -> serverMonitoringTypeList.addAll(type));
 
 		// 모니터링 여부 리스트 TreeTableView - DB
-		CustomTreeTableView<DBMonitoringYN> dbCtv = new CustomTreeTableView<>("", FontAwesomeIcon.LIST);
-		dbCtv.addMonitoringInstanceColumn("Instance", "alias");
-		dbCtv.addMonitoringYNTableColumn("Archive", "archiveUsageYN");
-		dbCtv.addMonitoringYNTableColumn("Table Space", "tableSpaceUsageYN");
-		dbCtv.addMonitoringYNTableColumn("ASM Disk", "asmDiskUsageYN");
-		dbCtv.addTreeTableItem(new DBMonitoringYN("DB"), dbPresetList, FontAwesomeIcon.DATABASE);
+		CustomTreeTableView dbCtv = new CustomTreeTableView("", FontAwesomeIcon.LIST);
+		dbCtv.addMonitoringInstanceColumn("Instance", "monitoringAlias");
+		dbMonitoringTypeList.forEach(type -> dbCtv.addMonitoringYNTableColumn(type.getName(), type));
+		dbCtv.addTreeTableItem(new MonitoringYN("DB "), dbYnList, FontAwesomeIcon.DATABASE);
 		setAnchorPaneAnchor(dbCtv, 0, 0, 0, 0);
 		dbPresetAP.getChildren().add(dbCtv);
 
 		// 모니터링 여부 리스트 TreeTableView - Server
-		CustomTreeTableView<ServerMonitoringYN> serverCtv = new CustomTreeTableView<>("", FontAwesomeIcon.LIST);
-		serverCtv.addMonitoringInstanceColumn("Instance", "alias");
-		serverCtv.addMonitoringYNTableColumn("OS Disk", "osDiskUsageYN");
-		serverCtv.addTreeTableItem(new ServerMonitoringYN("Server"), serverPresetList, FontAwesomeIcon.SERVER);
+		CustomTreeTableView serverCtv = new CustomTreeTableView("", FontAwesomeIcon.LIST);
+		serverCtv.addMonitoringInstanceColumn("Instance", "monitoringAlias");
+		serverMonitoringTypeList.forEach(type -> serverCtv.addMonitoringYNTableColumn(type.getName(), type));
+		serverCtv.addTreeTableItem(new MonitoringYN("Server "), serverYnList, FontAwesomeIcon.SERVER);
 		setAnchorPaneAnchor(serverCtv, 0, 0, 0, 0);
 		serverPresetAP.getChildren().add(serverCtv);
 	}