Deprecate /country/list and add redirect to /countries.

Addressed to #583

No functional changes.

Author: php-coder

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

@@ -64,7 +64,7 @@ public final class Url {
 	public static final String INFO_CATEGORY_PAGE    = "/category/{slug}";
 
 	public static final String ADD_COUNTRY_PAGE      = "/country/add";
-	public static final String LIST_COUNTRIES_PAGE   = "/country/list";
+	public static final String GET_COUNTRIES_PAGE    = "/countries";
 	public static final String INFO_COUNTRY_PAGE     = "/country/{slug}";
 
 	public static final String INFO_COLLECTION_PAGE  = "/collection/{slug}";
@@ -81,6 +81,7 @@ public final class Url {
 	// For backward compatibility
 	public static final String ACTIVATE_ACCOUNT_PAGE_WITH_KEY = "/account/activate/key/{key}";
 	public static final String LIST_CATEGORIES_PAGE           = "/category/list";
+	public static final String LIST_COUNTRIES_PAGE            = "/country/list";
 	public static final String INFO_CATEGORY_BY_ID_PAGE       = "/category/{id}/{slug}";
 	public static final String INFO_COUNTRY_BY_ID_PAGE        = "/country/{id}/{slug}";
 	public static final String INFO_COLLECTION_BY_ID_PAGE     = "/collection/{id}/{slug}";
@@ -146,7 +147,7 @@ public static Map<String, String> asMap(boolean production) {
 		map.put("INFO_COUNTRY_PAGE", INFO_COUNTRY_PAGE);
 		map.put("INFO_SERIES_PAGE", INFO_SERIES_PAGE);
 		map.put("GET_CATEGORIES_PAGE", GET_CATEGORIES_PAGE);
-		map.put("LIST_COUNTRIES_PAGE", LIST_COUNTRIES_PAGE);
+		map.put("GET_COUNTRIES_PAGE", GET_COUNTRIES_PAGE);
 		map.put("LIST_IMPORT_REQUESTS_PAGE", LIST_IMPORT_REQUESTS_PAGE);
 		map.put("LOGIN_PAGE", LOGIN_PAGE);
 		map.put("LOGOUT_PAGE", LOGOUT_PAGE);

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

@@ -138,12 +138,22 @@ public View showInfoById(
 		return view;
 	}
 
-	@GetMapping(Url.LIST_COUNTRIES_PAGE)
-	public void list(Model model, Locale userLocale) {
+	@GetMapping(Url.GET_COUNTRIES_PAGE)
+	public String showCountries(Model model, Locale userLocale) {
 		String lang = LocaleUtils.getLanguageOrNull(userLocale);
 		List<LinkEntityDto> countries = countryService.findAllAsLinkEntities(lang);
 
 		model.addAttribute("countries", countries);
+		
+		return "country/list";
+	}
+	
+	@GetMapping(Url.LIST_COUNTRIES_PAGE)
+	public View list() {
+		RedirectView view = new RedirectView();
+		view.setStatusCode(HttpStatus.MOVED_PERMANENTLY);
+		view.setUrl(Url.GET_COUNTRIES_PAGE);
+		return view;
 	}
 
 }

src/main/webapp/WEB-INF/views/site/index.html

@@ -68,7 +68,7 @@
 								<a th:href="@{${GET_CATEGORIES_PAGE}}" th:text="#{t_show_categories_list}" href="../category/list.html">show list of categories</a>
 							</li>
 							<li togglz:active="LIST_COUNTRIES">
-								<a th:href="@{${LIST_COUNTRIES_PAGE}}" th:text="#{t_show_countries_list}" href="../country/list.html">show list of countries</a>
+								<a th:href="@{${GET_COUNTRIES_PAGE}}" th:text="#{t_show_countries_list}" href="../country/list.html">show list of countries</a>
 							</li>
 							<li sec:authorize="hasAuthority('IMPORT_SERIES')">
 								<a th:href="@{${LIST_IMPORT_REQUESTS_PAGE}}" th:text="#{t_show_import_requests_list}" href="../series/import/list.html">show list of import requests</a>