refactor(ReportConfig): 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

@@ -34,7 +34,7 @@
 import ru.mystamps.web.feature.country.CountryService;
 import ru.mystamps.web.feature.image.ImageConfig;
 import ru.mystamps.web.feature.participant.ParticipantConfig;
-import ru.mystamps.web.feature.report.ReportController;
+import ru.mystamps.web.feature.report.ReportConfig;
 import ru.mystamps.web.feature.series.SeriesConfig;
 import ru.mystamps.web.feature.series.SeriesService;
 import ru.mystamps.web.feature.series.importing.SeriesImportConfig;
@@ -48,6 +48,7 @@
 	CountryConfig.Controllers.class,
 	ImageConfig.Controllers.class,
 	ParticipantConfig.Controllers.class,
+	ReportConfig.Controllers.class,
 	SeriesConfig.Controllers.class,
 	SeriesImportConfig.Controllers.class
 })
@@ -68,14 +69,6 @@ public ErrorController getErrorController() {
 	public RobotsTxtController getRobotsTxtController() {
 		return new RobotsTxtController();
 	}
-
-	@Bean
-	public ReportController getReportController() {
-		return new ReportController(
-			servicesConfig.getReportService(),
-			servicesConfig.getCronService()
-		);
-	}
 
 	@Bean
 	public SiteController getSiteController() {

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

@@ -37,8 +37,8 @@
 import ru.mystamps.web.feature.country.CountryService;
 import ru.mystamps.web.feature.image.ImageConfig;
 import ru.mystamps.web.feature.participant.ParticipantConfig;
+import ru.mystamps.web.feature.report.ReportConfig;
 import ru.mystamps.web.feature.report.ReportService;
-import ru.mystamps.web.feature.report.ReportServiceImpl;
 import ru.mystamps.web.feature.series.DownloaderService;
 import ru.mystamps.web.feature.series.HttpURLConnectionDownloaderService;
 import ru.mystamps.web.feature.series.SeriesConfig;
@@ -66,6 +66,7 @@
 	CountryConfig.Services.class,
 	ImageConfig.Services.class,
 	ParticipantConfig.Services.class,
+	ReportConfig.Services.class,
 	SeriesConfig.Services.class,
 	SeriesImportConfig.Services.class,
 	SeriesSalesConfig.Services.class,
@@ -82,6 +83,7 @@ public class ServicesConfig {
 	private final CategoryService categoryService;
 	private final CollectionService collectionService;
 	private final CountryService countryService;
+	private final ReportService reportService;
 	private final SeriesService seriesService;
 	private final UserService userService;
 
@@ -136,7 +138,7 @@ public MailService getMailService() {
 		boolean enableTestMode = !isProductionEnvironment;
 
 		return new MailServiceImpl(
-			getReportService(),
+			reportService,
 			mailSender,
 			messageSource,
 			env.getProperty("app.mail.admin.email", "root@localhost"),
@@ -146,14 +148,6 @@ public MailService getMailService() {
 		);
 	}
 
-	@Bean
-	public ReportService getReportService() {
-		return new ReportServiceImpl(
-			messageSource,
-			new Locale(env.getProperty("app.mail.admin.lang", "en"))
-		);
-	}
-	
 	@Bean
 	public SiteService getSiteService() {
 		return new SiteServiceImpl(

src/main/java/ru/mystamps/web/feature/report/ReportConfig.java

@@ -0,0 +1,67 @@
+/*
+ * 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.feature.report;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.MessageSource;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+import ru.mystamps.web.service.CronService;
+
+import java.util.Locale;
+
+/**
+ * Spring configuration that is required for sending reports.
+ *
+ * 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 ReportConfig {
+	
+	@RequiredArgsConstructor
+	public static class Controllers {
+		
+		private final ReportService reportService;
+		private final CronService cronService;
+		
+		@Bean
+		public ReportController reportController() {
+			return new ReportController(reportService, cronService);
+		}
+		
+	}
+	
+	@RequiredArgsConstructor
+	public static class Services {
+		
+		private final Environment env;
+		private final MessageSource messageSource;
+		
+		@Bean
+		public ReportService reportService() {
+			return new ReportServiceImpl(
+				messageSource,
+				new Locale(env.getProperty("app.mail.admin.lang", "en"))
+			);
+		}
+		
+	}
+	
+}