refactor: move SUGGEST_SERIES_COUNTRY constant to CountryUrl.

Should be in 232d41e and 3d03247
commits.

Addressed to #927

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/Url.java

@@ -61,8 +61,6 @@ public final class Url {
 
 	public static final String IMPORT_SERIES_SALES        = "/series/sales/import";
 
-	public static final String SUGGEST_SERIES_COUNTRY     = "/suggest/series_country";
-	
 	public static final String FORBIDDEN_PAGE        = "/error/403";
 	public static final String NOT_FOUND_PAGE        = "/error/404";
 	public static final String INTERNAL_ERROR_PAGE   = "/error/500";
@@ -136,7 +134,6 @@ public static Map<String, String> asMap(boolean production) {
 		map.put("REQUEST_IMPORT_SERIES_PAGE", REQUEST_IMPORT_SERIES_PAGE);
 		map.put("SEARCH_SERIES_BY_CATALOG", SEARCH_SERIES_BY_CATALOG);
 		map.put("SITE_EVENTS_PAGE", SITE_EVENTS_PAGE);
-		map.put("SUGGEST_SERIES_COUNTRY", SUGGEST_SERIES_COUNTRY);
 
 		if (serveContentFromSingleHost) {
 			ImageUrl.exposeResourcesToView(map);

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

@@ -29,9 +29,10 @@
 @SuppressWarnings("PMD.CommentDefaultAccessModifier")
 public final class CountryUrl {
 
-	public static final String ADD_COUNTRY_PAGE   = "/country/add";
-	static final String GET_COUNTRIES_PAGE        = "/countries";
-	static final String INFO_COUNTRY_PAGE         = "/country/{slug}";
+	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,6 +45,7 @@ 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/country/SuggestionController.java

@@ -21,7 +21,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
-import ru.mystamps.web.Url;
 import ru.mystamps.web.support.spring.security.CurrentUser;
 
 @RestController
@@ -34,7 +33,7 @@ class SuggestionController {
 	 * @author John Shkarin
 	 * @author Slava Semushin
 	 */
-	@GetMapping(Url.SUGGEST_SERIES_COUNTRY)
+	@GetMapping(CountryUrl.SUGGEST_SERIES_COUNTRY)
 	public String suggestCountryForUser(@CurrentUser Integer currentUserId) {
 		return StringUtils.defaultString(
 			countryService.suggestCountryForUser(currentUserId),

src/main/java/ru/mystamps/web/support/spring/security/SecurityConfig.java

@@ -90,7 +90,7 @@ protected void configure(HttpSecurity http) throws Exception {
 				.mvcMatchers(Url.ADD_SERIES_PAGE).hasAuthority(StringAuthority.CREATE_SERIES)
 				.mvcMatchers(Url.REQUEST_IMPORT_SERIES_PAGE).hasAuthority(StringAuthority.IMPORT_SERIES)
 				.mvcMatchers(Url.SITE_EVENTS_PAGE).hasAuthority(StringAuthority.VIEW_SITE_EVENTS)
-				.mvcMatchers(Url.SUGGEST_SERIES_COUNTRY).hasAuthority(StringAuthority.CREATE_SERIES)
+				.mvcMatchers(CountryUrl.SUGGEST_SERIES_COUNTRY).hasAuthority(StringAuthority.CREATE_SERIES)
 				.mvcMatchers(Url.DAILY_STATISTICS).hasAuthority(StringAuthority.VIEW_DAILY_STATS)
 				// @todo #884 /collection/{slug}/estimation: only owner should have access to estimation page
 				.mvcMatchers(CollectionUrl.ESTIMATION_COLLECTION_PAGE).hasAuthority(StringAuthority.ADD_SERIES_PRICE)