SeriesController: extract duplicated code to separate methods.

Related to #717

No functional changes.

Author: php-coder

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

@@ -137,16 +137,9 @@ public void showForm(
 
 		String lang = LocaleUtils.getLanguageOrNull(userLocale);
 
-		List<CategoryDto> categories =
-			categoryService.findCategoriesWithParents(lang);
-		List<FirstLevelCategoryDto> groupedCategories =
-			GroupByParent.transformCategories(categories);
-		model.addAttribute("categories", groupedCategories);
-		
-		List<LinkEntityDto> countries = countryService.findAllAsLinkEntities(lang);
-		model.addAttribute("countries", countries);
-		
-		model.addAttribute("years", YEARS);
+		addCategoriesToModel(model, lang);
+		addCountriesToModel(model, lang);
+		addYearToModel(model);
 
 		AddSeriesForm addSeriesForm = new AddSeriesForm();
 		addSeriesForm.setPerforated(true);
@@ -222,16 +215,9 @@ public String processInput(
 		if (result.hasErrors()) {
 			String lang = LocaleUtils.getLanguageOrNull(userLocale);
 
-			List<CategoryDto> categories =
-				categoryService.findCategoriesWithParents(lang);
-			List<FirstLevelCategoryDto> groupedCategories =
-				GroupByParent.transformCategories(categories);
-			model.addAttribute("categories", groupedCategories);
-			
-			List<LinkEntityDto> countries = countryService.findAllAsLinkEntities(lang);
-			model.addAttribute("countries", countries);
-			
-			model.addAttribute("years", YEARS);
+			addCategoriesToModel(model, lang);
+			addCountriesToModel(model, lang);
+			addYearToModel(model);
 
 			// don't try to re-display file upload field
 			form.setImage(null);
@@ -493,6 +479,24 @@ public String searchSeriesByCatalog(
 		return "series/search_result";
 	}
 
+	private void addCategoriesToModel(Model model, String lang) {
+		List<CategoryDto> categories = categoryService.findCategoriesWithParents(lang);
+		
+		List<FirstLevelCategoryDto> groupedCategories =
+			GroupByParent.transformCategories(categories);
+		
+		model.addAttribute("categories", groupedCategories);
+	}
+	
+	private void addCountriesToModel(Model model, String lang) {
+		List<LinkEntityDto> countries = countryService.findAllAsLinkEntities(lang);
+		model.addAttribute("countries", countries);
+	}
+	
+	private void addYearToModel(Model model) {
+		model.addAttribute("years", YEARS);
+	}
+	
 	// CheckStyle: ignore LineLength for next 1 line
 	private Map<String, ?> prepareCommonAttrsForSeriesInfo(SeriesDto series, Integer currentUserId) {
 		Map<String, Object> model = new HashMap<>();