refactor(SeriesController): move to ru.mystamps.web.feature.series package.

Addressed to #927

No functional changes.

Author: php-coder

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

@@ -36,6 +36,7 @@
 import ru.mystamps.web.feature.image.ImageConfig;
 import ru.mystamps.web.feature.participant.ParticipantConfig;
 import ru.mystamps.web.feature.participant.ParticipantService;
+import ru.mystamps.web.feature.series.SeriesController;
 
 @Configuration
 @RequiredArgsConstructor

src/main/java/ru/mystamps/web/controller/SeriesImportController.java

@@ -52,6 +52,7 @@
 import ru.mystamps.web.dao.dto.SeriesParsedDataDto;
 import ru.mystamps.web.dao.dto.SeriesSaleParsedDataDto;
 import ru.mystamps.web.feature.participant.ParticipantService;
+import ru.mystamps.web.feature.series.SeriesController;
 import ru.mystamps.web.service.SeriesImportService;
 import ru.mystamps.web.service.SeriesSalesImportService;
 import ru.mystamps.web.util.CatalogUtils;

…mps/web/controller/SeriesController.java …web/feature/series/SeriesController.javasrc/main/java/ru/mystamps/web/controller/SeriesController.java renamed to src/main/java/ru/mystamps/web/feature/series/SeriesController.java src/main/java/ru/mystamps/web/controller/SeriesController.java renamed to src/main/java/ru/mystamps/web/feature/series/SeriesController.java

@@ -15,7 +15,7 @@
  * 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.controller;
+package ru.mystamps.web.feature.series;
 
 import java.io.IOException;
 import java.time.Year;
@@ -525,30 +525,35 @@ public String searchSeriesByCatalog(
 		return "series/search_result";
 	}
 
-	protected void addCategoriesToModel(Model model, String lang) {
+	// "public" in order to be accessible from SeriesImportController
+	public void addCategoriesToModel(Model model, String lang) {
 		List<EntityWithParentDto> categories = categoryService.findCategoriesWithParents(lang);
 
 		List<SelectItem> groupedCategories = GroupByParent.transformEntities(categories);
 
 		model.addAttribute("categories", groupedCategories);
 	}
 
-	protected void addCountriesToModel(Model model, String lang) {
+	// "public" in order to be accessible from SeriesImportController
+	public void addCountriesToModel(Model model, String lang) {
 		List<LinkEntityDto> countries = countryService.findAllAsLinkEntities(lang);
 		model.addAttribute("countries", countries);
 	}
 
-	protected void addYearToModel(Model model) {
+	// "public" in order to be accessible from SeriesImportController
+	public void addYearToModel(Model model) {
 		model.addAttribute("years", YEARS);
 	}
 
-	protected void addSellersToModel(Model model) {
+	// "public" in order to be accessible from SeriesImportController
+	public void addSellersToModel(Model model) {
 		List<EntityWithParentDto> sellers = participantService.findSellersWithParents();
 		List<SelectItem> groupedSellers = GroupByParent.transformEntities(sellers);
 		model.addAttribute("sellers", groupedSellers);
 	}
 
-	protected static void loadErrorsFromDownloadInterceptor(
+	// "public" in order to be accessible from SeriesImportController
+	public static void loadErrorsFromDownloadInterceptor(
 		NullableImageUrl form,
 		BindingResult result,
 		HttpServletRequest request) {

src/main/java/ru/mystamps/web/feature/series/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * Stamps series.
+ */
+package ru.mystamps.web.feature.series;