Separate Repository module from Core module

Dokyeongyun · Dokyeongyun · commit 360b1c0ba2d9 · 2022-05-15T02:50:00.000+09:00
diff --git a/DBMonitoringWindowApp/build.gradle b/DBMonitoringWindowApp/build.gradle
@@ -14,6 +14,7 @@ dependencies {
     implementation project(':Utils')
     implementation project(':Common')
     implementation project(':Core')
+    implementation project(':Repository')
     
 	// Quartz Scheduler
     implementation 'org.quartz-scheduler:quartz:2.3.2'
diff --git a/DBMonitoringWindowApp/src/main/java/root/applications/ConsoleApp.java b/DBMonitoringWindowApp/src/main/java/root/applications/ConsoleApp.java
@@ -20,16 +20,16 @@
 import root.core.repository.constracts.DBCheckRepository;
 import root.core.repository.constracts.PropertyRepository;
 import root.core.repository.constracts.ServerMonitoringRepository;
-import root.core.repository.implement.DBCheckRepositoryImpl;
-import root.core.repository.implement.LinuxServerMonitoringRepository;
-import root.core.repository.implement.PropertyRepositoryImpl;
-import root.core.repository.implement.ReportFileRepo;
 import root.core.service.contracts.PropertyService;
-import root.core.service.implement.FilePropertyService;
 import root.core.usecase.constracts.DBCheckUsecase;
 import root.core.usecase.constracts.ServerMonitoringUsecase;
 import root.core.usecase.implement.DBCheckUsecaseImpl;
 import root.core.usecase.implement.ServerMonitoringUsecaseImpl;
+import root.repository.implement.DBCheckRepositoryImpl;
+import root.repository.implement.LinuxServerMonitoringRepository;
+import root.repository.implement.PropertyRepositoryImpl;
+import root.repository.implement.ReportFileRepo;
+import root.service.implement.FilePropertyService;
 import root.utils.CsvUtils;
 import root.utils.DateUtils;
 import root.utils.PatternUtils;
diff --git a/DBMonitoringWindowApp/src/main/java/root/applications/CsvReportSeparatorApp.java b/DBMonitoringWindowApp/src/main/java/root/applications/CsvReportSeparatorApp.java
@@ -10,7 +10,7 @@
 import java.util.regex.Pattern;
 
 import root.core.repository.constracts.ReportRepository;
-import root.core.repository.implement.ReportFileRepo;
+import root.repository.implement.ReportFileRepo;
 import root.utils.DateUtils;
 
 public class CsvReportSeparatorApp {
diff --git a/DBMonitoringWindowApp/src/main/java/root/applications/Program.java b/DBMonitoringWindowApp/src/main/java/root/applications/Program.java
@@ -6,10 +6,10 @@
 import javafx.stage.Stage;
 import lombok.extern.slf4j.Slf4j;
 import root.core.repository.constracts.PropertyRepository;
-import root.core.repository.implement.PropertyRepositoryImpl;
 import root.javafx.Controller.HomeController;
 import root.javafx.Controller.LeftMenuController;
 import root.javafx.DI.DependencyInjection;
+import root.repository.implement.PropertyRepositoryImpl;
 
 @Slf4j
 public class Program extends Application {
diff --git a/DBMonitoringWindowApp/src/main/java/root/javafx/Controller/AlertLogMonitoringMenuController.java b/DBMonitoringWindowApp/src/main/java/root/javafx/Controller/AlertLogMonitoringMenuController.java
@@ -36,12 +36,7 @@
 import root.core.domain.AlertLog;
 import root.core.domain.Log;
 import root.core.repository.constracts.ServerMonitoringRepository;
-import root.core.repository.implement.LinuxServerMonitoringRepository;
-import root.core.repository.implement.PropertyRepositoryImpl;
-import root.core.repository.implement.ReportFileRepo;
-import root.core.repository.implement.WindowServerMonitoringRepository;
 import root.core.service.contracts.PropertyService;
-import root.core.service.implement.FilePropertyService;
 import root.core.usecase.constracts.ServerMonitoringUsecase;
 import root.core.usecase.implement.ServerMonitoringUsecaseImpl;
 import root.javafx.CustomView.AlertLogListViewCell;
@@ -50,6 +45,11 @@
 import root.javafx.CustomView.TagBar;
 import root.javafx.CustomView.dateCell.DisableAfterTodayDateCell;
 import root.javafx.utils.AlertUtils;
+import root.repository.implement.LinuxServerMonitoringRepository;
+import root.repository.implement.PropertyRepositoryImpl;
+import root.repository.implement.ReportFileRepo;
+import root.repository.implement.WindowServerMonitoringRepository;
+import root.service.implement.FilePropertyService;
 
 @Slf4j
 public class AlertLogMonitoringMenuController implements Initializable {
diff --git a/DBMonitoringWindowApp/src/main/java/root/javafx/Controller/HistoryMenuController.java b/DBMonitoringWindowApp/src/main/java/root/javafx/Controller/HistoryMenuController.java
@@ -22,17 +22,17 @@
 import root.core.domain.TableSpaceUsage;
 import root.core.repository.constracts.DBCheckRepository;
 import root.core.repository.constracts.ServerMonitoringRepository;
-import root.core.repository.implement.DBCheckRepositoryImpl;
-import root.core.repository.implement.LinuxServerMonitoringRepository;
-import root.core.repository.implement.PropertyRepositoryImpl;
-import root.core.repository.implement.ReportFileRepo;
 import root.core.service.contracts.PropertyService;
-import root.core.service.implement.FilePropertyService;
 import root.core.usecase.constracts.DBCheckUsecase;
 import root.core.usecase.constracts.ServerMonitoringUsecase;
 import root.core.usecase.implement.DBCheckUsecaseImpl;
 import root.core.usecase.implement.ServerMonitoringUsecaseImpl;
 import root.javafx.utils.AlertUtils;
+import root.repository.implement.DBCheckRepositoryImpl;
+import root.repository.implement.LinuxServerMonitoringRepository;
+import root.repository.implement.PropertyRepositoryImpl;
+import root.repository.implement.ReportFileRepo;
+import root.service.implement.FilePropertyService;
 
 public class HistoryMenuController implements Initializable {
 
diff --git a/DBMonitoringWindowApp/src/main/java/root/javafx/Controller/MonitoringAPController.java b/DBMonitoringWindowApp/src/main/java/root/javafx/Controller/MonitoringAPController.java
@@ -35,17 +35,17 @@
 import javafx.util.StringConverter;
 import root.core.domain.MonitoringResult;
 import root.core.domain.enums.RoundingDigits;
-import root.core.repository.implement.PropertyRepositoryImpl;
-import root.core.repository.implement.ReportFileRepo;
 import root.core.service.contracts.PropertyService;
-import root.core.service.implement.FilePropertyService;
 import root.core.usecase.constracts.ReportUsecase;
 import root.core.usecase.implement.ReportUsecaseImpl;
 import root.javafx.CustomView.MonitoringTableViewContainer;
 import root.javafx.CustomView.dateCell.MonitoringHistoryDateCell;
 import root.javafx.CustomView.prequencyUI.PrequencyButton;
 import root.javafx.DI.DependencyInjection;
 import root.javafx.utils.AlertUtils;
+import root.repository.implement.PropertyRepositoryImpl;
+import root.repository.implement.ReportFileRepo;
+import root.service.implement.FilePropertyService;
 import root.utils.DateUtils;
 import root.utils.UnitUtils.FileSize;
 
diff --git a/DBMonitoringWindowApp/src/main/java/root/javafx/Controller/RunMenuController.java b/DBMonitoringWindowApp/src/main/java/root/javafx/Controller/RunMenuController.java
@@ -41,18 +41,18 @@
 import root.core.domain.enums.UsageUIType;
 import root.core.repository.constracts.DBCheckRepository;
 import root.core.repository.constracts.ServerMonitoringRepository;
-import root.core.repository.implement.DBCheckRepositoryImpl;
-import root.core.repository.implement.LinuxServerMonitoringRepository;
-import root.core.repository.implement.PropertyRepositoryImpl;
-import root.core.repository.implement.ReportFileRepo;
 import root.core.service.contracts.PropertyService;
-import root.core.service.implement.FilePropertyService;
 import root.core.usecase.constracts.DBCheckUsecase;
 import root.core.usecase.constracts.ServerMonitoringUsecase;
 import root.core.usecase.implement.DBCheckUsecaseImpl;
 import root.core.usecase.implement.ServerMonitoringUsecaseImpl;
 import root.javafx.CustomView.CustomTreeTableView;
 import root.javafx.CustomView.CustomTreeView;
+import root.repository.implement.DBCheckRepositoryImpl;
+import root.repository.implement.LinuxServerMonitoringRepository;
+import root.repository.implement.PropertyRepositoryImpl;
+import root.repository.implement.ReportFileRepo;
+import root.service.implement.FilePropertyService;
 import root.utils.UnitUtils.FileSize;
 
 public class RunMenuController implements Initializable {
diff --git a/DBMonitoringWindowApp/src/main/java/root/javafx/Controller/SettingMenuController.java b/DBMonitoringWindowApp/src/main/java/root/javafx/Controller/SettingMenuController.java
@@ -37,15 +37,15 @@
 import root.core.domain.enums.MonitoringType;
 import root.core.domain.enums.RoundingDigits;
 import root.core.domain.enums.UsageUIType;
-import root.core.repository.implement.PropertyRepositoryImpl;
 import root.core.service.contracts.PropertyService;
-import root.core.service.implement.FilePropertyService;
 import root.javafx.CustomView.ConnectionInfoVBox;
 import root.javafx.CustomView.DBConnInfoControl;
 import root.javafx.CustomView.MonitoringYNVBox;
 import root.javafx.CustomView.ServerConnInfoControl;
 import root.javafx.CustomView.dialogUI.CustomTextInputDialog;
 import root.javafx.utils.AlertUtils;
+import root.repository.implement.PropertyRepositoryImpl;
+import root.service.implement.FilePropertyService;
 import root.utils.UnitUtils.FileSize;
 
 @Slf4j
diff --git a/DBMonitoringWindowApp/src/main/java/root/javafx/CustomView/DBConnInfoControl.java b/DBMonitoringWindowApp/src/main/java/root/javafx/CustomView/DBConnInfoControl.java
@@ -9,11 +9,11 @@
 import javafx.scene.control.TextField;
 import root.common.database.implement.JdbcConnectionInfo;
 import root.core.repository.constracts.PropertyRepository;
-import root.core.repository.implement.PropertyRepositoryImpl;
 import root.javafx.CustomView.ConnectionInfoVBox.StatefulAP;
 import root.javafx.Service.ConnectionTestService;
 import root.javafx.Service.DatabaseConnectService;
 import root.javafx.utils.AlertUtils;
+import root.repository.implement.PropertyRepositoryImpl;
 
 public class DBConnInfoControl implements ConnInfoControl<JdbcConnectionInfo> {
 
diff --git a/DBMonitoringWindowApp/src/main/java/root/javafx/CustomView/DBConnectionInfoAnchorPane.java b/DBMonitoringWindowApp/src/main/java/root/javafx/CustomView/DBConnectionInfoAnchorPane.java
@@ -18,8 +18,8 @@
 import javafx.scene.control.TextField;
 import root.common.database.implement.JdbcConnectionInfo;
 import root.core.repository.constracts.PropertyRepository;
-import root.core.repository.implement.PropertyRepositoryImpl;
 import root.javafx.DI.DependencyInjection;
+import root.repository.implement.PropertyRepositoryImpl;
 
 public class DBConnectionInfoAnchorPane extends ConnectionInfoAP {
 
diff --git a/DBMonitoringWindowApp/src/main/java/root/javafx/CustomView/ServerConnInfoControl.java b/DBMonitoringWindowApp/src/main/java/root/javafx/CustomView/ServerConnInfoControl.java
@@ -10,11 +10,11 @@
 import lombok.extern.slf4j.Slf4j;
 import root.common.server.implement.JschConnectionInfo;
 import root.core.repository.constracts.PropertyRepository;
-import root.core.repository.implement.PropertyRepositoryImpl;
 import root.javafx.CustomView.ConnectionInfoVBox.StatefulAP;
 import root.javafx.Service.ConnectionTestService;
 import root.javafx.Service.ServerConnectService;
 import root.javafx.utils.AlertUtils;
+import root.repository.implement.PropertyRepositoryImpl;
 
 @Slf4j
 public class ServerConnInfoControl implements ConnInfoControl<JschConnectionInfo> {
diff --git a/DBMonitoringWindowApp/src/main/java/root/javafx/CustomView/ServerConnectionInfoAnchorPane.java b/DBMonitoringWindowApp/src/main/java/root/javafx/CustomView/ServerConnectionInfoAnchorPane.java
@@ -17,8 +17,8 @@
 import root.common.server.implement.JschConnectionInfo;
 import root.common.server.implement.ServerOS;
 import root.core.repository.constracts.PropertyRepository;
-import root.core.repository.implement.PropertyRepositoryImpl;
 import root.javafx.DI.DependencyInjection;
+import root.repository.implement.PropertyRepositoryImpl;
 
 @EqualsAndHashCode(callSuper = false)
 @Data
diff --git a/DBMonitoringWindowApp/src/main/java/root/javafx/CustomView/dialogUI/CustomTextInputDialog.java b/DBMonitoringWindowApp/src/main/java/root/javafx/CustomView/dialogUI/CustomTextInputDialog.java
@@ -23,12 +23,12 @@ public CustomTextInputDialog(String title, String headerText, String contentText
 		Image image = new Image(
 				getClass().getResource(System.getProperty("resourceBaseDir") + "/image/add_icon.png").toString());
 		stage.getIcons().add(image);
-		
+
 		// Button Custom
-		ButtonType okButton = new ButtonType("�Է�", ButtonData.OK_DONE);
+		ButtonType okButton = new ButtonType("입력", ButtonData.OK_DONE);
 		getDialogPane().getButtonTypes().removeAll(ButtonType.OK, ButtonType.CANCEL);
 		getDialogPane().getButtonTypes().addAll(okButton, ButtonType.CANCEL);
-		
+
 		// Content
 		setTitle(title);
 		setHeaderText(headerText);
diff --git a/Repository/.gitignore b/Repository/.gitignore
@@ -0,0 +1,2 @@
+/build/
+/bin/
diff --git a/Repository/build.gradle b/Repository/build.gradle
@@ -0,0 +1,28 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+
+	// Another module
+	implementation project(':Utils')
+    implementation project(':Common')
+    implementation project(':Core')
+
+    // Apache Commons Library
+    implementation 'commons-io:commons-io:2.8.0'
+    implementation 'org.apache.commons:commons-configuration2:2.7'
+    
+    // Apache POI
+    implementation 'org.apache.poi:poi:3.17'
+    implementation 'org.apache.poi:poi-ooxml-schemas:3.17'
+    implementation 'org.apache.poi:poi-scratchpad:3.17'
+    implementation 'org.apache.poi:poi-ooxml:3.17'
+    
+    // Logback
+    implementation 'ch.qos.logback:logback-classic:1.2.3'
+}
diff --git a/Repository/src/main/java/root/repository/implement/DBCheckRepositoryImpl.java b/Repository/src/main/java/root/repository/implement/DBCheckRepositoryImpl.java
@@ -1,4 +1,4 @@
-package root.core.repository.implement;
+package root.repository.implement;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/Repository/src/main/java/root/repository/implement/LinuxServerMonitoringRepository.java b/Repository/src/main/java/root/repository/implement/LinuxServerMonitoringRepository.java
@@ -1,4 +1,4 @@
-package root.core.repository.implement;
+package root.repository.implement;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/Repository/src/main/java/root/repository/implement/PropertyRepositoryImpl.java b/Repository/src/main/java/root/repository/implement/PropertyRepositoryImpl.java
@@ -1,4 +1,4 @@
-package root.core.repository.implement;
+package root.repository.implement;
 
 import java.io.BufferedWriter;
 import java.io.File;
diff --git a/Repository/src/main/java/root/repository/implement/ReportFileRepo.java b/Repository/src/main/java/root/repository/implement/ReportFileRepo.java
@@ -1,4 +1,4 @@
-package root.core.repository.implement;
+package root.repository.implement;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/Repository/src/main/java/root/repository/implement/WindowServerMonitoringRepository.java b/Repository/src/main/java/root/repository/implement/WindowServerMonitoringRepository.java
@@ -1,4 +1,4 @@
-package root.core.repository.implement;
+package root.repository.implement;
 
 import java.util.List;
 import java.util.StringTokenizer;
diff --git a/Repository/src/main/java/root/service/implement/FilePropertyService.java b/Repository/src/main/java/root/service/implement/FilePropertyService.java
@@ -1,4 +1,4 @@
-package root.core.service.implement;
+package root.service.implement;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/Repository/src/test/java/root/repository/implement/LinuxServerMonitoringRepositoryTest.java b/Repository/src/test/java/root/repository/implement/LinuxServerMonitoringRepositoryTest.java
@@ -1,4 +1,4 @@
-package root.core.repository.implement;
+package root.repository.implement;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
diff --git a/Repository/src/test/java/root/repository/implement/ReportRepositoryImplTest.java b/Repository/src/test/java/root/repository/implement/ReportRepositoryImplTest.java
@@ -1,4 +1,4 @@
-package root.core.repository.implement;
+package root.repository.implement;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/Repository/src/test/java/root/repository/implement/WindowServerMonitoringRepositoryTest.java b/Repository/src/test/java/root/repository/implement/WindowServerMonitoringRepositoryTest.java
@@ -1,4 +1,4 @@
-package root.core.repository.implement;
+package root.repository.implement;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/settings.gradle b/settings.gradle
@@ -3,12 +3,14 @@ rootProject.name = 'DBMonitoring'
 include ":Utils"
 include ":Common"
 include ":Core"
+include ":Repository"
 include ":DBMonitoringWindowApp"
 include ":DBMonitoringDownloaderApp"
 
 
 project(":Utils").projectDir = file("Utils")
 project(":Common").projectDir = file("Common")
 project(":Core").projectDir = file("Core")
+project(":Repository").projectDir = file("Repository")
 project(":DBMonitoringWindowApp").projectDir = file("DBMonitoringWindowApp")
 project(":DBMonitoringDownloaderApp").projectDir = file("DBMonitoringDownloaderApp")
