refactor: propagate constants from MediaType and HttpHeaders classes.

Author: php-coder

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

@@ -23,6 +23,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.core.env.Environment;
+import org.springframework.http.MediaType;
 import ru.mystamps.web.feature.account.AccountConfig;
 import ru.mystamps.web.feature.category.CategoryConfig;
 import ru.mystamps.web.feature.collection.CollectionConfig;
@@ -64,7 +65,10 @@ public DownloaderService getImageDownloaderService() {
 		return new TimedDownloaderService(
 			LoggerFactory.getLogger(TimedDownloaderService.class),
 			new HttpURLConnectionDownloaderService(
-				new String[]{"image/jpeg", "image/png"},
+				new String[]{
+					MediaType.IMAGE_JPEG_VALUE,
+					MediaType.IMAGE_PNG_VALUE
+				},
 				env.getRequiredProperty("app.downloader.timeout", Integer.class)
 			)
 		);
@@ -75,7 +79,11 @@ public DownloaderService getSeriesDownloaderService() {
 		return new TimedDownloaderService(
 			LoggerFactory.getLogger(TimedDownloaderService.class),
 			new HttpURLConnectionDownloaderService(
-				new String[]{"text/html", "image/jpeg", "image/png"},
+				new String[]{
+					MediaType.TEXT_HTML_VALUE,
+					MediaType.IMAGE_JPEG_VALUE,
+					MediaType.IMAGE_PNG_VALUE
+				},
 				env.getRequiredProperty("app.downloader.timeout", Integer.class)
 			)
 		);

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

@@ -22,6 +22,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpHeaders;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.StreamUtils;
 import ru.mystamps.web.feature.series.DownloadResult.Code;
@@ -131,7 +132,7 @@ private static HttpURLConnection openConnection(URL url) throws IOException {
 	private static void configureUserAgent(URLConnection conn) {
 		// FIXME: make it configurable
 		conn.setRequestProperty(
-			"User-Agent",
+			HttpHeaders.USER_AGENT,
 			"Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:46.0) Gecko/20100101 Firefox/46.0"
 		);
 	}

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

@@ -20,6 +20,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -45,7 +46,7 @@ public class CspController {
 	public void handleReport(
 		@RequestBody String body,
 		HttpServletRequest request,
-		@RequestHeader(name = "user-agent", defaultValue = UNKNOWN) String userAgent) {
+		@RequestHeader(name = HttpHeaders.USER_AGENT, defaultValue = UNKNOWN) String userAgent) {
 
 		String ip = StringUtils.defaultString(request.getRemoteAddr(), UNKNOWN);
 		LOG.warn("CSP report from IP: {}, user agent: {}", ip, userAgent);

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

@@ -20,6 +20,7 @@
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestAttribute;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -42,8 +43,8 @@ public String notFound(
 			@CurrentUser Integer currentUserId,
 			// CheckStyle: ignore LineLength for next 1 line
 			@RequestAttribute(name = RequestDispatcher.ERROR_REQUEST_URI, required = false) String page,
-			@RequestHeader(name = "referer", required = false) String referer,
-			@RequestHeader(name = "user-agent", required = false) String agent) {
+			@RequestHeader(name = HttpHeaders.REFERER, required = false) String referer,
+			@RequestHeader(name = HttpHeaders.USER_AGENT, required = false) String agent) {
 
 		// FIXME: sanitize all user's values (#60)
 		String ip     = request.getRemoteAddr();

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

@@ -19,6 +19,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import ru.mystamps.web.feature.account.AccountUrl;
@@ -37,7 +38,7 @@ public class RobotsTxtController {
 	@GetMapping(SiteUrl.ROBOTS_TXT)
 	@SuppressWarnings("PMD.AvoidDuplicateLiterals")
 	public void getRobotsText(HttpServletResponse response) {
-		response.setContentType("text/plain");
+		response.setContentType(MediaType.TEXT_PLAIN_VALUE);
 		response.setCharacterEncoding("UTF-8");
 
 		try {

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

@@ -21,6 +21,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
+import org.springframework.http.HttpHeaders;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.transaction.annotation.Transactional;
 import ru.mystamps.web.feature.site.SiteDb.SuspiciousActivity;
@@ -97,8 +98,8 @@ public void logAboutMissingCsrfToken(HttpServletRequest request) {
 			request.getMethod(),
 			SecurityContextUtils.getUserId(),
 			request.getRemoteAddr(),
-			request.getHeader("referer"),
-			request.getHeader("user-agent"),
+			request.getHeader(HttpHeaders.REFERER),
+			request.getHeader(HttpHeaders.USER_AGENT),
 			new Date()
 		);
 
@@ -117,8 +118,8 @@ public void logAboutInvalidCsrfToken(HttpServletRequest request) {
 			request.getMethod(),
 			SecurityContextUtils.getUserId(),
 			request.getRemoteAddr(),
-			request.getHeader("referer"),
-			request.getHeader("user-agent"),
+			request.getHeader(HttpHeaders.REFERER),
+			request.getHeader(HttpHeaders.USER_AGENT),
 			new Date()
 		);
 

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

@@ -20,6 +20,7 @@
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import ru.mystamps.web.feature.series.SeriesService;
@@ -46,7 +47,7 @@ public class SitemapController {
 
 	@GetMapping(SiteUrl.SITEMAP_XML)
 	public void getSitemapXml(HttpServletResponse response) {
-		response.setContentType("application/xml");
+		response.setContentType(MediaType.APPLICATION_XML_VALUE);
 		response.setCharacterEncoding("UTF-8");
 
 		DateFormat dateFormatter = new SimpleDateFormat(DATE_FORMAT, Locale.ENGLISH);

src/main/java/ru/mystamps/web/support/beanvalidation/ImageFileValidator.java

@@ -28,13 +28,13 @@
 import java.io.InputStream;
 import java.util.Arrays;
 
+import static org.springframework.http.MediaType.IMAGE_JPEG_VALUE;
+import static org.springframework.http.MediaType.IMAGE_PNG_VALUE;
+
 public class ImageFileValidator implements ConstraintValidator<ImageFile, MultipartFile> {
 
 	private static final Logger LOG = LoggerFactory.getLogger(ImageFileValidator.class);
 
-	private static final String JPEG_CONTENT_TYPE = "image/jpeg";
-	private static final String PNG_CONTENT_TYPE  = "image/png";
-	
 	// see https://en.wikipedia.org/wiki/JPEG#Syntax_and_structure
 	// CheckStyle: ignore NoWhitespaceAfterCheck for next 3 lines
 	private static final byte[][] JPEG_SIGNATURES = {
@@ -111,7 +111,7 @@ public boolean isValid(MultipartFile file, ConstraintValidatorContext ctx) {
 		}
 
 		String contentType = file.getContentType();
-		if (!StringUtils.equalsAny(contentType, PNG_CONTENT_TYPE, JPEG_CONTENT_TYPE)) {
+		if (!StringUtils.equalsAny(contentType, IMAGE_PNG_VALUE, IMAGE_JPEG_VALUE)) {
 			LOG.debug("Reject file with content type '{}'", contentType);
 			return false;
 		}

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

@@ -21,6 +21,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationListener;
+import org.springframework.http.HttpHeaders;
 import org.springframework.security.authentication.event.AuthenticationFailureBadCredentialsEvent;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -50,8 +51,8 @@ public void onApplicationEvent(AuthenticationFailureBadCredentialsEvent event) {
 		String method  = request.getMethod();
 		String page    = request.getRequestURI();
 		String ip      = request.getRemoteAddr();
-		String referer = request.getHeader("referer");
-		String agent   = request.getHeader("user-agent");
+		String referer = request.getHeader(HttpHeaders.REFERER);
+		String agent   = request.getHeader(HttpHeaders.USER_AGENT);
 		Date date      = new Date(event.getTimestamp());
 
 		siteService.logAboutFailedAuthentication(page, method, null, ip, referer, agent, date);