CollectionConfig: group Spring configuration into a single config.

Addressed to #927

No functional changes.

Author: php-coder

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

@@ -30,7 +30,8 @@
 import ru.mystamps.web.controller.*; // NOPMD: UnusedImports
 import ru.mystamps.web.feature.category.CategoryConfig;
 import ru.mystamps.web.feature.category.CategoryService;
-import ru.mystamps.web.feature.collection.CollectionController;
+import ru.mystamps.web.feature.collection.CollectionConfig;
+import ru.mystamps.web.feature.collection.CollectionService;
 import ru.mystamps.web.feature.country.CountryConfig;
 import ru.mystamps.web.feature.country.CountryService;
 import ru.mystamps.web.feature.participant.ParticipantConfig;
@@ -40,6 +41,7 @@
 @RequiredArgsConstructor
 @Import({
 	CategoryConfig.Controllers.class,
+	CollectionConfig.Controllers.class,
 	CountryConfig.Controllers.class,
 	ParticipantConfig.Controllers.class
 })
@@ -49,6 +51,7 @@ public class ControllersConfig {
 	private final MessageSource messageSource;
 	private final ApplicationEventPublisher eventPublisher;
 	private final CategoryService categoryService;
+	private final CollectionService collectionService;
 	private final CountryService countryService;
 	private final ParticipantService participantService;
 
@@ -60,17 +63,6 @@ public AccountController getAccountController() {
 		);
 	}
 
-	@Bean
-	public CollectionController getCollectionController() {
-		return new CollectionController(
-			categoryService,
-			servicesConfig.getCollectionService(),
-			countryService,
-			servicesConfig.getSeriesService(),
-			messageSource
-		);
-	}
-	
 	@Bean
 	public ImageController getImageController() {
 		return new ImageController(servicesConfig.getImageService());
@@ -98,7 +90,7 @@ public ReportController getReportController() {
 	public SeriesController getSeriesController() {
 		return new SeriesController(
 			categoryService,
-			servicesConfig.getCollectionService(),
+			collectionService,
 			countryService,
 			servicesConfig.getSeriesService(),
 			servicesConfig.getSeriesImportService(),
@@ -123,7 +115,7 @@ public SeriesImportController getSeriesImportController() {
 	public SiteController getSiteController() {
 		return new SiteController(
 			categoryService,
-			servicesConfig.getCollectionService(),
+			collectionService,
 			countryService,
 			servicesConfig.getSeriesService(),
 			servicesConfig.getSuspiciousActivityService()

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

@@ -28,8 +28,6 @@
 // CheckStyle: ignore AvoidStarImportCheck for next 2 lines
 import ru.mystamps.web.dao.*; // NOPMD: UnusedImports
 import ru.mystamps.web.dao.impl.*; // NOPMD: UnusedImports
-import ru.mystamps.web.feature.collection.CollectionDao;
-import ru.mystamps.web.feature.collection.JdbcCollectionDao;
 
 @Configuration
 @PropertySource("classpath:/sql/stamps_catalog_dao_queries.properties")
@@ -39,11 +37,6 @@ public class DaoConfig {
 	private final NamedParameterJdbcTemplate jdbcTemplate;
 	private final Environment env;
 
-	@Bean
-	public CollectionDao getCollectionDao() {
-		return new JdbcCollectionDao(jdbcTemplate);
-	}
-	
 	@Bean
 	public StampsCatalogDao getGibbonsCatalogDao() {
 		return new JdbcStampsCatalogDao(

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

@@ -33,8 +33,8 @@
 
 import ru.mystamps.web.feature.category.CategoryConfig;
 import ru.mystamps.web.feature.category.CategoryService;
+import ru.mystamps.web.feature.collection.CollectionConfig;
 import ru.mystamps.web.feature.collection.CollectionService;
-import ru.mystamps.web.feature.collection.CollectionServiceImpl;
 import ru.mystamps.web.feature.country.CountryConfig;
 import ru.mystamps.web.feature.country.CountryService;
 import ru.mystamps.web.feature.participant.ParticipantConfig;
@@ -46,6 +46,7 @@
 @Configuration
 @Import({
 	CategoryConfig.Services.class,
+	CollectionConfig.Services.class,
 	CountryConfig.Services.class,
 	ParticipantConfig.Services.class
 })
@@ -61,6 +62,7 @@ public class ServicesConfig {
 	private final MessageSource messageSource;
 	private final ApplicationEventPublisher eventPublisher;
 	private final CategoryService categoryService;
+	private final CollectionService collectionService;
 	private final CountryService countryService;
 	private final ParticipantService participantService;
 
@@ -69,21 +71,13 @@ public SuspiciousActivityService getSuspiciousActivityService() {
 		return new SuspiciousActivityServiceImpl(daoConfig.getSuspiciousActivityDao());
 	}
 
-	@Bean
-	public CollectionService getCollectionService() {
-		return new CollectionServiceImpl(
-			LoggerFactory.getLogger(CollectionServiceImpl.class),
-			daoConfig.getCollectionDao()
-		);
-	}
-	
 	@Bean
 	public CronService getCronService() {
 		return new CronServiceImpl(
 			LoggerFactory.getLogger(CronServiceImpl.class),
 			categoryService,
 			countryService,
-			getCollectionService(),
+			collectionService,
 			getSeriesService(),
 			getSuspiciousActivityService(),
 			getUserService(),
@@ -232,7 +226,7 @@ public UserService getUserService() {
 			LoggerFactory.getLogger(UserServiceImpl.class),
 			daoConfig.getUserDao(),
 			getUsersActivationService(),
-			getCollectionService(),
+			collectionService,
 			securityConfig.getPasswordEncoder()
 		);
 	}

src/main/java/ru/mystamps/web/feature/collection/CollectionConfig.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2009-2018 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.feature.collection;
+
+import org.slf4j.LoggerFactory;
+
+import org.springframework.context.MessageSource;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+
+import lombok.RequiredArgsConstructor;
+
+import ru.mystamps.web.feature.category.CategoryService;
+import ru.mystamps.web.feature.country.CountryService;
+import ru.mystamps.web.service.SeriesService;
+
+/**
+ * Spring configuration that is required for using collections 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.
+ */
+@Configuration
+public class CollectionConfig {
+	
+	@RequiredArgsConstructor
+	public static class Controllers {
+		
+		private final CategoryService categoryService;
+		private final CollectionService collectionService;
+		private final CountryService countryService;
+		private final SeriesService seriesService;
+		private final MessageSource messageSource;
+		
+		@Bean
+		public CollectionController collectionController() {
+			return new CollectionController(
+				categoryService,
+				collectionService,
+				countryService,
+				seriesService,
+				messageSource
+			);
+		}
+		
+	}
+	
+	@RequiredArgsConstructor
+	public static class Services {
+		
+		private final NamedParameterJdbcTemplate jdbcTemplate;
+		
+		@Bean
+		public CollectionService collectionService(CollectionDao collectionDao) {
+			return new CollectionServiceImpl(
+				LoggerFactory.getLogger(CollectionServiceImpl.class),
+				collectionDao
+			);
+		}
+		
+		@Bean
+		public CollectionDao collectionDao() {
+			return new JdbcCollectionDao(jdbcTemplate);
+		}
+		
+	}
+	
+}