refactor(SeriesImportUrl): move values related to the series import to the corresponding class.

Addressed to #927

No functional changes.

Author: php-coder

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

@@ -23,6 +23,7 @@
 import ru.mystamps.web.feature.country.CountryUrl;
 import ru.mystamps.web.feature.image.ImageUrl;
 import ru.mystamps.web.feature.participant.ParticipantUrl;
+import ru.mystamps.web.feature.series.importing.SeriesImportUrl;
 import ru.mystamps.web.feature.series.importing.sale.SeriesSalesImportUrl;
 
 import java.util.HashMap;
@@ -56,10 +57,6 @@ public final class Url {
 	public static final String SERIES_INFO_PAGE_REGEXP  = "/series/(\\d+|\\d+/(ask|image))";
 	public static final String SEARCH_SERIES_BY_CATALOG = "/series/search/by_catalog";
 
-	public static final String REQUEST_IMPORT_SERIES_PAGE = "/series/import/request";
-	public static final String REQUEST_IMPORT_PAGE        = "/series/import/request/{id}";
-	public static final String LIST_IMPORT_REQUESTS_PAGE  = "/series/import/requests";
-	
 	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";
@@ -119,6 +116,7 @@ public static Map<String, String> asMap(boolean production) {
 		CountryUrl.exposeUrlsToView(map);
 		CollectionUrl.exposeUrlsToView(map);
 		ParticipantUrl.exposeUrlsToView(map);
+		SeriesImportUrl.exposeUrlsToView(map);
 		SeriesSalesImportUrl.exposeUrlsToView(map);
 
 		map.put("ADD_IMAGE_SERIES_PAGE", ADD_IMAGE_SERIES_PAGE);
@@ -127,10 +125,7 @@ public static Map<String, String> asMap(boolean production) {
 		map.put("BOOTSTRAP_LANGUAGE", BOOTSTRAP_LANGUAGE);
 		map.put("DAILY_STATISTICS", DAILY_STATISTICS);
 		map.put("INFO_SERIES_PAGE", INFO_SERIES_PAGE);
-		map.put("LIST_IMPORT_REQUESTS_PAGE", LIST_IMPORT_REQUESTS_PAGE);
 		map.put("PUBLIC_URL", production ? PUBLIC_URL : SITE);
-		map.put("REQUEST_IMPORT_PAGE", REQUEST_IMPORT_PAGE);
-		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);
 

src/main/java/ru/mystamps/web/config/MvcConfig.java

@@ -55,6 +55,7 @@
 import ru.mystamps.web.feature.series.DownloadImageInterceptor;
 import ru.mystamps.web.feature.series.SeriesConfig;
 import ru.mystamps.web.feature.series.importing.SeriesImportConfig;
+import ru.mystamps.web.feature.series.importing.SeriesImportUrl;
 import ru.mystamps.web.feature.series.importing.event.EventsConfig;
 import ru.mystamps.web.feature.series.importing.sale.SeriesSalesImportConfig;
 import ru.mystamps.web.feature.site.SiteConfig;
@@ -159,7 +160,7 @@ public void addInterceptors(InterceptorRegistry registry) {
 			.addPathPatterns(
 				Url.ADD_SERIES_PAGE,
 				Url.ADD_IMAGE_SERIES_PAGE,
-				Url.REQUEST_IMPORT_PAGE.replace("{id}", "*")
+				SeriesImportUrl.REQUEST_IMPORT_PAGE.replace("{id}", "*")
 			);
 	}
 

src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportController.java

@@ -70,13 +70,13 @@ protected void initImportSeriesForm(WebDataBinder binder) {
 		binder.registerCustomEditor(String.class, "michelNumbers", new ExpandCatalogNumbersEditor());
 	}
 
-	@GetMapping(Url.REQUEST_IMPORT_SERIES_PAGE)
+	@GetMapping(SeriesImportUrl.REQUEST_IMPORT_SERIES_PAGE)
 	public void showRequestImportForm(Model model) {
 		RequestImportForm requestImportForm = new RequestImportForm();
 		model.addAttribute("requestImportForm", requestImportForm);
 	}
 
-	@PostMapping(Url.REQUEST_IMPORT_SERIES_PAGE)
+	@PostMapping(SeriesImportUrl.REQUEST_IMPORT_SERIES_PAGE)
 	public String processRequestImportForm(
 		@Valid RequestImportForm form,
 		BindingResult result,
@@ -93,11 +93,11 @@ public String processRequestImportForm(
 			new ImportRequestCreated(this, requestId, form.getUrl());
 		eventPublisher.publishEvent(requestCreated);
 
-		return redirectTo(Url.REQUEST_IMPORT_PAGE, requestId);
+		return redirectTo(SeriesImportUrl.REQUEST_IMPORT_PAGE, requestId);
 	}
 
 	@SuppressWarnings({ "PMD.ModifiedCyclomaticComplexity", "PMD.NPathComplexity" })
-	@GetMapping(Url.REQUEST_IMPORT_PAGE)
+	@GetMapping(SeriesImportUrl.REQUEST_IMPORT_PAGE)
 	public String showRequestAndImportSeriesForm(
 		@PathVariable("id") Integer requestId,
 		Model model,
@@ -172,7 +172,7 @@ public String showRequestAndImportSeriesForm(
 	}
 
 	@SuppressWarnings("checkstyle:parameternumber")
-	@PostMapping(Url.REQUEST_IMPORT_PAGE)
+	@PostMapping(SeriesImportUrl.REQUEST_IMPORT_PAGE)
 	public String processImportSeriesForm(
 		@PathVariable("id") Integer requestId,
 		Model model,
@@ -239,7 +239,7 @@ public String processImportSeriesForm(
 		return redirectTo(Url.INFO_SERIES_PAGE, seriesId);
 	}
 
-	@GetMapping(Url.LIST_IMPORT_REQUESTS_PAGE)
+	@GetMapping(SeriesImportUrl.LIST_IMPORT_REQUESTS_PAGE)
 	public String showListOfImportRequests(Model model) {
 		model.addAttribute("requests", seriesImportService.findAll());
 

src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportUrl.java

@@ -0,0 +1,45 @@
+/*
+ * 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.series.importing;
+
+import java.util.Map;
+
+/**
+ * URLs related to the series import.
+ *
+ * Should be used everywhere instead of hard-coded paths.
+ *
+ * @author Slava Semushin
+ */
+@SuppressWarnings("PMD.CommentDefaultAccessModifier")
+public final class SeriesImportUrl {
+	
+	public static final String REQUEST_IMPORT_SERIES_PAGE = "/series/import/request";
+	public static final String REQUEST_IMPORT_PAGE        = "/series/import/request/{id}";
+	static final String LIST_IMPORT_REQUESTS_PAGE         = "/series/import/requests";
+	
+	private SeriesImportUrl() {
+	}
+	
+	public static void exposeUrlsToView(Map<String, String> urls) {
+		urls.put("LIST_IMPORT_REQUESTS_PAGE", LIST_IMPORT_REQUESTS_PAGE);
+		urls.put("REQUEST_IMPORT_PAGE", REQUEST_IMPORT_PAGE);
+		urls.put("REQUEST_IMPORT_SERIES_PAGE", REQUEST_IMPORT_SERIES_PAGE);
+	}
+	
+}

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

@@ -48,6 +48,7 @@
 import ru.mystamps.web.feature.collection.CollectionUrl;
 import ru.mystamps.web.feature.country.CountryUrl;
 import ru.mystamps.web.feature.participant.ParticipantUrl;
+import ru.mystamps.web.feature.series.importing.SeriesImportUrl;
 import ru.mystamps.web.feature.series.importing.sale.SeriesSalesImportUrl;
 import ru.mystamps.web.feature.site.SiteService;
 
@@ -89,7 +90,7 @@ protected void configure(HttpSecurity http) throws Exception {
 				.mvcMatchers(CountryUrl.ADD_COUNTRY_PAGE).hasAuthority(StringAuthority.CREATE_COUNTRY)
 				.mvcMatchers(ParticipantUrl.ADD_PARTICIPANT_PAGE).hasAuthority(StringAuthority.ADD_PARTICIPANT)
 				.mvcMatchers(Url.ADD_SERIES_PAGE).hasAuthority(StringAuthority.CREATE_SERIES)
-				.mvcMatchers(Url.REQUEST_IMPORT_SERIES_PAGE).hasAuthority(StringAuthority.IMPORT_SERIES)
+				.mvcMatchers(SeriesImportUrl.REQUEST_IMPORT_SERIES_PAGE).hasAuthority(StringAuthority.IMPORT_SERIES)
 				.mvcMatchers(Url.SITE_EVENTS_PAGE).hasAuthority(StringAuthority.VIEW_SITE_EVENTS)
 				.mvcMatchers(CountryUrl.SUGGEST_SERIES_COUNTRY).hasAuthority(StringAuthority.CREATE_SERIES)
 				.mvcMatchers(Url.DAILY_STATISTICS).hasAuthority(StringAuthority.VIEW_DAILY_STATS)