refactor(ImageUrl): move image-related values to the corresponding class.

Addressed to #927

No functional changes.

Author: php-coder

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

@@ -21,6 +21,7 @@
 import ru.mystamps.web.feature.category.CategoryUrl;
 import ru.mystamps.web.feature.collection.CollectionUrl;
 import ru.mystamps.web.feature.country.CountryUrl;
+import ru.mystamps.web.feature.image.ImageUrl;
 import ru.mystamps.web.feature.participant.ParticipantUrl;
 
 import java.util.HashMap;
@@ -63,9 +64,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 GET_IMAGE_PAGE         = "/image/{id}";
-	public static final String GET_IMAGE_PREVIEW_PAGE = "/image/preview/{id}";
-	
 	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";
@@ -159,8 +157,8 @@ public static Map<String, String> asMap(boolean production) {
 			map.put("COLLECTION_INFO_JS", COLLECTION_INFO_JS);
 			map.put("DATE_UTILS_JS", DATE_UTILS_JS);
 			map.put("FAVICON_ICO", FAVICON_ICO);
-			map.put("GET_IMAGE_PAGE", GET_IMAGE_PAGE);
-			map.put("GET_IMAGE_PREVIEW_PAGE", GET_IMAGE_PREVIEW_PAGE);
+			map.put("GET_IMAGE_PAGE", ImageUrl.GET_IMAGE_PAGE);
+			map.put("GET_IMAGE_PREVIEW_PAGE", ImageUrl.GET_IMAGE_PREVIEW_PAGE);
 			map.put("JQUERY_JS", JQUERY_JS);
 			map.put("MAIN_CSS", MAIN_CSS);
 			map.put("PARTICIPANT_ADD_JS", PARTICIPANT_ADD_JS);
@@ -175,8 +173,9 @@ public static Map<String, String> asMap(boolean production) {
 			map.put("COLLECTION_INFO_JS", STATIC_RESOURCES_URL + COLLECTION_INFO_JS);
 			map.put("DATE_UTILS_JS", STATIC_RESOURCES_URL + DATE_UTILS_JS);
 			map.put("FAVICON_ICO", STATIC_RESOURCES_URL + FAVICON_ICO);
-			map.put("GET_IMAGE_PAGE", STATIC_RESOURCES_URL + GET_IMAGE_PAGE);
-			map.put("GET_IMAGE_PREVIEW_PAGE", STATIC_RESOURCES_URL + GET_IMAGE_PREVIEW_PAGE);
+			map.put("GET_IMAGE_PAGE", STATIC_RESOURCES_URL + ImageUrl.GET_IMAGE_PAGE);
+			// CheckStyle: ignore LineLength for next 1 line
+			map.put("GET_IMAGE_PREVIEW_PAGE", STATIC_RESOURCES_URL + ImageUrl.GET_IMAGE_PREVIEW_PAGE);
 			map.put("MAIN_CSS", STATIC_RESOURCES_URL + MAIN_CSS);
 			map.put("PARTICIPANT_ADD_JS", STATIC_RESOURCES_URL + PARTICIPANT_ADD_JS);
 			map.put("SERIES_ADD_JS", STATIC_RESOURCES_URL + SERIES_ADD_JS);

src/main/java/ru/mystamps/web/feature/image/ImageController.java

@@ -21,7 +21,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import ru.mystamps.web.Url;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -33,7 +32,7 @@ public class ImageController {
 
 	private final ImageService imageService;
 
-	@GetMapping(Url.GET_IMAGE_PAGE)
+	@GetMapping(ImageUrl.GET_IMAGE_PAGE)
 	public void getImage(@PathVariable("id") Integer imageId, HttpServletResponse response)
 		throws IOException {
 
@@ -55,7 +54,7 @@ public void getImage(@PathVariable("id") Integer imageId, HttpServletResponse re
 		response.getOutputStream().write(image.getData());
 	}
 
-	@GetMapping(Url.GET_IMAGE_PREVIEW_PAGE)
+	@GetMapping(ImageUrl.GET_IMAGE_PREVIEW_PAGE)
 	public void getImagePreview(@PathVariable("id") Integer imageId, HttpServletResponse response)
 		throws IOException {
 

src/main/java/ru/mystamps/web/feature/image/ImageUrl.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2009-2019 Slava Semushin <slava.semushin@gmail.com>
+ *
+ * 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.image;
+
+/**
+ * Image-related URLs.
+ *
+ * Should be used everywhere instead of hard-coded paths.
+ *
+ * @author Slava Semushin
+ */
+public final class ImageUrl {
+	
+	public static final String GET_IMAGE_PAGE         = "/image/{id}";
+	public static final String GET_IMAGE_PREVIEW_PAGE = "/image/preview/{id}";
+	
+	private ImageUrl() {
+	}
+	
+}