TDD: Write PropertyRepository test code

Author: Dokyeongyun

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

@@ -13,8 +13,6 @@
 
 public interface PropertyRepository {
 
-	boolean isFileExist(String filePath);
-
 	PropertiesConfiguration getConfiguration(String config) throws PropertyNotLoadedException;
 
 	void save(String filePath, PropertiesConfiguration config);
@@ -37,8 +35,6 @@ public interface PropertyRepository {
 
 	String getCommonResource(String key);
 
-	int getIntegerCommonResource(String key);
-
 	String[] getCommonResources(String key);
 
 	String[] getDBMonitoringContents();
@@ -53,16 +49,12 @@ public interface PropertyRepository {
 
 	Map<String, String> getMonitoringPresetMap();
 
-	String getLastUseMonitoringPresetName();
-
 	String getLastUseMonitoringPresetName(String filePath);
 
 	String[] getMonitoringDBNames();
 
 	String[] getMonitoringServerNames();
 
-	boolean isMonitoringContent(String toggleId);
-
 	void createNewPropertiesFile(String filePath, String type);
 
 	JdbcConnectionInfo getJdbcConnectionInfo(String dbName);

Repository/.gitignore

@@ -1,4 +1,5 @@
 /build/
 /bin/
 /report
-/src/test/resources/dbconfig.txt
+/src/test/resources/dbconfig.txt
+/config

Repository/build.gradle

@@ -17,6 +17,7 @@ dependencies {
     implementation 'commons-io:commons-io:2.8.0'
     implementation 'org.apache.commons:commons-configuration2:2.7'
     implementation 'org.apache.commons:commons-lang3:3.11'
+    implementation 'commons-beanutils:commons-beanutils:1.9.4'
 
     // Apache POI
     implementation 'org.apache.poi:poi:3.17'

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

@@ -66,11 +66,6 @@ public static PropertyRepository getInstance() {
 
 	/****************************************************************************/
 
-	@Override
-	public boolean isFileExist(String filePath) {
-		return new File(filePath).exists();
-	}
-
 	/**
 	 * Configuration 객체를 반환한다. TODO 굳이 메서드를 Wrapping 해서 호출할 필요가 있을까..? Controller와
 	 * 의존성 제거목적으로 일단 이렇게 함..
@@ -87,12 +82,15 @@ public PropertiesConfiguration getConfiguration(String name) throws PropertyNotL
 				throw new PropertyNotLoadedException("monitoringConfig properties file is not loaded");
 			}
 			return monitoringConfig;
+		} else if (name.equals("commonConfig") || name.equals("rememberConfig")) {
+			Configuration config = combinedConfig.getConfiguration(name);
+			if (config == null) {
+				throw new PropertyNotLoadedException(name + " properties file is not loaded");
+			}
+			return (PropertiesConfiguration) config;
 		}
 
-		if (combinedConfig == null) {
-			throw new PropertyNotLoadedException("combinedConfig properties file is not loaded");
-		}
-		return (PropertiesConfiguration) combinedConfig.getConfiguration(name);
+		throw new PropertyNotLoadedException("there is no properties file");
 	}
 
 	/**
@@ -137,9 +135,9 @@ public void save(String filePath, PropertiesConfiguration config) {
 
 	@Override
 	public void saveDBConnectionInfo(String filePath, Map<String, JdbcConnectionInfo> dbConfig) {
+		loadConnectionInfoConfig(filePath);
 		PropertiesConfiguration config = connInfoConfig;
 
-		// TODO dbnames property..
 		String dbNames = "";
 		for (String dbName : dbConfig.keySet()) {
 			dbNames += dbName + ",";
@@ -187,6 +185,7 @@ public void saveDBConnectionInfo(String filePath, Map<String, JdbcConnectionInfo
 
 			writer.writeln(layout.getCanonicalFooterCooment(true));
 			writer.flush();
+			writer.close();
 
 			log.info("[" + filePath + "] 파일 저장이 성공적으로 완료되었습니다.");
 		} catch (Exception e) {
@@ -197,9 +196,9 @@ public void saveDBConnectionInfo(String filePath, Map<String, JdbcConnectionInfo
 
 	@Override
 	public void saveServerConnectionInfo(String filePath, Map<String, JschConnectionInfo> serverConfig) {
+		loadConnectionInfoConfig(filePath);
 		PropertiesConfiguration config = connInfoConfig;
 
-		// TODO servernames property..
 		String serverNames = "";
 		for (String serverName : serverConfig.keySet()) {
 			serverNames += serverName + ",";
@@ -248,6 +247,7 @@ public void saveServerConnectionInfo(String filePath, Map<String, JschConnection
 
 			writer.writeln(layout.getCanonicalFooterCooment(true));
 			writer.flush();
+			writer.close();
 
 			log.info("[" + filePath + "] 파일 저장이 성공적으로 완료되었습니다.");
 		} catch (Exception e) {
@@ -289,7 +289,7 @@ private static PropertiesConfiguration load(String filePath) {
 		try {
 			return builder.getConfiguration();
 		} catch (ConfigurationException e) {
-			e.printStackTrace();
+			log.error(e.getMessage());
 			return null;
 		}
 	}
@@ -364,14 +364,6 @@ public String getCommonResource(String key) {
 		return combinedConfig.getString(key);
 	}
 
-	/**
-	 * commons.properties에서 값을 읽어 반환한다.
-	 */
-	@Override
-	public int getIntegerCommonResource(String key) {
-		return combinedConfig.getInt(key);
-	}
-
 	/**
 	 * commons.properties에서 값을 읽어 반환한다.
 	 */
@@ -442,16 +434,6 @@ public Map<String, String> getMonitoringPresetMap() {
 		return presetMap;
 	}
 
-	/**
-	 * 최근 사용한 Monitoring Preset 이름을 반환한다. 단, 최근 사용한 Preset이 없을 때, NULL을 반환한다.
-	 * 
-	 * @return
-	 */
-	@Override
-	public String getLastUseMonitoringPresetName() {
-		return connInfoConfig.subset("monitoring.setting.preset.lastuse").getString("");
-	}
-	
 	/**
 	 * 최근 사용한 Monitoring Preset 이름을 반환한다. 단, 최근 사용한 Preset이 없을 때, NULL을 반환한다.
 	 * 
@@ -461,7 +443,7 @@ public String getLastUseMonitoringPresetName() {
 	@Override
 	public String getLastUseMonitoringPresetName(String filePath) {
 		load(filePath);
-		return connInfoConfig.subset("monitoring.setting.preset.lastuse").getString("");
+		return connInfoConfig.getString("monitoring.setting.preset.lastuse");
 	}
 
 	/**
@@ -480,11 +462,6 @@ public String[] getMonitoringServerNames() {
 		return connInfoConfig.getStringArray("servernames");
 	}
 
-	@Override
-	public boolean isMonitoringContent(String toggleId) {
-		return monitoringConfig.containsKey(toggleId) == false ? true : monitoringConfig.getBoolean(toggleId);
-	}
-
 	/**
 	 * 지정된 경로에 새로운 파일을 생성한다.
 	 * 
@@ -519,7 +496,7 @@ public void createNewPropertiesFile(String filePath, String type) {
 
 			}
 		} catch (IOException e) {
-			e.printStackTrace();
+			log.error(e.getMessage());
 		}
 	}
 
@@ -554,6 +531,7 @@ public JschConnectionInfo getJschConnectionInfo(String serverName) {
 		try {
 			serverOS = ServerOS.valueOf(connInfoConfig.getString(serverName + ".server.os"));	
 		} catch (Exception e) {
+			log.error(e.getMessage());
 		}
 		String serverPort = connInfoConfig.getString(serverName + ".server.port");
 		String serverUserName = connInfoConfig.getString(serverName + ".server.username");

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

@@ -1,5 +1,6 @@
 package root.service.implement;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -60,7 +61,7 @@ public List<String> getConnectionInfoList() throws PropertyNotFoundException {
 	@Override
 	public String getLastUseConnectionInfoFilePath() {
 		String filePath = propRepo.getLastUseConnInfoFilePath();
-		return propRepo.isFileExist(filePath) ? filePath : null;
+		return new File(filePath).exists() ? filePath : null;
 	}
 
 	/**