로 설정됨)
- * 3. 반드시 확인하고 변경해야할 정보는 수신자(smtp.to), 서버호스트(smtp.host), 포트(smtp.port) 이다.
- * 4. 테스트 케이스 실행 전, 서버(run.bat)를 띄운다.
- * 5. SMTP를 통해 보낸 메일을 확인하기 위해 outlook으로 연결하여 생성한 계정으로 로그인한다.
- * 6. 테스트 케이스 실행 후 받은 편지함을 확인한다.
- * */
-
- /**
- * 아래는 SMTPAppender를 테스트하는 메소드
- * logger: level=ERROR, appender=SMTP
- * */
- @Test
- public void testSMTPAppender() {
- System.setProperty("mail.smtp.starttls.enable", "true");
- System.setProperty("mail.smtps.auth", "true");
-
- Logger logger = LogManager.getLogger("mailLogger");
-
- // 로그 출력
- logger.error("SMTPAppender 테스트 test");
- }
-}
diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/Log4j2FilterTest.java b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/Log4j2FilterTest.java
index 637d0314..16258288 100644
--- a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/Log4j2FilterTest.java
+++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/Log4j2FilterTest.java
@@ -1,23 +1,21 @@
package org.egovframe.rte.fdl.logging;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-
-import org.egovframe.rte.fdl.logging.sample.MarkerFilterTestSample;
-import org.egovframe.rte.fdl.logging.util.LogFileUtil;
-
-import javax.annotation.Resource;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.ThreadContext;
+import org.egovframe.rte.fdl.logging.sample.MarkerFilterTestSample;
+import org.egovframe.rte.fdl.logging.util.LogFileUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import javax.annotation.Resource;
+import java.io.File;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = { "classpath*:META-INF/spring/context-common.xml" })
public class Log4j2FilterTest {
@@ -57,7 +55,7 @@ public void testThresholdFilter() throws Exception {
assertTrue(!LogFileUtil.contains(logFileDir, "DEBUG"));
assertEquals(2, LogFileUtil.countWords(logFileDir, "ERROR"));
- String[] tailLines = LogFileUtil.getTailLines(logFile, 35);
+ String[] tailLines = LogFileUtil.getTailLines(logFile, 37);
assertTrue(tailLines[0].endsWith("- An ArithmeticException have been thrown"));
// 엔트리 메서드는 메서드 명으로 로그 메세지가 출력됨 (ex. entry() - entry, exit() - exit ...)
assertTrue(tailLines[1].endsWith("- Catching"));
diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/Log4j2FlowTracingTest.java b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/Log4j2FlowTracingTest.java
index 1a41edc4..5a0927b2 100644
--- a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/Log4j2FlowTracingTest.java
+++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/Log4j2FlowTracingTest.java
@@ -1,16 +1,15 @@
package org.egovframe.rte.fdl.logging;
-import org.egovframe.rte.fdl.logging.sample.FlowTracingTestSample;
-
-import javax.annotation.Resource;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.egovframe.rte.fdl.logging.sample.FlowTracingTestSample;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import javax.annotation.Resource;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = { "classpath*:META-INF/spring/context-common.xml" })
public class Log4j2FlowTracingTest {
diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/LogLayoutTest.java b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/LogLayoutTest.java
index e2fd745c..a1e77ae4 100644
--- a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/LogLayoutTest.java
+++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/LogLayoutTest.java
@@ -1,21 +1,5 @@
package org.egovframe.rte.fdl.logging;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.egovframe.rte.fdl.logging.sample.LogLayoutSample;
-import org.egovframe.rte.fdl.logging.util.LogFileUtil;
-
-import javax.annotation.Resource;
-
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.ThreadContext;
@@ -23,12 +7,24 @@
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.appender.FileAppender;
import org.apache.logging.log4j.core.layout.PatternLayout;
+import org.egovframe.rte.fdl.logging.sample.LogLayoutSample;
+import org.egovframe.rte.fdl.logging.util.LogFileUtil;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import javax.annotation.Resource;
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.junit.Assert.*;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = { "classpath*:META-INF/spring/context-common.xml" })
public class LogLayoutTest {
diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/LogLevelTest.java b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/LogLevelTest.java
index a7f2fced..c49bd8a2 100644
--- a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/LogLevelTest.java
+++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/LogLevelTest.java
@@ -1,37 +1,28 @@
package org.egovframe.rte.fdl.logging;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.util.Map;
-
-import org.egovframe.rte.fdl.logging.sample.LogLevelDebug;
-import org.egovframe.rte.fdl.logging.sample.LogLevelError;
-import org.egovframe.rte.fdl.logging.sample.LogLevelFatal;
-import org.egovframe.rte.fdl.logging.sample.LogLevelInfo;
-import org.egovframe.rte.fdl.logging.sample.LogLevelWarn;
-import org.egovframe.rte.fdl.logging.sample.service.LogTestService;
-import org.egovframe.rte.fdl.logging.sample.service.SomeVO;
-import org.egovframe.rte.fdl.logging.sample.service.impl.LogTestServiceImpl;
-import org.egovframe.rte.fdl.logging.util.LogFileUtil;
-
-import javax.annotation.Resource;
-
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.appender.FileAppender;
+import org.egovframe.rte.fdl.logging.sample.*;
+import org.egovframe.rte.fdl.logging.sample.service.LogTestService;
+import org.egovframe.rte.fdl.logging.sample.service.SomeVO;
+import org.egovframe.rte.fdl.logging.sample.service.impl.LogTestServiceImpl;
+import org.egovframe.rte.fdl.logging.util.LogFileUtil;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import javax.annotation.Resource;
+import java.io.File;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = { "classpath*:META-INF/spring/context-common.xml" })
public class LogLevelTest {
diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/LogTargetTest.java b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/LogTargetTest.java
index 0761b806..244c077b 100644
--- a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/LogTargetTest.java
+++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/LogTargetTest.java
@@ -1,21 +1,20 @@
package org.egovframe.rte.fdl.logging;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.egovframe.rte.fdl.logging.sample.LogLayoutSample;
+import org.egovframe.rte.fdl.logging.util.LogFileUtil;
+import org.junit.Test;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.Date;
-import org.egovframe.rte.fdl.logging.sample.LogLayoutSample;
-import org.egovframe.rte.fdl.logging.util.LogFileUtil;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
public class LogTargetTest {
-
+
/**
* 아래는 ConsoleAppender를 테스트하는 메소드 egovframework Logger: level=DEBUG,
* appender=Console
diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/LoggerHierarchyTest.java b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/LoggerHierarchyTest.java
index 9892a971..4eda920e 100644
--- a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/LoggerHierarchyTest.java
+++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/LoggerHierarchyTest.java
@@ -1,18 +1,17 @@
package org.egovframe.rte.fdl.logging;
-import static org.junit.Assert.assertEquals;
-
-import org.egovframe.rte.fdl.logging.sample.LogTestSample;
-
-import javax.annotation.Resource;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Logger;
+import org.egovframe.rte.fdl.logging.sample.LogTestSample;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import javax.annotation.Resource;
+
+import static org.junit.Assert.assertEquals;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = { "classpath*:META-INF/spring/context-common.xml" })
public class LoggerHierarchyTest {
diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/LoggerMatchingTest.java b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/LoggerMatchingTest.java
index b9aacd8c..60b74876 100644
--- a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/LoggerMatchingTest.java
+++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/LoggerMatchingTest.java
@@ -1,27 +1,20 @@
package org.egovframe.rte.fdl.logging;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-
-import org.egovframe.rte.fdl.logging.sample.LogLayoutSample;
-import org.egovframe.rte.fdl.logging.sample.LogLevelDebug;
-import org.egovframe.rte.fdl.logging.sample.LogLevelError;
-import org.egovframe.rte.fdl.logging.sample.LogLevelFatal;
-import org.egovframe.rte.fdl.logging.sample.LogLevelInfo;
-import org.egovframe.rte.fdl.logging.sample.LogLevelWarn;
-import org.egovframe.rte.fdl.logging.sample.LogTestSample;
-import org.egovframe.rte.fdl.logging.util.LogFileUtil;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.ThreadContext;
+import org.egovframe.rte.fdl.logging.sample.*;
+import org.egovframe.rte.fdl.logging.util.LogFileUtil;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import java.io.File;
+
+import static org.junit.Assert.assertTrue;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = { "classpath*:META-INF/spring/context-common.xml" })
public class LoggerMatchingTest {
diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/MethodLoggingTest.java b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/MethodLoggingTest.java
index bc27dcab..add85958 100644
--- a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/MethodLoggingTest.java
+++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/MethodLoggingTest.java
@@ -2,14 +2,13 @@
import org.egovframe.rte.fdl.logging.sample.service.LogTestService;
import org.egovframe.rte.fdl.logging.sample.service.SomeVO;
-
-import javax.annotation.Resource;
-
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import javax.annotation.Resource;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {
"classpath*:META-INF/spring/context-common.xml",
diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/Slf4JLoggerTest.java b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/Slf4JLoggerTest.java
index bde393ec..8ad1944b 100644
--- a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/Slf4JLoggerTest.java
+++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/Slf4JLoggerTest.java
@@ -1,14 +1,7 @@
package org.egovframe.rte.fdl.logging;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
import org.egovframe.rte.fdl.logging.sample.LogLayoutSample;
import org.egovframe.rte.fdl.logging.util.LogFileUtil;
-
import org.junit.Test;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
@@ -16,6 +9,12 @@
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import static org.junit.Assert.assertTrue;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = { "classpath*:META-INF/spring/context-common.xml" })
public class Slf4JLoggerTest {
diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/sample/service/SomeVO.java b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/sample/service/SomeVO.java
index edf04d7e..762238c8 100644
--- a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/sample/service/SomeVO.java
+++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/sample/service/SomeVO.java
@@ -1,9 +1,9 @@
package org.egovframe.rte.fdl.logging.sample.service;
-import java.io.Serializable;
-
import org.apache.commons.lang3.builder.ToStringBuilder;
+import java.io.Serializable;
+
public class SomeVO implements Serializable {
private static final long serialVersionUID = -1717767349866238571L;
diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/sample/service/impl/LogTestServiceImpl.java b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/sample/service/impl/LogTestServiceImpl.java
index 3d36b84d..80996b9d 100644
--- a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/sample/service/impl/LogTestServiceImpl.java
+++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/sample/service/impl/LogTestServiceImpl.java
@@ -1,10 +1,9 @@
package org.egovframe.rte.fdl.logging.sample.service.impl;
-import org.egovframe.rte.fdl.logging.sample.service.LogTestService;
-import org.egovframe.rte.fdl.logging.sample.service.SomeVO;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.egovframe.rte.fdl.logging.sample.service.LogTestService;
+import org.egovframe.rte.fdl.logging.sample.service.SomeVO;
import org.springframework.stereotype.Service;
@Service("logTestService")
diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/util/LogFileUtil.java b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/util/LogFileUtil.java
index e9ef7ed0..560074b7 100644
--- a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/util/LogFileUtil.java
+++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/util/LogFileUtil.java
@@ -1,10 +1,6 @@
package org.egovframe.rte.fdl.logging.util;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.RandomAccessFile;
+import java.io.*;
public class LogFileUtil {
diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/context-common.xml b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/context-common.xml
index 89ea20cd..d079b920 100644
--- a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/context-common.xml
+++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/context-common.xml
@@ -2,15 +2,11 @@
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/jdbc.properties b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/jdbc.properties
index aaa2fa09..3879fce8 100644
--- a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/jdbc.properties
+++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/jdbc.properties
@@ -1,7 +1,4 @@
-# JDBCAppender \ud14c\uc2a4\ud2b8\ub97c \uc704\ud55c \uc815\ubcf4
-
jdbc.driver=org.hsqldb.jdbcDriver
-jdbc.dburl=jdbc:hsqldb:mem:testdb
+jdbc.url=jdbc:hsqldb:mem:testdb
jdbc.username=sa
jdbc.password=
-usingDBMS=hsqldb
diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/db2l.sql b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/db2l.sql
deleted file mode 100644
index 6124f552..00000000
--- a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/db2l.sql
+++ /dev/null
@@ -1,64 +0,0 @@
--- 2014.01.13 추가 log4j 2 testdata
--- This SQL script creates the required tables by org.apache.logging.log4j.core.appender.db.jdbc.JDBCAppender
---
--- It is intended for PostgreSQL databases
-
-DROP TABLE db_log;
-COMMIT;
-
-CREATE TABLE db_log (
- eventDate timestamp NOT NULL,
- level varchar(254),
- logger varchar(254),
- message text,
- exception text
-);
-COMMIT;
-
--- 이전 log4j 1.x testdata
--- This SQL script creates the required tables by org.apache.log4j.db.DBAppender and
--- org.apache.log4j.db.DBReceiver.
---
--- It is intended for PostgreSQL databases.
-
-DROP TABLE logging_event_property;
-DROP TABLE logging_event_exception;
-DROP TABLE logging_event;
-
-
-CREATE SEQUENCE logging_event_id_seq MINVALUE 1 START 1;
-
-CREATE TABLE logging_event
- (
- sequence_number BIGINT NOT NULL,
- timestamp BIGINT NOT NULL,
- rendered_message TEXT NOT NULL,
- logger_name VARCHAR(254) NOT NULL,
- level_string VARCHAR(254) NOT NULL,
- ndc TEXT,
- thread_name VARCHAR(254),
- reference_flag SMALLINT,
- caller_filename VARCHAR(254) NOT NULL,
- caller_class VARCHAR(254) NOT NULL,
- caller_method VARCHAR(254) NOT NULL,
- caller_line CHAR(4) NOT NULL,
- event_id INT IDENTITY GENERATED ALWAYS PRIMARY KEY
- );
-
-CREATE TABLE logging_event_property
- (
- event_id INT NOT NULL,
- mapped_key VARCHAR(254) NOT NULL,
- mapped_value VARCHAR(1024),
- PRIMARY KEY(event_id, mapped_key),
- FOREIGN KEY (event_id) REFERENCES logging_event(event_id)
- );
-
-CREATE TABLE logging_event_exception
- (
- event_id INT NOT NULL,
- i SMALLINT NOT NULL,
- trace_line VARCHAR(254) NOT NULL,
- PRIMARY KEY(event_id, i),
- FOREIGN KEY (event_id) REFERENCES logging_event(event_id)
- );
diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/hsqldb.sql b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/hsqldb.sql
deleted file mode 100644
index 6d604ba5..00000000
--- a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/hsqldb.sql
+++ /dev/null
@@ -1,16 +0,0 @@
--- 2014.01.13 추가 log4j 2 testdata
--- This SQL script creates the required tables by org.apache.logging.log4j.core.appender.db.jdbc.JDBCAppender
---
--- It is intended for HSQLDB.
-
-DROP TABLE db_log IF EXISTS;
-COMMIT;
-
-CREATE TABLE db_log (
- eventDate timestamp NOT NULL,
- level VARCHAR(254),
- logger VARCHAR(254),
- message LONGVARCHAR,
- exception LONGVARCHAR
-);
-COMMIT;
diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/mssql.sql b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/mssql.sql
deleted file mode 100644
index 84569122..00000000
--- a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/mssql.sql
+++ /dev/null
@@ -1,62 +0,0 @@
--- 2014.01.13 추가 log4j 2 testdata
--- This SQL script creates the required tables by org.apache.logging.log4j.core.appender.db.jdbc.JDBCAppender
---
--- It is intended for MS SQL Server databases.
-DROP TABLE db_log
-COMMIT;
-
-CREATE TABLE db_log (
- eventDate timestamp NOT NULL,
- level VARCHAR(254),
- logger VARCHAR(254),
- message VARCHAR(4000),
- exception VARCHAR(4000)
-);
-COMMIT;
-
--- 이전 log4j 1.x testdata
--- This SQL script creates the required tables by org.apache.log4j.db.DBAppender and
--- org.apache.log4j.db.DBReceiver.
---
--- It is intended for MS SQL Server databases. This has been tested with version 7.0.
-
-DROP TABLE logging_event_property
-DROP TABLE logging_event_exception
-DROP TABLE logging_event
-
-CREATE TABLE logging_event
- (
- sequence_number DECIMAL(20) NOT NULL,
- timestamp DECIMAL(20) NOT NULL,
- rendered_message VARCHAR(4000) NOT NULL,
- logger_name VARCHAR(254) NOT NULL,
- level_string VARCHAR(254) NOT NULL,
- ndc VARCHAR(4000),
- thread_name VARCHAR(254),
- reference_flag SMALLINT,
- caller_filename VARCHAR(254) NOT NULL,
- caller_class VARCHAR(254) NOT NULL,
- caller_method VARCHAR(254) NOT NULL,
- caller_line CHAR(4) NOT NULL,
- event_id INT NOT NULL identity,
- PRIMARY KEY(event_id)
- )
-
-CREATE TABLE logging_event_property
- (
- event_id INT NOT NULL,
- mapped_key VARCHAR(254) NOT NULL,
- mapped_value VARCHAR(1024),
- PRIMARY KEY(event_id, mapped_key),
- FOREIGN KEY (event_id) REFERENCES logging_event(event_id)
- )
-
-CREATE TABLE logging_event_exception
- (
- event_id INT NOT NULL,
- i SMALLINT NOT NULL,
- trace_line VARCHAR(254) NOT NULL,
- PRIMARY KEY(event_id, i),
- FOREIGN KEY (event_id) REFERENCES logging_event(event_id)
- )
-
diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/mysql.sql b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/mysql.sql
deleted file mode 100644
index 1b8827dd..00000000
--- a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/mysql.sql
+++ /dev/null
@@ -1,68 +0,0 @@
--- 2014.01.13 추가 log4j 2 testdata
--- This SQL script creates the required tables by org.apache.logging.log4j.core.appender.db.jdbc.JDBCAppender
--- It is intended for MySQL databases. It has been tested on MySQL 5.1 with INNODB tables.
-
-DROP TABLE IF EXISTS db_log;
-
-CREATE TABLE db_log (
- eventDate timestamp NOT NULL,
- level varchar(254),
- logger varchar(254),
- message text,
- exception text
-);
-COMMIT;
-
-
--- 이전 log4j 1.x testdata
--- This SQL script creates the required tables by org.apache.log4j.db.DBAppender and
--- org.apache.log4j.db.DBReceiver.
---
--- It is intended for MySQL databases. It has been tested on MySQL 4.1.1 with INNODB tables.
-BEGIN;
-DROP TABLE IF EXISTS logging_event_property;
-DROP TABLE IF EXISTS logging_event_exception;
-DROP TABLE IF EXISTS logging_event;
-COMMIT;
-
-
-BEGIN;
-CREATE TABLE logging_event
- (
- sequence_number BIGINT NOT NULL,
- timestamp BIGINT NOT NULL,
- rendered_message TEXT NOT NULL,
- logger_name VARCHAR(254) NOT NULL,
- level_string VARCHAR(254) NOT NULL,
- ndc TEXT,
- thread_name VARCHAR(254),
- reference_flag SMALLINT,
- caller_filename VARCHAR(254) NOT NULL,
- caller_class VARCHAR(254) NOT NULL,
- caller_method VARCHAR(254) NOT NULL,
- caller_line CHAR(4) NOT NULL,
- event_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY
- );
-COMMIT;
-
-BEGIN;
-CREATE TABLE logging_event_property
- (
- event_id INT NOT NULL,
- mapped_key VARCHAR(254) NOT NULL,
- mapped_value TEXT,
- PRIMARY KEY(event_id, mapped_key),
- FOREIGN KEY (event_id) REFERENCES logging_event(event_id)
- );
-COMMIT;
-
-BEGIN;
-CREATE TABLE logging_event_exception
- (
- event_id INT NOT NULL,
- i SMALLINT NOT NULL,
- trace_line VARCHAR(254) NOT NULL,
- PRIMARY KEY(event_id, i),
- FOREIGN KEY (event_id) REFERENCES logging_event(event_id)
- );
-COMMIT;
diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/oracle.sql b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/oracle.sql
deleted file mode 100644
index 16a360b6..00000000
--- a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/oracle.sql
+++ /dev/null
@@ -1,70 +0,0 @@
--- 2014.01.13 추가 log4j 2 testdata
--- This SQL script creates the required tables by org.apache.logging.log4j.core.appender.db.jdbc.JDBCAppender
--- It is intended for Oracle databases.
-
-DROP TABLE db_log;
-COMMIT;
-
-CREATE TABLE db_log (
- eventDate timestamp NOT NULL,
- level VARCHAR2(254),
- logger VARCHAR2(254),
- message VARCHAR2(4000),
- exception VARCHAR2(4000)
-);
-COMMIT;
-
--- 이전 log4j 1.x testdata
--- This SQL script creates the required tables by org.apache.log4j.db.DBAppender and org.apache.log4j.db.DBReceiver.
---
--- It is intended for Oracle databases.
--- Tested successfully on Oracle9i Release 9.2.0.3.0 by James Stauffer
--- The following lines are useful in cleaning any previous tables
-
-drop TRIGGER logging_event_id_seq_trig;
-drop SEQUENCE logging_event_id_seq;
-drop table logging_event_property;
-drop table logging_event_exception;
-drop table logging_event;
-
-
-CREATE SEQUENCE logging_event_id_seq MINVALUE 1 START WITH 1;
-
-CREATE TABLE logging_event
- (
- sequence_number NUMBER(20) NOT NULL,
- timestamp NUMBER(20) NOT NULL,
- rendered_message VARCHAR2(4000) NOT NULL,
- logger_name VARCHAR2(254) NOT NULL,
- level_string VARCHAR2(254) NOT NULL,
- ndc VARCHAR2(4000),
- thread_name VARCHAR2(254),
- reference_flag SMALLINT,
- caller_filename VARCHAR2(254) NOT NULL,
- caller_class VARCHAR2(254) NOT NULL,
- caller_method VARCHAR2(254) NOT NULL,
- caller_line CHAR(4) NOT NULL,
- event_id NUMBER(10) PRIMARY KEY
- );
-
-CREATE TABLE logging_event_property
- (
- event_id NUMBER(10) NOT NULL,
- mapped_key VARCHAR2(254) NOT NULL,
- mapped_value VARCHAR2(1024),
- PRIMARY KEY(event_id, mapped_key),
- FOREIGN KEY (event_id) REFERENCES logging_event(event_id)
- );
-
-CREATE TABLE logging_event_exception
- (
- event_id NUMBER(10) NOT NULL,
- i SMALLINT NOT NULL,
- trace_line VARCHAR2(254) NOT NULL,
- PRIMARY KEY(event_id, i),
- FOREIGN KEY (event_id) REFERENCES logging_event(event_id)
- );
-
-
-
-
diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/postgresql.sql b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/postgresql.sql
deleted file mode 100644
index 4cab1ec9..00000000
--- a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/postgresql.sql
+++ /dev/null
@@ -1,65 +0,0 @@
--- 2014.01.13 추가 log4j 2 testdata
--- This SQL script creates the required tables by org.apache.logging.log4j.core.appender.db.jdbc.JDBCAppender
---
--- It is intended for PostgreSQL databases.
-DROP TABLE db_log;
-COMMIT;
-
-CREATE TABLE db_log (
- eventDate timestamp NOT NULL,
- level VARCHAR(254),
- logger VARCHAR(254),
- message TEXT,
- exception TEXT
-);
-COMMIT;
-
-
--- 이전 log4j 1.x testdata
--- This SQL script creates the required tables by org.apache.log4j.db.DBAppender and org.apache.log4j.db.DBReceiver.
---
--- It is intended for PostgreSQL databases.
-
-DROP TABLE logging_event_property;
-DROP TABLE logging_event_exception;
-DROP SEQUENCE logging_event_id_seq;
-DROP TABLE logging_event;
-
-
-CREATE SEQUENCE logging_event_id_seq MINVALUE 1 START 1;
-
-
-CREATE TABLE logging_event
- (
- sequence_number BIGINT NOT NULL,
- timestamp BIGINT NOT NULL,
- rendered_message TEXT NOT NULL,
- logger_name VARCHAR(254) NOT NULL,
- level_string VARCHAR(254) NOT NULL,
- ndc TEXT,
- thread_name VARCHAR(254),
- reference_flag SMALLINT,
- caller_filename VARCHAR(254) NOT NULL,
- caller_class VARCHAR(254) NOT NULL,
- caller_method VARCHAR(254) NOT NULL,
- caller_line CHAR(4) NOT NULL,
- event_id INT DEFAULT nextval('logging_event_id_seq') PRIMARY KEY
- );
-
-CREATE TABLE logging_event_property
- (
- event_id INT NOT NULL,
- mapped_key VARCHAR(254) NOT NULL,
- mapped_value VARCHAR(1024),
- PRIMARY KEY(event_id, mapped_key),
- FOREIGN KEY (event_id) REFERENCES logging_event(event_id)
- );
-
-CREATE TABLE logging_event_exception
- (
- event_id INT NOT NULL,
- i SMALLINT NOT NULL,
- trace_line VARCHAR(254) NOT NULL,
- PRIMARY KEY(event_id, i),
- FOREIGN KEY (event_id) REFERENCES logging_event(event_id)
- );
diff --git a/Foundation/org.egovframe.rte.fdl.property/pom.xml b/Foundation/org.egovframe.rte.fdl.property/pom.xml
index f37a0619..d4c27904 100644
--- a/Foundation/org.egovframe.rte.fdl.property/pom.xml
+++ b/Foundation/org.egovframe.rte.fdl.property/pom.xml
@@ -4,8 +4,8 @@
4.0.0
org.egovframe.rte
org.egovframe.rte.fdl.property
+ 4.1.0
jar
- 4.0.0
org.egovframe.rte.fdl.property
The eGovernment Standard Framework
https://www.egovframe.go.kr
@@ -18,10 +18,10 @@
- 5.3.6
- 4.0.0
- UTF-8
- UTF-8
+ 5.3.20
+ 4.1.0
+ 1.8
+ UTF-8
@@ -65,21 +65,21 @@
- org.springframework
- spring-test
- ${spring.maven.artifact.version}
+ junit
+ junit
+ 4.13.2
test
- junit
- junit
- 4.13.1
+ org.springframework
+ spring-test
+ ${spring.maven.artifact.version}
test
org.easymock
easymock
- 4.1
+ 4.3
test
@@ -93,30 +93,22 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.8.1
+ 3.10.1
- 1.8
- 1.8
- UTF-8
+ ${java.version}
+ ${java.version}
+ ${project.encoding}
org.codehaus.mojo
hibernate3-maven-plugin
3.0
-
-
-
- hbm2ddl
- annotationconfiguration
-
-
-
org.hsqldb
hsqldb
- 2.5.0
+ 2.5.2
@@ -130,7 +122,7 @@
org.apache.maven.plugins
maven-pmd-plugin
- 3.12.0
+ 3.17.0
@@ -176,9 +168,9 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.1.1
+ 3.4.0
- 1.8
+ ${java.version}
-Xdoclint:none
@@ -191,7 +183,7 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
- 3.1.2
+ 3.3.0
sunlink
@@ -201,7 +193,7 @@
true
-
@@ -232,9 +224,9 @@
128m
512m
- UTF-8
- UTF-8
- UTF-8
+ ${project.encoding}
+ ${project.encoding}
+ ${project.encoding}
-Xdoclint:none
@@ -243,8 +235,8 @@
org.apache.maven.plugins
maven-jxr-plugin
- UTF-8
- UTF-8
+ ${project.encoding}
+ ${project.encoding}
true
apidocs
diff --git a/Foundation/org.egovframe.rte.fdl.property/src/main/java/org/egovframe/rte/fdl/property/EgovPropertyService.java b/Foundation/org.egovframe.rte.fdl.property/src/main/java/org/egovframe/rte/fdl/property/EgovPropertyService.java
index 4c4a8c6d..70751b43 100644
--- a/Foundation/org.egovframe.rte.fdl.property/src/main/java/org/egovframe/rte/fdl/property/EgovPropertyService.java
+++ b/Foundation/org.egovframe.rte.fdl.property/src/main/java/org/egovframe/rte/fdl/property/EgovPropertyService.java
@@ -15,13 +15,13 @@
*/
package org.egovframe.rte.fdl.property;
+import org.egovframe.rte.fdl.cmmn.exception.FdlException;
+
import java.io.IOException;
import java.util.Collection;
import java.util.Iterator;
import java.util.Vector;
-import org.egovframe.rte.fdl.cmmn.exception.FdlException;
-
/**
* Property 서비스의 인터페이스 클래스
*
diff --git a/Foundation/org.egovframe.rte.fdl.property/src/main/java/org/egovframe/rte/fdl/property/db/DbPropertySource.java b/Foundation/org.egovframe.rte.fdl.property/src/main/java/org/egovframe/rte/fdl/property/db/DbPropertySource.java
index 46ea16c6..14e882a8 100644
--- a/Foundation/org.egovframe.rte.fdl.property/src/main/java/org/egovframe/rte/fdl/property/db/DbPropertySource.java
+++ b/Foundation/org.egovframe.rte.fdl.property/src/main/java/org/egovframe/rte/fdl/property/db/DbPropertySource.java
@@ -16,9 +16,10 @@
*/
package org.egovframe.rte.fdl.property.db;
-import javax.sql.DataSource;
import org.springframework.core.env.PropertySource;
+import javax.sql.DataSource;
+
/**
* DB기반의 PropertySource를 관리하는 클래스
* @author yjLee
diff --git a/Foundation/org.egovframe.rte.fdl.property/src/main/java/org/egovframe/rte/fdl/property/db/DbPropertySourceDelegate.java b/Foundation/org.egovframe.rte.fdl.property/src/main/java/org/egovframe/rte/fdl/property/db/DbPropertySourceDelegate.java
index fe3da59a..108559a8 100644
--- a/Foundation/org.egovframe.rte.fdl.property/src/main/java/org/egovframe/rte/fdl/property/db/DbPropertySourceDelegate.java
+++ b/Foundation/org.egovframe.rte.fdl.property/src/main/java/org/egovframe/rte/fdl/property/db/DbPropertySourceDelegate.java
@@ -16,12 +16,13 @@
*/
package org.egovframe.rte.fdl.property.db;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+import javax.sql.DataSource;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.sql.DataSource;
-import org.springframework.jdbc.core.JdbcTemplate;
/**
* DB기반의 PropertySource를 저장하는 클래스
diff --git a/Foundation/org.egovframe.rte.fdl.property/src/main/java/org/egovframe/rte/fdl/property/impl/EgovPropertyServiceImpl.java b/Foundation/org.egovframe.rte.fdl.property/src/main/java/org/egovframe/rte/fdl/property/impl/EgovPropertyServiceImpl.java
index 71581b93..82a6e8c4 100644
--- a/Foundation/org.egovframe.rte.fdl.property/src/main/java/org/egovframe/rte/fdl/property/impl/EgovPropertyServiceImpl.java
+++ b/Foundation/org.egovframe.rte.fdl.property/src/main/java/org/egovframe/rte/fdl/property/impl/EgovPropertyServiceImpl.java
@@ -15,23 +15,12 @@
*/
package org.egovframe.rte.fdl.property.impl;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-
import org.apache.commons.collections.ExtendedProperties;
import org.egovframe.rte.fdl.cmmn.exception.FdlException;
import org.egovframe.rte.fdl.property.EgovPropertyService;
-
-import org.apache.commons.collections.ExtendedProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.ApplicationContext;
@@ -43,6 +32,9 @@
import org.springframework.core.io.support.ResourcePatternResolver;
import org.springframework.util.Assert;
+import java.io.IOException;
+import java.util.*;
+
/**
* Property 서비스의 구현 클래스
*
@@ -341,7 +333,7 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
* 파일위치정보를 가지고 resources 정보 추출
* @param location 파일위치
* @param encoding Encoding 정보
- * @throws Exception
+ * @throws IOException
*/
private void loadPropertyResources(String location, String encoding) throws IOException {
if (resourceLoader instanceof ResourcePatternResolver) {
@@ -357,7 +349,7 @@ private void loadPropertyResources(String location, String encoding) throws IOEx
* 멀티로 지정된 경우 처리를 위해 LOOP 처리
* @param resources 리소스정보
* @param encoding 인코딩정보
- * @throws Exception
+ * @throws IOException
*/
private void loadPropertyLoop(Resource[] resources, String encoding) throws IOException {
Assert.notNull(resources, "Resource array must not be null");
@@ -370,7 +362,7 @@ private void loadPropertyLoop(Resource[] resources, String encoding) throws IOEx
* 파일 정보를 읽어서 egovProperties에 저장
* @param resource 리소스정보
* @param encoding 인코딩정보
- * @throws Exception
+ * @throws IOException
*/
private void loadPropertyRes(Resource resource, String encoding) throws IOException {
LOGGER.debug(messageSource.getMessage("debug.properties.filename", new String[] { resource.getFilename(), encoding }, Locale.getDefault()));
diff --git a/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/PropertyServiceAllKeyValGetTest.java b/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/PropertyServiceAllKeyValGetTest.java
index 1e4e0682..ef3940cc 100644
--- a/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/PropertyServiceAllKeyValGetTest.java
+++ b/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/PropertyServiceAllKeyValGetTest.java
@@ -1,17 +1,16 @@
package org.egovframe.rte.fdl.property;
-import static org.junit.Assert.assertEquals;
-
-import java.util.Collection;
-
-import javax.annotation.Resource;
-
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import javax.annotation.Resource;
+import java.util.Collection;
+
+import static org.junit.Assert.assertEquals;
+
/**
* PropertyServiceAllKeyValGetTest
*
diff --git a/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/PropertyServiceBasicTest.java b/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/PropertyServiceBasicTest.java
index 7207db64..def3cc21 100644
--- a/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/PropertyServiceBasicTest.java
+++ b/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/PropertyServiceBasicTest.java
@@ -1,19 +1,16 @@
package org.egovframe.rte.fdl.property;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Vector;
-
-import javax.annotation.Resource;
-
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import javax.annotation.Resource;
+import java.util.Vector;
+
+import static org.junit.Assert.*;
+
/**
* Property Service 기본 기능 확인 클래스
* @author 실행환경 개발팀 김태호
diff --git a/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/PropertyServiceCharSetTest.java b/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/PropertyServiceCharSetTest.java
index 7149f2e8..34ae404f 100644
--- a/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/PropertyServiceCharSetTest.java
+++ b/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/PropertyServiceCharSetTest.java
@@ -1,14 +1,14 @@
package org.egovframe.rte.fdl.property;
-import static org.junit.Assert.assertEquals;
-
-import javax.annotation.Resource;
-
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import javax.annotation.Resource;
+
+import static org.junit.Assert.assertEquals;
+
/**
* Property Service 다국어 지원 기능 확인 클래스
* @author 실행환경 개발팀 김태호
diff --git a/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/PropertyServiceExtFileTest.java b/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/PropertyServiceExtFileTest.java
index dac85399..6f9347c4 100644
--- a/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/PropertyServiceExtFileTest.java
+++ b/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/PropertyServiceExtFileTest.java
@@ -1,15 +1,15 @@
package org.egovframe.rte.fdl.property;
-import static org.junit.Assert.assertEquals;
-
-import javax.annotation.Resource;
-
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import javax.annotation.Resource;
+
+import static org.junit.Assert.assertEquals;
+
/**
* Property Service 기본 기능 확인 클래스
* @author Vincent Han
diff --git a/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/PropertyServiceRefreshTest.java b/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/PropertyServiceRefreshTest.java
index 3ab3d619..cd9db370 100644
--- a/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/PropertyServiceRefreshTest.java
+++ b/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/PropertyServiceRefreshTest.java
@@ -1,9 +1,5 @@
package org.egovframe.rte.fdl.property;
-import static org.junit.Assert.assertEquals;
-
-import javax.annotation.Resource;
-
import org.egovframe.rte.fdl.cmmn.exception.FdlException;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -11,9 +7,11 @@
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import java.io.IOError;
+import javax.annotation.Resource;
import java.io.IOException;
+import static org.junit.Assert.assertEquals;
+
/**
* PropertyServiceRefreshTest
*
diff --git a/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/annotation/PropertySourceAnnotationTests.java b/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/annotation/PropertySourceAnnotationTests.java
index d8ae6624..d605dd40 100644
--- a/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/annotation/PropertySourceAnnotationTests.java
+++ b/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/annotation/PropertySourceAnnotationTests.java
@@ -16,13 +16,6 @@
package org.egovframe.rte.fdl.property.annotation;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Iterator;
-
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -32,6 +25,13 @@
import org.springframework.core.env.Environment;
import org.springframework.core.env.MutablePropertySources;
+import java.util.Iterator;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
public class PropertySourceAnnotationTests {
diff --git a/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/db/context-test.xml b/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/db/context-test.xml
index d65805b2..a6a70063 100644
--- a/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/db/context-test.xml
+++ b/Foundation/org.egovframe.rte.fdl.property/src/test/java/org/egovframe/rte/fdl/property/db/context-test.xml
@@ -1,7 +1,7 @@
diff --git a/Foundation/org.egovframe.rte.fdl.security/pom.xml b/Foundation/org.egovframe.rte.fdl.security/pom.xml
index ece78d2e..fad807d6 100644
--- a/Foundation/org.egovframe.rte.fdl.security/pom.xml
+++ b/Foundation/org.egovframe.rte.fdl.security/pom.xml
@@ -4,8 +4,8 @@
4.0.0
org.egovframe.rte
org.egovframe.rte.fdl.security
+ 4.1.0
jar
- 4.0.0
org.egovframe.rte.fdl.security
The eGovernment Standard Framework
https://www.egovframe.go.kr
@@ -18,11 +18,11 @@
- 5.3.6
- 5.4.6
- 4.0.0
- UTF-8
- UTF-8
+ 5.3.20
+ 5.7.1
+ 4.1.0
+ 1.8
+ UTF-8
@@ -119,7 +119,7 @@
org.aspectj
aspectjweaver
- 1.9.5
+ 1.9.9.1
javax.servlet
@@ -134,6 +134,12 @@
+
+ junit
+ junit
+ 4.13.2
+ test
+
org.springframework
spring-test
@@ -146,16 +152,10 @@
-
- junit
- junit
- 4.13.1
- test
-
org.easymock
easymock
- 4.1
+ 4.3
test
@@ -173,7 +173,7 @@
org.hsqldb
hsqldb
- 2.5.0
+ 2.5.2
test
@@ -187,30 +187,22 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.8.1
+ 3.10.1
- 1.8
- 1.8
- UTF-8
+ ${java.version}
+ ${java.version}
+ ${project.encoding}
org.codehaus.mojo
hibernate3-maven-plugin
3.0
-
-
-
- hbm2ddl
- annotationconfiguration
-
-
-
org.hsqldb
hsqldb
- 2.5.0
+ 2.5.2
@@ -224,7 +216,7 @@
org.apache.maven.plugins
maven-pmd-plugin
- 3.12.0
+ 3.17.0
@@ -270,9 +262,9 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.1.1
+ 3.4.0
- 1.8
+ ${java.version}
-Xdoclint:none
@@ -285,7 +277,7 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
- 3.1.2
+ 3.3.0
sunlink
@@ -295,7 +287,7 @@
true
-
@@ -326,9 +318,9 @@
128m
512m
- UTF-8
- UTF-8
- UTF-8
+ ${project.encoding}
+ ${project.encoding}
+ ${project.encoding}
-Xdoclint:none
@@ -337,8 +329,8 @@
org.apache.maven.plugins
maven-jxr-plugin
- UTF-8
- UTF-8
+ ${project.encoding}
+ ${project.encoding}
true
apidocs
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/EgovSecurityConfigBeanDefinitionParser.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/EgovSecurityConfigBeanDefinitionParser.java
index 41dffb9b..fc23d076 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/EgovSecurityConfigBeanDefinitionParser.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/EgovSecurityConfigBeanDefinitionParser.java
@@ -133,9 +133,9 @@ protected void doParse(Element element, BeanDefinitionBuilder bean) {
EgovSecurityConfigShare.sniff = Boolean.valueOf(sniff);
}
- String xFrameOptions = element.getAttribute("xFrameOptions");
+ String xFrameOptions = element.getAttribute("xframeOptions");
if (StringUtils.hasText(xFrameOptions)) {
- bean.addPropertyValue("xFrameOptions", xFrameOptions);
+ bean.addPropertyValue("xframeOptions", xFrameOptions);
EgovSecurityConfigShare.xFrameOptions = xFrameOptions;
}
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/EgovSecurityHttp.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/EgovSecurityHttp.java
index df888a65..b6f3a9f3 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/EgovSecurityHttp.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/EgovSecurityHttp.java
@@ -15,12 +15,12 @@
*/
package org.egovframe.rte.fdl.security.config;
-import java.io.ByteArrayInputStream;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.InputStreamResource;
+import java.io.ByteArrayInputStream;
+
/**
* egov-security http create
*
@@ -85,7 +85,7 @@ public InputStreamResource getHttp(
" disable-url-rewriting=\"false\" use-expressions=\"false\">\n\n";
// Sniff 설정 활성화
- if (Sniff == true) {
+ if (Sniff) {
sHttp += " \n";
}
// Sniff 설정 비활성화
@@ -95,12 +95,12 @@ public InputStreamResource getHttp(
sHttp += " \n";
}
// 캐시 활성화
- if (CacheControl == true) {
+ if (CacheControl) {
sHttp += " \n";
}
// 캐시 비활성화
@@ -111,7 +111,7 @@ public InputStreamResource getHttp(
sHttp += " \n\n";
// Csrf 설정 활성화
- if (Csrf == true) {
+ if (Csrf) {
sHttp += " \n\n";
}
// Csrf 설정 비활성화
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/SecurityConfig.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/SecurityConfig.java
index 7fac1795..900159ae 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/SecurityConfig.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/SecurityConfig.java
@@ -201,8 +201,8 @@ public String getXframeOptions() {
return xframeOptions;
}
- public void setXframeOptions(String xFrameOptions) {
- this.xframeOptions = xFrameOptions;
+ public void setXframeOptions(String xframeOptions) {
+ this.xframeOptions = xframeOptions;
}
public boolean isXssProtection() {
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/SecurityConfigInitializer.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/SecurityConfigInitializer.java
index 5e37dba8..e4202906 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/SecurityConfigInitializer.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/SecurityConfigInitializer.java
@@ -15,14 +15,6 @@
*/
package org.egovframe.rte.fdl.security.config;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import javax.annotation.PostConstruct;
-import javax.servlet.Filter;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
@@ -31,7 +23,8 @@
import org.springframework.context.ApplicationContextAware;
import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.*;
+import org.springframework.security.crypto.password.MessageDigestPasswordEncoder;
+import org.springframework.security.crypto.password.NoOpPasswordEncoder;
import org.springframework.security.web.DefaultSecurityFilterChain;
import org.springframework.security.web.access.AccessDeniedHandlerImpl;
import org.springframework.security.web.access.ExceptionTranslationFilter;
@@ -44,6 +37,13 @@
import org.springframework.security.web.util.UrlUtils;
import org.springframework.util.StringUtils;
+import javax.annotation.PostConstruct;
+import javax.servlet.Filter;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Map;
+
/**
* egov-security schema namespace 처리를 담당하는 bean 클래스
*
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/AuthoritiesQueryFactoryBean.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/AuthoritiesQueryFactoryBean.java
index c2beb395..20d8de71 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/AuthoritiesQueryFactoryBean.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/AuthoritiesQueryFactoryBean.java
@@ -17,7 +17,6 @@
import org.egovframe.rte.fdl.logging.util.EgovJdkLogger;
import org.egovframe.rte.fdl.security.config.SecurityConfig;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/DataSourceFactoryBean.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/DataSourceFactoryBean.java
index b56625f0..aa472fab 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/DataSourceFactoryBean.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/DataSourceFactoryBean.java
@@ -16,15 +16,14 @@
package org.egovframe.rte.fdl.security.config.internal;
import org.egovframe.rte.fdl.security.config.SecurityConfig;
-
-import javax.sql.DataSource;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
+import javax.sql.DataSource;
+
/**
* dataSource 지정을 처리하는 factory bean 클래스
*
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/EgovSessionInformationExpiredStrategy.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/EgovSessionInformationExpiredStrategy.java
old mode 100644
new mode 100755
index e8fb174c..e209cf7c
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/EgovSessionInformationExpiredStrategy.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/EgovSessionInformationExpiredStrategy.java
@@ -1,13 +1,12 @@
package org.egovframe.rte.fdl.security.config.internal;
-import java.io.IOException;
+import org.springframework.security.web.session.SessionInformationExpiredEvent;
+import org.springframework.security.web.session.SessionInformationExpiredStrategy;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.security.web.session.SessionInformationExpiredEvent;
-import org.springframework.security.web.session.SessionInformationExpiredStrategy;
+import java.io.IOException;
/**
* SessionInformationExpiredStrategy를 처리하는 factory bean 클래스
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/LoginFormUrlFactoryBean.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/LoginFormUrlFactoryBean.java
index 53180d02..2269a05d 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/LoginFormUrlFactoryBean.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/LoginFormUrlFactoryBean.java
@@ -16,7 +16,6 @@
package org.egovframe.rte.fdl.security.config.internal;
import org.egovframe.rte.fdl.security.config.SecurityConfig;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/MapClassFactoryBean.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/MapClassFactoryBean.java
index 263ac597..08904f87 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/MapClassFactoryBean.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/MapClassFactoryBean.java
@@ -17,7 +17,6 @@
import org.egovframe.rte.fdl.logging.util.EgovJdkLogger;
import org.egovframe.rte.fdl.security.config.SecurityConfig;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/RequestMatcherTypeFactoryBean.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/RequestMatcherTypeFactoryBean.java
index d8f23585..c8d81c9f 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/RequestMatcherTypeFactoryBean.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/RequestMatcherTypeFactoryBean.java
@@ -16,7 +16,6 @@
package org.egovframe.rte.fdl.security.config.internal;
import org.egovframe.rte.fdl.security.config.SecurityConfig;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/UsersQueryFactoryBean.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/UsersQueryFactoryBean.java
index a4c87624..8671524a 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/UsersQueryFactoryBean.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/UsersQueryFactoryBean.java
@@ -17,7 +17,6 @@
import org.egovframe.rte.fdl.logging.util.EgovJdkLogger;
import org.egovframe.rte.fdl.security.config.SecurityConfig;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/intercept/EgovReloadableFilterInvocationSecurityMetadataSource.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/intercept/EgovReloadableFilterInvocationSecurityMetadataSource.java
index 9988e2e2..813faa37 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/intercept/EgovReloadableFilterInvocationSecurityMetadataSource.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/intercept/EgovReloadableFilterInvocationSecurityMetadataSource.java
@@ -15,19 +15,7 @@
*/
package org.egovframe.rte.fdl.security.intercept;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
import org.egovframe.rte.fdl.security.securedobject.EgovSecuredObjectService;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.access.ConfigAttribute;
@@ -35,6 +23,10 @@
import org.springframework.security.web.access.intercept.FilterInvocationSecurityMetadataSource;
import org.springframework.security.web.util.matcher.RequestMatcher;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+import java.util.Map.Entry;
+
/**
* MetadataSource 처리.
*
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/intercept/LookupAttributesMethodReplacer.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/intercept/LookupAttributesMethodReplacer.java
index 86942746..2511e6a4 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/intercept/LookupAttributesMethodReplacer.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/intercept/LookupAttributesMethodReplacer.java
@@ -15,14 +15,13 @@
*/
package org.egovframe.rte.fdl.security.intercept;
-import java.lang.reflect.Method;
-import java.util.List;
-
import org.egovframe.rte.fdl.security.securedobject.EgovSecuredObjectService;
-
import org.springframework.beans.factory.support.MethodReplacer;
import org.springframework.security.access.ConfigAttribute;
+import java.lang.reflect.Method;
+import java.util.List;
+
/**
* 보호자원의 url 요청정보에 대한 권한을 매핑하는 클래스
*
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/intercept/MethodResourcesMapFactoryBean.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/intercept/MethodResourcesMapFactoryBean.java
index e02345cf..19412653 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/intercept/MethodResourcesMapFactoryBean.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/intercept/MethodResourcesMapFactoryBean.java
@@ -15,14 +15,13 @@
*/
package org.egovframe.rte.fdl.security.intercept;
-import java.util.LinkedHashMap;
-import java.util.List;
-
import org.egovframe.rte.fdl.security.securedobject.EgovSecuredObjectService;
-
import org.springframework.beans.factory.FactoryBean;
import org.springframework.security.access.ConfigAttribute;
+import java.util.LinkedHashMap;
+import java.util.List;
+
/**
* Bean의 초기화 데이터 제공 기능을 구현 클래스
* @since 2014.01.22
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/intercept/UrlResourcesMapFactoryBean.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/intercept/UrlResourcesMapFactoryBean.java
index 7c15d60f..c6b65da2 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/intercept/UrlResourcesMapFactoryBean.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/intercept/UrlResourcesMapFactoryBean.java
@@ -15,15 +15,14 @@
*/
package org.egovframe.rte.fdl.security.intercept;
-import java.util.LinkedHashMap;
-import java.util.List;
-
import org.egovframe.rte.fdl.security.securedobject.EgovSecuredObjectService;
-
import org.springframework.beans.factory.FactoryBean;
import org.springframework.security.access.ConfigAttribute;
import org.springframework.security.web.util.matcher.RequestMatcher;
+import java.util.LinkedHashMap;
+import java.util.List;
+
/**
* Bean의 초기화 데이터 제공 기능을 구현 클래스
*
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/securedobject/EgovSecuredObjectService.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/securedobject/EgovSecuredObjectService.java
index f40ac2d9..8b92cc94 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/securedobject/EgovSecuredObjectService.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/securedobject/EgovSecuredObjectService.java
@@ -15,12 +15,12 @@
*/
package org.egovframe.rte.fdl.security.securedobject;
-import java.util.LinkedHashMap;
-import java.util.List;
-
import org.springframework.security.access.ConfigAttribute;
import org.springframework.security.web.util.matcher.RequestMatcher;
+import java.util.LinkedHashMap;
+import java.util.List;
+
/**
* 보호객체 관리를 지원하는 인터페이스
*
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/securedobject/impl/SecuredObjectDAO.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/securedobject/impl/SecuredObjectDAO.java
index 99b15cf2..7e37397d 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/securedobject/impl/SecuredObjectDAO.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/securedobject/impl/SecuredObjectDAO.java
@@ -15,18 +15,7 @@
*/
package org.egovframe.rte.fdl.security.securedobject.impl;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
import org.egovframe.rte.fdl.security.config.SecuredObjectConfig;
-
-import javax.annotation.PostConstruct;
-import javax.sql.DataSource;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
@@ -38,6 +27,10 @@
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
import org.springframework.util.StringUtils;
+import javax.annotation.PostConstruct;
+import javax.sql.DataSource;
+import java.util.*;
+
/**
* DB기반의 보호된 자원 관리를 구현한 DAO 클래스
*
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/securedobject/impl/SecuredObjectServiceImpl.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/securedobject/impl/SecuredObjectServiceImpl.java
index a851800b..25f0b775 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/securedobject/impl/SecuredObjectServiceImpl.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/securedobject/impl/SecuredObjectServiceImpl.java
@@ -15,19 +15,18 @@
*/
package org.egovframe.rte.fdl.security.securedobject.impl;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Set;
-
import org.egovframe.rte.fdl.security.config.SecurityConfig;
import org.egovframe.rte.fdl.security.securedobject.EgovSecuredObjectService;
-
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.security.access.ConfigAttribute;
import org.springframework.security.web.util.matcher.RequestMatcher;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Set;
+
/**
* 보호객체 관리를 지원하는 구현 클래스
*
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/securedobject/impl/SelfRegexRequestMatcher.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/securedobject/impl/SelfRegexRequestMatcher.java
index dd07a226..b74107cf 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/securedobject/impl/SelfRegexRequestMatcher.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/securedobject/impl/SelfRegexRequestMatcher.java
@@ -15,11 +15,11 @@
*/
package org.egovframe.rte.fdl.security.securedobject.impl;
-import javax.servlet.http.HttpServletRequest;
-
import org.springframework.security.web.util.matcher.RegexRequestMatcher;
import org.springframework.security.web.util.matcher.RequestMatcher;
+import javax.servlet.http.HttpServletRequest;
+
public class SelfRegexRequestMatcher implements RequestMatcher {
private String pattern = null;
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/DefaultMapUserDetailsMapping.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/DefaultMapUserDetailsMapping.java
index e204068c..747ad012 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/DefaultMapUserDetailsMapping.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/DefaultMapUserDetailsMapping.java
@@ -15,17 +15,16 @@
*/
package org.egovframe.rte.fdl.security.userdetails;
+import org.egovframe.rte.fdl.security.userdetails.jdbc.EgovUsersByUsernameMapping;
+import org.egovframe.rte.fdl.security.userdetails.util.CamelCaseUtil;
+
+import javax.sql.DataSource;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;
-import org.egovframe.rte.fdl.security.userdetails.jdbc.EgovUsersByUsernameMapping;
-import org.egovframe.rte.fdl.security.userdetails.util.CamelCaseUtil;
-
-import javax.sql.DataSource;
-
/**
* 기본 사용자 정보 mapping 처리 클래스
*
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/EgovUserDetails.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/EgovUserDetails.java
index 38e86b3b..672bbcd4 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/EgovUserDetails.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/EgovUserDetails.java
@@ -15,13 +15,13 @@
*/
package org.egovframe.rte.fdl.security.userdetails;
-import java.util.Arrays;
-import java.util.Collection;
-
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.User;
+import java.util.Arrays;
+import java.util.Collection;
+
/**
* 사용자 계정 정보를 관리하기 위한 클래스
*
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/hierarchicalroles/HierarchyStringsFactoryBean.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/hierarchicalroles/HierarchyStringsFactoryBean.java
index 4598219a..70551df8 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/hierarchicalroles/HierarchyStringsFactoryBean.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/hierarchicalroles/HierarchyStringsFactoryBean.java
@@ -17,7 +17,6 @@
import org.egovframe.rte.fdl.security.config.SecuredObjectConfig;
import org.egovframe.rte.fdl.security.securedobject.EgovSecuredObjectService;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.context.ApplicationContext;
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/jdbc/EgovJdbcUserDetailsManager.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/jdbc/EgovJdbcUserDetailsManager.java
index 3530259f..6c81ad54 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/jdbc/EgovJdbcUserDetailsManager.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/jdbc/EgovJdbcUserDetailsManager.java
@@ -15,19 +15,8 @@
*/
package org.egovframe.rte.fdl.security.userdetails.jdbc;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
import org.egovframe.rte.fdl.security.userdetails.EgovUserDetails;
import org.egovframe.rte.fdl.string.EgovObjectUtil;
-
-import javax.sql.DataSource;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContextException;
@@ -39,6 +28,11 @@
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.security.provisioning.JdbcUserDetailsManager;
+import javax.sql.DataSource;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
+
/**
* 사용자계정 정보를 DB에서 관리할수 있도록 구현한 클래스
*
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/jdbc/EgovUsersByUsernameMapping.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/jdbc/EgovUsersByUsernameMapping.java
index 850ae86d..3fd505a3 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/jdbc/EgovUsersByUsernameMapping.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/jdbc/EgovUsersByUsernameMapping.java
@@ -15,17 +15,15 @@
*/
package org.egovframe.rte.fdl.security.userdetails.jdbc;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-
import org.egovframe.rte.fdl.security.userdetails.EgovUserDetails;
-
-import javax.sql.DataSource;
-
import org.springframework.jdbc.core.SqlParameter;
import org.springframework.jdbc.object.MappingSqlQuery;
+import javax.sql.DataSource;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
/**
* 사용자 계정 정보를 DB에서 관리할 수 있도록 구현한 클래스
*
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/util/EgovUserDetailsHelper.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/util/EgovUserDetailsHelper.java
index cd14c469..c1e986fb 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/util/EgovUserDetailsHelper.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/util/EgovUserDetailsHelper.java
@@ -15,14 +15,8 @@
*/
package org.egovframe.rte.fdl.security.userdetails.util;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
import org.egovframe.rte.fdl.security.userdetails.EgovUserDetails;
import org.egovframe.rte.fdl.string.EgovObjectUtil;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.core.Authentication;
@@ -33,6 +27,11 @@
import org.springframework.security.crypto.password.DelegatingPasswordEncoder;
import org.springframework.security.crypto.password.MessageDigestPasswordEncoder;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
/**
* 사용자 계정 정보를 처리하는 유틸 클래스
*
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/resources/META-INF/spring.schemas b/Foundation/org.egovframe.rte.fdl.security/src/main/resources/META-INF/spring.schemas
index d9ffdb69..7ac0a48b 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/resources/META-INF/spring.schemas
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://maven.egovframe.go.kr/schema/egov-security/egov-security.xsd=org/egovframe/rte/fdl/security/config/egov-security-4.0.0.xsd
-http\://maven.egovframe.go.kr/schema/egov-security/egov-security-4.0.0.xsd=org/egovframe/rte/fdl/security/config/egov-security-4.0.0.xsd
+http\://maven.egovframe.go.kr/schema/egov-security/egov-security.xsd=org/egovframe/rte/fdl/security/config/egov-security-4.1.0.xsd
+http\://maven.egovframe.go.kr/schema/egov-security/egov-security-4.1.0.xsd=org/egovframe/rte/fdl/security/config/egov-security-4.1.0.xsd
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/resources/META-INF/spring/security/security-config.xml b/Foundation/org.egovframe.rte.fdl.security/src/main/resources/META-INF/spring/security/security-config.xml
index 10ad42ff..bb6e7847 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/main/resources/META-INF/spring/security/security-config.xml
+++ b/Foundation/org.egovframe.rte.fdl.security/src/main/resources/META-INF/spring/security/security-config.xml
@@ -2,21 +2,15 @@
-
-
+ http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
-
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/resources/org/egovframe/rte/fdl/security/config/egov-security-4.0.0.xsd b/Foundation/org.egovframe.rte.fdl.security/src/main/resources/org/egovframe/rte/fdl/security/config/egov-security-4.1.0.xsd
similarity index 100%
rename from Foundation/org.egovframe.rte.fdl.security/src/main/resources/org/egovframe/rte/fdl/security/config/egov-security-4.0.0.xsd
rename to Foundation/org.egovframe.rte.fdl.security/src/main/resources/org/egovframe/rte/fdl/security/config/egov-security-4.1.0.xsd
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/EgovSecurityConfigTest.java b/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/EgovSecurityConfigTest.java
index 5db3c990..6a7417fd 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/EgovSecurityConfigTest.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/EgovSecurityConfigTest.java
@@ -1,26 +1,8 @@
package org.egovframe.rte.fdl.security;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
import org.egovframe.rte.fdl.security.userdetails.EgovUserDetailsVO;
import org.egovframe.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
import org.egovframe.rte.fdl.security.web.CategoryController;
-
-import javax.annotation.Resource;
-import javax.servlet.Filter;
-import javax.sql.DataSource;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -32,7 +14,6 @@
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.core.io.ClassPathResource;
-import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.datasource.init.ScriptUtils;
import org.springframework.mock.web.MockFilterChain;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -53,7 +34,14 @@
import org.springframework.security.web.authentication.logout.LogoutFilter;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.jdbc.JdbcTestUtils;
+
+import javax.annotation.Resource;
+import javax.servlet.Filter;
+import javax.sql.DataSource;
+import java.lang.reflect.Method;
+import java.util.*;
+
+import static org.junit.Assert.*;
/**
* @author sjyoon
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/EgovSecurityServiceTest.java b/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/EgovSecurityServiceTest.java
index ae2f1855..3b79a979 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/EgovSecurityServiceTest.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/EgovSecurityServiceTest.java
@@ -1,22 +1,8 @@
package org.egovframe.rte.fdl.security;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.lang.reflect.Method;
-import java.util.*;
-
import org.egovframe.rte.fdl.security.userdetails.EgovUserDetailsVO;
import org.egovframe.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
import org.egovframe.rte.fdl.security.web.CategoryController;
-
-import javax.annotation.Resource;
-import javax.servlet.Filter;
-import javax.sql.DataSource;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -49,6 +35,14 @@
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import javax.annotation.Resource;
+import javax.servlet.Filter;
+import javax.sql.DataSource;
+import java.lang.reflect.Method;
+import java.util.*;
+
+import static org.junit.Assert.*;
+
/**
* @author sjyoon
*
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/userdetails/CamelCaseUtilTest.java b/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/userdetails/CamelCaseUtilTest.java
index 6edea882..9aa9a2ce 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/userdetails/CamelCaseUtilTest.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/userdetails/CamelCaseUtilTest.java
@@ -1,10 +1,10 @@
package org.egovframe.rte.fdl.security.userdetails;
-import static org.junit.Assert.*;
-
import org.egovframe.rte.fdl.security.userdetails.util.CamelCaseUtil;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class CamelCaseUtilTest {
@Test
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/userdetails/EgovUserDetailsMapping.java b/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/userdetails/EgovUserDetailsMapping.java
index 4c1b69ff..88fbb973 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/userdetails/EgovUserDetailsMapping.java
+++ b/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/userdetails/EgovUserDetailsMapping.java
@@ -1,15 +1,13 @@
package org.egovframe.rte.fdl.security.userdetails;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
import org.egovframe.rte.fdl.security.userdetails.jdbc.EgovUsersByUsernameMapping;
-
-import javax.sql.DataSource;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.sql.DataSource;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
/**
* @author sjyoon
*
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/config-context.xml b/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/config-context.xml
index 607a44fc..8aaad4b5 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/config-context.xml
+++ b/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/config-context.xml
@@ -1,11 +1,11 @@
+ http://maven.egovframe.go.kr/schema/egov-security http://maven.egovframe.go.kr/schema/egov-security/egov-security-4.1.0.xsd">
- classpath:/META-INF/message/message-common
+ META-INF.message.message-common
@@ -24,6 +24,4 @@
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/context-datasource-jdbc.xml b/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/context-datasource-jdbc.xml
index 86947d14..3f8912e0 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/context-datasource-jdbc.xml
+++ b/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/context-datasource-jdbc.xml
@@ -4,10 +4,10 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/context-security.xml b/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/context-security.xml
index e78bed2c..a82e3794 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/context-security.xml
+++ b/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/context-security.xml
@@ -15,17 +15,6 @@
-
-
@@ -33,38 +22,19 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -72,16 +42,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -171,18 +119,4 @@
-
-
-
-
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/jdbc.properties b/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/jdbc.properties
index abe56ea4..387bf096 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/jdbc.properties
+++ b/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/jdbc.properties
@@ -1,5 +1,9 @@
-driver=net.sf.log4jdbc.DriverSpy
-dburl=jdbc:log4jdbc:hsqldb:mem:testdb
-username=sa
-password=
+#jdbc.driver=net.sf.log4jdbc.DriverSpy
+#jdbc.url=jdbc:log4jdbc:hsqldb:mem:testdb
+#jdbc.username=sa
+#jdbc.password=
+jdbc.driver=org.hsqldb.jdbcDriver
+jdbc.url=jdbc:hsqldb:mem:testdb
+jdbc.username=sa
+jdbc.password=
usingDBMS=hsql
diff --git a/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/testdata/sample_schema_hsql.sql b/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/testdata/sample_schema_hsql.sql
index 4be4cd45..96aeff54 100644
--- a/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/testdata/sample_schema_hsql.sql
+++ b/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/testdata/sample_schema_hsql.sql
@@ -3,7 +3,6 @@ CREATE TABLE SAMPLE (ID VARCHAR(16) NOT NULL PRIMARY KEY,NAME VARCHAR(50),DESCRI
INSERT INTO SAMPLE VALUES('SAMPLE-00002','Sample Test','This is initial test data.','Y','test');
INSERT INTO SAMPLE VALUES('SAMPLE-00083','test Name','test Desc','Y','test');
-
CREATE TABLE USERS(USER_ID VARCHAR(20) NOT NULL,USER_NAME VARCHAR(50) NOT NULL,PASSWORD VARCHAR(30) NOT NULL,ENABLED INTEGER,SSN VARCHAR(13),SL_YN CHAR(1),BIRTH_DAY VARCHAR(8),AGE NUMERIC(3),CELL_PHONE VARCHAR(14),ADDR VARCHAR(100),EMAIL VARCHAR(50),EMAIL_YN CHAR(1),IMAGE_FILE VARCHAR(100),REG_DATE DATE,CONSTRAINT PK_USERS PRIMARY KEY(USER_ID));
INSERT INTO USERS VALUES('user','Hong Gil-dong','7hHLsZBS5AsHqsDKBgwj7g==',1,'8006041227717','Y','19800603',29,'010-9949-6484','Sinsa-Dong, Gangnam-Gu, Seoul-Si','bbnydory@google.com','Y','','2008-06-04');
@@ -11,7 +10,6 @@ INSERT INTO USERS VALUES('buyer','Lee, Man-hong','eUqtJMvVhGEBHtkJS3+iEg==',1,'1
INSERT INTO USERS VALUES('test','Kim, Young-Su','CY9rzUYh03PK3k6DJie09g==',1,'1234567890123','Y','19800604',29,'010-6456-4492','Gumi-Dong, Bundang-Gu, Seongnam-Si, Gyeonggi-Do','test@empal.com','Y','','2008-03-13');
INSERT INTO USERS VALUES('jimi','jimi test','lMoR6BOUb15HW6Lm4F/VsA==',1,'1234567890123','Y','19800604',29,'010-6456-4492','Gumi-Dong, Bundang-Gu, Seongnam-Si, Gyeonggi-Do','test@empal.com','Y','','2008-03-13');
-
CREATE TABLE ROLES(AUTHORITY VARCHAR(50) NOT NULL,ROLE_NAME VARCHAR(50),DESCRIPTION VARCHAR(100),CREATE_DATE DATE,MODIFY_DATE DATE,CONSTRAINT PK_ROLES PRIMARY KEY(AUTHORITY));
CREATE TABLE ROLES_HIERARCHY(PARENT_ROLE VARCHAR(50) NOT NULL,CHILD_ROLE VARCHAR(50) NOT NULL,CONSTRAINT PK_ROLES_HIERARCHY PRIMARY KEY(PARENT_ROLE,CHILD_ROLE),CONSTRAINT FK_ROLES1 FOREIGN KEY(PARENT_ROLE) REFERENCES ROLES(AUTHORITY),CONSTRAINT FK_ROLES2 FOREIGN KEY(CHILD_ROLE) REFERENCES ROLES (AUTHORITY));
CREATE TABLE SECURED_RESOURCES(RESOURCE_ID VARCHAR(10) NOT NULL,RESOURCE_NAME VARCHAR(50),RESOURCE_PATTERN VARCHAR(300) NOT NULL,DESCRIPTION VARCHAR(100),RESOURCE_TYPE VARCHAR(10),SORT_ORDER INTEGER,CREATE_DATE DATE,MODIFY_DATE DATE,CONSTRAINT PK_RECURED_RESOURCES PRIMARY KEY(RESOURCE_ID));
diff --git a/Foundation/org.egovframe.rte.fdl.string/pom.xml b/Foundation/org.egovframe.rte.fdl.string/pom.xml
index 917a914d..f47a677e 100644
--- a/Foundation/org.egovframe.rte.fdl.string/pom.xml
+++ b/Foundation/org.egovframe.rte.fdl.string/pom.xml
@@ -4,8 +4,8 @@
4.0.0
org.egovframe.rte
org.egovframe.rte.fdl.string
+ 4.1.0
jar
- 4.0.0
org.egovframe.rte.fdl.string
The eGovernment Standard Framework
https://www.egovframe.go.kr
@@ -18,10 +18,10 @@
- 5.3.6
- 4.0.0
- UTF-8
- UTF-8
+ 5.3.20
+ 4.1.0
+ 1.8
+ UTF-8
@@ -42,6 +42,12 @@
+
+ junit
+ junit
+ 4.13.2
+ test
+
org.springframework
spring-test
@@ -67,16 +73,10 @@
test
-
- junit
- junit
- 4.13.1
- test
-
org.easymock
easymock
- 4.1
+ 4.3
test
@@ -90,30 +90,22 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.8.1
+ 3.10.1
- 1.8
- 1.8
- UTF-8
+ ${java.version}
+ ${java.version}
+ ${project.encoding}
org.codehaus.mojo
hibernate3-maven-plugin
3.0
-
-
-
- hbm2ddl
- annotationconfiguration
-
-
-
org.hsqldb
hsqldb
- 2.5.0
+ 2.5.2
@@ -127,7 +119,7 @@
org.apache.maven.plugins
maven-pmd-plugin
- 3.12.0
+ 3.17.0
@@ -173,9 +165,9 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.1.1
+ 3.4.0
- 1.8
+ ${java.version}
-Xdoclint:none
@@ -188,7 +180,7 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
- 3.1.2
+ 3.3.0
sunlink
@@ -198,7 +190,7 @@
true
-
@@ -229,9 +221,9 @@
128m
512m
- UTF-8
- UTF-8
- UTF-8
+ ${project.encoding}
+ ${project.encoding}
+ ${project.encoding}
-Xdoclint:none
@@ -240,8 +232,8 @@
org.apache.maven.plugins
maven-jxr-plugin
- UTF-8
- UTF-8
+ ${project.encoding}
+ ${project.encoding}
true
apidocs
diff --git a/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovObjectUtil.java b/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovObjectUtil.java
index e49a0431..76af1261 100644
--- a/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovObjectUtil.java
+++ b/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovObjectUtil.java
@@ -15,11 +15,11 @@
*/
package org.egovframe.rte.fdl.string;
-import java.lang.reflect.Constructor;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.reflect.Constructor;
+
/**
* 객체의 로딩을 지원하는 유틸 클래스
*
diff --git a/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovStringUtil.java b/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovStringUtil.java
index 461cfe25..4d42aac0 100644
--- a/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovStringUtil.java
+++ b/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovStringUtil.java
@@ -15,6 +15,10 @@
*/
package org.egovframe.rte.fdl.string;
+import org.apache.commons.codec.binary.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -24,10 +28,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.codec.binary.Base64;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* 문자열을 처리하는 유틸 클래스
*
diff --git a/Foundation/org.egovframe.rte.fdl.string/src/test/java/org/egovframe/rte/fdl/string/EgovDateUtilTest.java b/Foundation/org.egovframe.rte.fdl.string/src/test/java/org/egovframe/rte/fdl/string/EgovDateUtilTest.java
index cc0d98a6..36512d85 100644
--- a/Foundation/org.egovframe.rte.fdl.string/src/test/java/org/egovframe/rte/fdl/string/EgovDateUtilTest.java
+++ b/Foundation/org.egovframe.rte.fdl.string/src/test/java/org/egovframe/rte/fdl/string/EgovDateUtilTest.java
@@ -1,13 +1,5 @@
package org.egovframe.rte.fdl.string;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-
-import java.text.ParseException;
-import java.util.Calendar;
-import java.util.Date;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -17,6 +9,12 @@
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import java.text.ParseException;
+import java.util.Calendar;
+import java.util.Date;
+
+import static org.junit.Assert.*;
+
/**
* @author sjyoon
diff --git a/Foundation/org.egovframe.rte.fdl.string/src/test/java/org/egovframe/rte/fdl/string/EgovNumericUtilTest.java b/Foundation/org.egovframe.rte.fdl.string/src/test/java/org/egovframe/rte/fdl/string/EgovNumericUtilTest.java
index 09219622..8b99284f 100644
--- a/Foundation/org.egovframe.rte.fdl.string/src/test/java/org/egovframe/rte/fdl/string/EgovNumericUtilTest.java
+++ b/Foundation/org.egovframe.rte.fdl.string/src/test/java/org/egovframe/rte/fdl/string/EgovNumericUtilTest.java
@@ -1,9 +1,5 @@
package org.egovframe.rte.fdl.string;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -13,6 +9,8 @@
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import static org.junit.Assert.*;
+
/**
* @author sjyoon
diff --git a/Foundation/org.egovframe.rte.fdl.string/src/test/java/org/egovframe/rte/fdl/string/EgovObjectUtilTest.java b/Foundation/org.egovframe.rte.fdl.string/src/test/java/org/egovframe/rte/fdl/string/EgovObjectUtilTest.java
index 03a16c47..862dc6f7 100644
--- a/Foundation/org.egovframe.rte.fdl.string/src/test/java/org/egovframe/rte/fdl/string/EgovObjectUtilTest.java
+++ b/Foundation/org.egovframe.rte.fdl.string/src/test/java/org/egovframe/rte/fdl/string/EgovObjectUtilTest.java
@@ -1,12 +1,5 @@
package org.egovframe.rte.fdl.string;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -16,6 +9,8 @@
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import static org.junit.Assert.*;
+
/**
* @author sjyoon
diff --git a/Foundation/org.egovframe.rte.fdl.string/src/test/java/org/egovframe/rte/fdl/string/EgovStringUtilTest.java b/Foundation/org.egovframe.rte.fdl.string/src/test/java/org/egovframe/rte/fdl/string/EgovStringUtilTest.java
index 675246a5..31de3986 100644
--- a/Foundation/org.egovframe.rte.fdl.string/src/test/java/org/egovframe/rte/fdl/string/EgovStringUtilTest.java
+++ b/Foundation/org.egovframe.rte.fdl.string/src/test/java/org/egovframe/rte/fdl/string/EgovStringUtilTest.java
@@ -1,14 +1,11 @@
package org.egovframe.rte.fdl.string;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.junit.Test;
+import static org.junit.Assert.*;
/**
* @author sjyoon
diff --git a/Foundation/org.egovframe.rte.fdl.xml/pom.xml b/Foundation/org.egovframe.rte.fdl.xml/pom.xml
index 0e6178ab..4f6e4d57 100644
--- a/Foundation/org.egovframe.rte.fdl.xml/pom.xml
+++ b/Foundation/org.egovframe.rte.fdl.xml/pom.xml
@@ -4,8 +4,8 @@
4.0.0
org.egovframe.rte
org.egovframe.rte.fdl.xml
+ 4.1.0
jar
- 4.0.0
org.egovframe.rte.fdl.xml
The eGovernment Standard Framework
https://www.egovframe.go.kr
@@ -18,10 +18,10 @@
- 5.3.6
- 4.0.0
- UTF-8
- UTF-8
+ 5.3.20
+ 4.1.0
+ 1.8
+ UTF-8
@@ -45,12 +45,12 @@
org.jdom
jdom2
- 2.0.6
+ 2.0.6.1
xerces
xercesImpl
- 2.12.0
+ 2.12.2
javax.annotation
@@ -59,6 +59,12 @@
+
+ junit
+ junit
+ 4.13.2
+ test
+
org.springframework
spring-test
@@ -89,12 +95,6 @@
1.2.0
test
-
- junit
- junit
- 4.13.1
- test
-
@@ -106,30 +106,22 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.8.1
+ 3.10.1
- 1.8
- 1.8
- UTF-8
+ ${java.version}
+ ${java.version}
+ ${project.encoding}
org.codehaus.mojo
hibernate3-maven-plugin
3.0
-
-
-
- hbm2ddl
- annotationconfiguration
-
-
-
org.hsqldb
hsqldb
- 2.5.0
+ 2.5.2
@@ -143,7 +135,7 @@
org.apache.maven.plugins
maven-pmd-plugin
- 3.12.0
+ 3.17.0
@@ -189,9 +181,9 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.1.1
+ 3.4.0
- 1.8
+ ${java.version}
-Xdoclint:none
@@ -204,7 +196,7 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
- 3.1.2
+ 3.3.0
sunlink
@@ -214,7 +206,7 @@
true
-
@@ -245,9 +237,9 @@
128m
512m
- UTF-8
- UTF-8
- UTF-8
+ ${project.encoding}
+ ${project.encoding}
+ ${project.encoding}
-Xdoclint:none
@@ -256,8 +248,8 @@
org.apache.maven.plugins
maven-jxr-plugin
- UTF-8
- UTF-8
+ ${project.encoding}
+ ${project.encoding}
true
apidocs
diff --git a/Foundation/org.egovframe.rte.fdl.xml/src/main/java/org/egovframe/rte/fdl/xml/AbstractXMLUtility.java b/Foundation/org.egovframe.rte.fdl.xml/src/main/java/org/egovframe/rte/fdl/xml/AbstractXMLUtility.java
index b671b160..f030c602 100644
--- a/Foundation/org.egovframe.rte.fdl.xml/src/main/java/org/egovframe/rte/fdl/xml/AbstractXMLUtility.java
+++ b/Foundation/org.egovframe.rte.fdl.xml/src/main/java/org/egovframe/rte/fdl/xml/AbstractXMLUtility.java
@@ -16,20 +16,6 @@
*/
package org.egovframe.rte.fdl.xml;
-import java.io.CharArrayReader;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-
import org.egovframe.rte.fdl.logging.util.EgovResourceReleaser;
import org.egovframe.rte.fdl.xml.exception.ValidatorException;
import org.jdom2.Document;
@@ -44,6 +30,16 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import javax.xml.transform.*;
+import javax.xml.transform.stream.StreamResult;
+import java.io.CharArrayReader;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
/**
* XML문서 파싱 작업시 공통적으로 사용하는 메소드를 포함하는 추상 클래스.
* 파싱할 XML 문서를 받는 부분과 XML 문서 파싱 후 에러 메시지를 생성하는 부분으로 나뉜다.
diff --git a/Foundation/org.egovframe.rte.fdl.xml/src/main/java/org/egovframe/rte/fdl/xml/EgovConcreteSAXFactory.java b/Foundation/org.egovframe.rte.fdl.xml/src/main/java/org/egovframe/rte/fdl/xml/EgovConcreteSAXFactory.java
index ad5d9cd8..2d616c26 100644
--- a/Foundation/org.egovframe.rte.fdl.xml/src/main/java/org/egovframe/rte/fdl/xml/EgovConcreteSAXFactory.java
+++ b/Foundation/org.egovframe.rte.fdl.xml/src/main/java/org/egovframe/rte/fdl/xml/EgovConcreteSAXFactory.java
@@ -17,7 +17,6 @@
package org.egovframe.rte.fdl.xml;
import org.egovframe.rte.fdl.xml.exception.UnsupportedException;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/Foundation/org.egovframe.rte.fdl.xml/src/main/java/org/egovframe/rte/fdl/xml/EgovDOMValidatorService.java b/Foundation/org.egovframe.rte.fdl.xml/src/main/java/org/egovframe/rte/fdl/xml/EgovDOMValidatorService.java
index a03eb2b8..8d3fe2cc 100644
--- a/Foundation/org.egovframe.rte.fdl.xml/src/main/java/org/egovframe/rte/fdl/xml/EgovDOMValidatorService.java
+++ b/Foundation/org.egovframe.rte.fdl.xml/src/main/java/org/egovframe/rte/fdl/xml/EgovDOMValidatorService.java
@@ -16,16 +16,15 @@
*/
package org.egovframe.rte.fdl.xml;
-import java.io.IOException;
-import java.util.Set;
+import org.apache.xerces.parsers.DOMParser;
import org.egovframe.rte.fdl.xml.error.ErrorChecker;
import org.egovframe.rte.fdl.xml.exception.ValidatorException;
-import org.apache.xerces.parsers.DOMParser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
+
+import java.io.IOException;
+import java.util.Set;
/**
* DOMValidator Class
diff --git a/Foundation/org.egovframe.rte.fdl.xml/src/main/java/org/egovframe/rte/fdl/xml/EgovSAXValidatorService.java b/Foundation/org.egovframe.rte.fdl.xml/src/main/java/org/egovframe/rte/fdl/xml/EgovSAXValidatorService.java
index d0909b2d..c871b9d5 100644
--- a/Foundation/org.egovframe.rte.fdl.xml/src/main/java/org/egovframe/rte/fdl/xml/EgovSAXValidatorService.java
+++ b/Foundation/org.egovframe.rte.fdl.xml/src/main/java/org/egovframe/rte/fdl/xml/EgovSAXValidatorService.java
@@ -16,19 +16,18 @@
*/
package org.egovframe.rte.fdl.xml;
-import java.io.IOException;
-import java.util.Set;
-
import org.egovframe.rte.fdl.xml.error.ErrorChecker;
import org.egovframe.rte.fdl.xml.exception.ValidatorException;
import org.egovframe.rte.fdl.xml.impl.ContentHandlerImpl;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
+import java.io.IOException;
+import java.util.Set;
+
/**
* SAXValidator Class
* @author 개발프레임웍크 실행환경 개발팀 김종호
diff --git a/Foundation/org.egovframe.rte.fdl.xml/src/main/java/org/egovframe/rte/fdl/xml/error/ErrorChecker.java b/Foundation/org.egovframe.rte.fdl.xml/src/main/java/org/egovframe/rte/fdl/xml/error/ErrorChecker.java
index 02574710..ad04cda0 100644
--- a/Foundation/org.egovframe.rte.fdl.xml/src/main/java/org/egovframe/rte/fdl/xml/error/ErrorChecker.java
+++ b/Foundation/org.egovframe.rte.fdl.xml/src/main/java/org/egovframe/rte/fdl/xml/error/ErrorChecker.java
@@ -16,11 +16,12 @@
*/
package org.egovframe.rte.fdl.xml.error;
-import java.util.HashSet;
-import java.util.Set;
import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.DefaultHandler;
+import java.util.HashSet;
+import java.util.Set;
+
/**
* DefaultHandler를 상속하는 클래스로, XML 파서가 파싱을 할 때
* 파싱하는 XML 문서에서 에러가 발생하면 에러 메시지를 받아
diff --git a/Foundation/org.egovframe.rte.fdl.xml/src/test/java/org/egovframe/rte/fdl/xml/ControlXMLTest.java b/Foundation/org.egovframe.rte.fdl.xml/src/test/java/org/egovframe/rte/fdl/xml/ControlXMLTest.java
index a18a73a6..baa0c96e 100644
--- a/Foundation/org.egovframe.rte.fdl.xml/src/test/java/org/egovframe/rte/fdl/xml/ControlXMLTest.java
+++ b/Foundation/org.egovframe.rte.fdl.xml/src/test/java/org/egovframe/rte/fdl/xml/ControlXMLTest.java
@@ -1,20 +1,9 @@
package org.egovframe.rte.fdl.xml;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
import org.egovframe.rte.fdl.xml.exception.UnsupportedException;
import org.egovframe.rte.fdl.xml.exception.ValidatorException;
import org.egovframe.rte.fdl.xml.impl.EgovDOMFactoryServiceImpl;
import org.egovframe.rte.fdl.xml.impl.EgovSAXFactoryServiceImpl;
-
-import javax.annotation.Resource;
-import javax.xml.transform.TransformerException;
-
import org.jdom2.Attribute;
import org.jdom2.Document;
import org.jdom2.Element;
@@ -28,6 +17,15 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.xml.sax.SAXException;
+import javax.annotation.Resource;
+import javax.xml.transform.TransformerException;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
/**
* CategoryControllerTest is TestCase of CategoryController
*
diff --git a/Foundation/org.egovframe.rte.fdl.xml/src/test/java/org/egovframe/rte/fdl/xml/ehcache/CacheImpl.java b/Foundation/org.egovframe.rte.fdl.xml/src/test/java/org/egovframe/rte/fdl/xml/ehcache/CacheImpl.java
index a07eb304..b1027c66 100644
--- a/Foundation/org.egovframe.rte.fdl.xml/src/test/java/org/egovframe/rte/fdl/xml/ehcache/CacheImpl.java
+++ b/Foundation/org.egovframe.rte.fdl.xml/src/test/java/org/egovframe/rte/fdl/xml/ehcache/CacheImpl.java
@@ -1,16 +1,15 @@
package org.egovframe.rte.fdl.xml.ehcache;
-import java.io.Serializable;
-import java.net.URL;
-
import net.sf.ehcache.Cache;
import net.sf.ehcache.CacheException;
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Element;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.Serializable;
+import java.net.URL;
+
public class CacheImpl {
private static CacheManager manager;
private static Cache cache;
diff --git a/Foundation/org.egovframe.rte.fdl.xml/src/test/java/org/egovframe/rte/fdl/xml/ehcache/CacheServer.java b/Foundation/org.egovframe.rte.fdl.xml/src/test/java/org/egovframe/rte/fdl/xml/ehcache/CacheServer.java
index 98ea64ea..f5f2d410 100644
--- a/Foundation/org.egovframe.rte.fdl.xml/src/test/java/org/egovframe/rte/fdl/xml/ehcache/CacheServer.java
+++ b/Foundation/org.egovframe.rte.fdl.xml/src/test/java/org/egovframe/rte/fdl/xml/ehcache/CacheServer.java
@@ -1,18 +1,16 @@
package org.egovframe.rte.fdl.xml.ehcache;
+import net.sf.ehcache.Element;
+import org.egovframe.rte.fdl.xml.SharedObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.net.ServerSocket;
import java.net.Socket;
-import org.egovframe.rte.fdl.xml.SharedObject;
-
-import net.sf.ehcache.Element;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
public class CacheServer extends Thread {
/** The hang-around time */
diff --git a/Foundation/org.egovframe.rte.fdl.xml/src/test/java/org/egovframe/rte/fdl/xml/ehcache/CacheXMLAgent.java b/Foundation/org.egovframe.rte.fdl.xml/src/test/java/org/egovframe/rte/fdl/xml/ehcache/CacheXMLAgent.java
index 08852a66..bd48a0f5 100644
--- a/Foundation/org.egovframe.rte.fdl.xml/src/test/java/org/egovframe/rte/fdl/xml/ehcache/CacheXMLAgent.java
+++ b/Foundation/org.egovframe.rte.fdl.xml/src/test/java/org/egovframe/rte/fdl/xml/ehcache/CacheXMLAgent.java
@@ -1,20 +1,19 @@
package org.egovframe.rte.fdl.xml.ehcache;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.net.Socket;
-import java.util.Iterator;
-import java.util.List;
-
import org.egovframe.rte.fdl.xml.SharedObject;
-
import org.jdom2.Attribute;
import org.jdom2.Element;
import org.jdom2.JDOMException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.net.Socket;
+import java.util.Iterator;
+import java.util.List;
+
public class CacheXMLAgent {
String cacheServerIP;
diff --git a/Foundation/org.egovframe.rte.fdl.xml/src/test/java/org/egovframe/rte/fdl/xml/ehcache/CacheXMLTest.java b/Foundation/org.egovframe.rte.fdl.xml/src/test/java/org/egovframe/rte/fdl/xml/ehcache/CacheXMLTest.java
index 6f2fc53f..479ddb88 100644
--- a/Foundation/org.egovframe.rte.fdl.xml/src/test/java/org/egovframe/rte/fdl/xml/ehcache/CacheXMLTest.java
+++ b/Foundation/org.egovframe.rte.fdl.xml/src/test/java/org/egovframe/rte/fdl/xml/ehcache/CacheXMLTest.java
@@ -1,16 +1,10 @@
package org.egovframe.rte.fdl.xml.ehcache;
-import java.io.File;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.net.Socket;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.annotation.Resource;
-
+import org.egovframe.rte.fdl.xml.EgovSAXValidatorService;
+import org.egovframe.rte.fdl.xml.SharedObject;
+import org.egovframe.rte.fdl.xml.impl.EgovDOMFactoryServiceImpl;
+import org.egovframe.rte.fdl.xml.impl.EgovSAXFactoryServiceImpl;
import org.jdom2.Attribute;
import org.jdom2.Document;
import org.jdom2.Element;
@@ -23,10 +17,14 @@
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.egovframe.rte.fdl.xml.EgovSAXValidatorService;
-import org.egovframe.rte.fdl.xml.SharedObject;
-import org.egovframe.rte.fdl.xml.impl.EgovDOMFactoryServiceImpl;
-import org.egovframe.rte.fdl.xml.impl.EgovSAXFactoryServiceImpl;
+import javax.annotation.Resource;
+import java.io.File;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.net.Socket;
+import java.util.Iterator;
+import java.util.List;
/**
* CategoryControllerTest is TestCase of CategoryController
diff --git a/Foundation/org.egovframe.rte.fdl.xml/src/test/resources/spring/egovxml.properties b/Foundation/org.egovframe.rte.fdl.xml/src/test/resources/spring/egovxml.properties
index ef920274..536f7e0e 100644
--- a/Foundation/org.egovframe.rte.fdl.xml/src/test/resources/spring/egovxml.properties
+++ b/Foundation/org.egovframe.rte.fdl.xml/src/test/resources/spring/egovxml.properties
@@ -1,2 +1,2 @@
#egovxmlsaved.path=C:\\Temp\\
-egovxmlsaved.path=/Users/EGOV2020/temp/
\ No newline at end of file
+egovxmlsaved.path=/Users/EGOV2022/temp/
\ No newline at end of file
diff --git a/Integration/org.egovframe.rte.itl.integration/pom.xml b/Integration/org.egovframe.rte.itl.integration/pom.xml
index c4b20089..c5193193 100644
--- a/Integration/org.egovframe.rte.itl.integration/pom.xml
+++ b/Integration/org.egovframe.rte.itl.integration/pom.xml
@@ -4,8 +4,8 @@
4.0.0
org.egovframe.rte
org.egovframe.rte.itl.integration
+ 4.1.0
jar
- 4.0.0
org.egovframe.rte.itl.integration
The eGovernment Standard Framework
https://www.egovframe.go.kr
@@ -18,10 +18,10 @@
- 5.3.6
- 4.0.0
- UTF-8
- UTF-8
+ 5.3.20
+ 4.1.0
+ 1.8
+ UTF-8
@@ -52,8 +52,19 @@
javax.annotation-api
1.3.2
+
+ org.hibernate
+ hibernate-entitymanager
+ 5.6.8.Final
+
+
+ junit
+ junit
+ 4.13.2
+ test
+
org.springframework
spring-test
@@ -72,15 +83,10 @@
${spring.maven.artifact.version}
test
-
- org.hibernate
- hibernate-core
- 5.4.10.Final
-
org.hibernate
hibernate-entitymanager
- 5.4.10.Final
+ 5.6.8.Final
org.slf4j
@@ -96,7 +102,7 @@
org.dbunit
dbunit
- 2.6.0
+ 2.7.3
test
@@ -105,22 +111,16 @@
-
- junit
- junit
- 4.13.1
- test
-
org.easymock
easymock
- 4.1
+ 4.3
test
org.hsqldb
hsqldb
- 2.5.0
+ 2.5.2
test
@@ -134,30 +134,22 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.8.1
+ 3.10.1
- 1.8
- 1.8
- UTF-8
+ ${java.version}
+ ${java.version}
+ ${project.encoding}
org.codehaus.mojo
hibernate3-maven-plugin
3.0
-
-
-
- hbm2ddl
- annotationconfiguration
-
-
-
org.hsqldb
hsqldb
- 2.5.0
+ 2.5.2
@@ -171,7 +163,7 @@
org.apache.maven.plugins
maven-pmd-plugin
- 3.12.0
+ 3.17.0
@@ -217,9 +209,9 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.1.1
+ 3.4.0
- 1.8
+ ${java.version}
-Xdoclint:none
@@ -232,7 +224,7 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
- 3.1.2
+ 3.3.0
sunlink
@@ -242,7 +234,7 @@
true
-
@@ -273,9 +265,9 @@
128m
512m
- UTF-8
- UTF-8
- UTF-8
+ ${project.encoding}
+ ${project.encoding}
+ ${project.encoding}
-Xdoclint:none
@@ -284,8 +276,8 @@
org.apache.maven.plugins
maven-jxr-plugin
- UTF-8
- UTF-8
+ ${project.encoding}
+ ${project.encoding}
true
apidocs
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/simple/SimpleMessage.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/simple/SimpleMessage.java
index e6048f25..020d3613 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/simple/SimpleMessage.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/simple/SimpleMessage.java
@@ -15,13 +15,14 @@
*/
package org.egovframe.rte.itl.integration.message.simple;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
import org.egovframe.rte.itl.integration.EgovIntegrationMessage;
import org.egovframe.rte.itl.integration.EgovIntegrationMessageHeader;
import org.springframework.util.StringUtils;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
/**
* 전자정부 연계 서비스의 표준 메시지 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/simple/SimpleMessageHeader.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/simple/SimpleMessageHeader.java
index 3f78046a..ff1e608a 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/simple/SimpleMessageHeader.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/simple/SimpleMessageHeader.java
@@ -15,10 +15,10 @@
*/
package org.egovframe.rte.itl.integration.message.simple;
-import java.util.Calendar;
-
import org.egovframe.rte.itl.integration.EgovIntegrationMessageHeader;
+import java.util.Calendar;
+
/**
* 전자정부 연계 서비스의 표준 메시지 헤더 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/typed/TypedList.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/typed/TypedList.java
index b7e002d5..f5f1bf81 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/typed/TypedList.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/typed/TypedList.java
@@ -15,17 +15,12 @@
*/
package org.egovframe.rte.itl.integration.message.typed;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-
import org.egovframe.rte.itl.integration.type.ListType;
import org.egovframe.rte.itl.integration.type.Type;
-
import org.springframework.util.CollectionUtils;
+import java.util.*;
+
/**
* 연계 서비스의 표준 메시지 구현 클래스.
*
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/typed/TypedListIterator.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/typed/TypedListIterator.java
index 23fa8f06..a49222aa 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/typed/TypedListIterator.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/typed/TypedListIterator.java
@@ -15,10 +15,10 @@
*/
package org.egovframe.rte.itl.integration.message.typed;
-import java.util.ListIterator;
-
import org.egovframe.rte.itl.integration.type.ListType;
+import java.util.ListIterator;
+
/**
* 연계 서비스의 표준 메시지 구현 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/typed/TypedMap.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/typed/TypedMap.java
index 58955006..d21f647c 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/typed/TypedMap.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/typed/TypedMap.java
@@ -15,16 +15,16 @@
*/
package org.egovframe.rte.itl.integration.message.typed;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
import org.egovframe.rte.itl.integration.type.NoSuchRecordFieldException;
import org.egovframe.rte.itl.integration.type.RecordType;
import org.egovframe.rte.itl.integration.type.Type;
import org.egovframe.rte.itl.integration.type.UnassignableValueException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
/**
* 연계 서비스의 표준 메시지 구현 클래스.
*
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/typed/TypedMessage.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/typed/TypedMessage.java
index 05ff8f9a..7c133e71 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/typed/TypedMessage.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/typed/TypedMessage.java
@@ -15,16 +15,15 @@
*/
package org.egovframe.rte.itl.integration.message.typed;
-import java.util.HashMap;
-import java.util.Map;
-
import org.egovframe.rte.itl.integration.EgovIntegrationMessage;
import org.egovframe.rte.itl.integration.EgovIntegrationMessageHeader;
import org.egovframe.rte.itl.integration.type.RecordType;
import org.egovframe.rte.itl.integration.type.Type;
-
import org.springframework.util.StringUtils;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* 전자정부 연계 서비스의 표준 Message 구현 클래스.
*
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/typed/TypedMessageHeader.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/typed/TypedMessageHeader.java
index f1ac84c6..89fe2407 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/typed/TypedMessageHeader.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/message/typed/TypedMessageHeader.java
@@ -15,13 +15,14 @@
*/
package org.egovframe.rte.itl.integration.message.typed;
-import java.util.Calendar;
-import java.util.HashMap;
import org.egovframe.rte.itl.integration.EgovIntegrationMessageHeader;
import org.egovframe.rte.itl.integration.type.PrimitiveType;
import org.egovframe.rte.itl.integration.type.RecordType;
import org.egovframe.rte.itl.integration.type.Type;
+import java.util.Calendar;
+import java.util.HashMap;
+
/**
* 전자정부 연계 서비스의 표준 MessageHeader 구현 클래스.
*
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/IntegrationDefinition.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/IntegrationDefinition.java
index e4533fe9..5ae7835a 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/IntegrationDefinition.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/IntegrationDefinition.java
@@ -15,13 +15,12 @@
*/
package org.egovframe.rte.itl.integration.metadata;
-import java.util.Calendar;
-import java.util.concurrent.atomic.AtomicBoolean;
-
import org.egovframe.rte.itl.integration.util.Validatable;
-
import org.springframework.util.StringUtils;
+import java.util.Calendar;
+import java.util.concurrent.atomic.AtomicBoolean;
+
/**
* 연계 서비스 메타 데이터 중 '연계 정의' 구현 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/OrganizationDefinition.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/OrganizationDefinition.java
index 9d701693..7062bb63 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/OrganizationDefinition.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/OrganizationDefinition.java
@@ -15,15 +15,14 @@
*/
package org.egovframe.rte.itl.integration.metadata;
+import org.egovframe.rte.itl.integration.util.Validatable;
+import org.springframework.util.StringUtils;
+
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.egovframe.rte.itl.integration.util.Validatable;
-
-import org.springframework.util.StringUtils;
-
/**
* 연계 서비스 메타 데이터 중 '기관' 구현 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/RecordTypeDefinition.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/RecordTypeDefinition.java
index 6adea8aa..894236f3 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/RecordTypeDefinition.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/RecordTypeDefinition.java
@@ -15,15 +15,14 @@
*/
package org.egovframe.rte.itl.integration.metadata;
+import org.egovframe.rte.itl.integration.util.Validatable;
+import org.springframework.util.StringUtils;
+
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.egovframe.rte.itl.integration.util.Validatable;
-
-import org.springframework.util.StringUtils;
-
/**
* 연계 서비스 메타 데이터 중 '레코트 타입' 구현 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/RecordTypeFieldDefinition.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/RecordTypeFieldDefinition.java
index d5f96214..aaa6627f 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/RecordTypeFieldDefinition.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/RecordTypeFieldDefinition.java
@@ -15,12 +15,11 @@
*/
package org.egovframe.rte.itl.integration.metadata;
-import java.util.concurrent.atomic.AtomicBoolean;
-
import org.egovframe.rte.itl.integration.util.Validatable;
-
import org.springframework.util.StringUtils;
+import java.util.concurrent.atomic.AtomicBoolean;
+
/**
* 전자정부 연계 서비스 메타 데이터 중 '레코트 타입 필드' 구현 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/ServiceDefinition.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/ServiceDefinition.java
index 5cfd9788..abffccef 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/ServiceDefinition.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/ServiceDefinition.java
@@ -15,12 +15,11 @@
*/
package org.egovframe.rte.itl.integration.metadata;
-import java.util.concurrent.atomic.AtomicBoolean;
-
import org.egovframe.rte.itl.integration.util.Validatable;
-
import org.springframework.util.StringUtils;
+import java.util.concurrent.atomic.AtomicBoolean;
+
/**
* 연계 서비스 메타 데이터 중 '서비스'를 정의하기 위한 구현 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/SystemDefinition.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/SystemDefinition.java
index 588869d1..4043b6fe 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/SystemDefinition.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/SystemDefinition.java
@@ -15,15 +15,14 @@
*/
package org.egovframe.rte.itl.integration.metadata;
+import org.egovframe.rte.itl.integration.util.Validatable;
+import org.springframework.util.StringUtils;
+
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.egovframe.rte.itl.integration.util.Validatable;
-
-import org.springframework.util.StringUtils;
-
/**
* 전자정부 연계 서비스 메타 데이터 중 '시스템'를 나타내는 구현 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/IntegrationDefinitionDao.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/IntegrationDefinitionDao.java
index 306b8189..933c63b4 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/IntegrationDefinitionDao.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/IntegrationDefinitionDao.java
@@ -15,10 +15,10 @@
*/
package org.egovframe.rte.itl.integration.metadata.dao;
-import java.util.List;
-
import org.egovframe.rte.itl.integration.metadata.IntegrationDefinition;
+import java.util.List;
+
/**
* 연계 서비스 메타 데이터의 IntegrationDefinition을 읽어오기 위한 DAO 인터페이스
*
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateIntegrationDefinitionDao.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateIntegrationDefinitionDao.java
index 37c905e6..0cd5f2f1 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateIntegrationDefinitionDao.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateIntegrationDefinitionDao.java
@@ -15,15 +15,14 @@
*/
package org.egovframe.rte.itl.integration.metadata.dao.hibernate;
-import java.util.List;
-
import org.egovframe.rte.itl.integration.metadata.IntegrationDefinition;
import org.egovframe.rte.itl.integration.metadata.dao.IntegrationDefinitionDao;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.orm.hibernate5.support.HibernateDaoSupport;
+import java.util.List;
+
/**
* 연계 서비스 IntegrationDefinitionDao 구현 클래스.
*
@@ -50,7 +49,7 @@ public class HibernateIntegrationDefinitionDao extends HibernateDaoSupport imple
public IntegrationDefinition getIntegrationDefinition(String id) {
LOGGER.debug("get IntegrationDefinition (id = \"{}\")", id);
- IntegrationDefinition integrationDefinition = (IntegrationDefinition) getHibernateTemplate().get(IntegrationDefinition.class, id);
+ IntegrationDefinition integrationDefinition = getHibernateTemplate().get(IntegrationDefinition.class, id);
// CHECKSTYLE:ON
LOGGER.debug("get IntegrationDefinition (id = \"{}\") = {}", id, integrationDefinition);
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateOrganizationDefinitionDao.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateOrganizationDefinitionDao.java
index a3b7ac83..24f9774e 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateOrganizationDefinitionDao.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateOrganizationDefinitionDao.java
@@ -17,7 +17,6 @@
import org.egovframe.rte.itl.integration.metadata.OrganizationDefinition;
import org.egovframe.rte.itl.integration.metadata.dao.OrganizationDefinitionDao;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.orm.hibernate5.support.HibernateDaoSupport;
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateRecordTypeDefinitionDao.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateRecordTypeDefinitionDao.java
index 9638efa3..3d20363b 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateRecordTypeDefinitionDao.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateRecordTypeDefinitionDao.java
@@ -17,7 +17,6 @@
import org.egovframe.rte.itl.integration.metadata.RecordTypeDefinition;
import org.egovframe.rte.itl.integration.metadata.dao.RecordTypeDefinitionDao;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.orm.hibernate5.support.HibernateDaoSupport;
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateServiceDefinitionDao.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateServiceDefinitionDao.java
index 54a3f3c7..cb300be8 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateServiceDefinitionDao.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateServiceDefinitionDao.java
@@ -15,16 +15,14 @@
*/
package org.egovframe.rte.itl.integration.metadata.dao.hibernate;
-import java.util.List;
-
-import org.egovframe.rte.itl.integration.metadata.IntegrationDefinition;
import org.egovframe.rte.itl.integration.metadata.ServiceDefinition;
import org.egovframe.rte.itl.integration.metadata.dao.ServiceDefinitionDao;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.orm.hibernate5.support.HibernateDaoSupport;
+import java.util.List;
+
/**
* 연계 서비스 ServiceDefinitionDao 구현 클래스.
*
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateSystemDefinitionDao.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateSystemDefinitionDao.java
index a57ec124..849449e6 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateSystemDefinitionDao.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateSystemDefinitionDao.java
@@ -15,15 +15,14 @@
*/
package org.egovframe.rte.itl.integration.metadata.dao.hibernate;
-import java.util.List;
-
import org.egovframe.rte.itl.integration.metadata.SystemDefinition;
import org.egovframe.rte.itl.integration.metadata.dao.SystemDefinitionDao;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.orm.hibernate5.support.HibernateDaoSupport;
+import java.util.List;
+
/**
* 연계 서비스 SystemDefinitionDao 구현 클래스.
*
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/support/AbstractService.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/support/AbstractService.java
index de938241..5d66783f 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/support/AbstractService.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/support/AbstractService.java
@@ -15,13 +15,9 @@
*/
package org.egovframe.rte.itl.integration.support;
-import org.egovframe.rte.itl.integration.EgovIntegrationMessage;
-import org.egovframe.rte.itl.integration.EgovIntegrationMessageHeader;
+import org.egovframe.rte.itl.integration.*;
import org.egovframe.rte.itl.integration.EgovIntegrationMessageHeader.ResultCode;
-import org.egovframe.rte.itl.integration.EgovIntegrationService;
-import org.egovframe.rte.itl.integration.EgovIntegrationServiceCallback;
import org.egovframe.rte.itl.integration.EgovIntegrationServiceCallback.CallbackId;
-import org.egovframe.rte.itl.integration.EgovIntegrationServiceResponse;
import org.egovframe.rte.itl.integration.message.simple.SimpleMessage;
import org.egovframe.rte.itl.integration.message.simple.SimpleMessageHeader;
import org.slf4j.Logger;
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/AbstractType.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/AbstractType.java
index b3b9b229..47f4986c 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/AbstractType.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/AbstractType.java
@@ -15,13 +15,13 @@
*/
package org.egovframe.rte.itl.integration.type;
-import java.util.Arrays;
-import java.util.List;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
+import java.util.Arrays;
+import java.util.List;
+
/**
* 연계 서비스의 표준 메시지의 Type을 정의하기 위한 기본 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/ListType.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/ListType.java
index 06072f17..9463ae9d 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/ListType.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/ListType.java
@@ -15,13 +15,12 @@
*/
package org.egovframe.rte.itl.integration.type;
-import java.util.Collection;
-
import org.egovframe.rte.itl.integration.message.typed.TypedList;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Collection;
+
/**
* 전자정부 연계 서비스의 표준 메시지를 정의 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/PrimitiveType.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/PrimitiveType.java
index 830413f9..d6dc4719 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/PrimitiveType.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/PrimitiveType.java
@@ -17,11 +17,7 @@
import java.math.BigDecimal;
import java.math.BigInteger;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 연계 서비스의 표준 메시지를 정의 클래스
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/RecordType.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/RecordType.java
index bb8dbf88..0bf2e87c 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/RecordType.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/RecordType.java
@@ -15,15 +15,14 @@
*/
package org.egovframe.rte.itl.integration.type;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
import org.egovframe.rte.itl.integration.message.typed.TypedMap;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
/**
* 연계 서비스의 표준 메시지를 정의 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/support/PrimitiveTypeFactoryBean.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/support/PrimitiveTypeFactoryBean.java
index 2931b4fb..a4eb2883 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/support/PrimitiveTypeFactoryBean.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/support/PrimitiveTypeFactoryBean.java
@@ -17,7 +17,6 @@
import org.egovframe.rte.itl.integration.type.NoSuchTypeException;
import org.egovframe.rte.itl.integration.type.PrimitiveType;
-
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.config.AbstractFactoryBean;
import org.springframework.util.StringUtils;
diff --git a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/support/TypeLoaderUsingMetadata.java b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/support/TypeLoaderUsingMetadata.java
index e3931462..ae1594b9 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/support/TypeLoaderUsingMetadata.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/main/java/org/egovframe/rte/itl/integration/type/support/TypeLoaderUsingMetadata.java
@@ -15,25 +15,18 @@
*/
package org.egovframe.rte.itl.integration.type.support;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
import org.egovframe.rte.itl.integration.metadata.RecordTypeDefinition;
import org.egovframe.rte.itl.integration.metadata.RecordTypeFieldDefinition;
import org.egovframe.rte.itl.integration.metadata.dao.RecordTypeDefinitionDao;
-import org.egovframe.rte.itl.integration.type.CircularInheritanceException;
-import org.egovframe.rte.itl.integration.type.ListType;
-import org.egovframe.rte.itl.integration.type.NoSuchTypeException;
-import org.egovframe.rte.itl.integration.type.PrimitiveType;
-import org.egovframe.rte.itl.integration.type.RecordType;
-import org.egovframe.rte.itl.integration.type.Type;
-import org.egovframe.rte.itl.integration.type.TypeLoader;
-
+import org.egovframe.rte.itl.integration.type.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
/**
* 전자정부 연계 서비스의 표준 메시지의 Type을 읽어오기 위한 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/message/typed/TypedListTest.java b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/message/typed/TypedListTest.java
index c0efaab5..da233361 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/message/typed/TypedListTest.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/message/typed/TypedListTest.java
@@ -1,24 +1,14 @@
package org.egovframe.rte.itl.integration.message.typed;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.NoSuchElementException;
-
import org.egovframe.rte.itl.integration.type.ListType;
import org.egovframe.rte.itl.integration.type.PrimitiveType;
import org.egovframe.rte.itl.integration.type.UnassignableValueException;
-
import org.junit.Test;
+import java.util.*;
+
+import static org.junit.Assert.*;
+
public class TypedListTest
{
@@ -685,7 +675,7 @@ public void testToArray() throws Exception
assertEquals(strings[i], array[i]);
}
- String[] stringArray = list.toArray(new String[] {});
+ String[] stringArray = list.toArray(new String[0]);
assertNotNull(stringArray);
assertEquals(strings.length, stringArray.length);
for (int i = 0; i < strings.length; i++)
@@ -696,7 +686,7 @@ public void testToArray() throws Exception
// Un Assignable
try
{
- list.toArray(new Integer[] {});
+ list.toArray(new Integer[0]);
fail();
}
catch (ArrayStoreException e)
diff --git a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/message/typed/TypedMapTest.java b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/message/typed/TypedMapTest.java
index 56cd1e3e..469f0669 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/message/typed/TypedMapTest.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/message/typed/TypedMapTest.java
@@ -1,9 +1,7 @@
package org.egovframe.rte.itl.integration.message.typed;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import org.egovframe.rte.itl.integration.type.*;
+import org.junit.Test;
import java.util.Collection;
import java.util.HashMap;
@@ -11,14 +9,7 @@
import java.util.Map.Entry;
import java.util.Set;
-import org.egovframe.rte.itl.integration.type.ListType;
-import org.egovframe.rte.itl.integration.type.NoSuchRecordFieldException;
-import org.egovframe.rte.itl.integration.type.PrimitiveType;
-import org.egovframe.rte.itl.integration.type.RecordType;
-import org.egovframe.rte.itl.integration.type.Type;
-import org.egovframe.rte.itl.integration.type.UnassignableValueException;
-
-import org.junit.Test;
+import static org.junit.Assert.*;
public class TypedMapTest {
diff --git a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateIntegrationDefinitionDaoTest.java b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateIntegrationDefinitionDaoTest.java
index 93211564..219266e1 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateIntegrationDefinitionDaoTest.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateIntegrationDefinitionDaoTest.java
@@ -1,21 +1,10 @@
package org.egovframe.rte.itl.integration.metadata.dao.hibernate;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Calendar;
-import java.util.List;
-
-import org.egovframe.rte.itl.integration.metadata.IntegrationDefinition;
-
-import javax.sql.DataSource;
-
import org.dbunit.database.IDatabaseConnection;
import org.dbunit.dataset.ReplacementDataSet;
import org.dbunit.dataset.xml.FlatXmlDataSet;
import org.dbunit.operation.DatabaseOperation;
+import org.egovframe.rte.itl.integration.metadata.IntegrationDefinition;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -25,6 +14,12 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ResourceUtils;
+import javax.sql.DataSource;
+import java.util.Calendar;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations="/org/egovframe/rte/itl/integration/metadata/dao/hibernate/context.xml")
@Transactional(readOnly=false)
diff --git a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateOrganizationDefinitionDaoTest.java b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateOrganizationDefinitionDaoTest.java
index bfcea327..160efb2e 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateOrganizationDefinitionDaoTest.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateOrganizationDefinitionDaoTest.java
@@ -1,20 +1,12 @@
package org.egovframe.rte.itl.integration.metadata.dao.hibernate;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import org.egovframe.rte.itl.integration.metadata.OrganizationDefinition;
-import org.egovframe.rte.itl.integration.metadata.ServiceDefinition;
-import org.egovframe.rte.itl.integration.metadata.SystemDefinition;
-
-import javax.sql.DataSource;
-
import org.dbunit.database.IDatabaseConnection;
import org.dbunit.dataset.ReplacementDataSet;
import org.dbunit.dataset.xml.FlatXmlDataSet;
import org.dbunit.operation.DatabaseOperation;
+import org.egovframe.rte.itl.integration.metadata.OrganizationDefinition;
+import org.egovframe.rte.itl.integration.metadata.ServiceDefinition;
+import org.egovframe.rte.itl.integration.metadata.SystemDefinition;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -24,6 +16,10 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ResourceUtils;
+import javax.sql.DataSource;
+
+import static org.junit.Assert.*;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations="/org/egovframe/rte/itl/integration/metadata/dao/hibernate/context.xml")
@Transactional(readOnly=false)
diff --git a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateRecordTypeDefinitionDaoTest.java b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateRecordTypeDefinitionDaoTest.java
index c19cb7a9..ade0e738 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateRecordTypeDefinitionDaoTest.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateRecordTypeDefinitionDaoTest.java
@@ -1,18 +1,10 @@
package org.egovframe.rte.itl.integration.metadata.dao.hibernate;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import org.egovframe.rte.itl.integration.metadata.RecordTypeDefinition;
-
-import javax.sql.DataSource;
-
import org.dbunit.database.IDatabaseConnection;
import org.dbunit.dataset.ReplacementDataSet;
import org.dbunit.dataset.xml.FlatXmlDataSet;
import org.dbunit.operation.DatabaseOperation;
+import org.egovframe.rte.itl.integration.metadata.RecordTypeDefinition;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -22,6 +14,10 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ResourceUtils;
+import javax.sql.DataSource;
+
+import static org.junit.Assert.*;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations="/org/egovframe/rte/itl/integration/metadata/dao/hibernate/context.xml")
@Transactional(readOnly=false)
diff --git a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateServiceDefinitionDaoTest.java b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateServiceDefinitionDaoTest.java
index c58ec055..3a114cf1 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateServiceDefinitionDaoTest.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateServiceDefinitionDaoTest.java
@@ -1,18 +1,10 @@
package org.egovframe.rte.itl.integration.metadata.dao.hibernate;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import org.egovframe.rte.itl.integration.metadata.ServiceDefinition;
-
-import javax.sql.DataSource;
-
import org.dbunit.database.IDatabaseConnection;
import org.dbunit.dataset.ReplacementDataSet;
import org.dbunit.dataset.xml.FlatXmlDataSet;
import org.dbunit.operation.DatabaseOperation;
+import org.egovframe.rte.itl.integration.metadata.ServiceDefinition;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -22,6 +14,10 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ResourceUtils;
+import javax.sql.DataSource;
+
+import static org.junit.Assert.*;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations="/org/egovframe/rte/itl/integration/metadata/dao/hibernate/context.xml")
@Transactional(readOnly=false)
diff --git a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateSystemDefinitionDaoTest.java b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateSystemDefinitionDaoTest.java
index b21e0d07..bc01ad07 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateSystemDefinitionDaoTest.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/HibernateSystemDefinitionDaoTest.java
@@ -1,19 +1,11 @@
package org.egovframe.rte.itl.integration.metadata.dao.hibernate;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import org.egovframe.rte.itl.integration.metadata.ServiceDefinition;
-import org.egovframe.rte.itl.integration.metadata.SystemDefinition;
-
-import javax.sql.DataSource;
-
import org.dbunit.database.IDatabaseConnection;
import org.dbunit.dataset.ReplacementDataSet;
import org.dbunit.dataset.xml.FlatXmlDataSet;
import org.dbunit.operation.DatabaseOperation;
+import org.egovframe.rte.itl.integration.metadata.ServiceDefinition;
+import org.egovframe.rte.itl.integration.metadata.SystemDefinition;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -23,6 +15,10 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ResourceUtils;
+import javax.sql.DataSource;
+
+import static org.junit.Assert.*;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = "/org/egovframe/rte/itl/integration/metadata/dao/hibernate/context.xml")
@Transactional(readOnly=false)
diff --git a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/SpringDatabaseDataSourceConnection.java b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/SpringDatabaseDataSourceConnection.java
index 9ff6c271..ed5c31ed 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/SpringDatabaseDataSourceConnection.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/metadata/dao/hibernate/SpringDatabaseDataSourceConnection.java
@@ -1,13 +1,12 @@
package org.egovframe.rte.itl.integration.metadata.dao.hibernate;
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.sql.DataSource;
-
import org.dbunit.database.DatabaseDataSourceConnection;
import org.springframework.jdbc.datasource.DataSourceUtils;
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
+
/**
* Wrapped version of DBUnits DatabaseDataSourceConnection to enable Spring Transaction support.
*/
diff --git a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/support/AbstractServiceTest.java b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/support/AbstractServiceTest.java
index 658fcbfc..bab83ccd 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/support/AbstractServiceTest.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/support/AbstractServiceTest.java
@@ -1,16 +1,15 @@
package org.egovframe.rte.itl.integration.support;
-import static org.junit.Assert.assertEquals;
-
import org.egovframe.rte.itl.integration.EgovIntegrationMessage;
import org.egovframe.rte.itl.integration.EgovIntegrationMessageHeader.ResultCode;
import org.egovframe.rte.itl.integration.EgovIntegrationService;
import org.egovframe.rte.itl.integration.EgovIntegrationServiceResponse;
import org.egovframe.rte.itl.integration.message.simple.SimpleMessage;
import org.egovframe.rte.itl.integration.message.simple.SimpleMessageHeader;
-
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class AbstractServiceTest
{
diff --git a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/type/ListTypeTest.java b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/type/ListTypeTest.java
index 1e93d87d..d513df5b 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/type/ListTypeTest.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/type/ListTypeTest.java
@@ -1,17 +1,13 @@
package org.egovframe.rte.itl.integration.type;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import org.egovframe.rte.itl.integration.message.typed.TypedList;
+import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.egovframe.rte.itl.integration.message.typed.TypedList;
-
-import org.junit.Test;
+import static org.junit.Assert.*;
public class ListTypeTest
{
diff --git a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/type/PrimitiveTypeTest.java b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/type/PrimitiveTypeTest.java
index 1c2ac06d..28803fc2 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/type/PrimitiveTypeTest.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/type/PrimitiveTypeTest.java
@@ -1,15 +1,13 @@
package org.egovframe.rte.itl.integration.type;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
import java.util.Date;
-import org.junit.Test;
+import static org.junit.Assert.*;
public class PrimitiveTypeTest
{
diff --git a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/type/RecordTypeTest.java b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/type/RecordTypeTest.java
index e003e015..ff6f3e08 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/type/RecordTypeTest.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/type/RecordTypeTest.java
@@ -1,16 +1,13 @@
package org.egovframe.rte.itl.integration.type;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import org.egovframe.rte.itl.integration.message.typed.TypedMap;
+import org.junit.Test;
import java.util.Calendar;
import java.util.HashMap;
import java.util.Map;
-import org.egovframe.rte.itl.integration.message.typed.TypedMap;
-
-import org.junit.Test;
+import static org.junit.Assert.*;
public class RecordTypeTest {
diff --git a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/type/support/PrimitiveTypeFactoryBeanTest.java b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/type/support/PrimitiveTypeFactoryBeanTest.java
index 84f75abb..742b3490 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/type/support/PrimitiveTypeFactoryBeanTest.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/type/support/PrimitiveTypeFactoryBeanTest.java
@@ -1,11 +1,6 @@
package org.egovframe.rte.itl.integration.type.support;
-import static org.junit.Assert.assertEquals;
-
import org.egovframe.rte.itl.integration.type.PrimitiveType;
-
-import javax.annotation.Resource;
-
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.BeanFactory;
@@ -13,6 +8,10 @@
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import javax.annotation.Resource;
+
+import static org.junit.Assert.assertEquals;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations="/org/egovframe/rte/itl/integration/type/support/context.xml")
public class PrimitiveTypeFactoryBeanTest
diff --git a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/type/support/TypeLoaderUsingMetadataTest.java b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/type/support/TypeLoaderUsingMetadataTest.java
index 557e060f..0d082609 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/type/support/TypeLoaderUsingMetadataTest.java
+++ b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/type/support/TypeLoaderUsingMetadataTest.java
@@ -1,22 +1,16 @@
package org.egovframe.rte.itl.integration.type.support;
-import java.util.HashMap;
-import java.util.Map;
-
import org.egovframe.rte.itl.integration.metadata.RecordTypeDefinition;
import org.egovframe.rte.itl.integration.metadata.RecordTypeFieldDefinition;
import org.egovframe.rte.itl.integration.metadata.dao.RecordTypeDefinitionDao;
-import org.egovframe.rte.itl.integration.type.CircularInheritanceException;
-import org.egovframe.rte.itl.integration.type.ListType;
-import org.egovframe.rte.itl.integration.type.NoSuchTypeException;
-import org.egovframe.rte.itl.integration.type.PrimitiveType;
-import org.egovframe.rte.itl.integration.type.RecordType;
-import org.egovframe.rte.itl.integration.type.Type;
-
+import org.egovframe.rte.itl.integration.type.*;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import java.util.HashMap;
+import java.util.Map;
+
public class TypeLoaderUsingMetadataTest {
private static TypeLoaderUsingMetadata typeLoader;
diff --git a/Integration/org.egovframe.rte.itl.integration/src/test/resources/org/egovframe/rte/itl/integration/metadata/dao/hibernate/context.xml b/Integration/org.egovframe.rte.itl.integration/src/test/resources/org/egovframe/rte/itl/integration/metadata/dao/hibernate/context.xml
index 9972aa83..794bfdf7 100644
--- a/Integration/org.egovframe.rte.itl.integration/src/test/resources/org/egovframe/rte/itl/integration/metadata/dao/hibernate/context.xml
+++ b/Integration/org.egovframe.rte.itl.integration/src/test/resources/org/egovframe/rte/itl/integration/metadata/dao/hibernate/context.xml
@@ -26,13 +26,6 @@
diff --git a/Integration/org.egovframe.rte.itl.integration/src/test/resources/unitils.properties b/Integration/org.egovframe.rte.itl.integration/src/test/resources/unitils.properties
deleted file mode 100644
index baa1d0fb..00000000
--- a/Integration/org.egovframe.rte.itl.integration/src/test/resources/unitils.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-database.driverClassName=org.hsqldb.jdbcDriver
-database.url=jdbc:hsqldb:mem:test
-database.userName=sa
-database.password=
-database.schemaNames=public
-database.dialect=hsqldb
-
-#DatabaseModule.Transactional.value.default=commit
-#transactionManager.type=simple
\ No newline at end of file
diff --git a/Integration/org.egovframe.rte.itl.webservice/pom.xml b/Integration/org.egovframe.rte.itl.webservice/pom.xml
index 73534eae..b7abceeb 100644
--- a/Integration/org.egovframe.rte.itl.webservice/pom.xml
+++ b/Integration/org.egovframe.rte.itl.webservice/pom.xml
@@ -4,8 +4,8 @@
4.0.0
org.egovframe.rte
org.egovframe.rte.itl.webservice
+ 4.1.0
jar
- 4.0.0
org.egovframe.rte.itl.webservice
The eGovernment Standard Framework
https://www.egovframe.go.kr
@@ -18,10 +18,10 @@
- 5.3.6
- 4.0.0
- UTF-8
- UTF-8
+ 5.3.20
+ 4.1.0
+ 1.8
+ UTF-8
@@ -60,12 +60,12 @@
org.apache.cxf
cxf-rt-frontend-jaxws
- 3.3.4
+ 3.5.2
org.apache.cxf
cxf-rt-transports-http-jetty
- 3.3.4
+ 3.5.2
javax.servlet
@@ -80,21 +80,22 @@
+
+ junit
+ junit
+ 4.13.2
+ test
+
org.springframework
spring-test
${spring.maven.artifact.version}
test
-
- org.hibernate
- hibernate-core
- 5.4.10.Final
-
org.hibernate
hibernate-entitymanager
- 5.4.10.Final
+ 5.6.8.Final
org.slf4j
@@ -114,7 +115,7 @@
org.dbunit
dbunit
- 2.6.0
+ 2.7.3
test
@@ -126,25 +127,19 @@
org.hsqldb
hsqldb
- 2.5.0
+ 2.5.2
test
org.apache.commons
commons-dbcp2
- 2.4.0
- test
-
-
- junit
- junit
- 4.13.1
+ 2.9.0
test
org.easymock
easymock
- 4.1
+ 4.3
test
@@ -158,30 +153,22 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.8.1
+ 3.10.1
- 1.8
- 1.8
- UTF-8
+ ${java.version}
+ ${java.version}
+ ${project.encoding}
org.codehaus.mojo
hibernate3-maven-plugin
3.0
-
-
-
- hbm2ddl
- annotationconfiguration
-
-
-
org.hsqldb
hsqldb
- 2.5.0
+ 2.5.2
@@ -195,7 +182,7 @@
org.apache.maven.plugins
maven-pmd-plugin
- 3.12.0
+ 3.17.0
@@ -241,9 +228,9 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.1.1
+ 3.4.0
- 1.8
+ ${java.version}
-Xdoclint:none
@@ -256,7 +243,7 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
- 3.1.2
+ 3.3.0
sunlink
@@ -266,7 +253,7 @@
true
-
@@ -297,9 +284,9 @@
128m
512m
- UTF-8
- UTF-8
- UTF-8
+ ${project.encoding}
+ ${project.encoding}
+ ${project.encoding}
-Xdoclint:none
@@ -308,8 +295,8 @@
org.apache.maven.plugins
maven-jxr-plugin
- UTF-8
- UTF-8
+ ${project.encoding}
+ ${project.encoding}
true
apidocs
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/EgovWebService.java b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/EgovWebService.java
index b3aa00aa..9bf6b888 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/EgovWebService.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/EgovWebService.java
@@ -15,8 +15,6 @@
*/
package org.egovframe.rte.itl.webservice;
-import java.util.Calendar;
-
import org.egovframe.rte.itl.integration.EgovIntegrationMessage;
import org.egovframe.rte.itl.integration.EgovIntegrationMessageHeader.ResultCode;
import org.egovframe.rte.itl.integration.metadata.IntegrationDefinition;
@@ -25,10 +23,11 @@
import org.egovframe.rte.itl.integration.metadata.SystemDefinition;
import org.egovframe.rte.itl.integration.support.AbstractService;
import org.egovframe.rte.itl.webservice.service.EgovWebServiceClient;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Calendar;
+
/**
* 전자정부 웹 서비스의 단위 서비스 구현 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/EgovWebServiceContext.java b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/EgovWebServiceContext.java
index b2c5ed5e..8bc28136 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/EgovWebServiceContext.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/EgovWebServiceContext.java
@@ -15,13 +15,8 @@
*/
package org.egovframe.rte.itl.webservice;
-import java.lang.reflect.Field;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.egovframe.rte.itl.integration.EgovIntegrationContext;
import org.egovframe.rte.itl.integration.EgovIntegrationNoSuchServiceException;
import org.egovframe.rte.itl.integration.EgovIntegrationService;
@@ -37,22 +32,8 @@
import org.egovframe.rte.itl.webservice.data.WebServiceServerDefinition;
import org.egovframe.rte.itl.webservice.data.dao.WebServiceClientDefinitionDao;
import org.egovframe.rte.itl.webservice.data.dao.WebServiceServerDefinitionDao;
-import org.egovframe.rte.itl.webservice.service.EgovWebServiceClassLoader;
-import org.egovframe.rte.itl.webservice.service.EgovWebServiceClient;
-import org.egovframe.rte.itl.webservice.service.MessageConverter;
-import org.egovframe.rte.itl.webservice.service.ServiceBridge;
-import org.egovframe.rte.itl.webservice.service.ServiceEndpointInfo;
-import org.egovframe.rte.itl.webservice.service.ServiceEndpointInterfaceInfo;
-import org.egovframe.rte.itl.webservice.service.impl.EgovWebServiceClientImpl;
-import org.egovframe.rte.itl.webservice.service.impl.MessageConverterImpl;
-import org.egovframe.rte.itl.webservice.service.impl.ServiceBridgeImpl;
-import org.egovframe.rte.itl.webservice.service.impl.ServiceEndpointInfoImpl;
-import org.egovframe.rte.itl.webservice.service.impl.ServiceEndpointInterfaceInfoImpl;
-
-import javax.xml.ws.Endpoint;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
+import org.egovframe.rte.itl.webservice.service.*;
+import org.egovframe.rte.itl.webservice.service.impl.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
@@ -60,6 +41,14 @@
import org.springframework.context.ApplicationContextAware;
import org.springframework.util.StringUtils;
+import javax.xml.ws.Endpoint;
+import java.lang.reflect.Field;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* 전자정부 웹서비스 Context 구현 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/EgovWebServiceMessage.java b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/EgovWebServiceMessage.java
index d7cef889..d760bd20 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/EgovWebServiceMessage.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/EgovWebServiceMessage.java
@@ -15,11 +15,11 @@
*/
package org.egovframe.rte.itl.webservice;
-import java.util.Map;
-
import org.egovframe.rte.itl.integration.EgovIntegrationMessageHeader;
import org.egovframe.rte.itl.integration.message.simple.SimpleMessage;
+import java.util.Map;
+
/**
* 전자정부 웹 서비스 메시지 구현 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/EgovWebServiceMessageHeader.java b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/EgovWebServiceMessageHeader.java
index b6317e46..995730b5 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/EgovWebServiceMessageHeader.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/EgovWebServiceMessageHeader.java
@@ -15,14 +15,13 @@
*/
package org.egovframe.rte.itl.webservice;
-import java.util.Calendar;
-
import org.egovframe.rte.itl.integration.EgovIntegrationMessageHeader;
import org.egovframe.rte.itl.integration.type.RecordType;
import org.egovframe.rte.itl.integration.type.Type;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
+import java.util.Calendar;
/**
* 전자정부 웹 서비스 메시지 헤더 구현 클래스
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/EgovWebServiceServlet.java b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/EgovWebServiceServlet.java
index 6099037c..9e03afe3 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/EgovWebServiceServlet.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/EgovWebServiceServlet.java
@@ -15,8 +15,6 @@
*/
package org.egovframe.rte.itl.webservice;
-import javax.servlet.ServletConfig;
-
import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -24,6 +22,8 @@
import org.springframework.context.ApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
+import javax.servlet.ServletConfig;
+
/**
* 전자정부 웹 서비스를 Servlet을 통해 제공하기 위해 사용하는 Servlet 구현 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/data/MappingInfo.java b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/data/MappingInfo.java
index 073c53d2..e460fc23 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/data/MappingInfo.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/data/MappingInfo.java
@@ -15,12 +15,11 @@
*/
package org.egovframe.rte.itl.webservice.data;
-import java.util.concurrent.atomic.AtomicBoolean;
-
import org.egovframe.rte.itl.integration.util.Validatable;
-
import org.springframework.util.StringUtils;
+import java.util.concurrent.atomic.AtomicBoolean;
+
/**
* 전자정부 웹 서비스 설정 정보 중 Param 매핑 정보 구현 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/data/WebServiceClientDefinition.java b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/data/WebServiceClientDefinition.java
index 03aaf11d..bb1e7c5e 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/data/WebServiceClientDefinition.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/data/WebServiceClientDefinition.java
@@ -15,15 +15,14 @@
*/
package org.egovframe.rte.itl.webservice.data;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.atomic.AtomicBoolean;
-
import org.egovframe.rte.itl.integration.metadata.ServiceDefinition;
import org.egovframe.rte.itl.integration.util.Validatable;
-
import org.springframework.util.StringUtils;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicBoolean;
+
/**
* 전자정부 웹 서비스 설정 정보 중 Client 정보 구현 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/data/WebServiceServerDefinition.java b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/data/WebServiceServerDefinition.java
index b81efe2d..7b3b31d1 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/data/WebServiceServerDefinition.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/data/WebServiceServerDefinition.java
@@ -15,11 +15,12 @@
*/
package org.egovframe.rte.itl.webservice.data;
-import java.util.concurrent.atomic.AtomicBoolean;
import org.egovframe.rte.itl.integration.metadata.ServiceDefinition;
import org.egovframe.rte.itl.integration.util.Validatable;
import org.springframework.util.StringUtils;
+import java.util.concurrent.atomic.AtomicBoolean;
+
/**
* 전자정부 웹 서비스 설정 정보 중 Server 정보 구현 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/data/dao/hibernate/HibernateWebServiceClientDefinitionDao.java b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/data/dao/hibernate/HibernateWebServiceClientDefinitionDao.java
index c7f21672..fba5694e 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/data/dao/hibernate/HibernateWebServiceClientDefinitionDao.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/data/dao/hibernate/HibernateWebServiceClientDefinitionDao.java
@@ -18,7 +18,6 @@
import org.egovframe.rte.itl.integration.metadata.ServiceDefinition;
import org.egovframe.rte.itl.webservice.data.WebServiceClientDefinition;
import org.egovframe.rte.itl.webservice.data.dao.WebServiceClientDefinitionDao;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.orm.hibernate5.support.HibernateDaoSupport;
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/data/dao/hibernate/HibernateWebServiceServerDefinitionDao.java b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/data/dao/hibernate/HibernateWebServiceServerDefinitionDao.java
index 6123189d..4733df49 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/data/dao/hibernate/HibernateWebServiceServerDefinitionDao.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/data/dao/hibernate/HibernateWebServiceServerDefinitionDao.java
@@ -18,7 +18,6 @@
import org.egovframe.rte.itl.integration.metadata.ServiceDefinition;
import org.egovframe.rte.itl.webservice.data.WebServiceServerDefinition;
import org.egovframe.rte.itl.webservice.data.dao.WebServiceServerDefinitionDao;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.orm.hibernate5.support.HibernateDaoSupport;
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/EgovWebServiceClassLoaderFactoryBean.java b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/EgovWebServiceClassLoaderFactoryBean.java
index 6e368c11..7dd8e2a7 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/EgovWebServiceClassLoaderFactoryBean.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/EgovWebServiceClassLoaderFactoryBean.java
@@ -16,7 +16,6 @@
package org.egovframe.rte.itl.webservice.service.impl;
import org.egovframe.rte.itl.webservice.service.EgovWebServiceClassLoader;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.context.ApplicationContext;
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/EgovWebServiceClassLoaderImpl.java b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/EgovWebServiceClassLoaderImpl.java
index ed221fd8..ac570db4 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/EgovWebServiceClassLoaderImpl.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/EgovWebServiceClassLoaderImpl.java
@@ -15,33 +15,6 @@
*/
package org.egovframe.rte.itl.webservice.service.impl;
-import static javax.jws.WebParam.Mode.INOUT;
-import static javax.jws.WebParam.Mode.OUT;
-import static org.objectweb.asm.Opcodes.ACC_ABSTRACT;
-import static org.objectweb.asm.Opcodes.ACC_INTERFACE;
-import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
-import static org.objectweb.asm.Opcodes.ALOAD;
-import static org.objectweb.asm.Opcodes.ARETURN;
-import static org.objectweb.asm.Opcodes.ASTORE;
-import static org.objectweb.asm.Opcodes.CHECKCAST;
-import static org.objectweb.asm.Opcodes.DUP;
-import static org.objectweb.asm.Opcodes.GETFIELD;
-import static org.objectweb.asm.Opcodes.INVOKEINTERFACE;
-import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
-import static org.objectweb.asm.Opcodes.NEW;
-import static org.objectweb.asm.Opcodes.POP;
-import static org.objectweb.asm.Opcodes.RETURN;
-import static org.objectweb.asm.Opcodes.V1_5;
-
-import java.lang.reflect.Array;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
import org.egovframe.rte.itl.integration.type.ListType;
import org.egovframe.rte.itl.integration.type.PrimitiveType;
import org.egovframe.rte.itl.integration.type.RecordType;
@@ -51,9 +24,6 @@
import org.egovframe.rte.itl.webservice.service.ServiceEndpointInfo;
import org.egovframe.rte.itl.webservice.service.ServiceEndpointInterfaceInfo;
import org.egovframe.rte.itl.webservice.service.ServiceParamInfo;
-
-import javax.xml.ws.Holder;
-
import org.objectweb.asm.AnnotationVisitor;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.FieldVisitor;
@@ -61,6 +31,20 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.xml.ws.Holder;
+import java.lang.reflect.Array;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import static javax.jws.WebParam.Mode.INOUT;
+import static javax.jws.WebParam.Mode.OUT;
+import static org.objectweb.asm.Opcodes.*;
+
/**
* 웹 서비스에 필요한 클래스를 생성하는 ClassLoader 구현 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/EgovWebServiceClientImpl.java b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/EgovWebServiceClientImpl.java
index 980f1fc5..0c632cf8 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/EgovWebServiceClientImpl.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/EgovWebServiceClientImpl.java
@@ -15,34 +15,28 @@
*/
package org.egovframe.rte.itl.webservice.service.impl;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.egovframe.rte.itl.integration.EgovIntegrationMessage;
import org.egovframe.rte.itl.integration.EgovIntegrationMessageHeader;
import org.egovframe.rte.itl.integration.EgovIntegrationMessageHeader.ResultCode;
import org.egovframe.rte.itl.webservice.EgovWebServiceMessage;
import org.egovframe.rte.itl.webservice.EgovWebServiceMessageHeader;
-import org.egovframe.rte.itl.webservice.service.EgovWebServiceClassLoader;
-import org.egovframe.rte.itl.webservice.service.EgovWebServiceClient;
-import org.egovframe.rte.itl.webservice.service.MessageConverter;
-import org.egovframe.rte.itl.webservice.service.ServiceEndpointInterfaceInfo;
-import org.egovframe.rte.itl.webservice.service.ServiceParamInfo;
+import org.egovframe.rte.itl.webservice.service.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.ReflectionUtils;
import javax.jws.WebParam.Mode;
import javax.xml.namespace.QName;
import javax.xml.ws.Holder;
import javax.xml.ws.Service;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.ReflectionUtils;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 웹서비스 Client로 실제 웹서비스를 호출하는 구현 클래스
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/MessageConverterImpl.java b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/MessageConverterImpl.java
index bd0075b3..088922e7 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/MessageConverterImpl.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/MessageConverterImpl.java
@@ -15,24 +15,19 @@
*/
package org.egovframe.rte.itl.webservice.service.impl;
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
import org.egovframe.rte.itl.integration.type.ListType;
import org.egovframe.rte.itl.integration.type.PrimitiveType;
import org.egovframe.rte.itl.integration.type.RecordType;
import org.egovframe.rte.itl.integration.type.Type;
import org.egovframe.rte.itl.webservice.service.EgovWebServiceClassLoader;
import org.egovframe.rte.itl.webservice.service.MessageConverter;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.reflect.Array;
+import java.util.*;
+import java.util.Map.Entry;
+
/**
* Map, List 등으로 구성된 메시지와 Value Object 간의 변환을 수행하는 구현 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/ServiceBridgeImpl.java b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/ServiceBridgeImpl.java
index 7b8ad967..2c061c8a 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/ServiceBridgeImpl.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/ServiceBridgeImpl.java
@@ -15,10 +15,6 @@
*/
package org.egovframe.rte.itl.webservice.service.impl;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.Map;
-
import org.egovframe.rte.itl.integration.EgovIntegrationMessageHeader;
import org.egovframe.rte.itl.integration.EgovIntegrationMessageHeader.ResultCode;
import org.egovframe.rte.itl.integration.EgovIntegrationServiceProvider;
@@ -28,12 +24,14 @@
import org.egovframe.rte.itl.webservice.service.ServiceBridge;
import org.egovframe.rte.itl.webservice.service.ServiceEndpointInfo;
import org.egovframe.rte.itl.webservice.service.ServiceParamInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jws.WebParam.Mode;
import javax.xml.ws.Holder;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
/**
* 자동 생성된 웹 서비스 ServiceEndpoint와 EgovIntegrationServiceProvider의 인터페이스 구현 클래스
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/ServiceEndpointInfoImpl.java b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/ServiceEndpointInfoImpl.java
index 00d6e826..237b558e 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/ServiceEndpointInfoImpl.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/ServiceEndpointInfoImpl.java
@@ -15,23 +15,21 @@
*/
package org.egovframe.rte.itl.webservice.service.impl;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Map.Entry;
-
import org.egovframe.rte.itl.integration.type.RecordType;
import org.egovframe.rte.itl.integration.type.Type;
import org.egovframe.rte.itl.webservice.EgovWebServiceMessageHeader;
import org.egovframe.rte.itl.webservice.data.WebServiceServerDefinition;
import org.egovframe.rte.itl.webservice.service.ServiceEndpointInfo;
import org.egovframe.rte.itl.webservice.service.ServiceParamInfo;
-
-import javax.jws.WebParam.Mode;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
+import javax.jws.WebParam.Mode;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map.Entry;
+
/**
* 웹 서비스 ServiceEndpoint 정보 구현 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/ServiceEndpointInterfaceInfoImpl.java b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/ServiceEndpointInterfaceInfoImpl.java
index 55620d48..1936c9f4 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/ServiceEndpointInterfaceInfoImpl.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/main/java/org/egovframe/rte/itl/webservice/service/impl/ServiceEndpointInterfaceInfoImpl.java
@@ -15,12 +15,6 @@
*/
package org.egovframe.rte.itl.webservice.service.impl;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
import org.egovframe.rte.itl.integration.type.RecordType;
import org.egovframe.rte.itl.integration.type.Type;
import org.egovframe.rte.itl.webservice.EgovWebServiceMessageHeader;
@@ -28,13 +22,17 @@
import org.egovframe.rte.itl.webservice.data.WebServiceClientDefinition;
import org.egovframe.rte.itl.webservice.service.ServiceEndpointInterfaceInfo;
import org.egovframe.rte.itl.webservice.service.ServiceParamInfo;
-
-import javax.jws.WebParam.Mode;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
+import javax.jws.WebParam.Mode;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
/**
* 웹 서비스 ServiceEndpointInterface 정보 구현 클래스
*
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/EgovWebServiceContextTest.java b/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/EgovWebServiceContextTest.java
index 4045aa61..458c85dd 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/EgovWebServiceContextTest.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/EgovWebServiceContextTest.java
@@ -1,10 +1,5 @@
package org.egovframe.rte.itl.webservice;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.egovframe.rte.itl.integration.EgovIntegrationMessage;
import org.egovframe.rte.itl.integration.EgovIntegrationServiceProvider;
import org.egovframe.rte.itl.integration.metadata.IntegrationDefinition;
@@ -24,15 +19,18 @@
import org.egovframe.rte.itl.webservice.service.ServiceBridge;
import org.egovframe.rte.itl.webservice.service.ServiceEndpointInfo;
import org.egovframe.rte.itl.webservice.service.ServiceEndpointInterfaceInfo;
-
-import javax.xml.ws.Holder;
-
import org.junit.Test;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.AbstractApplicationContext;
+import javax.xml.ws.Holder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
public class EgovWebServiceContextTest {
private final OrganizationDefinition organizationA = new OrganizationDefinition("ORG00000", "Organization A");
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/EgovWebServiceTest.java b/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/EgovWebServiceTest.java
index c5673ccb..07395699 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/EgovWebServiceTest.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/EgovWebServiceTest.java
@@ -1,11 +1,5 @@
package org.egovframe.rte.itl.webservice;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import java.util.Calendar;
-
import org.egovframe.rte.itl.integration.EgovIntegrationMessage;
import org.egovframe.rte.itl.integration.EgovIntegrationMessageHeader;
import org.egovframe.rte.itl.integration.EgovIntegrationMessageHeader.ResultCode;
@@ -14,9 +8,12 @@
import org.egovframe.rte.itl.integration.metadata.ServiceDefinition;
import org.egovframe.rte.itl.integration.metadata.SystemDefinition;
import org.egovframe.rte.itl.webservice.service.EgovWebServiceClient;
-
import org.junit.Test;
+import java.util.Calendar;
+
+import static org.junit.Assert.*;
+
public class EgovWebServiceTest
{
private final OrganizationDefinition providerOrganization =
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/data/dao/hibernate/HibernateWebServiceClientDefinitionDaoTest.java b/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/data/dao/hibernate/HibernateWebServiceClientDefinitionDaoTest.java
index 6d73c61c..57ac0dc2 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/data/dao/hibernate/HibernateWebServiceClientDefinitionDaoTest.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/data/dao/hibernate/HibernateWebServiceClientDefinitionDaoTest.java
@@ -1,27 +1,23 @@
package org.egovframe.rte.itl.webservice.data.dao.hibernate;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import org.egovframe.rte.itl.webservice.data.WebServiceClientDefinition;
-
-import javax.sql.DataSource;
-
import org.dbunit.database.IDatabaseConnection;
import org.dbunit.dataset.ReplacementDataSet;
import org.dbunit.dataset.xml.FlatXmlDataSet;
import org.dbunit.operation.DatabaseOperation;
+import org.egovframe.rte.itl.webservice.data.WebServiceClientDefinition;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ResourceUtils;
+import javax.sql.DataSource;
+
+import static org.junit.Assert.*;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations="/org/egovframe/rte/itl/webservice/data/dao/hibernate/context.xml")
@Transactional(readOnly=false)
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/data/dao/hibernate/HibernateWebServiceServerDefinitionDaoTest.java b/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/data/dao/hibernate/HibernateWebServiceServerDefinitionDaoTest.java
index e38d5e30..5ccece49 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/data/dao/hibernate/HibernateWebServiceServerDefinitionDaoTest.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/data/dao/hibernate/HibernateWebServiceServerDefinitionDaoTest.java
@@ -1,27 +1,23 @@
package org.egovframe.rte.itl.webservice.data.dao.hibernate;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import org.egovframe.rte.itl.webservice.data.WebServiceServerDefinition;
-
-import javax.sql.DataSource;
-
import org.dbunit.database.IDatabaseConnection;
import org.dbunit.dataset.ReplacementDataSet;
import org.dbunit.dataset.xml.FlatXmlDataSet;
import org.dbunit.operation.DatabaseOperation;
+import org.egovframe.rte.itl.webservice.data.WebServiceServerDefinition;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ResourceUtils;
+import javax.sql.DataSource;
+
+import static org.junit.Assert.*;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations="/org/egovframe/rte/itl/webservice/data/dao/hibernate/context.xml")
@Transactional(readOnly=false)
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/data/dao/hibernate/SpringDatabaseDataSourceConnection.java b/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/data/dao/hibernate/SpringDatabaseDataSourceConnection.java
index 7d9ae695..19c420b1 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/data/dao/hibernate/SpringDatabaseDataSourceConnection.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/data/dao/hibernate/SpringDatabaseDataSourceConnection.java
@@ -1,13 +1,12 @@
package org.egovframe.rte.itl.webservice.data.dao.hibernate;
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.sql.DataSource;
-
import org.dbunit.database.DatabaseDataSourceConnection;
import org.springframework.jdbc.datasource.DataSourceUtils;
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
+
/**
* Wrapped version of DBUnits DatabaseDataSourceConnection to enable Spring Transaction support.
*/
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/service/impl/MessageConverterImplTest.java b/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/service/impl/MessageConverterImplTest.java
index fb3f1f83..8a9e8585 100644
--- a/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/service/impl/MessageConverterImplTest.java
+++ b/Integration/org.egovframe.rte.itl.webservice/src/test/java/org/egovframe/rte/itl/webservice/service/impl/MessageConverterImplTest.java
@@ -1,17 +1,5 @@
package org.egovframe.rte.itl.webservice.service.impl;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.egovframe.rte.itl.integration.type.ListType;
import org.egovframe.rte.itl.integration.type.PrimitiveType;
import org.egovframe.rte.itl.integration.type.RecordType;
@@ -20,9 +8,14 @@
import org.egovframe.rte.itl.webservice.service.MessageConverter;
import org.egovframe.rte.itl.webservice.service.ServiceEndpointInfo;
import org.egovframe.rte.itl.webservice.service.ServiceEndpointInterfaceInfo;
-
import org.junit.Test;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.*;
+
+import static org.junit.Assert.*;
+
public class MessageConverterImplTest {
private final RecordType personRecordType = new RecordType("personRecordType", "PersonRecordType", new HashMap() {
/**
diff --git a/Integration/org.egovframe.rte.itl.webservice/src/test/resources/unitils.properties b/Integration/org.egovframe.rte.itl.webservice/src/test/resources/unitils.properties
deleted file mode 100644
index baa1d0fb..00000000
--- a/Integration/org.egovframe.rte.itl.webservice/src/test/resources/unitils.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-database.driverClassName=org.hsqldb.jdbcDriver
-database.url=jdbc:hsqldb:mem:test
-database.userName=sa
-database.password=
-database.schemaNames=public
-database.dialect=hsqldb
-
-#DatabaseModule.Transactional.value.default=commit
-#transactionManager.type=simple
\ No newline at end of file
diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/pom.xml b/Persistence/org.egovframe.rte.psl.data.jpa/pom.xml
index 48245ec8..8dfe2a77 100644
--- a/Persistence/org.egovframe.rte.psl.data.jpa/pom.xml
+++ b/Persistence/org.egovframe.rte.psl.data.jpa/pom.xml
@@ -4,8 +4,8 @@
4.0.0
org.egovframe.rte
org.egovframe.rte.psl.data.jpa
+ 4.1.0
jar
- 4.0.0
org.egovframe.rte.psl.data.jpa
The eGovernment Standard Framework
https://www.egovframe.go.kr
@@ -18,17 +18,17 @@
- 5.3.6
- 4.0.0
- UTF-8
- UTF-8
+ 5.3.20
+ 4.1.0
+ 1.8
+ UTF-8
org.springframework.data
spring-data-jpa
- 1.11.23.RELEASE
+ 2.7.0
jcl-over-slf4j
@@ -71,7 +71,7 @@
org.hibernate
hibernate-entitymanager
- 5.4.10.Final
+ 5.6.8.Final
runtime
@@ -81,6 +81,12 @@
+
+ junit
+ junit
+ 4.13.2
+ test
+
org.egovframe.rte
org.egovframe.rte.psl.dataaccess
@@ -103,34 +109,28 @@
-
- junit
- junit
- 4.13.1
- test
-
org.easymock
easymock
- 4.1
+ 4.3
test
org.hsqldb
hsqldb
- 2.5.0
+ 2.5.2
test
mysql
mysql-connector-java
- 5.1.31
+ 8.0.29
test
org.apache.commons
commons-dbcp2
- 2.4.0
+ 2.9.0
test
@@ -144,30 +144,22 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.8.1
+ 3.10.1
- 1.8
- 1.8
- UTF-8
+ ${java.version}
+ ${java.version}
+ ${project.encoding}
org.codehaus.mojo
hibernate3-maven-plugin
3.0
-
-
-
- hbm2ddl
- annotationconfiguration
-
-
-
org.hsqldb
hsqldb
- 2.5.0
+ 2.5.2
@@ -181,7 +173,7 @@
org.apache.maven.plugins
maven-pmd-plugin
- 3.12.0
+ 3.17.0
@@ -227,9 +219,9 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.1.1
+ 3.4.0
- 1.8
+ ${java.version}
-Xdoclint:none
@@ -242,7 +234,7 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
- 3.1.2
+ 3.3.0
sunlink
@@ -252,7 +244,7 @@
true
-
@@ -283,9 +275,9 @@
128m
512m
- UTF-8
- UTF-8
- UTF-8
+ ${project.encoding}
+ ${project.encoding}
+ ${project.encoding}
-Xdoclint:none
@@ -294,8 +286,8 @@
org.apache.maven.plugins
maven-jxr-plugin
- UTF-8
- UTF-8
+ ${project.encoding}
+ ${project.encoding}
true
apidocs
diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/CrudTest.java b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/CrudTest.java
index ac0e67c8..3b39fd0c 100644
--- a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/CrudTest.java
+++ b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/CrudTest.java
@@ -1,17 +1,7 @@
package org.egovframe.rte.psl.data.jpa;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Random;
-
import org.egovframe.rte.psl.data.jpa.domain.Article;
import org.egovframe.rte.psl.data.jpa.repository.ArticleRepository;
-
-import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
@@ -21,43 +11,41 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = "classpath*:META-INF/spring/context-*.xml")
@Transactional
public class CrudTest {
-
private static final Logger LOGGER = LoggerFactory.getLogger(CrudTest.class);
@Autowired
ArticleRepository repository;
- @Before
- public void setUp() {
- // no-op
- }
-
@Test
public void testInsert() {
-
Article article = getArticle();
article = repository.save(article);
-
- LOGGER.debug("Inserted articleId: {}", repository.findOne(article.getArticleId()));
- assertEquals(article, repository.findOne(article.getArticleId()));
+ LOGGER.debug("Inserted articleId: {}", repository.findById(article.getArticleId()));
+ assertEquals(article, repository.findById(article.getArticleId()).get());
}
@Test
public void testSelectList() {
-
Article[] articles = getArticleList();
-
- LOGGER.debug("Insert {} of articles", articles.length);
for (int i = 0; i < articles.length; i++) {
articles[i] = repository.save(articles[i]);
}
+
+ LOGGER.debug("Insert {} of articles", articles.length);
assertEquals(articles.length, repository.count());
- LOGGER.debug("Select all of articles");
List list = (List) repository.findAll();
for (Article article : articles) {
LOGGER.debug("Selected article id : {}", article.getArticleId());
@@ -69,23 +57,22 @@ public void testSelectList() {
public void testUpdate() {
Article article = getArticle();
article = repository.save(article);
-
+
LOGGER.debug("Update article subejct: from {}", article.getSubject());
article.setSubject("Modified");
+
repository.save(article);
LOGGER.debug("Update article subejct: to {}", article.getSubject());
-
assertEquals("Modified", article.getSubject());
}
@Test
public void testDelete() {
Article[] articles = getArticleList();
-
for (int i = 0; i < articles.length; i++) {
articles[i] = repository.save(articles[i]);
}
-
+
int index = (new Random()).nextInt(articles.length);
LOGGER.debug("Delete article id: {}", index);
repository.delete(articles[index]);
@@ -95,30 +82,24 @@ public void testDelete() {
}
private Article[] getArticleList() {
- List articles = new ArrayList();
-
- Article article = null;
+ List articles = new ArrayList<>();
+ Article article;
for (int i = 0; i < 10; i++) {
article = new Article();
-
article.setSubject("Title " + (i+1));
article.setContents("Sample article...");
article.setCreatedDatetime(new Date());
-
LOGGER.debug("Create article: {}, {}, {}", article.getSubject(), article.getContents(), article.getCreatedDatetime());
articles.add(article);
}
-
return articles.toArray(new Article[0]);
}
private Article getArticle() {
Article article = new Article();
-
article.setSubject("Sample article");
article.setContents("Sample article...");
article.setCreatedDatetime(new Date());
-
LOGGER.debug("Create article subject: {}", article.getSubject());
return article;
}
diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/PagingAndSortingTest.java b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/PagingAndSortingTest.java
index 763fbacc..3666e27d 100644
--- a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/PagingAndSortingTest.java
+++ b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/PagingAndSortingTest.java
@@ -1,15 +1,7 @@
package org.egovframe.rte.psl.data.jpa;
-import static org.junit.Assert.assertEquals;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
import org.egovframe.rte.psl.data.jpa.domain.Employee;
import org.egovframe.rte.psl.data.jpa.repository.EmployeeRepository;
-
-import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
@@ -18,11 +10,16 @@
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Order;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = "classpath*:META-INF/spring/context-*.xml")
@Transactional
@@ -34,54 +31,37 @@ public class PagingAndSortingTest {
private static final String[] NAME = {"Alice", "Bob", "Charles", "Dennis", "Emily", "Frank ", "George", "Henry"};
- @Before
- public void setUp() {
- // no-op
- }
-
-
@Test
public void testSelectList() {
-
Employee[] employees = getEmployeeList();
-
for (int i = 0; i < employees.length; i++) {
employees[i] = repository.save(employees[i]);
}
+ Page list;
int size = 3;
- Page list = null;
int totalIndex = 0;
- Sort sort = new Sort(new Order(Sort.Direction.ASC, "employeeName"));
-
for (int i = 0; i < (NAME.length + (size - 1)) / size ; i++) { // 올림 처리
- list = repository.findAll(new PageRequest(i, size, sort));
-
+ list = repository.findAll(PageRequest.of(i, size, Sort.by(Sort.Direction.ASC, "employeeName")));
LOGGER.debug("Number of current page's element : {}", list.getNumberOfElements());
for (Employee employee : list) {
LOGGER.debug("Selected employee name : {}", employee.getEmployeeName());
assertEquals(NAME[totalIndex++], employee.getEmployeeName());
}
-
assertEquals((i == NAME.length / size ? NAME.length % size : size), list.getNumberOfElements());
}
}
private Employee[] getEmployeeList() {
- List employees = new ArrayList();
-
- Employee employee = null;
- for (int i = 0; i < NAME.length; i++) {
+ Employee employee;
+ List employees = new ArrayList<>();
+ for (String s : NAME) {
employee = new Employee();
-
- employee.setEmployeeName(NAME[i]);
+ employee.setEmployeeName(s);
employee.setHireDate(new Date());
-
employees.add(employee);
}
-
return employees.toArray(new Employee[0]);
}
-
}
diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/QueryMethodTest.java b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/QueryMethodTest.java
index 17b9667a..01847b66 100644
--- a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/QueryMethodTest.java
+++ b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/QueryMethodTest.java
@@ -1,17 +1,7 @@
package org.egovframe.rte.psl.data.jpa;
-import static org.junit.Assert.assertEquals;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
import org.egovframe.rte.psl.data.jpa.domain.User;
import org.egovframe.rte.psl.data.jpa.repository.UserDetailRepository;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -20,6 +10,15 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = "classpath*:META-INF/spring/context-*.xml")
diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/RelationshipTest.java b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/RelationshipTest.java
index 2953dbed..9b43d631 100644
--- a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/RelationshipTest.java
+++ b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/RelationshipTest.java
@@ -1,17 +1,9 @@
package org.egovframe.rte.psl.data.jpa;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
import org.egovframe.rte.psl.data.jpa.domain.Department;
import org.egovframe.rte.psl.data.jpa.domain.Employee;
import org.egovframe.rte.psl.data.jpa.repository.DepartmentRepository;
import org.egovframe.rte.psl.data.jpa.repository.EmployeeRepository;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -20,6 +12,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = "classpath*:META-INF/spring/context-*.xml")
@Transactional
diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/SimpleTest.java b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/SimpleTest.java
index 230373af..d0916e98 100644
--- a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/SimpleTest.java
+++ b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/SimpleTest.java
@@ -1,11 +1,8 @@
package org.egovframe.rte.psl.data.jpa;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-
+import org.egovframe.rte.psl.data.jpa.domain.User;
+import org.egovframe.rte.psl.data.jpa.domain.UserPK;
+import org.egovframe.rte.psl.data.jpa.repository.UserRepository;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -14,9 +11,9 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
-import org.egovframe.rte.psl.data.jpa.domain.User;
-import org.egovframe.rte.psl.data.jpa.domain.UserPK;
-import org.egovframe.rte.psl.data.jpa.repository.UserRepository;
+import java.util.List;
+
+import static org.junit.Assert.*;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = "classpath*:META-INF/spring/context-*.xml")
@@ -25,13 +22,12 @@ public class SimpleTest {
@Autowired
UserRepository repository;
-
+
User user;
@Before
public void setUp() {
user = new User();
- //user.setId(new Long(1));
user.setUsername("foobar");
user.setFirstname("firstname");
user.setLastname("lastname");
@@ -39,34 +35,26 @@ public void setUp() {
@Test
public void testInsert() {
-
user = repository.save(user);
System.out.println("user pk>"+user.getId());
-
UserPK userPk = new UserPK();
userPk.setId(user.getId());
-
- assertEquals(user, repository.findOne(userPk));
+ assertEquals(user, repository.findById(userPk).get());
}
@Test
- public void testFindByLastname() throws Exception {
-
+ public void testFindByLastname() {
user = repository.save(user);
-
List users = repository.findByLastname("lastname");
-
assertNotNull(users);
assertTrue(users.contains(user));
}
@Test
- public void testFindByName() throws Exception {
-
+ public void testFindByName() {
user = repository.save(user);
-
List users = repository.findByFirstnameOrLastname("lastname");
-
assertTrue(users.contains(user));
}
+
}
diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/domain/Article.java b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/domain/Article.java
index 49164960..74afc085 100644
--- a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/domain/Article.java
+++ b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/domain/Article.java
@@ -1,11 +1,10 @@
package org.egovframe.rte.psl.data.jpa.domain;
-import java.util.Date;
-
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import java.util.Date;
@Entity
public class Article {
diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/domain/Department.java b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/domain/Department.java
index fb2793ea..3844d2e4 100644
--- a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/domain/Department.java
+++ b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/domain/Department.java
@@ -1,10 +1,6 @@
package org.egovframe.rte.psl.data.jpa.domain;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import javax.persistence.*;
@Entity
public class Department {
diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/domain/Employee.java b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/domain/Employee.java
index 90794e99..7759f12a 100644
--- a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/domain/Employee.java
+++ b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/domain/Employee.java
@@ -1,14 +1,8 @@
package org.egovframe.rte.psl.data.jpa.domain;
+import javax.persistence.*;
import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
@Entity
@Table(name = "employee")
public class Employee {
diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/domain/User.java b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/domain/User.java
index c460e6aa..490d1f89 100644
--- a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/domain/User.java
+++ b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/domain/User.java
@@ -1,16 +1,8 @@
package org.egovframe.rte.psl.data.jpa.domain;
+import javax.persistence.*;
import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-
-import org.springframework.data.jpa.domain.AbstractPersistable;
-
@Entity
@IdClass(UserPK.class)
public class User {
diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/domain/UserPK.java b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/domain/UserPK.java
index ec02de95..7df5b35a 100644
--- a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/domain/UserPK.java
+++ b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/domain/UserPK.java
@@ -6,9 +6,7 @@ public class UserPK implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
-
-// public int hashCode(){return 0;};
-// public boolean equals(Object anObject) {return true;};
+
public UserPK(){}
public UserPK(Long userId)
@@ -25,7 +23,6 @@ public void setId(Long id)
{
this.id = id;
}
-
public int hashCode() {
return super.hashCode();
@@ -33,22 +30,6 @@ public int hashCode() {
public boolean equals(Object obj) {
return true;
-
-// if (this == obj)
-// return true;
-// if (obj == null)
-// return false;
-// if (getClass() != obj.getClass())
-// return false;
-//
-// UserPK other = (UserPK) obj;
-// if (userId == null) {
-// if (other.userId != null)
-// return false;
-// } else if (!userId.equals(other.userId))
-// return false;
-// return true;
}
-
}
diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/repository/ArticleRepository.java b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/repository/ArticleRepository.java
index 6607d1e8..98b7bf0a 100644
--- a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/repository/ArticleRepository.java
+++ b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/repository/ArticleRepository.java
@@ -1,7 +1,6 @@
package org.egovframe.rte.psl.data.jpa.repository;
import org.egovframe.rte.psl.data.jpa.domain.Article;
-
import org.springframework.data.repository.CrudRepository;
public interface ArticleRepository extends CrudRepository {
diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/repository/DepartmentRepository.java b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/repository/DepartmentRepository.java
index 7bd4044c..f7a5d23e 100644
--- a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/repository/DepartmentRepository.java
+++ b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/repository/DepartmentRepository.java
@@ -1,11 +1,10 @@
package org.egovframe.rte.psl.data.jpa.repository;
-import java.util.List;
-
import org.egovframe.rte.psl.data.jpa.domain.Department;
-
import org.springframework.data.repository.CrudRepository;
+import java.util.List;
+
public interface DepartmentRepository extends CrudRepository {
List findByDeptNameContaining(String deptname);
diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/repository/EmployeeRepository.java b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/repository/EmployeeRepository.java
index b68ff4ff..294411b2 100644
--- a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/repository/EmployeeRepository.java
+++ b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/repository/EmployeeRepository.java
@@ -1,7 +1,6 @@
package org.egovframe.rte.psl.data.jpa.repository;
import org.egovframe.rte.psl.data.jpa.domain.Employee;
-
import org.springframework.data.repository.PagingAndSortingRepository;
public interface EmployeeRepository extends PagingAndSortingRepository {
diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/repository/UserDetailRepository.java b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/repository/UserDetailRepository.java
index 21b56a47..3d2ede7a 100644
--- a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/repository/UserDetailRepository.java
+++ b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/repository/UserDetailRepository.java
@@ -1,13 +1,12 @@
package org.egovframe.rte.psl.data.jpa.repository;
+import org.egovframe.rte.psl.data.jpa.domain.User;
+import org.springframework.data.repository.CrudRepository;
+
import java.util.Collection;
import java.util.Date;
import java.util.List;
-import org.egovframe.rte.psl.data.jpa.domain.User;
-
-import org.springframework.data.repository.CrudRepository;
-
public interface UserDetailRepository extends CrudRepository {
List findByLastnameAndFirstname(String lastname, String firstname);
diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/repository/UserRepository.java b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/repository/UserRepository.java
index ac5cd425..48e10d61 100644
--- a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/repository/UserRepository.java
+++ b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/java/org/egovframe/rte/psl/data/jpa/repository/UserRepository.java
@@ -1,14 +1,13 @@
package org.egovframe.rte.psl.data.jpa.repository;
-import java.util.List;
-
import org.egovframe.rte.psl.data.jpa.domain.User;
import org.egovframe.rte.psl.data.jpa.domain.UserPK;
-
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.query.Param;
+import java.util.List;
+
public interface UserRepository extends CrudRepository {
User findByUsername(String username);
@@ -20,4 +19,5 @@ public interface UserRepository extends CrudRepository {
@Query("select u from User u where u.firstname = :name or u.lastname = :name")
List findByFirstnameOrLastname(@Param("name") String name);
+
}
diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/resources/META-INF/spring/context-common.xml b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/resources/META-INF/spring/context-common.xml
index 5e878cd8..d079b920 100644
--- a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/resources/META-INF/spring/context-common.xml
+++ b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/resources/META-INF/spring/context-common.xml
@@ -1,14 +1,12 @@
-
+
diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/resources/META-INF/spring/context-data-jpa.xml b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/resources/META-INF/spring/context-data-jpa.xml
index 678e583a..0b199f24 100644
--- a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/resources/META-INF/spring/context-data-jpa.xml
+++ b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/resources/META-INF/spring/context-data-jpa.xml
@@ -1,14 +1,13 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jpa="http://www.springframework.org/schema/data/jpa"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd">
diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/resources/META-INF/spring/context-datasource.xml b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/resources/META-INF/spring/context-datasource.xml
index 102e1982..c348fe63 100644
--- a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/resources/META-INF/spring/context-datasource.xml
+++ b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/resources/META-INF/spring/context-datasource.xml
@@ -6,29 +6,7 @@
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
-
-
-
diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/resources/META-INF/spring/jdbc.properties b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/resources/META-INF/spring/jdbc.properties
index f1575840..6f39bacd 100644
--- a/Persistence/org.egovframe.rte.psl.data.jpa/src/test/resources/META-INF/spring/jdbc.properties
+++ b/Persistence/org.egovframe.rte.psl.data.jpa/src/test/resources/META-INF/spring/jdbc.properties
@@ -3,41 +3,8 @@ jpa.database=H2
jpa.showSql=true
jpa.persistenceUnit=jpa.sample
-
jdbc.driver=org.hsqldb.jdbcDriver
-jdbc.dburl=jdbc:hsqldb:mem:testdb
+jdbc.url=jdbc:hsqldb:mem:testdb
jdbc.username=sa
jdbc.password=
usingDBMS=hsql
-
-#jdbc.driver=oracle.jdbc.driver.OracleDriver
-#jdbc.dburl=jdbc:oracle:thin:@192.168.200.22:1521:egovfrm
-#jdbc.username=rte
-#jdbc.password=rte01
-#usingDBMS=oracle
-
-#jdbc.driver=com.mysql.jdbc.Driver
-#jdbc.dburl=jdbc:mysql://db2:1621/rte
-#jdbc.username=rte
-#jdbc.password=rte01
-#usingDBMS=mysql
-
-#jdbc.driver=com.tmax.tibero.jdbc.TbDriver
-#jdbc.dburl=jdbc:tibero:thin:@db1:1821:egovfrm
-#jdbc.username=tibero
-#jdbc.password=tmax
-#usingDBMS=tibero
-
-#jdbc.dburl=jdbc:Altibase://192.168.200.22:1721/?user=rte&password=rte01&encoding=UTF8&portNumber=1721&databaseName=egovfrm
-#jdbc.driver=Altibase.jdbc.driver.AltibaseDriver
-#jdbc.dburl=jdbc:Altibase://db1:1721/egovfrm
-#jdbc.username=rte
-#jdbc.password=rte01
-#usingDBMS=altibase
-
-
-#jdbc.driver=oracle.jdbc.driver.OracleDriver
-#jdbc.dburl=jdbc:oracle:thin:@localhost:1521:test2
-#jdbc.username=test2
-#jdbc.password=test2
-#usingDBMS=oracle
\ No newline at end of file
diff --git a/Persistence/org.egovframe.rte.psl.data.mongodb/pom.xml b/Persistence/org.egovframe.rte.psl.data.mongodb/pom.xml
index 60b12c3f..89530f4c 100644
--- a/Persistence/org.egovframe.rte.psl.data.mongodb/pom.xml
+++ b/Persistence/org.egovframe.rte.psl.data.mongodb/pom.xml
@@ -4,8 +4,8 @@
4.0.0
org.egovframe.rte
org.egovframe.rte.psl.data.mongodb
+ 4.1.0
jar
- 4.0.0
org.egovframe.rte.psl.data.mongodb
The eGovernment Standard Framework
https://www.egovframe.go.kr
@@ -18,10 +18,10 @@
- 5.3.6
- 4.0.0
- UTF-8
- UTF-8
+ 5.3.20
+ 4.1.0
+ 1.8
+ UTF-8
@@ -30,26 +30,31 @@
org.egovframe.rte.fdl.cmmn
${org.egovframe.rte.version}
+
+ org.mongodb
+ mongo-java-driver
+ 3.12.10
+
org.springframework.data
spring-data-mongodb
- 2.2.3.RELEASE
+ 3.4.0
org.springframework
- spring-core
+ spring-beans
org.springframework
- spring-expression
+ spring-context
org.springframework
- spring-beans
+ spring-core
org.springframework
- spring-context
+ spring-expression
org.springframework
@@ -57,11 +62,11 @@
org.slf4j
- jcl-over-slf4j
+ slf4j-api
org.slf4j
- slf4j-api
+ jcl-over-slf4j
@@ -72,6 +77,12 @@
+
+ junit
+ junit
+ 4.13.2
+ test
+
org.springframework
spring-test
@@ -84,16 +95,10 @@
-
- junit
- junit
- 4.13.1
- test
-
org.easymock
easymock
- 4.1
+ 4.3
test
@@ -107,30 +112,22 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.8.1
+ 3.10.1
- 1.8
- 1.8
- UTF-8
+ ${java.version}
+ ${java.version}
+ ${project.encoding}
org.codehaus.mojo
hibernate3-maven-plugin
3.0
-
-
-
- hbm2ddl
- annotationconfiguration
-
-
-
org.hsqldb
hsqldb
- 2.5.0
+ 2.5.2
@@ -144,7 +141,7 @@
org.apache.maven.plugins
maven-pmd-plugin
- 3.12.0
+ 3.17.0
@@ -190,9 +187,9 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.1.1
+ 3.4.0
- 1.8
+ ${java.version}
-Xdoclint:none
@@ -205,7 +202,7 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
- 3.1.2
+ 3.3.0
sunlink
@@ -215,7 +212,7 @@
true
-
@@ -246,9 +243,9 @@
128m
512m
- UTF-8
- UTF-8
- UTF-8
+ ${project.encoding}
+ ${project.encoding}
+ ${project.encoding}
-Xdoclint:none
@@ -257,8 +254,8 @@
org.apache.maven.plugins
maven-jxr-plugin
- UTF-8
- UTF-8
+ ${project.encoding}
+ ${project.encoding}
true
apidocs
diff --git a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoOperationsAnonymousTest.java b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoOperationsAnonymousTest.java
index 2d4721f6..38ca343a 100644
--- a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoOperationsAnonymousTest.java
+++ b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoOperationsAnonymousTest.java
@@ -1,10 +1,7 @@
package org.egovframe.rte.psl.data.mongodb;
-import static org.junit.Assert.assertEquals;
-import static org.springframework.data.mongodb.core.query.Criteria.where;
-
-import java.net.UnknownHostException;
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClients;
+import org.egovframe.rte.psl.data.mongodb.domain.Person;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -16,33 +13,49 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.egovframe.rte.psl.data.mongodb.domain.SimplePerson;
+
+import static org.junit.Assert.assertEquals;
+import static org.springframework.data.mongodb.core.query.Criteria.where;
@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = "classpath*:META-INF/spring/context-common.xml")
+@ContextConfiguration(locations = "classpath:META-INF/spring/context-common.xml")
public class MongoOperationsAnonymousTest {
private static final Logger LOGGER = LoggerFactory.getLogger(MongoOperationsAnonymousTest.class);
- @Value("#{mongo['mongo.host']}")
- private String mongoHost;
+ @Value("${mongodb.host}")
+ private String mongodbHost;
+
+ @Value("${mongodb.port}")
+ private int mongodbPort;
- @Value("#{mongo['mongo.port']}")
- private int mongoPort;
+ @Value("${mongodb.database}")
+ private String mongodbDatabase;
@Before
public void setUp() {
- LOGGER.info("MongoDB host : " + mongoHost);
- LOGGER.info("MongoDB port : " + mongoPort);
+ LOGGER.info("##### MongoDB host : " + mongodbHost);
+ LOGGER.info("##### MongoDB port : " + mongodbPort);
+ LOGGER.info("##### MongoDB database : " + mongodbDatabase);
}
@Test
- public void testBasicOperations() throws UnknownHostException {
- MongoOperations mongoOps = new MongoTemplate(new MongoClient(mongoHost, mongoPort), "database");
- mongoOps.insert(new SimplePerson("Joe", 34));
- SimplePerson person = mongoOps.findOne(new Query(where("name").is("Joe")), SimplePerson.class);
- assertEquals("Joe", person.getName());
- mongoOps.dropCollection("person");
+ public void testBasicOperations() {
+ MongoOperations mongoOperations = new MongoTemplate(MongoClients.create("mongodb://"+mongodbHost+":"+mongodbPort), mongodbDatabase);
+
+ Person person = new Person();
+ person.setId("1001");
+ person.setName("Kim");
+ person.setAge(20);
+ mongoOperations.save(person, "person");
+
+ Person person1 = mongoOperations.findOne(new Query(where("name").is("Kim").and("age").is(20)), Person.class);
+ LOGGER.info("##### MongoOperationsAnonymousTest person : " + person1);
+ assertEquals(person.getId(), person1.getId());
+ assertEquals(person.getName(), person1.getName());
+ assertEquals(person.getAge(), person1.getAge());
+
+ mongoOperations.dropCollection("person");
}
}
diff --git a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoOperationsAuthTest.java b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoOperationsAuthTest.java
index f623008f..a3ff6ada 100644
--- a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoOperationsAuthTest.java
+++ b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoOperationsAuthTest.java
@@ -1,42 +1,45 @@
package org.egovframe.rte.psl.data.mongodb;
-import static org.junit.Assert.assertEquals;
-import static org.springframework.data.mongodb.core.query.Criteria.where;
-
-import java.net.UnknownHostException;
-import javax.annotation.Resource;
-import org.junit.Before;
+import org.egovframe.rte.psl.data.mongodb.domain.Person;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.egovframe.rte.psl.data.mongodb.domain.SimplePerson;
+
+import static org.junit.Assert.assertEquals;
+import static org.springframework.data.mongodb.core.query.Criteria.where;
@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = "classpath:/META-INF/spring/context-data-*.xml")
+@ContextConfiguration(locations = "classpath:META-INF/spring/context-data-mongodb.xml")
public class MongoOperationsAuthTest {
-
private static final Logger LOGGER = LoggerFactory.getLogger(MongoOperationsAuthTest.class);
- @Resource(name = "mongoTemplate")
+ @Autowired
private MongoTemplate mongoTemplate;
- @Before
- public void setUp() {
- }
-
@Test
- public void testBasicOperations() throws UnknownHostException {
- MongoOperations mongoOps = mongoTemplate;
- mongoOps.save(new SimplePerson("Joe", 34));
- SimplePerson person = mongoOps.findOne(new Query(where("name").is("Joe")), SimplePerson.class);
- assertEquals("Joe", person.getName());
- mongoOps.dropCollection("person");
+ public void testBasicOperations() {
+ MongoOperations mongoOperations = mongoTemplate;
+
+ Person person = new Person();
+ person.setId("1001");
+ person.setName("Kim");
+ person.setAge(20);
+ mongoOperations.save(person, "person");
+
+ Person person1 = mongoOperations.findOne(new Query(where("name").is("Kim").and("age").is(20)), Person.class);
+ LOGGER.info("##### MongoOperationsAnonymousTest person : " + person1);
+ assertEquals(person.getId(), person1.getId());
+ assertEquals(person.getName(), person1.getName());
+ assertEquals(person.getAge(), person1.getAge());
+
+ mongoOperations.dropCollection("person");
}
}
diff --git a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoTemplateTest.java b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoTemplateTest.java
index f9414d6c..dea08564 100644
--- a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoTemplateTest.java
+++ b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoTemplateTest.java
@@ -1,60 +1,58 @@
package org.egovframe.rte.psl.data.mongodb;
-import static org.junit.Assert.assertEquals;
-import static org.springframework.data.mongodb.core.query.Criteria.where;
-import static org.springframework.data.mongodb.core.query.Query.query;
-import static org.springframework.data.mongodb.core.query.Update.update;
-
-import java.util.List;
-import javax.annotation.Resource;
+import org.egovframe.rte.psl.data.mongodb.domain.Person;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.egovframe.rte.psl.data.mongodb.domain.SimplePerson;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.springframework.data.mongodb.core.query.Criteria.where;
+import static org.springframework.data.mongodb.core.query.Query.query;
+import static org.springframework.data.mongodb.core.query.Update.update;
@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = "classpath*:META-INF/spring/context-data-*.xml")
+@ContextConfiguration(locations = "classpath:META-INF/spring/context-data-mongodb.xml")
public class MongoTemplateTest {
-
private static final Logger LOGGER = LoggerFactory.getLogger(MongoTemplateTest.class);
- @Resource(name = "mongoTemplate")
+ @Autowired
private MongoTemplate mongoTemplate;
@Test
public void testBasicOperations() {
- SimplePerson person = new SimplePerson("Joe", 34);
+ Person person = new Person();
+ person.setId("1001");
+ person.setName("Kim");
+ person.setAge(20);
+
// Insert
- mongoTemplate.insert(person);
- LOGGER.info("Insert : " + person);
+ mongoTemplate.save(person, "person");
+ LOGGER.info("##### MongoTemplateTest person Insert : " + person);
// Find
- person = mongoTemplate.findOne(new Query(where("name").is("Joe")), SimplePerson.class);
- LOGGER.info("Found: " + person);
-
- assertEquals("Joe", person.getName());
+ person = mongoTemplate.findOne(new Query(where("id").is("1001")), Person.class);
+ LOGGER.info("##### MongoTemplateTest person Find : " + person);
// Update
- mongoTemplate.updateFirst(query(where("name").is("Joe")), update("age", 35), SimplePerson.class);
- person = mongoTemplate.findOne(query(where("name").is("Joe")), SimplePerson.class);
- LOGGER.info("Updated: " + person);
-
- assertEquals(35, person.getAge());
+ mongoTemplate.updateFirst(query(where("id").is("1001")), update("age", 30), Person.class);
+ person = mongoTemplate.findOne(query(where("id").is("1001")), Person.class);
+ LOGGER.info("##### MongoTemplateTest person Update : " + person);
// Delete
mongoTemplate.remove(person);
- // Check that deletion worked
- List people = mongoTemplate.findAll(SimplePerson.class);
- LOGGER.info("Number of people = : " + people.size());
- assertEquals(1, people.size());
-
- mongoTemplate.dropCollection("person");
+ // Find
+ List people = mongoTemplate.findAll(Person.class);
+ LOGGER.info("##### MongoTemplateTest person size : " + people.size());
+ assertEquals(0, people.size());
}
}
diff --git a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/PersonRepositoryTest.java b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/PersonRepositoryTest.java
index fb3c3d05..a33bc0f1 100644
--- a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/PersonRepositoryTest.java
+++ b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/PersonRepositoryTest.java
@@ -1,12 +1,9 @@
package org.egovframe.rte.psl.data.mongodb;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import com.mongodb.BasicDBObject;
-import java.util.List;
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
+import org.egovframe.rte.psl.data.mongodb.domain.Address;
+import org.egovframe.rte.psl.data.mongodb.domain.Person;
+import org.egovframe.rte.psl.data.mongodb.repository.PersonRepository;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -22,26 +19,29 @@
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.egovframe.rte.psl.data.mongodb.domain.Address;
-import org.egovframe.rte.psl.data.mongodb.domain.Person;
-import org.egovframe.rte.psl.data.mongodb.repository.PersonRepository;
+
+import javax.annotation.PostConstruct;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = "classpath*:META-INF/spring/context-data-*.xml")
+@ContextConfiguration(locations = "classpath:META-INF/spring/context-data-mongodb.xml")
public class PersonRepositoryTest {
-
private static final Logger LOGGER = LoggerFactory.getLogger(PersonRepositoryTest.class);
@Autowired
- private PersonRepository repository;
-
- @Resource(name = "mongoTemplate")
private MongoTemplate mongoTemplate;
+ @Autowired
+ private PersonRepository personRepository;
+
private Person makePerson() {
Person person = new Person();
- person.setFirstname("Gildong");
- person.setLastname("Hong");
+ person.setId("1001");
+ person.setName("Jung");
+ person.setAge(20);
Address address = new Address();
address.setZipCode("100-100");
@@ -61,65 +61,63 @@ public void before() {
@Before
public void setUp() {
Person person = makePerson();
- person = repository.save(person);
- LOGGER.info("Persion ID : " + person.getId());
+ person = personRepository.save(person);
+ LOGGER.info("##### PersonRepositoryTest Persion ID : " + person.getId());
}
@After
public void tearDown() {
- repository.deleteAll();
+ personRepository.deleteAll();
}
@Test
public void readsFirstPageCorrectly() {
PageRequest pageable = PageRequest.of(0, 10);
- Page persons = repository.findAll(pageable);
- LOGGER.info("Persons Total elements : " + persons.getTotalElements());
+ Page persons = personRepository.findAll(pageable);
+ LOGGER.info("##### PersonRepositoryTest Persons Total elements : " + persons.getTotalElements());
assertTrue(persons.isFirst());
}
@Test
public void testQueryMethods() {
- List list = repository.findByLastname("Hong");
- LOGGER.info("Number of Hong = : " + list.size());
+ List list = personRepository.findByName("Jung");
+ LOGGER.info("##### PersonRepositoryTest List : " + list.size());
assertEquals(1, list.size());
PageRequest pageable = PageRequest.of(0, 10);
- Page persons = repository.findByFirstname("Gildong", pageable);
+ Page persons = personRepository.findByName("Jung", pageable);
assertTrue(persons.isFirst());
assertEquals(1L, persons.getTotalElements());
assertEquals(1, persons.getTotalPages());
- Person hong = list.get(0);
- LOGGER.info("Hong Person id = " + hong.getId());
+ Person personList = list.get(0);
+ LOGGER.info("##### PersonRepositoryTest personList : " + personList);
- Address address = hong.getAddress();
- Person found = repository.findByAddress(address);
- LOGGER.info("Found Person id = " + hong.getId());
+ Address address = personList.getAddress();
+ Person personAddress = personRepository.findByAddress(address);
+ LOGGER.info("##### PersonRepositoryTest Found personAddress : " + personAddress);
- assertEquals(hong, found);
+ assertEquals(personList, personAddress);
}
@Test
- public void testDeleteMothods() {
- Long deleted = repository.deletePersonByLastname("Hong");
- assertEquals(1L, deleted.longValue());
- List list = repository.deleteByLastname("Hong");
- assertEquals(0, list.size());
+ public void testQueryAnnotation() {
+ List list = personRepository.findByPersonName("Jung");
+ assertEquals(1, list.size());
}
@Test
public void testGeoSpatialMethods() {
Point point = new Point(43.1, 48.1);
Distance distance = new Distance(200, Metrics.KILOMETERS);
- List list = repository.findByLocationNear(point, distance);
+ List list = personRepository.findByLocationNear(point, distance);
assertEquals(1, list.size());
}
@Test
- public void testQueryAnnotation() {
- List list = repository.findByThePersonsFirstname("Gildong");
+ public void testDeleteMothods() {
+ List list = personRepository.deleteByName("Jung");
assertEquals(1, list.size());
}
diff --git a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/Address.java b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/Address.java
index c79cc66f..39753d6e 100644
--- a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/Address.java
+++ b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/Address.java
@@ -3,6 +3,7 @@
public class Address {
private String zipCode;
+
private String address;
public String getZipCode() {
diff --git a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/Person.java b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/Person.java
index 84dadfa9..98608621 100644
--- a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/Person.java
+++ b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/Person.java
@@ -6,20 +6,14 @@ public class Person {
@Id
private String id;
- private String firstname;
- private String lastname;
+
+ private String name;
+
+ private int age;
+
private Address address;
- private double[] location;
- @Override
- public boolean equals(Object obj) {
- if (obj instanceof Person) {
- if (this.id != null && (this.id.equals(((Person)obj).id))) {
- return true;
- }
- }
- return false;
- }
+ private double[] location;
public String getId() {
return id;
@@ -29,20 +23,20 @@ public void setId(String id) {
this.id = id;
}
- public String getFirstname() {
- return firstname;
+ public String getName() {
+ return name;
}
- public void setFirstname(String firstname) {
- this.firstname = firstname;
+ public void setName(String name) {
+ this.name = name;
}
- public String getLastname() {
- return lastname;
+ public int getAge() {
+ return age;
}
- public void setLastname(String lastname) {
- this.lastname = lastname;
+ public void setAge(int age) {
+ this.age = age;
}
public Address getAddress() {
@@ -61,4 +55,14 @@ public void setLocation(double[] location) {
this.location = location;
}
+ @Override
+ public boolean equals(Object obj) {
+ if (obj instanceof Person) {
+ if (this.id != null && (this.id.equals(((Person)obj).id))) {
+ return true;
+ }
+ }
+ return false;
+ }
+
}
diff --git a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/SimplePerson.java b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/SimplePerson.java
deleted file mode 100644
index 97acdfbd..00000000
--- a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/SimplePerson.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.egovframe.rte.psl.data.mongodb.domain;
-
-public class SimplePerson {
-
- private String id;
- private String name;
- private int age;
-
- public SimplePerson(String name, int age) {
- this.name = name;
- this.age = age;
- }
-
- public String getId() {
- return id;
- }
-
- public String getName() {
- return name;
- }
-
- public int getAge() {
- return age;
- }
-
- @Override
- public String toString() {
- return "Person [id=" + id + ", name=" + name + ", age=" + age + "]";
- }
-
-}
diff --git a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/repository/PersonRepository.java b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/repository/PersonRepository.java
index 567ebcfc..84acb622 100644
--- a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/repository/PersonRepository.java
+++ b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/repository/PersonRepository.java
@@ -1,10 +1,7 @@
package org.egovframe.rte.psl.data.mongodb.repository;
-import java.util.List;
-
import org.egovframe.rte.psl.data.mongodb.domain.Address;
import org.egovframe.rte.psl.data.mongodb.domain.Person;
-
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.geo.Distance;
@@ -12,25 +9,23 @@
import org.springframework.data.mongodb.repository.MongoRepository;
import org.springframework.data.mongodb.repository.Query;
+import java.util.List;
+
public interface PersonRepository extends MongoRepository {
- // Query methods
- List findByLastname(String lastname);
+ List findByName(String name);
- Page findByFirstname(String firstname, Pageable pageable);
+ Page findByName(String name, Pageable pageable);
Person findByAddress(Address address);
- // Delete methods
- List deleteByLastname(String lastname);
+ List deleteByName(String name);
- Long deletePersonByLastname(String lastname);
+ Long deletePersonByName(String lastname);
- // Geo-spatial methods
List findByLocationNear(Point location, Distance distance);
- // JSON based query methods
- @Query("{ 'firstname' : ?0 }")
- List findByThePersonsFirstname(String firstname);
+ @Query("{ 'name' : ?0 }")
+ List findByPersonName(String name);
}
diff --git a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/resources/META-INF/spring/context-common.xml b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/resources/META-INF/spring/context-common.xml
index 2ca32fdd..8bc0ab9a 100644
--- a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/resources/META-INF/spring/context-common.xml
+++ b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/resources/META-INF/spring/context-common.xml
@@ -2,12 +2,10 @@
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-
-
-
4.0.0
org.egovframe.rte
org.egovframe.rte.psl.dataaccess
+ 4.1.0
jar
- 4.0.0
org.egovframe.rte.psl.dataaccess
The eGovernment Standard Framework
https://www.egovframe.go.kr
@@ -18,10 +18,10 @@
- 5.3.6
- 4.0.0
- UTF-8
- UTF-8
+ 5.3.20
+ 4.1.0
+ 1.8
+ UTF-8
@@ -32,35 +32,33 @@
org.springframework
- spring-orm
+ spring-context
${spring.maven.artifact.version}
- commons-logging
commons-logging
+ commons-logging
org.springframework
- spring-test
- ${spring.maven.artifact.version}
- test
-
-
- org.springframework
- spring-context
+ spring-orm
${spring.maven.artifact.version}
-
- commons-logging
commons-logging
+ commons-logging
-
+
+ org.springframework
+ spring-test
+ ${spring.maven.artifact.version}
+ test
+
javax
javaee-api
@@ -76,13 +74,13 @@
org.mybatis
mybatis
- 3.5.3
+ 3.5.10
org.mybatis
mybatis-spring
- 2.0.3
+ 2.0.7
commons-collections
@@ -99,25 +97,25 @@
junit
junit
- 4.13.1
+ 4.13.2
test
org.easymock
easymock
- 4.1
+ 4.3
test
org.apache.commons
commons-lang3
- 3.10
+ 3.12.0
test
org.apache.commons
commons-dbcp2
- 2.4.0
+ 2.9.0
test
@@ -141,50 +139,9 @@
org.hsqldb
hsqldb
- 2.5.0
- test
-
-
-
-
-
-
@@ -196,30 +153,22 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.8.1
+ 3.10.1
- 1.8
- 1.8
- UTF-8
+ ${java.version}
+ ${java.version}
+ ${project.encoding}
org.codehaus.mojo
hibernate3-maven-plugin
3.0
-
-
-
- hbm2ddl
- annotationconfiguration
-
-
-
org.hsqldb
hsqldb
- 2.5.0
+ 2.5.2
@@ -233,7 +182,7 @@
org.apache.maven.plugins
maven-pmd-plugin
- 3.12.0
+ 3.17.0
@@ -279,9 +228,9 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.1.1
+ 3.4.0
- 1.8
+ ${java.version}
-Xdoclint:none
@@ -294,7 +243,7 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
- 3.1.2
+ 3.3.0
sunlink
@@ -304,7 +253,7 @@
true
-
@@ -335,9 +284,9 @@
128m
512m
- UTF-8
- UTF-8
- UTF-8
+ ${project.encoding}
+ ${project.encoding}
+ ${project.encoding}
-Xdoclint:none
@@ -346,8 +295,8 @@
org.apache.maven.plugins
maven-jxr-plugin
- UTF-8
- UTF-8
+ ${project.encoding}
+ ${project.encoding}
true
apidocs
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/EgovAbstractDAO.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/EgovAbstractDAO.java
index 8dc1705e..1fedc009 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/EgovAbstractDAO.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/EgovAbstractDAO.java
@@ -15,14 +15,12 @@
*/
package org.egovframe.rte.psl.dataaccess;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
+import com.ibatis.sqlmap.client.SqlMapClient;
import org.egovframe.rte.psl.orm.ibatis.support.SqlMapClientDaoSupport;
-import com.ibatis.sqlmap.client.SqlMapClient;
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
/**
* Spring 의 iBatis 연동 지원을 Annotation 형식으로 쉽게 처리하기 위한 공통 parent DAO 클래스
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/EgovAbstractMapper.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/EgovAbstractMapper.java
index 86e50b5b..da3bbcab 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/EgovAbstractMapper.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/EgovAbstractMapper.java
@@ -16,16 +16,15 @@
*/
package org.egovframe.rte.psl.dataaccess;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
import org.apache.ibatis.session.ResultHandler;
import org.apache.ibatis.session.RowBounds;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.support.SqlSessionDaoSupport;
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
/**
* Spring의 MyBatis 연동 지원 공통 parent DAO 클래스.
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/mapper/Mapper.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/mapper/Mapper.java
index faf2c96d..caf20673 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/mapper/Mapper.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/mapper/Mapper.java
@@ -16,14 +16,10 @@
*/
package org.egovframe.rte.psl.dataaccess.mapper;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
import org.springframework.stereotype.Component;
+import java.lang.annotation.*;
+
/**
* Mapper 인터페이스에 대한 marker Annotation(Single-value)으로 MyBatis 적용 방식 중 annotation을 사용한 방식에 대한 기준을 위해 사용된다.
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/typehandler/CalendarMapperTypeHandler.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/typehandler/CalendarMapperTypeHandler.java
index 19c3a3e7..469a89e5 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/typehandler/CalendarMapperTypeHandler.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/typehandler/CalendarMapperTypeHandler.java
@@ -15,15 +15,15 @@
*/
package org.egovframe.rte.psl.dataaccess.typehandler;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.TypeHandler;
+
import java.sql.CallableStatement;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Calendar;
-import org.apache.ibatis.type.JdbcType;
-import org.apache.ibatis.type.TypeHandler;
-
/**
* Calendar Type - Timestamp 변환을 지원하는 TypeHandler 확장 클래스
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/typehandler/CalendarTypeHandler.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/typehandler/CalendarTypeHandler.java
index 10a854f2..7d5ce871 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/typehandler/CalendarTypeHandler.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/typehandler/CalendarTypeHandler.java
@@ -15,12 +15,12 @@
*/
package org.egovframe.rte.psl.dataaccess.typehandler;
-import java.sql.SQLException;
-
import com.ibatis.sqlmap.client.extensions.ParameterSetter;
import com.ibatis.sqlmap.client.extensions.ResultGetter;
import com.ibatis.sqlmap.client.extensions.TypeHandlerCallback;
+import java.sql.SQLException;
+
/**
* Calendar Type - Timestamp 변환을 지원하는 TypeHandler 확장 클래스
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/typehandler/StringTimestampTypeHandler.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/typehandler/StringTimestampTypeHandler.java
index eaf49b20..fd742778 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/typehandler/StringTimestampTypeHandler.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/dataaccess/typehandler/StringTimestampTypeHandler.java
@@ -15,15 +15,15 @@
*/
package org.egovframe.rte.psl.dataaccess.typehandler;
+import com.ibatis.sqlmap.client.extensions.ParameterSetter;
+import com.ibatis.sqlmap.client.extensions.ResultGetter;
+import com.ibatis.sqlmap.client.extensions.TypeHandlerCallback;
+
import java.sql.SQLException;
import java.sql.Timestamp;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import com.ibatis.sqlmap.client.extensions.ParameterSetter;
-import com.ibatis.sqlmap.client.extensions.ResultGetter;
-import com.ibatis.sqlmap.client.extensions.TypeHandlerCallback;
-
/**
* String - Timestamp 변환을 지원하는 TypeHandler 확장 클래스
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/SqlMapClientCallback.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/SqlMapClientCallback.java
index 667f1b7d..718800d1 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/SqlMapClientCallback.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/SqlMapClientCallback.java
@@ -16,10 +16,10 @@
package org.egovframe.rte.psl.orm.ibatis;
-import java.sql.SQLException;
-
import com.ibatis.sqlmap.client.SqlMapExecutor;
+import java.sql.SQLException;
+
/**
* Callback interface for data access code that works with the iBATIS
* {@link com.ibatis.sqlmap.client.SqlMapExecutor} interface. To be used
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/SqlMapClientFactoryBean.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/SqlMapClientFactoryBean.java
index b0f4aa25..e9241576 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/SqlMapClientFactoryBean.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/SqlMapClientFactoryBean.java
@@ -16,12 +16,6 @@
package org.egovframe.rte.psl.orm.ibatis;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.util.Properties;
-import javax.sql.DataSource;
-
import com.ibatis.common.xml.NodeletException;
import com.ibatis.sqlmap.client.SqlMapClient;
import com.ibatis.sqlmap.client.SqlMapClientBuilder;
@@ -32,7 +26,6 @@
import com.ibatis.sqlmap.engine.transaction.TransactionConfig;
import com.ibatis.sqlmap.engine.transaction.TransactionManager;
import com.ibatis.sqlmap.engine.transaction.external.ExternalTransactionConfig;
-
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.NestedIOException;
@@ -41,6 +34,12 @@
import org.springframework.jdbc.support.lob.LobHandler;
import org.springframework.util.ObjectUtils;
+import javax.sql.DataSource;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.util.Properties;
+
/**
* {@link org.springframework.beans.factory.FactoryBean} that creates an
* iBATIS {@link com.ibatis.sqlmap.client.SqlMapClient}. This is the usual
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/SqlMapClientOperations.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/SqlMapClientOperations.java
index 919fdca6..97040130 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/SqlMapClientOperations.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/SqlMapClientOperations.java
@@ -16,13 +16,12 @@
package org.egovframe.rte.psl.orm.ibatis;
-import java.util.List;
-import java.util.Map;
-
import com.ibatis.sqlmap.client.event.RowHandler;
-
import org.springframework.dao.DataAccessException;
+import java.util.List;
+import java.util.Map;
+
/**
* Interface that specifies a basic set of iBATIS SqlMapClient operations,
* implemented by {@link SqlMapClientTemplate}. Not often used, but a useful
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/SqlMapClientTemplate.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/SqlMapClientTemplate.java
index 259be252..3807f913 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/SqlMapClientTemplate.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/SqlMapClientTemplate.java
@@ -16,17 +16,10 @@
package org.egovframe.rte.psl.orm.ibatis;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Map;
-import javax.sql.DataSource;
-
import com.ibatis.sqlmap.client.SqlMapClient;
import com.ibatis.sqlmap.client.SqlMapExecutor;
import com.ibatis.sqlmap.client.SqlMapSession;
import com.ibatis.sqlmap.client.event.RowHandler;
-
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.CannotGetJdbcConnectionException;
import org.springframework.jdbc.JdbcUpdateAffectedIncorrectNumberOfRowsException;
@@ -35,6 +28,12 @@
import org.springframework.jdbc.support.JdbcAccessor;
import org.springframework.util.Assert;
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Map;
+
/**
* Helper class that simplifies data access via the iBATIS
* {@link com.ibatis.sqlmap.client.SqlMapClient} API, converting checked
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/support/AbstractLobTypeHandler.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/support/AbstractLobTypeHandler.java
index f3c008c7..71fd2cc9 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/support/AbstractLobTypeHandler.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/support/AbstractLobTypeHandler.java
@@ -16,22 +16,20 @@
package org.egovframe.rte.psl.orm.ibatis.support;
-import java.io.IOException;
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
import com.ibatis.sqlmap.engine.type.BaseTypeHandler;
-
import org.egovframe.rte.psl.orm.ibatis.SqlMapClientFactoryBean;
-
import org.springframework.jdbc.datasource.DataSourceUtils;
import org.springframework.jdbc.support.lob.LobCreator;
import org.springframework.jdbc.support.lob.LobHandler;
import org.springframework.transaction.support.TransactionSynchronizationAdapter;
import org.springframework.transaction.support.TransactionSynchronizationManager;
+import java.io.IOException;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
/**
* Abstract base class for iBATIS TypeHandler implementations that map to LOBs.
* Retrieves the LobHandler to use from SqlMapClientFactoryBean at config time.
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/support/BlobByteArrayTypeHandler.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/support/BlobByteArrayTypeHandler.java
index a4b1ecc4..993ad03f 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/support/BlobByteArrayTypeHandler.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/support/BlobByteArrayTypeHandler.java
@@ -16,13 +16,13 @@
package org.egovframe.rte.psl.orm.ibatis.support;
+import org.springframework.jdbc.support.lob.LobCreator;
+import org.springframework.jdbc.support.lob.LobHandler;
+
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import org.springframework.jdbc.support.lob.LobCreator;
-import org.springframework.jdbc.support.lob.LobHandler;
-
/**
* iBATIS TypeHandler implementation for byte arrays that get mapped to BLOBs.
* Retrieves the LobHandler to use from SqlMapClientFactoryBean at config time.
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/support/BlobSerializableTypeHandler.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/support/BlobSerializableTypeHandler.java
index 1f17eb0a..77b8f86f 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/support/BlobSerializableTypeHandler.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/support/BlobSerializableTypeHandler.java
@@ -16,18 +16,14 @@
package org.egovframe.rte.psl.orm.ibatis.support;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
+import org.springframework.jdbc.support.lob.LobCreator;
+import org.springframework.jdbc.support.lob.LobHandler;
+
+import java.io.*;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import org.springframework.jdbc.support.lob.LobCreator;
-import org.springframework.jdbc.support.lob.LobHandler;
-
/**
* iBATIS TypeHandler implementation for arbitrary objects that get serialized to BLOBs.
* Retrieves the LobHandler to use from SqlMapClientFactoryBean at config time.
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/support/ClobStringTypeHandler.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/support/ClobStringTypeHandler.java
index 62adc65a..98678747 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/support/ClobStringTypeHandler.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/support/ClobStringTypeHandler.java
@@ -16,13 +16,13 @@
package org.egovframe.rte.psl.orm.ibatis.support;
+import org.springframework.jdbc.support.lob.LobCreator;
+import org.springframework.jdbc.support.lob.LobHandler;
+
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import org.springframework.jdbc.support.lob.LobCreator;
-import org.springframework.jdbc.support.lob.LobHandler;
-
/**
* iBATIS TypeHandler implementation for Strings that get mapped to CLOBs.
* Retrieves the LobHandler to use from SqlMapClientFactoryBean at config time.
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/support/SqlMapClientDaoSupport.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/support/SqlMapClientDaoSupport.java
index 76f399dc..3710cdbd 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/support/SqlMapClientDaoSupport.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/main/java/org/egovframe/rte/psl/orm/ibatis/support/SqlMapClientDaoSupport.java
@@ -16,15 +16,13 @@
package org.egovframe.rte.psl.orm.ibatis.support;
-import javax.sql.DataSource;
-
import com.ibatis.sqlmap.client.SqlMapClient;
-
import org.egovframe.rte.psl.orm.ibatis.SqlMapClientTemplate;
-
import org.springframework.dao.support.DaoSupport;
import org.springframework.util.Assert;
+import javax.sql.DataSource;
+
/**
* Convenient super class for iBATIS SqlMapClient data access objects.
* Requires a SqlMapClient to be set, providing a SqlMapClientTemplate
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/TestBase.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/TestBase.java
index 83df5873..15b748a4 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/TestBase.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/TestBase.java
@@ -1,11 +1,10 @@
package org.egovframe.rte.psl.dataaccess;
-import java.util.Properties;
+import org.junit.Before;
import javax.annotation.Resource;
import javax.sql.DataSource;
-
-import org.junit.Before;
+import java.util.Properties;
public class TestBase {
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/DataTypeTestMapper.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/DataTypeTestMapper.java
index f5f65ddc..a7f4c50c 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/DataTypeTestMapper.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/DataTypeTestMapper.java
@@ -2,7 +2,6 @@
import org.egovframe.rte.psl.dataaccess.EgovAbstractMapper;
import org.egovframe.rte.psl.dataaccess.vo.TypeTestVO;
-
import org.springframework.stereotype.Repository;
@Repository("dataTypeTestMapper")
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/DeptDAO.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/DeptDAO.java
index 3f11eb2f..476da380 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/DeptDAO.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/DeptDAO.java
@@ -1,12 +1,11 @@
package org.egovframe.rte.psl.dataaccess.dao;
-import java.util.List;
-
import org.egovframe.rte.psl.dataaccess.EgovAbstractDAO;
import org.egovframe.rte.psl.dataaccess.vo.DeptVO;
-
import org.springframework.stereotype.Repository;
+import java.util.List;
+
@Repository("deptDAO")
public class DeptDAO extends EgovAbstractDAO {
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/DeptMapper.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/DeptMapper.java
index 3a6d7fab..3fd55edd 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/DeptMapper.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/DeptMapper.java
@@ -1,12 +1,11 @@
package org.egovframe.rte.psl.dataaccess.dao;
-import java.util.List;
-
import org.egovframe.rte.psl.dataaccess.EgovAbstractMapper;
import org.egovframe.rte.psl.dataaccess.vo.DeptVO;
-
import org.springframework.stereotype.Repository;
+import java.util.List;
+
@Repository("deptMapper")
public class DeptMapper extends EgovAbstractMapper {
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/EmpBatchMapper.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/EmpBatchMapper.java
index 47558628..1c0da1fc 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/EmpBatchMapper.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/EmpBatchMapper.java
@@ -1,24 +1,15 @@
package org.egovframe.rte.psl.dataaccess.dao;
-import java.util.Iterator;
-import java.util.List;
-
-import org.egovframe.rte.psl.dataaccess.EgovAbstractMapper;
-import org.egovframe.rte.psl.dataaccess.vo.DeptIncludesEmpListVO;
-import org.egovframe.rte.psl.dataaccess.vo.DeptVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpDeptSimpleCompositeVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpExtendsDeptVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesDeptVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesEmpListVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesMgrVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.apache.ibatis.session.RowBounds;
+import org.egovframe.rte.psl.dataaccess.EgovAbstractMapper;
+import org.egovframe.rte.psl.dataaccess.vo.*;
import org.mybatis.spring.SqlSessionTemplate;
import org.springframework.stereotype.Repository;
+import javax.annotation.Resource;
+import java.util.Iterator;
+import java.util.List;
+
@Repository("empBatchMapper")
public class EmpBatchMapper extends EgovAbstractMapper {
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/EmpDAO.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/EmpDAO.java
index 6bc1fdf8..c9432344 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/EmpDAO.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/EmpDAO.java
@@ -1,24 +1,15 @@
package org.egovframe.rte.psl.dataaccess.dao;
-import java.math.BigDecimal;
-import java.sql.SQLException;
-import java.util.Iterator;
-import java.util.List;
-
+import com.ibatis.sqlmap.client.SqlMapExecutor;
import org.egovframe.rte.psl.dataaccess.EgovAbstractDAO;
-import org.egovframe.rte.psl.dataaccess.vo.DeptIncludesEmpListVO;
-import org.egovframe.rte.psl.dataaccess.vo.DeptVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpDeptSimpleCompositeVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpExtendsDeptVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesDeptVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesEmpListVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesMgrVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
+import org.egovframe.rte.psl.dataaccess.vo.*;
import org.egovframe.rte.psl.orm.ibatis.SqlMapClientCallback;
import org.springframework.stereotype.Repository;
-import com.ibatis.sqlmap.client.SqlMapExecutor;
+import java.math.BigDecimal;
+import java.sql.SQLException;
+import java.util.Iterator;
+import java.util.List;
@SuppressWarnings("deprecation")
@Repository("empDAO")
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/EmpGeneralMapper.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/EmpGeneralMapper.java
index b5ea768d..f6622e19 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/EmpGeneralMapper.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/EmpGeneralMapper.java
@@ -1,20 +1,12 @@
package org.egovframe.rte.psl.dataaccess.dao;
-import java.util.Iterator;
-import java.util.List;
-
import org.egovframe.rte.psl.dataaccess.EgovAbstractMapper;
-import org.egovframe.rte.psl.dataaccess.vo.DeptIncludesEmpListVO;
-import org.egovframe.rte.psl.dataaccess.vo.DeptVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpDeptSimpleCompositeVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpExtendsDeptVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesDeptVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesEmpListVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesMgrVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
+import org.egovframe.rte.psl.dataaccess.vo.*;
import org.springframework.stereotype.Repository;
+import java.util.Iterator;
+import java.util.List;
+
@Repository("empGeneralMapper")
public class EmpGeneralMapper extends EgovAbstractMapper {
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/EmpMapper.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/EmpMapper.java
index ce8214a6..0075391a 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/EmpMapper.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/EmpMapper.java
@@ -1,22 +1,14 @@
package org.egovframe.rte.psl.dataaccess.dao;
-import java.util.Iterator;
-import java.util.List;
-
-import org.egovframe.rte.psl.dataaccess.EgovAbstractMapper;
-import org.egovframe.rte.psl.dataaccess.vo.DeptIncludesEmpListVO;
-import org.egovframe.rte.psl.dataaccess.vo.DeptVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpDeptSimpleCompositeVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpExtendsDeptVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesDeptVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesEmpListVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesMgrVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
import org.apache.ibatis.session.ResultHandler;
import org.apache.ibatis.session.RowBounds;
+import org.egovframe.rte.psl.dataaccess.EgovAbstractMapper;
+import org.egovframe.rte.psl.dataaccess.vo.*;
import org.springframework.stereotype.Repository;
+import java.util.Iterator;
+import java.util.List;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/JobHistDAO.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/JobHistDAO.java
index 3ec0dd13..2eb6021e 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/JobHistDAO.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/JobHistDAO.java
@@ -1,12 +1,11 @@
package org.egovframe.rte.psl.dataaccess.dao;
-import java.util.List;
-
import org.egovframe.rte.psl.dataaccess.EgovAbstractDAO;
import org.egovframe.rte.psl.dataaccess.vo.JobHistVO;
-
import org.springframework.stereotype.Repository;
+import java.util.List;
+
@Repository("jobHistDAO")
public class JobHistDAO extends EgovAbstractDAO {
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/JobHistMapper.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/JobHistMapper.java
index ed70b3a3..a55f397d 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/JobHistMapper.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/JobHistMapper.java
@@ -1,15 +1,13 @@
package org.egovframe.rte.psl.dataaccess.dao;
-import java.util.List;
-
import org.egovframe.rte.psl.dataaccess.EgovAbstractMapper;
import org.egovframe.rte.psl.dataaccess.vo.JobHistVO;
-
-import javax.annotation.Resource;
-
import org.mybatis.spring.SqlSessionTemplate;
import org.springframework.stereotype.Repository;
+import javax.annotation.Resource;
+import java.util.List;
+
@Repository("jobHistMapper")
public class JobHistMapper extends EgovAbstractMapper {
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/MapTypeDAO.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/MapTypeDAO.java
index caa6157e..4ecdd403 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/MapTypeDAO.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/MapTypeDAO.java
@@ -1,12 +1,11 @@
package org.egovframe.rte.psl.dataaccess.dao;
-import java.util.List;
-import java.util.Map;
-
import org.egovframe.rte.psl.dataaccess.EgovAbstractDAO;
-
import org.springframework.stereotype.Repository;
+import java.util.List;
+import java.util.Map;
+
@Repository("mapTypeDAO")
@SuppressWarnings("deprecation")
public class MapTypeDAO extends EgovAbstractDAO {
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/MapTypeMapper.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/MapTypeMapper.java
index 4c454ba9..51d1e106 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/MapTypeMapper.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/MapTypeMapper.java
@@ -1,12 +1,11 @@
package org.egovframe.rte.psl.dataaccess.dao;
-import java.util.List;
-import java.util.Map;
-
import org.egovframe.rte.psl.dataaccess.EgovAbstractMapper;
-
import org.springframework.stereotype.Repository;
+import java.util.List;
+import java.util.Map;
+
@Repository("mapTypeMapper")
public class MapTypeMapper extends EgovAbstractMapper {
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/TypeTestDAO.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/TypeTestDAO.java
index 7439dcb2..0e349b74 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/TypeTestDAO.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/TypeTestDAO.java
@@ -2,7 +2,6 @@
import org.egovframe.rte.psl.dataaccess.EgovAbstractDAO;
import org.egovframe.rte.psl.dataaccess.vo.TypeTestVO;
-
import org.springframework.stereotype.Repository;
@Repository("typeTestDAO")
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/TypeTestMapper.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/TypeTestMapper.java
index bfedf4da..e499a669 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/TypeTestMapper.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/dao/TypeTestMapper.java
@@ -2,7 +2,6 @@
import org.egovframe.rte.psl.dataaccess.EgovAbstractMapper;
import org.egovframe.rte.psl.dataaccess.vo.TypeTestVO;
-
import org.springframework.stereotype.Repository;
@Repository("typeTestMapper")
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/BasicDataAccessTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/BasicDataAccessTest.java
index 85f4057c..bffc7b8f 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/BasicDataAccessTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/BasicDataAccessTest.java
@@ -1,19 +1,8 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.util.List;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.DeptDAO;
import org.egovframe.rte.psl.dataaccess.vo.DeptVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -24,6 +13,12 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/BatchTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/BatchTest.java
index 9add6333..80ab3376 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/BatchTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/BatchTest.java
@@ -1,27 +1,24 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpDAO;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.core.io.ClassPathResource;
import org.springframework.jdbc.datasource.init.ScriptUtils;
-import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/CacheModelTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/CacheModelTest.java
index c74cfa74..10804218 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/CacheModelTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/CacheModelTest.java
@@ -1,19 +1,8 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpDAO;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -24,6 +13,12 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/CallableStatementTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/CallableStatementTest.java
index e503733d..21596d4f 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/CallableStatementTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/CallableStatementTest.java
@@ -1,28 +1,9 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.sql.ResultSet;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TimeZone;
-
+import org.apache.commons.lang3.builder.ToStringBuilder;
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpDAO;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -35,6 +16,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.sql.ResultSet;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ComplexPropertiesTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ComplexPropertiesTest.java
index d275a4bb..d48085d2 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ComplexPropertiesTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ComplexPropertiesTest.java
@@ -1,24 +1,9 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.List;
-
+import com.ibatis.common.jdbc.exception.NestedSQLException;
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpDAO;
-import org.egovframe.rte.psl.dataaccess.vo.DeptIncludesEmpListVO;
-import org.egovframe.rte.psl.dataaccess.vo.DeptVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesDeptVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesMgrVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
+import org.egovframe.rte.psl.dataaccess.vo.*;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -29,7 +14,12 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
-import com.ibatis.common.jdbc.exception.NestedSQLException;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+import static org.junit.Assert.*;
/**
* == 개정이력(Modification Information) ==
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/CompositeKeyTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/CompositeKeyTest.java
index 00b299b0..aac76ed7 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/CompositeKeyTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/CompositeKeyTest.java
@@ -1,20 +1,9 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.List;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpDAO;
import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesEmpListVO;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -25,6 +14,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/DataTypeTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/DataTypeTest.java
index caccd7e7..beba49ea 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/DataTypeTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/DataTypeTest.java
@@ -1,21 +1,8 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.math.BigDecimal;
-import java.sql.SQLException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.TypeTestDAO;
import org.egovframe.rte.psl.dataaccess.vo.TypeTestVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -27,6 +14,14 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.sql.SQLException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/DynamicSQLTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/DynamicSQLTest.java
index a098df31..a86b922d 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/DynamicSQLTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/DynamicSQLTest.java
@@ -1,25 +1,11 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpDAO;
import org.egovframe.rte.psl.dataaccess.dao.JobHistDAO;
import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesEmpListVO;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
import org.egovframe.rte.psl.dataaccess.vo.JobHistVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -30,6 +16,16 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/FetchSizeTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/FetchSizeTest.java
index 0739062e..00fc581c 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/FetchSizeTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/FetchSizeTest.java
@@ -1,17 +1,8 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.math.BigDecimal;
-import java.util.List;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpDAO;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -22,6 +13,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/InLineParameterTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/InLineParameterTest.java
index 3f9489eb..ccc7f53b 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/InLineParameterTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/InLineParameterTest.java
@@ -1,19 +1,8 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpDAO;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -24,6 +13,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/LobTypeTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/LobTypeTest.java
index 10113832..621769a7 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/LobTypeTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/LobTypeTest.java
@@ -1,19 +1,8 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.TypeTestDAO;
import org.egovframe.rte.psl.dataaccess.vo.LobTestVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -27,6 +16,15 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/MapTypeParameterTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/MapTypeParameterTest.java
index 59a97a19..7dd64af0 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/MapTypeParameterTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/MapTypeParameterTest.java
@@ -1,20 +1,8 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
-
+import org.apache.commons.collections.map.ListOrderedMap;
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.MapTypeDAO;
-
-import javax.annotation.Resource;
-
-import org.apache.commons.collections.map.ListOrderedMap;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -25,6 +13,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ParameterMapTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ParameterMapTest.java
index 2c1bc1f3..f2d2e97b 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ParameterMapTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ParameterMapTest.java
@@ -1,19 +1,8 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpDAO;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -24,6 +13,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/RemapResultsTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/RemapResultsTest.java
index b29df845..a8ff27fe 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/RemapResultsTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/RemapResultsTest.java
@@ -1,20 +1,7 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.MapTypeDAO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -28,6 +15,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ReplacedTextTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ReplacedTextTest.java
index 8b41c4c7..58a5dc3d 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ReplacedTextTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ReplacedTextTest.java
@@ -1,19 +1,7 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.MapTypeDAO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -24,6 +12,14 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ResultMapTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ResultMapTest.java
index 73a72886..b6a28497 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ResultMapTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ResultMapTest.java
@@ -1,19 +1,10 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpDAO;
import org.egovframe.rte.psl.dataaccess.vo.EmpDeptSimpleCompositeVO;
import org.egovframe.rte.psl.dataaccess.vo.EmpExtendsDeptVO;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -24,6 +15,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ResultsetTypeTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ResultsetTypeTest.java
index 0f66d947..2e59a2ac 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ResultsetTypeTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ResultsetTypeTest.java
@@ -1,17 +1,8 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.math.BigDecimal;
-import java.util.List;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpDAO;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -22,6 +13,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ReuseSQLTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ReuseSQLTest.java
index 3e890b57..9ebfd7a3 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ReuseSQLTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/ReuseSQLTest.java
@@ -1,25 +1,11 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpDAO;
import org.egovframe.rte.psl.dataaccess.dao.JobHistDAO;
import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesEmpListVO;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
import org.egovframe.rte.psl.dataaccess.vo.JobHistVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -30,6 +16,16 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/RowHandlerTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/RowHandlerTest.java
index 34084c0b..e7744ad0 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/RowHandlerTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/RowHandlerTest.java
@@ -1,18 +1,8 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.util.Properties;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpDAO;
import org.egovframe.rte.psl.dataaccess.rowhandler.FileWritingRowHandler;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -25,6 +15,12 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.io.File;
+import java.util.Properties;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/SelectKeyTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/SelectKeyTest.java
index d49abecd..9ad5de49 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/SelectKeyTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/SelectKeyTest.java
@@ -1,17 +1,8 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpDAO;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -22,6 +13,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/TimeoutTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/TimeoutTest.java
index b7cbc2d2..42c747ed 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/TimeoutTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/TimeoutTest.java
@@ -1,17 +1,10 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.Reader;
-import java.sql.SQLException;
-
+import com.ibatis.common.resources.Resources;
+import com.ibatis.sqlmap.client.SqlMapClient;
+import com.ibatis.sqlmap.client.SqlMapClientBuilder;
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpDAO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -23,9 +16,11 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
-import com.ibatis.common.resources.Resources;
-import com.ibatis.sqlmap.client.SqlMapClient;
-import com.ibatis.sqlmap.client.SqlMapClientBuilder;
+import javax.annotation.Resource;
+import java.io.Reader;
+import java.sql.SQLException;
+
+import static org.junit.Assert.*;
/**
* == 개정이력(Modification Information) ==
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/TypeHandlerTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/TypeHandlerTest.java
index 7a672a98..6b472162 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/TypeHandlerTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/TypeHandlerTest.java
@@ -1,18 +1,7 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.Map;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.TypeTestDAO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -24,6 +13,15 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/WithoutMappingCUDTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/WithoutMappingCUDTest.java
index 52e98635..e4e06266 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/WithoutMappingCUDTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/WithoutMappingCUDTest.java
@@ -1,17 +1,8 @@
package org.egovframe.rte.psl.dataaccess.ibatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.math.BigDecimal;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.DeptDAO;
import org.egovframe.rte.psl.dataaccess.vo.DeptVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -22,6 +13,11 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mapper/DepartmentMapper.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mapper/DepartmentMapper.java
index 53b5ce7d..0d0db079 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mapper/DepartmentMapper.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mapper/DepartmentMapper.java
@@ -1,13 +1,12 @@
package org.egovframe.rte.psl.dataaccess.mapper;
-import java.math.BigDecimal;
-
-import org.egovframe.rte.psl.dataaccess.vo.DeptVO;
-
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
+import org.egovframe.rte.psl.dataaccess.vo.DeptVO;
+
+import java.math.BigDecimal;
@Mapper("departmentMapper")
public interface DepartmentMapper {
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mapper/EmployerMapper.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mapper/EmployerMapper.java
index ed8ae7c5..896bf069 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mapper/EmployerMapper.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mapper/EmployerMapper.java
@@ -1,11 +1,10 @@
package org.egovframe.rte.psl.dataaccess.mapper;
-import java.math.BigDecimal;
-import java.util.List;
-
+import org.apache.ibatis.session.ResultHandler;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-import org.apache.ibatis.session.ResultHandler;
+import java.math.BigDecimal;
+import java.util.List;
/**
* == 개정이력(Modification Information) ==
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/BasicDataMapperTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/BasicDataMapperTest.java
index 18b02573..9a715abb 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/BasicDataMapperTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/BasicDataMapperTest.java
@@ -1,19 +1,8 @@
package org.egovframe.rte.psl.dataaccess.mybatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.util.List;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.DeptMapper;
import org.egovframe.rte.psl.dataaccess.vo.DeptVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -24,6 +13,12 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/BatchMapperTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/BatchMapperTest.java
index e91cc66b..828ed978 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/BatchMapperTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/BatchMapperTest.java
@@ -1,25 +1,22 @@
package org.egovframe.rte.psl.dataaccess.mybatis;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpBatchMapper;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.core.io.ClassPathResource;
import org.springframework.jdbc.datasource.init.ScriptUtils;
-import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/CacheModelMapperTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/CacheModelMapperTest.java
index c73fea9a..86e0dd87 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/CacheModelMapperTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/CacheModelMapperTest.java
@@ -1,19 +1,8 @@
package org.egovframe.rte.psl.dataaccess.mybatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpMapper;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -24,6 +13,12 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/CallableStatementMapperTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/CallableStatementMapperTest.java
index 1d80ec37..213c1a17 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/CallableStatementMapperTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/CallableStatementMapperTest.java
@@ -1,25 +1,8 @@
package org.egovframe.rte.psl.dataaccess.mybatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TimeZone;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpMapper;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,6 +15,12 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ComplexPropertiesMapperTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ComplexPropertiesMapperTest.java
index 280b18df..899ec58a 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ComplexPropertiesMapperTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ComplexPropertiesMapperTest.java
@@ -1,24 +1,8 @@
package org.egovframe.rte.psl.dataaccess.mybatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.List;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpGeneralMapper;
-import org.egovframe.rte.psl.dataaccess.vo.DeptIncludesEmpListVO;
-import org.egovframe.rte.psl.dataaccess.vo.DeptVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesDeptVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesMgrVO;
-import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
+import org.egovframe.rte.psl.dataaccess.vo.*;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -30,6 +14,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/CompositeKeyMapperTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/CompositeKeyMapperTest.java
index 54a690e4..47779f83 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/CompositeKeyMapperTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/CompositeKeyMapperTest.java
@@ -1,20 +1,9 @@
package org.egovframe.rte.psl.dataaccess.mybatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.List;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpGeneralMapper;
import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesEmpListVO;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -25,6 +14,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/DataTypeMapperTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/DataTypeMapperTest.java
index 3d91a7fd..e3d68ce2 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/DataTypeMapperTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/DataTypeMapperTest.java
@@ -1,21 +1,8 @@
package org.egovframe.rte.psl.dataaccess.mybatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.math.BigDecimal;
-import java.sql.SQLException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.DataTypeTestMapper;
import org.egovframe.rte.psl.dataaccess.vo.TypeTestVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -27,6 +14,14 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.sql.SQLException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/DynamicSQLMapperTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/DynamicSQLMapperTest.java
index b869804e..8af98a73 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/DynamicSQLMapperTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/DynamicSQLMapperTest.java
@@ -1,25 +1,11 @@
package org.egovframe.rte.psl.dataaccess.mybatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpMapper;
import org.egovframe.rte.psl.dataaccess.dao.JobHistMapper;
import org.egovframe.rte.psl.dataaccess.vo.EmpIncludesEmpListVO;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
import org.egovframe.rte.psl.dataaccess.vo.JobHistVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -30,6 +16,16 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/FetchSizeTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/FetchSizeTest.java
index 89cb7b22..bee4d209 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/FetchSizeTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/FetchSizeTest.java
@@ -1,17 +1,8 @@
package org.egovframe.rte.psl.dataaccess.mybatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.math.BigDecimal;
-import java.util.List;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpMapper;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -22,6 +13,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/InLineParameterTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/InLineParameterTest.java
index c83ba80a..4ec0be31 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/InLineParameterTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/InLineParameterTest.java
@@ -1,19 +1,8 @@
package org.egovframe.rte.psl.dataaccess.mybatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpMapper;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -24,6 +13,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/LobTypeTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/LobTypeTest.java
index 02622f7b..f0681527 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/LobTypeTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/LobTypeTest.java
@@ -1,19 +1,8 @@
package org.egovframe.rte.psl.dataaccess.mybatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.TypeTestMapper;
import org.egovframe.rte.psl.dataaccess.vo.LobTestVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -27,6 +16,15 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/MapTypeParameterTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/MapTypeParameterTest.java
index efd984f4..5e04b97f 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/MapTypeParameterTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/MapTypeParameterTest.java
@@ -1,20 +1,8 @@
package org.egovframe.rte.psl.dataaccess.mybatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
-
+import org.apache.commons.collections.map.ListOrderedMap;
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.MapTypeMapper;
-
-import javax.annotation.Resource;
-
-import org.apache.commons.collections.map.ListOrderedMap;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -25,6 +13,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ParameterMapTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ParameterMapTest.java
index 6dd23729..2af46182 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ParameterMapTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ParameterMapTest.java
@@ -1,19 +1,8 @@
package org.egovframe.rte.psl.dataaccess.mybatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpMapper;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -24,6 +13,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/RemapResultsTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/RemapResultsTest.java
index 75c53c5a..cd5a5189 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/RemapResultsTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/RemapResultsTest.java
@@ -1,19 +1,7 @@
package org.egovframe.rte.psl.dataaccess.mybatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.MapTypeMapper;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -26,6 +14,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ReplacedTextTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ReplacedTextTest.java
index e427f02a..20f57d6e 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ReplacedTextTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ReplacedTextTest.java
@@ -1,19 +1,7 @@
package org.egovframe.rte.psl.dataaccess.mybatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.MapTypeMapper;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -24,6 +12,14 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ResultHandlerMapperTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ResultHandlerMapperTest.java
index 6e08cfb5..45b0e049 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ResultHandlerMapperTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ResultHandlerMapperTest.java
@@ -1,19 +1,9 @@
package org.egovframe.rte.psl.dataaccess.mybatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.util.Properties;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpMapper;
import org.egovframe.rte.psl.dataaccess.mapper.EmployerMapper;
import org.egovframe.rte.psl.dataaccess.resulthandler.FileWritingResultHandler;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -26,6 +16,12 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.io.File;
+import java.util.Properties;
+
+import static org.junit.Assert.*;
+
/**
* FileWritingResultHandler 테스트
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ResultMapTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ResultMapTest.java
index 1752087c..a7478b7b 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ResultMapTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ResultMapTest.java
@@ -1,19 +1,10 @@
package org.egovframe.rte.psl.dataaccess.mybatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpMapper;
import org.egovframe.rte.psl.dataaccess.vo.EmpDeptSimpleCompositeVO;
import org.egovframe.rte.psl.dataaccess.vo.EmpExtendsDeptVO;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -24,6 +15,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ResultsetTypeMapperTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ResultsetTypeMapperTest.java
index 33473ed3..94cf111a 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ResultsetTypeMapperTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/ResultsetTypeMapperTest.java
@@ -1,17 +1,8 @@
package org.egovframe.rte.psl.dataaccess.mybatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.math.BigDecimal;
-import java.util.List;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpMapper;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -22,6 +13,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/SelectKeyMapperTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/SelectKeyMapperTest.java
index 755c7bea..5d5c1b8d 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/SelectKeyMapperTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/SelectKeyMapperTest.java
@@ -1,17 +1,8 @@
package org.egovframe.rte.psl.dataaccess.mybatis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.dao.EmpMapper;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -22,6 +13,13 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/mapper/DepartmentMapperTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/mapper/DepartmentMapperTest.java
index b05853e8..325b2481 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/mapper/DepartmentMapperTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/mapper/DepartmentMapperTest.java
@@ -1,17 +1,8 @@
package org.egovframe.rte.psl.dataaccess.mybatis.mapper;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.math.BigDecimal;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.mapper.DepartmentMapper;
import org.egovframe.rte.psl.dataaccess.vo.DeptVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -21,6 +12,11 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/mapper/EmployerMapperTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/mapper/EmployerMapperTest.java
index 1e09adef..fd3d1c5a 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/mapper/EmployerMapperTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/mybatis/mapper/EmployerMapperTest.java
@@ -1,19 +1,8 @@
package org.egovframe.rte.psl.dataaccess.mybatis.mapper;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.util.List;
-
import org.egovframe.rte.psl.dataaccess.TestBase;
import org.egovframe.rte.psl.dataaccess.mapper.EmployerMapper;
import org.egovframe.rte.psl.dataaccess.vo.EmpVO;
-
-import javax.annotation.Resource;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -23,6 +12,12 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
/**
* == 개정이력(Modification Information) ==
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/resulthandler/FileWritingResultHandler.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/resulthandler/FileWritingResultHandler.java
index 90d258a7..5df6affc 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/resulthandler/FileWritingResultHandler.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/resulthandler/FileWritingResultHandler.java
@@ -1,20 +1,19 @@
package org.egovframe.rte.psl.dataaccess.resulthandler;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Properties;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.ibatis.session.ResultContext;
import org.apache.ibatis.session.ResultHandler;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Properties;
+
/**
* 쿼리결과를 파일로 출력하는 ResultHandler
*
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/rowhandler/FileWritingRowHandler.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/rowhandler/FileWritingRowHandler.java
index 5480eab1..93063aea 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/rowhandler/FileWritingRowHandler.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/rowhandler/FileWritingRowHandler.java
@@ -1,20 +1,18 @@
package org.egovframe.rte.psl.dataaccess.rowhandler;
+import com.ibatis.sqlmap.client.event.RowHandler;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Properties;
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import com.ibatis.sqlmap.client.event.RowHandler;
-
@Scope("prototype")
@Component("fileWritingRowHandler")
public class FileWritingRowHandler implements RowHandler {
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/utils/CamelUtilTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/utils/CamelUtilTest.java
index 2bc707f8..43dc8594 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/utils/CamelUtilTest.java
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/utils/CamelUtilTest.java
@@ -1,10 +1,10 @@
package org.egovframe.rte.psl.dataaccess.utils;
-import static org.junit.Assert.*;
-
import org.egovframe.rte.psl.dataaccess.util.CamelUtil;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class CamelUtilTest {
@Test
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/resources/META-INF/spring/context-datasource.xml b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/resources/META-INF/spring/context-datasource.xml
index b7b452c1..9c699ac1 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/resources/META-INF/spring/context-datasource.xml
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/resources/META-INF/spring/context-datasource.xml
@@ -5,7 +5,7 @@
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/resources/META-INF/spring/jdbc.properties b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/resources/META-INF/spring/jdbc.properties
index 1420ba96..5e0d7501 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/resources/META-INF/spring/jdbc.properties
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/resources/META-INF/spring/jdbc.properties
@@ -1,36 +1,5 @@
jdbc.driver=org.hsqldb.jdbcDriver
-jdbc.dburl=jdbc:hsqldb:mem:testdb
+jdbc.url=jdbc:hsqldb:mem:testdb
jdbc.username=sa
jdbc.password=
usingDBMS=hsql
-
-#jdbc.driver=oracle.jdbc.driver.OracleDriver
-#jdbc.dburl=jdbc:oracle:thin:@202.30.70.32:1521:egovfrm
-#jdbc.username=rte
-#jdbc.password=rte01
-#usingDBMS=oracle
-
-#jdbc.driver=com.mysql.jdbc.Driver
-#jdbc.dburl=jdbc:mysql://db2:1621/rte
-#jdbc.username=rte
-#jdbc.password=rte01
-#usingDBMS=mysql
-
-#jdbc.driver=com.tmax.tibero.jdbc.TbDriver
-#jdbc.dburl=jdbc:tibero:thin:@db1:1821:egovfrm
-#jdbc.username=tibero
-#jdbc.password=tmax
-#usingDBMS=tibero
-
-#jdbc.dburl=jdbc:Altibase://192.168.200.22:1721/?user=rte&password=rte01&encoding=UTF8&portNumber=1721&databaseName=egovfrm
-#jdbc.driver=Altibase.jdbc.driver.AltibaseDriver
-#jdbc.dburl=jdbc:Altibase://db1:1721/egovfrm
-#jdbc.username=rte
-#jdbc.password=rte01
-#usingDBMS=altibase
-
-#jdbc.driver=oracle.jdbc.driver.OracleDriver
-#jdbc.dburl=jdbc:oracle:thin:@localhost:1521:test2
-#jdbc.username=test2
-#jdbc.password=test2
-#usingDBMS=oracle
\ No newline at end of file
diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/resources/META-INF/testdata/outResultFile.txt b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/resources/META-INF/testdata/outResultFile.txt
index 177a0655..75ce26f3 100644
--- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/resources/META-INF/testdata/outResultFile.txt
+++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/resources/META-INF/testdata/outResultFile.txt
@@ -1,156 +1,4 @@
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@7a34b7b8[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@74a9c4b0[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@85ec632[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@1c05a54d[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@65ef722a[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@5fd9b663[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@214894fc[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@10567255[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@e362c57[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@1c4ee95c[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@79c4715d[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@5aa360ea[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@6548bb7d[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@e27ba81[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@54336c81[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@3d829787[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@71652c98[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@51bde877[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@60b85ba1[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@492fc69e[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@117632cf[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@2fb68ec6[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@d71adc2[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@3add81c4[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@1a1d3c1a[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@1c65121[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@159e366[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@57dc9128[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@24528a25[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@17ae98d7[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@59221b97[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@6ac4944a[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@5a772895[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@39fc6b2c[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@704b2127[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@3ee39da0[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@5d332969[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@7cc9ce8[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@2e27d72f[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@c0b41d6[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@4837595f[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@2bffa76d[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@3b718392[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@6d2260db[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@1f2d2181[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@49bf29c6[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@7ee55e70[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@3fcdcf[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@7668d560[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@46292372[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@126be319[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@6c44052e[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@5c371e13[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@530a8454[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@1e34c607[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@5215cd9a[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@36b6964d[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@31198ceb[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@9257031[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@75201592[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@7726e185[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@aa5455e[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@282308c3[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@5dda14d0[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@1db0ec27[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@3d9fc57a[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@d4ab71a[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@3b4ef7[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@1af05b03[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@5987e932[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@1ad777f[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@5bbbdd4b[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@438bad7c[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@25230246[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@4fdf8f12[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@4a8b5227[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@54f5f647[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@6979efad[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@5a6d5a8f[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@4a67318f[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@315ba14a[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@17f9344b[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@27f0ad19[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@54e81b21[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@38d5b107[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@6650813a[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@44ea608c[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@50cf5a23[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@450794b4[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@273c947f[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@30457e14[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@1af1347d[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@632aa1a3[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@20765ed5[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@3b582111[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@2899a8db[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@1e8823d2[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@c1a4620[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@76b0ae1b[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@130a0f66[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@4c432866[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@12365c88[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@6105f8a3[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@2237bada[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@77e2a6e2[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@5710768a[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@199e4c2b[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@6e0d4a8[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@64d7b720[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@30272916[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@5bb3d42d[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@5bf61e67[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@2c1dc8e[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@b273a59[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@4e7095ac[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@251ebf23[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@29b732a2[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@1b70203f[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@51671b08[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@15051a0[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@1162410a[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@b09fac1[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@62df0ff3[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@61019f59[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@62e8f862[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@26f3d90c[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@3c49fab6[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@515f4131[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@74518890[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@4c5204af[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@3f3ddbd9[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@14c053c6[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@6c2d4cc6[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@30865a90[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@6134ac4a[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@777c9dc9[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@71b1a49c[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@73e132e0[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@3773862a[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@2472c7d8[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
org.egovframe.rte.psl.dataaccess.vo.EmpVO@589b028e[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@22175d4f[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@9fecdf1[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@3b809711[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@3b0f7d9d[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@236ab296[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@5c84624f[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@63034ed1[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@232024b9[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@55a8dc49[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@2a415aa9[comm=,deptNo=20,empName=SMITH,empNo=7369,hireDate=Wed Dec 17 00:00:00 KST 1980,job=CLERK,mgr=7902,sal=800]
-org.egovframe.rte.psl.dataaccess.vo.EmpVO@53cdecf6[comm=