[ch07] use self-reference to separate responsibility.

src/main/java/ch07/springbook/sql/SqlRetrievalFailureException.java

@@ -9,4 +9,8 @@ public SqlRetrievalFailureException(String message) {
 	public SqlRetrievalFailureException(String message, Throwable cause) {
 		super(message, cause);
 	}
+
+	public SqlRetrievalFailureException(Throwable cause) {
+		super(cause);
+	}
 }

src/main/java/ch07/springbook/sql/XmlSqlService.java

@@ -10,17 +10,62 @@
 import javax.xml.bind.Unmarshaller;
 
 import ch01.springbook.user.dao.UserDao;
+import ch07.springbook.sql.reader.SqlReader;
+import ch07.springbook.sql.registry.SqlNotFoundException;
+import ch07.springbook.sql.registry.SqlRegistry;
+
+public class XmlSqlService implements SqlService, SqlRegistry, SqlReader {
+
+	private SqlReader sqlReader;
+	private SqlRegistry sqlRegistry;
 
-public class XmlSqlService implements SqlService {
 	private Map<String, String> sqlMap = new HashMap<>();
 	private String sqlMapFile;
 
+	public void setSqlReader(SqlReader sqlReader) {
+		this.sqlReader = sqlReader;
+	}
+
+	public void setSqlRegistry(SqlRegistry sqlRegistry) {
+		this.sqlRegistry = sqlRegistry;
+	}
+
 	public void setSqlMapFile(String sqlMapFile) {
 		this.sqlMapFile = sqlMapFile;
 	}
 
 	@PostConstruct
 	public void loadSql() {
+		sqlReader.read(sqlRegistry);
+	}
+
+	@Override
+	public String getSql(String key) throws SqlRetrievalFailureException {
+		try {
+			return sqlRegistry.findSql(key);
+		} catch (SqlNotFoundException e) {
+			throw new SqlRetrievalFailureException(e);
+		}
+	}
+
+	@Override
+	public void registerSql(String key, String sql) {
+		sqlMap.put(key, sql);
+	}
+
+	@Override
+	public String findSql(String key) throws SqlNotFoundException {
+		String sql = sqlMap.get(key);
+
+		if (sql == null) {
+			throw new SqlRetrievalFailureException("Can not find appropriate sql statement, key: " + key);
+		}
+
+		return sql;
+	}
+
+	@Override
+	public void read(SqlRegistry sqlRegistry) {
 		String contextPath = Sqlmap.class.getPackage().getName();
 
 		try {
@@ -30,22 +75,11 @@ public void loadSql() {
 			Sqlmap sqlmap = (Sqlmap)unmarshaller.unmarshal(inputStream);
 
 			for (SqlType sql : sqlmap.getSql()) {
-				sqlMap.put(sql.getKey(), sql.getValue());
+				sqlRegistry.registerSql(sql.getKey(), sql.getValue());
 			}
 
 		} catch (JAXBException e) {
 			throw new RuntimeException(e);
 		}
 	}
-
-	@Override
-	public String getSql(String key) throws SqlRetrievalFailureException {
-		String sql = sqlMap.get(key);
-
-		if (sql == null) {
-			throw new SqlRetrievalFailureException("Can not find appropriate sql statement, key: " + key);
-		}
-
-		return sql;
-	}
 }

src/main/java/ch07/springbook/sql/reader/SqlReader.java

@@ -0,0 +1,7 @@
+package ch07.springbook.sql.reader;
+
+import ch07.springbook.sql.registry.SqlRegistry;
+
+public interface SqlReader {
+	void read(SqlRegistry sqlRegistry);
+}

src/main/java/ch07/springbook/sql/registry/SqlNotFoundException.java

@@ -0,0 +1,12 @@
+package ch07.springbook.sql.registry;
+
+public class SqlNotFoundException extends RuntimeException {
+
+	public SqlNotFoundException(String message) {
+		super(message);
+	}
+
+	public SqlNotFoundException(String message, Throwable cause) {
+		super(message, cause);
+	}
+}

src/main/java/ch07/springbook/sql/registry/SqlRegistry.java

@@ -0,0 +1,6 @@
+package ch07.springbook.sql.registry;
+
+public interface SqlRegistry {
+	void registerSql(String key, String sql);
+	String findSql(String key) throws SqlNotFoundException;
+}

src/main/resources/applicationContext.xml

@@ -41,6 +41,8 @@
     <bean id="testUserService" class="ch01.springbook.user.UserServiceTest$TestUserService" parent="userService" />
 
     <bean id="sqlService" class="ch07.springbook.sql.XmlSqlService" >
+        <property name="sqlReader" ref="sqlService" />
+        <property name="sqlRegistry" ref="sqlService" />
         <property name="sqlMapFile" value="/sql/sqlmap.xml" />
     </bean>
     <!--