[ch07] Replace XML application context using @configuration class.

pom.xml

@@ -19,6 +19,7 @@
         <cglib.version>3.1</cglib.version>
         <junit.version>4.12</junit.version>
         <hsqldb.version>2.3.5</hsqldb.version>
+        <h2.version>1.4.196</h2.version>
     </properties>
 
     <dependencies>
@@ -101,6 +102,12 @@
             <version>${hsqldb.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+        </dependency>
+
     </dependencies>
 
     <build>

src/test/java/ch01/springbook/user/UserServiceTest.java

@@ -35,7 +35,7 @@ static class TestUserServiceException extends RuntimeException {
 
 	}
 
-	static class TestUserService extends UserServiceImpl {
+	public static class TestUserService extends UserServiceImpl {
 		private String id = "test04";
 
 		private TestUserService(String id) {

src/test/java/ch06/springbook/factorybean/FactoryBeanTest.java

@@ -3,10 +3,12 @@
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
 
+import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -25,10 +27,4 @@ public void getMessageFromFactoryBeanTest() {
 		assertThat(Message.class.isInstance(message), is(true));
 		assertThat(((Message)message).getText(), is("Factory Bean"));
 	}
-
-	@Test
-	public void getFactoryBeanTest() {
-		Object factory = applicationContext.getBean("&message");
-		assertThat(MessageFactoryBean.class.isInstance(factory), is(true));
-	}
 }

src/test/java/ch07/springbook/AbstractUpdatableSqlRegistryTest.java

@@ -9,7 +9,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import ch07.springbook.sql.registry.ConcurrentHashMapSqlRegistry;
 import ch07.springbook.sql.registry.SqlNotFoundException;
 import ch07.springbook.sql.registry.SqlUpdateFailureException;
 import ch07.springbook.sql.registry.UpdatableSqlRegistry;

src/test/java/ch07/springbook/EmbeddedDbSqlRegistryTest.java

@@ -21,7 +21,7 @@ public class EmbeddedDbSqlRegistryTest extends AbstractUpdatableSqlRegistryTest
 
 	@Override
 	protected UpdatableSqlRegistry createUpdatableSqlRegistry() {
-		db = new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL)
+		db = new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2)
 										  .addScript("classpath:sql/embedded/schema.sql")
 										  .build();
 

src/test/java/ch07/springbook/EmbeddedDbTest.java

@@ -22,7 +22,7 @@ public class EmbeddedDbTest {
 	@Before
 	public void setUp() {
 		db = new EmbeddedDatabaseBuilder()
-				.setType(EmbeddedDatabaseType.HSQL)
+				.setType(EmbeddedDatabaseType.H2)
 				.addScript("classpath:sql/embedded/schema.sql")
 				.addScript("classpath:sql/embedded/data.sql")
 				.build();

src/test/java/test/TestApplicationContext.java

@@ -1,9 +1,110 @@
 package test;
 
+import javax.sql.DataSource;
+
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.jdbc.datasource.SimpleDriverDataSource;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+import org.springframework.oxm.Unmarshaller;
+import org.springframework.oxm.jaxb.Jaxb2Marshaller;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import com.mysql.jdbc.Driver;
+
+import ch01.springbook.user.UserService;
+import ch01.springbook.user.UserServiceImpl;
+import ch01.springbook.user.UserServiceTest;
+import ch01.springbook.user.dao.UserDao;
+import ch01.springbook.user.dao.UserDaoJdbc;
+import ch06.springbook.factorybean.Message;
+import ch06.springbook.factorybean.MessageFactoryBean;
+import ch07.springbook.sql.OxmSqlService;
+import ch07.springbook.sql.SqlService;
+import ch07.springbook.sql.registry.EmbeddedDbSqlRegistry;
+import ch07.springbook.sql.registry.SqlRegistry;
 
 @Configuration
-@ImportResource(locations = "/applicationContext.xml")
+@EnableTransactionManagement
 public class TestApplicationContext {
+
+	@Bean
+	public DataSource dataSource() {
+		SimpleDriverDataSource dataSource = new SimpleDriverDataSource();
+		dataSource.setDriverClass(Driver.class);
+		dataSource.setUrl("jdbc:mysql://localhost/tobystudy?useUnicode=true&characterEncoding=UTF-8&useSSL=true&verifyServerCertificate=false");
+		dataSource.setUsername("study");
+		dataSource.setPassword("study");
+
+		return dataSource;
+	}
+
+	@Bean
+	public PlatformTransactionManager transactionManager() {
+		DataSourceTransactionManager transactionManager = new DataSourceTransactionManager();
+		transactionManager.setDataSource(dataSource());
+		return transactionManager;
+	}
+
+	@Bean
+	public UserDao userDao() {
+		UserDaoJdbc userDaoJdbc = new UserDaoJdbc();
+		userDaoJdbc.setDataSource(dataSource());
+		userDaoJdbc.setSqlService(sqlService());
+		return userDaoJdbc;
+	}
+
+	@Bean
+	public UserService userService() {
+		UserServiceImpl userService = new UserServiceImpl();
+		userService.setUserDao(userDao());
+		return userService;
+	}
+
+	@Bean
+	public UserService testUserService() {
+		UserServiceTest.TestUserService testUserService = new UserServiceTest.TestUserService();
+		testUserService.setUserDao(userDao());
+		return testUserService;
+	}
+
+	@Bean
+	public SqlService sqlService() {
+		OxmSqlService oxmSqlService = new OxmSqlService();
+		oxmSqlService.setUnmarshaller(unmarshaller());
+		oxmSqlService.setSqlRegistry(sqlRegistry());
+		return oxmSqlService;
+	}
+
+	@Bean
+	public Unmarshaller unmarshaller() {
+		Jaxb2Marshaller jaxb2Marshaller = new Jaxb2Marshaller();
+		jaxb2Marshaller.setContextPath("ch07.springbook.sql.reader.jaxb");
+		return jaxb2Marshaller;
+	}
+
+	@Bean
+	public SqlRegistry sqlRegistry() {
+		EmbeddedDbSqlRegistry embeddedDbSqlRegistry = new EmbeddedDbSqlRegistry();
+		embeddedDbSqlRegistry.setDataSource(embeddedDatabase());
+		return embeddedDbSqlRegistry;
+	}
+
+	@Bean
+	public DataSource embeddedDatabase() {
+		return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL)
+											.addScript("classpath:sql/embedded/schema.sql")
+											.build();
+	}
+
+	@Bean
+	public Message message() throws Exception {
+		MessageFactoryBean messageFactoryBean = new MessageFactoryBean();
+		messageFactoryBean.setText("Factory Bean");
+
+		return messageFactoryBean.getObject();
+	}
 }