diff --git a/src/main/java/com/toby/tobyspring/user/dao/UserDao.java b/src/main/java/com/toby/tobyspring/user/dao/UserDao.java
index 2fb8d9f..859d674 100644
--- a/src/main/java/com/toby/tobyspring/user/dao/UserDao.java
+++ b/src/main/java/com/toby/tobyspring/user/dao/UserDao.java
@@ -14,11 +14,10 @@ public class UserDao {
private JdbcContext jdbcContext;
public void setDataSource(DataSource dataSource) {
- this.dataSource = dataSource;
- }
+ this.jdbcContext = new JdbcContext();
+ this.jdbcContext.setDataSource(dataSource);
- public void setJdbcContext(JdbcContext jdbcContext) {
- this.jdbcContext = jdbcContext;
+ this.dataSource = dataSource;
}
public void add(final User user) throws SQLException {
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
index 4b8c706..1de6718 100644
--- a/src/main/resources/applicationContext.xml
+++ b/src/main/resources/applicationContext.xml
@@ -3,10 +3,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-
-
-
@@ -16,6 +12,5 @@
-
\ No newline at end of file
diff --git a/src/test/java/com/toby/tobyspring/user/dao/UserDaoTest.java b/src/test/java/com/toby/tobyspring/user/dao/UserDaoTest.java
index 81753f2..7a91527 100644
--- a/src/test/java/com/toby/tobyspring/user/dao/UserDaoTest.java
+++ b/src/test/java/com/toby/tobyspring/user/dao/UserDaoTest.java
@@ -30,10 +30,6 @@ public void setup() {
DataSource dataSource = new SingleConnectionDataSource("jdbc:oracle:thin:@localhost:1521:orcl", "dahye", "test", true);
userDao.setDataSource(dataSource);
- JdbcContext jdbcContext = new JdbcContext();
- jdbcContext.setDataSource(dataSource);
- userDao.setJdbcContext(jdbcContext);
-
user1 = new User("dahyekim", "김다혜", "dahye");
user2 = new User("toby", "토비", "toby");
user3 = new User("whiteship", "백기선", "white");