refactor: move a category dao class into shared dao configutation.

Part of and fixes #1150

Author: php-coder

src/main/java/ru/mystamps/web/config/DaoConfig.java

@@ -20,10 +20,12 @@
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import ru.mystamps.web.feature.category.CategoryConfig;
 import ru.mystamps.web.feature.country.CountryConfig;
 
 @Configuration
 @Import({
+	CategoryConfig.Daos.class,
 	CountryConfig.Daos.class
 })
 public class DaoConfig {

src/main/java/ru/mystamps/web/feature/category/CategoryConfig.java

@@ -26,8 +26,9 @@
 /**
  * Spring configuration that is required for using categories in an application.
  *
- * The beans are grouped into two classes to make possible to register a controller
- * and the services in the separated application contexts.
+ * The beans are grouped into different classes to make possible to register a controller
+ * and the services in the separate application contexts. DAOs have been extracted to use
+ * them independently from services in the tests.
  */
 @Configuration
 public class CategoryConfig {
@@ -52,16 +53,23 @@ public SuggestionController suggestionCategoryController() {
 	@RequiredArgsConstructor
 	public static class Services {
 
-		private final NamedParameterJdbcTemplate jdbcTemplate;
+		private final CategoryDao categoryDao;
 
 		@Bean
-		public CategoryService categoryService(CategoryDao categoryDao) {
+		public CategoryService categoryService() {
 			return new CategoryServiceImpl(
 				LoggerFactory.getLogger(CategoryServiceImpl.class),
 				categoryDao
 			);
 		}
 
+	}
+	
+	@RequiredArgsConstructor
+	public static class Daos {
+		
+		private final NamedParameterJdbcTemplate jdbcTemplate;
+		
 		@Bean
 		public CategoryDao categoryDao() {
 			return new JdbcCategoryDao(jdbcTemplate);

src/test/java/ru/mystamps/web/feature/category/JdbcCategoryDaoTest.java

@@ -27,13 +27,13 @@
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.context.junit4.SpringRunner;
+import ru.mystamps.web.config.DaoConfig;
 import ru.mystamps.web.tests.Random;
 
 import java.util.Map;
 
 @JdbcTest
-// @todo #1143 Introduce a dedicated config for DAO classes
-@ContextConfiguration(classes = CategoryConfig.Services.class)
+@ContextConfiguration(classes = DaoConfig.class)
 @TestPropertySource(
 	properties = {
 		// don't load test data, start with an empty database