refactor(CollectionUrl): move collection-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.collection.CollectionUrl;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -67,9 +68,6 @@ public final class Url {
 	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}";
-	public static final String ESTIMATION_COLLECTION_PAGE = "/collection/{slug}/estimation";
-	
 	public static final String GET_IMAGE_PAGE         = "/image/{id}";
 	public static final String GET_IMAGE_PREVIEW_PAGE = "/image/preview/{id}";
 
@@ -84,7 +82,6 @@ public final class Url {
 	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}";
 	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}";
 
@@ -145,11 +142,11 @@ public static Map<String, String> asMap(boolean production) {
 		map.put("AUTHENTICATION_PAGE", AccountUrl.AUTHENTICATION_PAGE);
 		map.put("BOOTSTRAP_LANGUAGE", BOOTSTRAP_LANGUAGE);
 		map.put("DAILY_STATISTICS", DAILY_STATISTICS);
-		map.put("ESTIMATION_COLLECTION_PAGE", ESTIMATION_COLLECTION_PAGE);
+		map.put("ESTIMATION_COLLECTION_PAGE", CollectionUrl.ESTIMATION_COLLECTION_PAGE);
 		map.put("GET_CATEGORIES_PAGE", GET_CATEGORIES_PAGE);
 		map.put("GET_COUNTRIES_PAGE", GET_COUNTRIES_PAGE);
 		map.put("INFO_CATEGORY_PAGE", INFO_CATEGORY_PAGE);
-		map.put("INFO_COLLECTION_PAGE", INFO_COLLECTION_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);
 		map.put("LIST_IMPORT_REQUESTS_PAGE", LIST_IMPORT_REQUESTS_PAGE);

src/main/java/ru/mystamps/web/feature/collection/CollectionController.java

@@ -26,7 +26,6 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.servlet.View;
 import org.springframework.web.servlet.view.RedirectView;
-import ru.mystamps.web.Url;
 import ru.mystamps.web.common.LocaleUtils;
 import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.feature.country.CountryService;
@@ -45,7 +44,7 @@ public class CollectionController {
 	private final CountryService countryService;
 	private final MessageSource messageSource;
 
-	@GetMapping(Url.INFO_COLLECTION_PAGE)
+	@GetMapping(CollectionUrl.INFO_COLLECTION_PAGE)
 	public String showInfoBySlug(
 		@PathVariable("slug") String slug,
 		Model model,
@@ -95,7 +94,7 @@ public String showInfoBySlug(
 	}
 
 	// @todo #884 Add integration tests for collection estimation page
-	@GetMapping(Url.ESTIMATION_COLLECTION_PAGE)
+	@GetMapping(CollectionUrl.ESTIMATION_COLLECTION_PAGE)
 	public String showPrices(
 		@PathVariable("slug") String slug,
 		Model model,
@@ -126,7 +125,7 @@ public String showPrices(
 		return "collection/estimation";
 	}
 
-	@GetMapping(Url.INFO_COLLECTION_BY_ID_PAGE)
+	@GetMapping(CollectionUrl.INFO_COLLECTION_BY_ID_PAGE)
 	public View showInfoById(
 		@PathVariable("slug") String slug,
 		HttpServletResponse response)
@@ -145,7 +144,7 @@ public View showInfoById(
 
 		RedirectView view = new RedirectView();
 		view.setStatusCode(HttpStatus.MOVED_PERMANENTLY);
-		view.setUrl(Url.INFO_COLLECTION_PAGE);
+		view.setUrl(CollectionUrl.INFO_COLLECTION_PAGE);
 
 		return view;
 	}

src/main/java/ru/mystamps/web/feature/collection/CollectionUrl.java

@@ -0,0 +1,39 @@
+/*
+ * 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.collection;
+
+/**
+ * Collection-related URLs.
+ *
+ * Should be used everywhere instead of hard-coded paths.
+ *
+ * @author Slava Semushin
+ */
+@SuppressWarnings("PMD.CommentDefaultAccessModifier")
+public final class CollectionUrl {
+	
+	public static final String INFO_COLLECTION_PAGE       = "/collection/{slug}";
+	public static final String ESTIMATION_COLLECTION_PAGE = "/collection/{slug}/estimation";
+	
+	// For backward compatibility
+	static final String INFO_COLLECTION_BY_ID_PAGE = "/collection/{id}/{slug}";
+	
+	private CollectionUrl() {
+	}
+	
+}

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

@@ -43,6 +43,7 @@
 import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.feature.collection.AddToCollectionForm;
 import ru.mystamps.web.feature.collection.CollectionService;
+import ru.mystamps.web.feature.collection.CollectionUrl;
 import ru.mystamps.web.feature.country.Country;
 import ru.mystamps.web.feature.country.CountryService;
 import ru.mystamps.web.feature.participant.ParticipantService;
@@ -391,7 +392,7 @@ public String addToCollection(
 		redirectAttributes.addFlashAttribute("justAddedSeriesId", seriesId);
 
 		String collectionSlug = currentUserDetails.getUserCollectionSlug();
-		return redirectTo(Url.INFO_COLLECTION_PAGE, collectionSlug);
+		return redirectTo(CollectionUrl.INFO_COLLECTION_PAGE, collectionSlug);
 	}
 
 	@PostMapping(path = Url.INFO_SERIES_PAGE, params = "action=REMOVE")
@@ -419,7 +420,7 @@ public String removeFromCollection(
 		redirectAttributes.addFlashAttribute("justRemovedSeries", true);
 
 		String collectionSlug = currentUserDetails.getUserCollectionSlug();
-		return redirectTo(Url.INFO_COLLECTION_PAGE, collectionSlug);
+		return redirectTo(CollectionUrl.INFO_COLLECTION_PAGE, collectionSlug);
 	}
 
 	@PostMapping(Url.ADD_SERIES_ASK_PAGE)

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

@@ -20,6 +20,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.web.header.HeaderWriter;
 import ru.mystamps.web.Url;
+import ru.mystamps.web.feature.collection.CollectionUrl;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -33,7 +34,7 @@
 class ContentSecurityPolicyHeaderWriter implements HeaderWriter {
 
 	private static final String COLLECTION_INFO_PAGE_PATTERN =
-		Url.INFO_COLLECTION_PAGE.replace("{slug}", "");
+		CollectionUrl.INFO_COLLECTION_PAGE.replace("{slug}", "");
 
 	private static final Pattern SERIES_INFO_PAGE_PATTERN =
 		Pattern.compile(Url.SERIES_INFO_PAGE_REGEXP);

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.collection.CollectionUrl;
 import ru.mystamps.web.feature.site.SiteService;
 
 import javax.servlet.Filter;
@@ -89,7 +90,7 @@ protected void configure(HttpSecurity http) throws Exception {
 				.mvcMatchers(Url.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(Url.ESTIMATION_COLLECTION_PAGE).hasAuthority(StringAuthority.ADD_SERIES_PRICE)
+				.mvcMatchers(CollectionUrl.ESTIMATION_COLLECTION_PAGE).hasAuthority(StringAuthority.ADD_SERIES_PRICE)
 				.regexMatchers(HttpMethod.POST, "/series/[0-9]+")
 					.hasAnyAuthority(
 						StringAuthority.UPDATE_COLLECTION,