SeriesImportController.processImportSeriesForm(): handle errors from interceptor.

Fix #718

Author: php-coder

src/main/java/ru/mystamps/web/controller/SeriesController.java

@@ -496,6 +496,48 @@ protected void addYearToModel(Model model) {
 		model.addAttribute("years", YEARS);
 	}
 
+	protected static void loadErrorsFromDownloadInterceptor(
+		NullableImageUrl form,
+		BindingResult result,
+		HttpServletRequest request) {
+		
+		Object downloadResultErrorCode =
+			request.getAttribute(DownloadImageInterceptor.ERROR_CODE_ATTR_NAME);
+		
+		if (downloadResultErrorCode == null) {
+			return;
+		}
+		
+		if (downloadResultErrorCode instanceof DownloadResult.Code) {
+			DownloadResult.Code code = (DownloadResult.Code)downloadResultErrorCode;
+			switch (code) {
+				case INVALID_URL:
+					// Url is being validated by @URL, to avoid showing an error message
+					// twice we're skipping error from an interceptor.
+					break;
+				case INSUFFICIENT_PERMISSIONS:
+					// A user without permissions has tried to download a file. It means that he
+					// didn't specify a file but somehow provide a URL to an image. In this case,
+					// let's show an error message that file is required.
+					result.rejectValue(
+						"image",
+						"ru.mystamps.web.support.beanvalidation.NotEmptyFilename.message"
+					);
+					form.nullifyImageUrl();
+					break;
+				default:
+					result.rejectValue(
+						DownloadImageInterceptor.DOWNLOADED_IMAGE_FIELD_NAME,
+						DownloadResult.class.getName() + "." + code.toString(),
+						"Could not download image"
+					);
+					break;
+			}
+		}
+		
+		request.removeAttribute(DownloadImageInterceptor.ERROR_CODE_ATTR_NAME);
+	}
+	
 	// CheckStyle: ignore LineLength for next 1 line
 	private Map<String, ?> prepareCommonAttrsForSeriesInfo(SeriesDto series, Integer currentUserId) {
 		Map<String, Object> model = new HashMap<>();
@@ -556,50 +598,6 @@ private void addSeriesSalesFormToModel(Model model) {
 		model.addAttribute("buyers", groupedBuyers);
 	}
 
-	// false positive on Travis CI
-	@SuppressWarnings("PMD.UnusedPrivateMethod")
-	private static void loadErrorsFromDownloadInterceptor(
-		NullableImageUrl form,
-		BindingResult result,
-		HttpServletRequest request) {
-		
-		Object downloadResultErrorCode =
-			request.getAttribute(DownloadImageInterceptor.ERROR_CODE_ATTR_NAME);
-		
-		if (downloadResultErrorCode == null) {
-			return;
-		}
-		
-		if (downloadResultErrorCode instanceof DownloadResult.Code) {
-			DownloadResult.Code code = (DownloadResult.Code)downloadResultErrorCode;
-			switch (code) {
-				case INVALID_URL:
-					// Url is being validated by @URL, to avoid showing an error message
-					// twice we're skipping error from an interceptor.
-					break;
-				case INSUFFICIENT_PERMISSIONS:
-					// A user without permissions has tried to download a file. It means that he
-					// didn't specify a file but somehow provide a URL to an image. In this case,
-					// let's show an error message that file is required.
-					result.rejectValue(
-						"image",
-						"ru.mystamps.web.support.beanvalidation.NotEmptyFilename.message"
-					);
-					form.nullifyImageUrl();
-					break;
-				default:
-					result.rejectValue(
-						DownloadImageInterceptor.DOWNLOADED_IMAGE_FIELD_NAME,
-						DownloadResult.class.getName() + "." + code.toString(),
-						"Could not download image"
-					);
-					break;
-			}
-		}
-		
-		request.removeAttribute(DownloadImageInterceptor.ERROR_CODE_ATTR_NAME);
-	}
-	
 	private static void addImageFormToModel(Model model) {
 		AddImageForm form = new AddImageForm();
 		model.addAttribute("addImageForm", form);

src/main/java/ru/mystamps/web/controller/SeriesImportController.java

@@ -20,6 +20,7 @@
 import java.io.IOException;
 import java.util.Locale;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
@@ -141,6 +142,7 @@ public String showRequestAndImportSeriesForm(
 		return "series/import/info";
 	}
 
+	@SuppressWarnings("checkstyle:parameternumber")
 	@PostMapping(Url.REQUEST_IMPORT_PAGE)
 	public String processImportSeriesForm(
 		@PathVariable("id") Integer requestId,
@@ -149,6 +151,7 @@ public String processImportSeriesForm(
 		BindingResult result,
 		@CurrentUser Integer currentUserId,
 		Locale userLocale,
+		HttpServletRequest httpRequest,
 		HttpServletResponse httpResponse)
 		throws IOException {
 
@@ -163,8 +166,7 @@ public String processImportSeriesForm(
 			return null;
 		}
 
-		// @todo #709 SeriesImportController.processImportSeriesForm():
-		//  handle errors from interceptor
+		SeriesController.loadErrorsFromDownloadInterceptor(form, result, httpRequest);
 
 		model.addAttribute("request", request);
 

src/main/java/ru/mystamps/web/controller/dto/ImportSeriesForm.java

@@ -41,7 +41,7 @@
 
 @Getter
 @Setter
-public class ImportSeriesForm implements AddSeriesDto {
+public class ImportSeriesForm implements AddSeriesDto, NullableImageUrl {
 
 	// @todo #709 /series/import/request/{id}(category): add integration test for required field
 	@NotNull