ParticipantConfig: 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

@@ -32,13 +32,15 @@
 import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.feature.country.CountryConfig;
 import ru.mystamps.web.feature.country.CountryService;
-import ru.mystamps.web.feature.participant.ParticipantController;
+import ru.mystamps.web.feature.participant.ParticipantConfig;
+import ru.mystamps.web.feature.participant.ParticipantService;
 
 @Configuration
 @RequiredArgsConstructor
 @Import({
 	CategoryConfig.Controllers.class,
-	CountryConfig.Controllers.class
+	CountryConfig.Controllers.class,
+	ParticipantConfig.Controllers.class
 })
 public class ControllersConfig {
 
@@ -47,6 +49,7 @@ public class ControllersConfig {
 	private final ApplicationEventPublisher eventPublisher;
 	private final CategoryService categoryService;
 	private final CountryService countryService;
+	private final ParticipantService participantService;
 
 	@Bean
 	public AccountController getAccountController() {
@@ -77,11 +80,6 @@ public ErrorController getErrorController() {
 		return new ErrorController(servicesConfig.getSiteService());
 	}
 
-	@Bean
-	public ParticipantController getParticipantController() {
-		return new ParticipantController(servicesConfig.getParticipantService());
-	}
-	
 	@Bean
 	public RobotsTxtController getRobotsTxtController() {
 		return new RobotsTxtController();
@@ -104,7 +102,7 @@ public SeriesController getSeriesController() {
 			servicesConfig.getSeriesService(),
 			servicesConfig.getSeriesImportService(),
 			servicesConfig.getSeriesSalesService(),
-			servicesConfig.getParticipantService()
+			participantService
 		);
 	}
 
@@ -115,7 +113,7 @@ public SeriesImportController getSeriesImportController() {
 			servicesConfig.getSeriesSalesService(),
 			servicesConfig.getSeriesSalesImportService(),
 			getSeriesController(),
-			servicesConfig.getParticipantService(),
+			participantService,
 			eventPublisher
 		);
 	}

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.participant.JdbcParticipantDao;
-import ru.mystamps.web.feature.participant.ParticipantDao;
 
 @Configuration
 @PropertySource("classpath:/sql/stamps_catalog_dao_queries.properties")
@@ -133,11 +131,6 @@ public SuspiciousActivityDao getSuspiciousActivityDao() {
 		return new JdbcSuspiciousActivityDao(jdbcTemplate);
 	}
 
-	@Bean
-	public ParticipantDao getParticipantDao() {
-		return new JdbcParticipantDao(jdbcTemplate);
-	}
-	
 	@Bean
 	public StampsCatalogDao getYvertCatalogDao() {
 		return new JdbcStampsCatalogDao(

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

@@ -35,16 +35,17 @@
 import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.feature.country.CountryConfig;
 import ru.mystamps.web.feature.country.CountryService;
+import ru.mystamps.web.feature.participant.ParticipantConfig;
 import ru.mystamps.web.feature.participant.ParticipantService;
-import ru.mystamps.web.feature.participant.ParticipantServiceImpl;
 // CheckStyle: ignore AvoidStarImportCheck for next 1 line
 import ru.mystamps.web.service.*; // NOPMD: UnusedImports
 import ru.mystamps.web.support.spring.security.SecurityConfig;
 
 @Configuration
 @Import({
 	CategoryConfig.Services.class,
-	CountryConfig.Services.class
+	CountryConfig.Services.class,
+	ParticipantConfig.Services.class
 })
 @RequiredArgsConstructor
 @SuppressWarnings("PMD.CouplingBetweenObjects")
@@ -59,6 +60,7 @@ public class ServicesConfig {
 	private final ApplicationEventPublisher eventPublisher;
 	private final CategoryService categoryService;
 	private final CountryService countryService;
+	private final ParticipantService participantService;
 
 	@Bean
 	public SuspiciousActivityService getSuspiciousActivityService() {
@@ -180,7 +182,7 @@ public SeriesImportService getSeriesImportService() {
 			getSeriesSalesService(),
 			getSeriesSalesImportService(),
 			getSeriesInfoExtractorService(),
-			getParticipantService(),
+			participantService,
 			eventPublisher
 		);
 	}
@@ -193,7 +195,7 @@ public SeriesInfoExtractorService getSeriesInfoExtractorService() {
 				LoggerFactory.getLogger(SeriesInfoExtractorServiceImpl.class),
 				categoryService,
 				countryService,
-				getParticipantService()
+				participantService
 			)
 		);
 	}
@@ -287,12 +289,4 @@ public StampsCatalogService getZagorskiCatalogService() {
 		);
 	}
 
-	@Bean
-	public ParticipantService getParticipantService() {
-		return new ParticipantServiceImpl(
-			LoggerFactory.getLogger(ParticipantServiceImpl.class),
-			daoConfig.getParticipantDao()
-		);
-	}
-	
 }

src/main/java/ru/mystamps/web/feature/participant/ParticipantConfig.java

@@ -0,0 +1,69 @@
+/*
+ * 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.participant;
+
+import org.slf4j.LoggerFactory;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+
+import lombok.RequiredArgsConstructor;
+
+/**
+ * Spring configuration that is required for transaction participants (buyers and sellers).
+ *
+ * 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 ParticipantConfig {
+	
+	@RequiredArgsConstructor
+	public static class Controllers {
+		
+		private final ParticipantService participantService;
+		
+		@Bean
+		public ParticipantController participantController() {
+			return new ParticipantController(participantService);
+		}
+		
+	}
+	
+	@RequiredArgsConstructor
+	public static class Services {
+		
+		private final NamedParameterJdbcTemplate jdbcTemplate;
+		
+		@Bean
+		public ParticipantService participantService(ParticipantDao participantDao) {
+			return new ParticipantServiceImpl(
+				LoggerFactory.getLogger(ParticipantServiceImpl.class),
+				participantDao
+			);
+		}
+		
+		@Bean
+		public ParticipantDao participantDao() {
+			return new JdbcParticipantDao(jdbcTemplate);
+		}
+		
+	}
+	
+}