Merge pull request #120 from Dokyeongyun/develop

Develop

Author: Dokyeongyun

pom.xml

@@ -19,18 +19,18 @@
 			<version>11.2.0.4</version>
 		</dependency>
 
-		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-configuration2 -->
+		<!-- commons-configuration2 -->
 		<dependency>
 		    <groupId>org.apache.commons</groupId>
 		    <artifactId>commons-configuration2</artifactId>
-		    <version>2.4</version>
+		    <version>2.7</version>
 		</dependency>
 
-		<!-- https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils -->
+		<!-- commons-beanutils -->
 		<dependency>
 		    <groupId>commons-beanutils</groupId>
 		    <artifactId>commons-beanutils</artifactId>
-		    <version>1.9.3</version>
+		    <version>1.9.4</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/com.jcraft/jsch -->
@@ -61,11 +61,11 @@
 		    <version>2.6</version>
 		</dependency>
 
-		<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
+		<!-- Guava -->
 		<dependency>
 		    <groupId>com.google.guava</groupId>
 		    <artifactId>guava</artifactId>
-		    <version>21.0</version>
+		    <version>30.1.1-jre</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/com.opencsv/opencsv -->
@@ -79,28 +79,28 @@
 		<dependency>
 		    <groupId>org.apache.poi</groupId>
 		    <artifactId>poi</artifactId>
-		    <version>3.14</version>
+		    <version>3.17</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml-schemas -->
 		<dependency>
 		    <groupId>org.apache.poi</groupId>
 		    <artifactId>poi-ooxml-schemas</artifactId>
-		    <version>3.14</version>
+		    <version>3.17</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.apache.poi/poi-scratchpad -->
 		<dependency>
 		    <groupId>org.apache.poi</groupId>
 		    <artifactId>poi-scratchpad</artifactId>
-		    <version>3.14</version>
+		    <version>3.17</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
 		<dependency>
 		    <groupId>org.apache.poi</groupId>
 		    <artifactId>poi-ooxml</artifactId>
-		    <version>3.14</version>
+		    <version>3.17</version>
 		</dependency>
 
 		<!-- JavaFX UI -->

src/main/java/Root/common/database/implement/JdbcDatabase.java

@@ -110,7 +110,7 @@ public boolean rollback(Connection conn) {
 	 * @param validationQuery the query to be executed with the connection
 	 * @return 1 if valid, else return -1
 	 */
-	public boolean validateConn(Connection conn, String validationQuery) {
+	public static boolean validateConn(Connection conn, String validationQuery) {
 		if (conn == null) {
 			return false;
 		}

src/main/java/Root/core/domain/JdbcConnectionInfo.java

@@ -21,8 +21,19 @@ public class JdbcConnectionInfo {
 	private String jdbcHost;
 	private String jdbcPort;
 	private String jdbcOracleDriver;
-	
-	public JdbcConnectionInfo(String jdbcDBName, String jdbcDriver, String jdbcUrl, String jdbcId, String jdbcPw, String jdbcValidation, int jdbcConnections) {
+
+	public JdbcConnectionInfo(String jdbcDriver, String jdbcUrl, String jdbcId, String jdbcPw, String jdbcValidation,
+			int jdbcConnections) {
+		this.jdbcDriver = jdbcDriver;
+		this.jdbcUrl = jdbcUrl;
+		this.jdbcId = jdbcId;
+		this.jdbcPw = jdbcPw;
+		this.jdbcValidation = jdbcValidation;
+		this.jdbcConnections = jdbcConnections;
+	}
+
+	public JdbcConnectionInfo(String jdbcDBName, String jdbcDriver, String jdbcUrl, String jdbcId, String jdbcPw,
+			String jdbcValidation, int jdbcConnections) {
 		this.jdbcDBName = jdbcDBName;
 		this.jdbcDriver = jdbcDriver;
 		this.jdbcUrl = jdbcUrl;

src/main/java/Root/javafx/Service/DatabaseConnectService.java

@@ -0,0 +1,37 @@
+package root.javafx.Service;
+
+import javafx.concurrent.Service;
+import javafx.concurrent.Task;
+import javafx.scene.control.Alert.AlertType;
+import root.common.database.implement.JdbcDatabase;
+import root.core.domain.JdbcConnectionInfo;
+import root.utils.AlertUtils;
+
+public class DatabaseConnectService extends Service<Boolean> {
+
+	public static final String SUCCESS_MSG = "데이터베이스가 성공적으로 연동되었습니다.\n URL: %s \n Driver: %s";
+	public static final String FAIL_MSG = "데이터베이스 연동에 실패했습니다.\n URL: %s \n Driver: %s";
+
+	private JdbcConnectionInfo jdbc;
+	private JdbcDatabase db;
+
+	public DatabaseConnectService(JdbcConnectionInfo jdbc) {
+		this.jdbc = jdbc;
+		this.db = new JdbcDatabase(jdbc);
+	}
+
+	@Override
+	protected Task<Boolean> createTask() {
+		return new Task<Boolean>() {
+			@Override
+			protected Boolean call() throws Exception {
+				db.init();
+				boolean isConn = JdbcDatabase.validateConn(db.getConn(), jdbc.getJdbcValidation());
+				if (!isConn) {
+					throw new Exception("Database connection test Failed");
+				}
+				return isConn;
+			}
+		};
+	}
+}

src/main/java/Root/utils/DBManageExcel.java

@@ -33,14 +33,14 @@ public static void createMonthlyReportInExcel(int year, int month) {
 
 			// CellStyle 생성
 			// 1. 회색 배경, 검은색 실선 테두리, 중앙정렬
-			XSSFCellStyle grayCS = excel.createCellStyle("d0cece", (short) 0);
+			XSSFCellStyle grayCS = excel.createCellStyle("d0cece", false);
 			// 2. 회색 배경, 검은색 실선 테두리, 왼쪽정렬
-			XSSFCellStyle grayCSLeft = excel.createCellStyle("d0cece", (short) 0);
+			XSSFCellStyle grayCSLeft = excel.createCellStyle("d0cece", false);
 			grayCSLeft.setAlignment(HorizontalAlignment.LEFT);
 			// 3. 흰색 배경, 검은색 실선 테두리, 중앙정렬
-			XSSFCellStyle whiteCS = excel.createCellStyle("ffffff", (short) 0);
+			XSSFCellStyle whiteCS = excel.createCellStyle("ffffff", false);
 			// 4. 흰색 배경, 검은색 실선 테두리, 왼쪽정렬
-			XSSFCellStyle whiteCSLeft = excel.createCellStyle("ffffff", (short) 0);
+			XSSFCellStyle whiteCSLeft = excel.createCellStyle("ffffff", false);
 			whiteCSLeft.setAlignment(HorizontalAlignment.LEFT);
 
 			// Write Header Region