refactor: move a method from CountryController to SeriesController to reduce a coupling.

Fix #1052

Author: php-coder

src/main/java/ru/mystamps/web/feature/country/CountryConfig.java

@@ -22,7 +22,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
-import ru.mystamps.web.feature.series.SeriesService;
 
 /**
  * Spring configuration that is required for using countries in an application.
@@ -37,11 +36,10 @@ public class CountryConfig {
 	public static class Controllers {
 
 		private final CountryService countryService;
-		private final SeriesService seriesService;
 
 		@Bean
 		public CountryController countryController() {
-			return new CountryController(countryService, seriesService);
+			return new CountryController(countryService);
 		}
 
 		@Bean

src/main/java/ru/mystamps/web/feature/country/CountryController.java

@@ -32,8 +32,7 @@
 import org.springframework.web.servlet.view.RedirectView;
 import ru.mystamps.web.common.LinkEntityDto;
 import ru.mystamps.web.common.LocaleUtils;
-import ru.mystamps.web.feature.series.SeriesInfoDto;
-import ru.mystamps.web.feature.series.SeriesService;
+import ru.mystamps.web.feature.series.SeriesUrl;
 import ru.mystamps.web.support.spring.mvc.ReplaceRepeatingSpacesEditor;
 import ru.mystamps.web.support.spring.security.CurrentUser;
 
@@ -50,7 +49,6 @@
 public class CountryController {
 
 	private final CountryService countryService;
-	private final SeriesService seriesService;
 
 	@InitBinder("addCountryForm")
 	protected void initBinder(WebDataBinder binder) {
@@ -81,35 +79,7 @@ public String processInput(
 
 		redirectAttributes.addFlashAttribute("justAddedCountry", true);
 
-		return redirectTo(CountryUrl.INFO_COUNTRY_PAGE, slug);
-	}
-	
-	// CheckStyle: ignore LineLength for next 1 line
-	// @todo #927 CountryController: remove dependency on SeriesService by moving showInfoBySlug() method
-	@GetMapping(CountryUrl.INFO_COUNTRY_PAGE)
-	public String showInfoBySlug(
-		@Country @PathVariable("slug") LinkEntityDto country,
-		Model model,
-		Locale userLocale,
-		HttpServletResponse response)
-		throws IOException {
-		
-		if (country == null) {
-			response.sendError(HttpServletResponse.SC_NOT_FOUND);
-			return null;
-		}
-		
-		String slug = country.getSlug();
-		String name = country.getName();
-		
-		String lang = LocaleUtils.getLanguageOrNull(userLocale);
-		List<SeriesInfoDto> series = seriesService.findByCountrySlug(slug, lang);
-		
-		model.addAttribute("countrySlug", slug);
-		model.addAttribute("countryName", name);
-		model.addAttribute("seriesOfCountry", series);
-		
-		return "country/info";
+		return redirectTo(SeriesUrl.INFO_COUNTRY_PAGE, slug);
 	}
 
 	/**
@@ -128,7 +98,7 @@ public View showInfoById(
 
 		RedirectView view = new RedirectView();
 		view.setStatusCode(HttpStatus.MOVED_PERMANENTLY);
-		view.setUrl(CountryUrl.INFO_COUNTRY_PAGE);
+		view.setUrl(SeriesUrl.INFO_COUNTRY_PAGE);
 
 		return view;
 	}

src/main/java/ru/mystamps/web/feature/country/CountryUrl.java

@@ -32,7 +32,6 @@ public final class CountryUrl {
 	public static final String SUGGEST_SERIES_COUNTRY = "/suggest/series_country";
 	public static final String ADD_COUNTRY_PAGE       = "/country/add";
 	static final String GET_COUNTRIES_PAGE            = "/countries";
-	static final String INFO_COUNTRY_PAGE             = "/country/{slug}";
 
 	// For backward compatibility
 	static final String LIST_COUNTRIES_PAGE     = "/country/list";
@@ -44,7 +43,6 @@ private CountryUrl() {
 	public static void exposeUrlsToView(Map<String, String> urls) {
 		urls.put("ADD_COUNTRY_PAGE", ADD_COUNTRY_PAGE);
 		urls.put("GET_COUNTRIES_PAGE", GET_COUNTRIES_PAGE);
-		urls.put("INFO_COUNTRY_PAGE", INFO_COUNTRY_PAGE);
 		urls.put("SUGGEST_SERIES_COUNTRY", SUGGEST_SERIES_COUNTRY);
 	}
 

src/main/java/ru/mystamps/web/feature/series/SeriesController.java

@@ -255,6 +255,32 @@ public String showInfo(
 		return "series/info";
 	}
 
+	@GetMapping(SeriesUrl.INFO_COUNTRY_PAGE)
+	public String showInfoByCountrySlug(
+		@Country @PathVariable("slug") LinkEntityDto country,
+		Model model,
+		Locale userLocale,
+		HttpServletResponse response)
+		throws IOException {
+		
+		if (country == null) {
+			response.sendError(HttpServletResponse.SC_NOT_FOUND);
+			return null;
+		}
+		
+		String slug = country.getSlug();
+		String name = country.getName();
+		
+		String lang = LocaleUtils.getLanguageOrNull(userLocale);
+		List<SeriesInfoDto> series = seriesService.findByCountrySlug(slug, lang);
+		
+		model.addAttribute("countrySlug", slug);
+		model.addAttribute("countryName", name);
+		model.addAttribute("seriesOfCountry", series);
+		
+		return "country/info";
+	}
+	
 	@SuppressWarnings("checkstyle:parameternumber")
 	@PostMapping(path = SeriesUrl.ADD_IMAGE_SERIES_PAGE, params = "imageUrl")
 	public String processImageWithImageUrl(

src/main/java/ru/mystamps/web/feature/series/SeriesUrl.java

@@ -32,6 +32,7 @@ public final class SeriesUrl {
 	public static final String ADD_SERIES_PAGE          = "/series/add";
 	public static final String ADD_SERIES_ASK_PAGE      = "/series/{id}/ask";
 	public static final String INFO_SERIES_PAGE         = "/series/{id}";
+	public static final String INFO_COUNTRY_PAGE        = "/country/{slug}";
 	public static final String ADD_IMAGE_SERIES_PAGE    = "/series/{id}/image";
 	public static final String SERIES_INFO_PAGE_REGEXP  = "/series/(\\d+|\\d+/(ask|image))";
 	static final String SEARCH_SERIES_BY_CATALOG        = "/series/search/by_catalog";
@@ -47,6 +48,7 @@ public static void exposeUrlsToView(Map<String, String> urls) {
 		urls.put("ADD_IMAGE_SERIES_PAGE", ADD_IMAGE_SERIES_PAGE);
 		urls.put("ADD_SERIES_ASK_PAGE", ADD_SERIES_ASK_PAGE);
 		urls.put("ADD_SERIES_PAGE", ADD_SERIES_PAGE);
+		urls.put("INFO_COUNTRY_PAGE", INFO_COUNTRY_PAGE);
 		urls.put("INFO_SERIES_PAGE", INFO_SERIES_PAGE);
 		urls.put("SEARCH_SERIES_BY_CATALOG", SEARCH_SERIES_BY_CATALOG);
 	}