[ch07] Use @import annotation.

src/main/java/com/AppContext.java

@@ -6,26 +6,20 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 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.dao.UserDao;
-import ch07.springbook.sql.OxmSqlService;
-import ch07.springbook.sql.SqlService;
-import ch07.springbook.sql.registry.EmbeddedDbSqlRegistry;
-import ch07.springbook.sql.registry.SqlRegistry;
 
 @Configuration
 @EnableTransactionManagement
 @ComponentScan(basePackages = "ch01")
+@Import(SqlServiceContext.class)
 public class AppContext {
 
 	@Autowired
@@ -48,33 +42,4 @@ public PlatformTransactionManager transactionManager() {
 		transactionManager.setDataSource(dataSource());
 		return transactionManager;
 	}
-
-	@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();
-	}
 }

src/main/java/com/SqlServiceContext.java

@@ -0,0 +1,47 @@
+package com;
+
+import javax.sql.DataSource;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+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 ch07.springbook.sql.OxmSqlService;
+import ch07.springbook.sql.SqlService;
+import ch07.springbook.sql.registry.EmbeddedDbSqlRegistry;
+import ch07.springbook.sql.registry.SqlRegistry;
+
+@Configuration
+public class SqlServiceContext {
+	@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();
+	}
+}