refactor(CategoryUrl): move category-related values to the corresponding class.

Addressed to #927

No functional changes.

Author: php-coder

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

@@ -18,6 +18,7 @@
 package ru.mystamps.web;
 
 import ru.mystamps.web.feature.account.AccountUrl;
+import ru.mystamps.web.feature.category.CategoryUrl;
 import ru.mystamps.web.feature.collection.CollectionUrl;
 
 import java.util.HashMap;
@@ -60,10 +61,6 @@ public final class Url {
 	public static final String SUGGEST_SERIES_CATEGORY    = "/suggest/series_category";
 	public static final String SUGGEST_SERIES_COUNTRY     = "/suggest/series_country";
 
-	public static final String ADD_CATEGORY_PAGE     = "/category/add";
-	public static final String GET_CATEGORIES_PAGE   = "/categories";
-	public static final String INFO_CATEGORY_PAGE    = "/category/{slug}";
-	
 	public static final String ADD_COUNTRY_PAGE      = "/country/add";
 	public static final String GET_COUNTRIES_PAGE    = "/countries";
 	public static final String INFO_COUNTRY_PAGE     = "/country/{slug}";
@@ -78,9 +75,7 @@ public final class Url {
 	public static final String INTERNAL_ERROR_PAGE   = "/error/500";
 
 	// For backward compatibility
-	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 ADD_SERIES_WITH_CATEGORY_PAGE  = "/series/add/category/{slug}";
 	public static final String ADD_SERIES_WITH_COUNTRY_PAGE   = "/series/add/country/{slug}";
@@ -133,7 +128,7 @@ public static Map<String, String> asMap(boolean production) {
 		// Constants sorted in an ascending order.
 		Map<String, String> map = new HashMap<>();
 		map.put("ACTIVATE_ACCOUNT_PAGE", AccountUrl.ACTIVATE_ACCOUNT_PAGE);
-		map.put("ADD_CATEGORY_PAGE", ADD_CATEGORY_PAGE);
+		map.put("ADD_CATEGORY_PAGE", CategoryUrl.ADD_CATEGORY_PAGE);
 		map.put("ADD_COUNTRY_PAGE", ADD_COUNTRY_PAGE);
 		map.put("ADD_IMAGE_SERIES_PAGE", ADD_IMAGE_SERIES_PAGE);
 		map.put("ADD_PARTICIPANT_PAGE", ADD_PARTICIPANT_PAGE);
@@ -143,9 +138,9 @@ public static Map<String, String> asMap(boolean production) {
 		map.put("BOOTSTRAP_LANGUAGE", BOOTSTRAP_LANGUAGE);
 		map.put("DAILY_STATISTICS", DAILY_STATISTICS);
 		map.put("ESTIMATION_COLLECTION_PAGE", CollectionUrl.ESTIMATION_COLLECTION_PAGE);
-		map.put("GET_CATEGORIES_PAGE", GET_CATEGORIES_PAGE);
+		map.put("GET_CATEGORIES_PAGE", CategoryUrl.GET_CATEGORIES_PAGE);
 		map.put("GET_COUNTRIES_PAGE", GET_COUNTRIES_PAGE);
-		map.put("INFO_CATEGORY_PAGE", INFO_CATEGORY_PAGE);
+		map.put("INFO_CATEGORY_PAGE", CategoryUrl.INFO_CATEGORY_PAGE);
 		map.put("INFO_COLLECTION_PAGE", CollectionUrl.INFO_COLLECTION_PAGE);
 		map.put("INFO_COUNTRY_PAGE", INFO_COUNTRY_PAGE);
 		map.put("INFO_SERIES_PAGE", INFO_SERIES_PAGE);

src/main/java/ru/mystamps/web/feature/category/CategoryController.java

@@ -30,7 +30,6 @@
 import org.springframework.web.servlet.View;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import org.springframework.web.servlet.view.RedirectView;
-import ru.mystamps.web.Url;
 import ru.mystamps.web.common.LinkEntityDto;
 import ru.mystamps.web.common.LocaleUtils;
 import ru.mystamps.web.feature.series.SeriesInfoDto;
@@ -62,12 +61,12 @@ protected void initBinder(WebDataBinder binder) {
 		binder.registerCustomEditor(String.class, "nameRu", editor);
 	}
 
-	@GetMapping(Url.ADD_CATEGORY_PAGE)
+	@GetMapping(CategoryUrl.ADD_CATEGORY_PAGE)
 	public AddCategoryForm showForm() {
 		return new AddCategoryForm();
 	}
 
-	@PostMapping(Url.ADD_CATEGORY_PAGE)
+	@PostMapping(CategoryUrl.ADD_CATEGORY_PAGE)
 	public String processInput(
 		@Valid AddCategoryForm form,
 		BindingResult result,
@@ -82,10 +81,10 @@ public String processInput(
 
 		redirectAttributes.addFlashAttribute("justAddedCategory", true);
 
-		return redirectTo(Url.INFO_CATEGORY_PAGE, slug);
+		return redirectTo(CategoryUrl.INFO_CATEGORY_PAGE, slug);
 	}
 
-	@GetMapping(Url.INFO_CATEGORY_PAGE)
+	@GetMapping(CategoryUrl.INFO_CATEGORY_PAGE)
 	public String showInfoBySlug(
 		@Category @PathVariable("slug") LinkEntityDto category,
 		Model model,
@@ -111,7 +110,7 @@ public String showInfoBySlug(
 		return "category/info";
 	}
 
-	@GetMapping(Url.INFO_CATEGORY_BY_ID_PAGE)
+	@GetMapping(CategoryUrl.INFO_CATEGORY_BY_ID_PAGE)
 	public View showInfoById(
 		@Category @PathVariable("slug") LinkEntityDto country,
 		HttpServletResponse response)
@@ -124,12 +123,12 @@ public View showInfoById(
 
 		RedirectView view = new RedirectView();
 		view.setStatusCode(HttpStatus.MOVED_PERMANENTLY);
-		view.setUrl(Url.INFO_CATEGORY_PAGE);
+		view.setUrl(CategoryUrl.INFO_CATEGORY_PAGE);
 
 		return view;
 	}
 
-	@GetMapping(Url.GET_CATEGORIES_PAGE)
+	@GetMapping(CategoryUrl.GET_CATEGORIES_PAGE)
 	public String showCategories(Model model, Locale userLocale) {
 		String lang = LocaleUtils.getLanguageOrNull(userLocale);
 		List<LinkEntityDto> categories = categoryService.findAllAsLinkEntities(lang);
@@ -139,11 +138,11 @@ public String showCategories(Model model, Locale userLocale) {
 		return "category/list";
 	}
 
-	@GetMapping(Url.LIST_CATEGORIES_PAGE)
+	@GetMapping(CategoryUrl.LIST_CATEGORIES_PAGE)
 	public View list() {
 		RedirectView view = new RedirectView();
 		view.setStatusCode(HttpStatus.MOVED_PERMANENTLY);
-		view.setUrl(Url.GET_CATEGORIES_PAGE);
+		view.setUrl(CategoryUrl.GET_CATEGORIES_PAGE);
 		return view;
 	}
 

src/main/java/ru/mystamps/web/feature/category/CategoryUrl.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2009-2019 Slava Semushin <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.feature.category;
+
+/**
+ * Category-related URLs.
+ *
+ * Should be used everywhere instead of hard-coded paths.
+ *
+ * @author Slava Semushin
+ */
+@SuppressWarnings("PMD.CommentDefaultAccessModifier")
+public final class CategoryUrl {
+	
+	public static final String ADD_CATEGORY_PAGE   = "/category/add";
+	public static final String GET_CATEGORIES_PAGE = "/categories";
+	public static final String INFO_CATEGORY_PAGE  = "/category/{slug}";
+	
+	// For backward compatibility
+	static final String LIST_CATEGORIES_PAGE       = "/category/list";
+	static final String INFO_CATEGORY_BY_ID_PAGE   = "/category/{id}/{slug}";
+	
+	private CategoryUrl() {
+	}
+	
+}

src/main/java/ru/mystamps/web/feature/site/RobotsTxtController.java

@@ -23,6 +23,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import ru.mystamps.web.Url;
 import ru.mystamps.web.feature.account.AccountUrl;
+import ru.mystamps.web.feature.category.CategoryUrl;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -49,7 +50,7 @@ public void getRobotsText(HttpServletResponse response) {
 			writer.println("Disallow: " + AccountUrl.LOGIN_PAGE);
 			writer.println("Disallow: " + Url.ADD_COUNTRY_PAGE);
 			writer.println("Disallow: " + Url.ADD_SERIES_PAGE);
-			writer.println("Disallow: " + Url.ADD_CATEGORY_PAGE);
+			writer.println("Disallow: " + CategoryUrl.ADD_CATEGORY_PAGE);
 			writer.println("Disallow: " + Url.FORBIDDEN_PAGE);
 			writer.println("Disallow: " + Url.NOT_FOUND_PAGE);
 			writer.println("Disallow: " + Url.INTERNAL_ERROR_PAGE);

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

@@ -44,6 +44,7 @@
 import ru.mystamps.web.Url;
 import ru.mystamps.web.feature.account.AccountUrl;
 import ru.mystamps.web.feature.account.UserService;
+import ru.mystamps.web.feature.category.CategoryUrl;
 import ru.mystamps.web.feature.collection.CollectionUrl;
 import ru.mystamps.web.feature.site.SiteService;
 
@@ -81,7 +82,7 @@ protected void configure(HttpSecurity http) throws Exception {
 
 		http
 			.authorizeRequests()
-				.mvcMatchers(Url.ADD_CATEGORY_PAGE).hasAuthority(StringAuthority.CREATE_CATEGORY)
+				.mvcMatchers(CategoryUrl.ADD_CATEGORY_PAGE).hasAuthority(StringAuthority.CREATE_CATEGORY)
 				.mvcMatchers(Url.ADD_COUNTRY_PAGE).hasAuthority(StringAuthority.CREATE_COUNTRY)
 				.mvcMatchers(Url.ADD_PARTICIPANT_PAGE).hasAuthority(StringAuthority.ADD_PARTICIPANT)
 				.mvcMatchers(Url.ADD_SERIES_PAGE).hasAuthority(StringAuthority.CREATE_SERIES)