Merge pull request #180 from Dokyeongyun/ft-220225-runMenu

Ft 220225 run menu

Author: Dokyeongyun

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

@@ -6,6 +6,9 @@
 import root.core.domain.JdbcConnectionInfo;
 import root.core.domain.JschConnectionInfo;
 import root.core.domain.MonitoringYN;
+import root.core.domain.enums.RoundingDigits;
+import root.core.domain.enums.UsageUIType;
+import root.utils.UnitUtils.FileSize;
 
 public interface PropertyService {
 
@@ -15,7 +18,7 @@ public interface PropertyService {
 	 * @param filePath
 	 */
 	void loadConnectionInfoConfig(String filePath);
-	
+
 	/**
 	 * 모니터링 접속정보 설정파일의 경로를 반환한다.
 	 * 
@@ -36,7 +39,7 @@ public interface PropertyService {
 	 * @param filePath
 	 */
 	void loadMonitoringInfoConfig(String filePath);
-	
+
 	/**
 	 * 최근 사용된 모니터링 여부 Preset 설정파일의 Preset명을 반환한다.
 	 * 
@@ -51,7 +54,7 @@ public interface PropertyService {
 	 * @return
 	 */
 	List<MonitoringYN> getDBMonitoringYnList(String presetConfigFileName);
-	
+
 	/**
 	 * 모니터링여부 Preset 설정파일을 읽어 Server 모니터링 여부 리스트를 반환한다.
 	 * 
@@ -75,4 +78,25 @@ public interface PropertyService {
 	List<JdbcConnectionInfo> getJdbcConnInfoList(List<String> dbNames);
 
 	List<JschConnectionInfo> getJschConnInfoList(List<String> serverNames);
+
+	/**
+	 * 기본값으로 설정된 FileSize 단위를 반환한다.
+	 * 
+	 * @return
+	 */
+	FileSize getDefaultFileSizeUnit();
+
+	/**
+	 * 기본값으로 설정된 반올림 자릿수를 반환한다.
+	 * 
+	 * @return
+	 */
+	RoundingDigits getDefaultRoundingDigits();
+
+	/**
+	 * 기본값으로 설정된 사용량 컬럼 UI 타입을 반환한다.
+	 * 
+	 * @return
+	 */
+	UsageUIType getDefaultUsageUIType();
 }

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

@@ -2,24 +2,26 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Spliterator;
-import java.util.Spliterators;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
 
+import org.apache.commons.configuration2.PropertiesConfiguration;
 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.domain.enums.RoundingDigits;
+import root.core.domain.enums.UsageUIType;
 import root.core.repository.constracts.PropertyRepository;
 import root.core.service.contracts.PropertyService;
+import root.utils.UnitUtils.FileSize;
 
 public class FilePropertyService implements PropertyService {
 
@@ -124,13 +126,20 @@ private List<MonitoringYN> getMonitoringYNList(List<String> aliasList, List<Moni
 
 	@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) : "";
-				}, key -> propRepo.getMonitoringConfigResource(key)));
+		Map<String, String> result = new HashMap<>();
+
+		PropertiesConfiguration config = propRepo.getConfiguration("connInfoConfig");
+
+		config.getKeys().forEachRemaining(key -> {
+			if (key.matches(MONITORING_PRESET_KEY)) {
+				Matcher m = MONITORING_PRESET_KEY_PATTERN.matcher(key);
+				if (m.matches()) {
+					String presetName = m.group(1);
+					result.put(presetName, config.getString(key));
+				}
+			}
+		});
+		return result;
 	}
 
 	@Override
@@ -170,4 +179,27 @@ public List<JschConnectionInfo> getJschConnInfoList(List<String> serverNames) {
 				Collectors.mapping(serverName -> propRepo.getJschConnectionInfo(serverName), Collectors.toList()));
 	}
 
+	/**
+	 * 기본값으로 설정된 FileSize 단위를 반환한다.
+	 */
+	@Override
+	public FileSize getDefaultFileSizeUnit() {
+		return FileSize.find(propRepo.getCommonResource("unit.filesize"));
+	}
+
+	/**
+	 * 기본값으로 설정된 반올림 자릿수를 반환한다.
+	 */
+	@Override
+	public RoundingDigits getDefaultRoundingDigits() {
+		return RoundingDigits.find(propRepo.getCommonResource("unit.rounding"));
+	}
+
+	/**
+	 * 기본값으로 설정된 사용량 컬럼 UI 타입을 반환한다.
+	 */
+	@Override
+	public UsageUIType getDefaultUsageUIType() {
+		return UsageUIType.find(propRepo.getCommonResource("usage-ui-type"));
+	}
 }