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

Now JdbcCountryDaoTest doesn't depend on a service class and we can stop @ignore this test. This
removes a hack that has been added in e004fa3 commit (#1163).

Part of #1150

Author: php-coder

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

@@ -28,6 +28,7 @@
 
 @Configuration
 @Import({
+	DaoConfig.class,
 	SecurityConfig.class,
 	ServicesConfig.class,
 	TaskExecutorConfig.class,

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

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2009-2019 Slava Semushin <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package ru.mystamps.web.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import ru.mystamps.web.feature.country.CountryConfig;
+
+@Configuration
+@Import({
+	CountryConfig.Daos.class
+})
+public class DaoConfig {
+}

src/main/java/ru/mystamps/web/feature/country/CountryConfig.java

@@ -28,8 +28,9 @@
 /**
  * Spring configuration that is required for using countries 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 CountryConfig {
@@ -54,12 +55,12 @@ public SuggestionController suggestionCountryController() {
 	@RequiredArgsConstructor
 	public static class Services {
 
+		private final CountryDao countryDao;
 		private final Environment env;
-		private final NamedParameterJdbcTemplate jdbcTemplate;
 		private final RestTemplateBuilder restTemplateBuilder;
 
 		@Bean
-		public CountryService countryService(CountryDao countryDao) {
+		public CountryService countryService() {
 			return new TogglzWithFallbackCountryService(
 				new ApiCountryService(restTemplateBuilder, env),
 				new CountryServiceImpl(
@@ -69,6 +70,13 @@ public CountryService countryService(CountryDao countryDao) {
 			);
 		}
 
+	}
+	
+	@RequiredArgsConstructor
+	public static class Daos {
+		
+		private final NamedParameterJdbcTemplate jdbcTemplate;
+		
 		@Bean
 		public CountryDao countryDao() {
 			return new JdbcCountryDao(jdbcTemplate);

src/test/java/ru/mystamps/web/feature/country/JdbcCountryDaoTest.java

@@ -19,7 +19,6 @@
 package ru.mystamps.web.feature.country;
 
 import org.assertj.core.api.WithAssertions;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,15 +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;
 
-// FIXME: deal with failing tests
-@Ignore
 @JdbcTest
-// LATER: use a single application context with DAOs (see #1150)
-@ContextConfiguration(classes = CountryConfig.Services.class)
+@ContextConfiguration(classes = DaoConfig.class)
 @TestPropertySource(
 	properties = {
 		// don't load test data, start with an empty database