image should be required for user; image or imageUrl should be required for admin

Author: php-coder

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

@@ -179,9 +179,25 @@ public View showFormWithCountry(
 		return view;
 	}
 
-	@PostMapping(Url.ADD_SERIES_PAGE)
+	@PostMapping(path = Url.ADD_SERIES_PAGE, params = "imageUrl")
+	public String processInputWithImageUrl(
+		@Validated({ Default.class,
+			AddSeriesForm.ImageUrlChecks.class,
+			AddSeriesForm.ReleaseDateChecks.class,
+			AddSeriesForm.ImageChecks.class }) AddSeriesForm form,
+		BindingResult result,
+		@CurrentUser Integer currentUserId,
+		Locale userLocale,
+		Model model,
+		HttpServletRequest request) {
+		
+		return processInput(form, result, currentUserId, userLocale, model, request);
+	}
+	
+	@PostMapping(path = Url.ADD_SERIES_PAGE, params = "!imageUrl")
 	public String processInput(
 		@Validated({ Default.class,
+			AddSeriesForm.RequireImageCheck.class,
 			AddSeriesForm.ReleaseDateChecks.class,
 			AddSeriesForm.ImageChecks.class }) AddSeriesForm form,
 		BindingResult result,

src/main/java/ru/mystamps/web/model/AddSeriesForm.java

@@ -45,6 +45,7 @@
 import ru.mystamps.web.validation.jsr303.MaxFileSize;
 import ru.mystamps.web.validation.jsr303.MaxFileSize.Unit;
 import ru.mystamps.web.validation.jsr303.NotEmptyFile;
+import ru.mystamps.web.validation.jsr303.NotEmptyFilename;
 import ru.mystamps.web.validation.jsr303.NotNullIfFirstField;
 import ru.mystamps.web.validation.jsr303.Price;
 import ru.mystamps.web.validation.jsr303.ReleaseDateIsNotInFuture;
@@ -63,7 +64,7 @@
 // TODO: image and downloadedImage should be filled together
 // TODO: combine price with currency to separate class
 @SuppressWarnings({"PMD.TooManyFields", "PMD.AvoidDuplicateLiterals"})
-@RequireImageOrImageUrl
+@RequireImageOrImageUrl(groups = AddSeriesForm.ImageUrl1Checks.class)
 @NotNullIfFirstField.List({
 	@NotNullIfFirstField(
 		first = "month", second = "year", message = "{month.requires.year}",
@@ -136,22 +137,21 @@ public class AddSeriesForm implements AddSeriesDto, HasImageOrImageUrl {
 
 	// Name of this field should match with the value of
 	// DownloadImageInterceptor.UPLOADED_IMAGE_FIELD_NAME.
-	//@NotEmptyFilename(groups = Image1Checks.class)
-	@NotEmptyFile(groups = Image2Checks.class)
-	@MaxFileSize(value = MAX_IMAGE_SIZE, unit = Unit.Kbytes, groups = Image3Checks.class)
+	@NotEmptyFilename(groups = RequireImageCheck.class)
+	@NotEmptyFile(groups = Image1Checks.class)
+	@MaxFileSize(value = MAX_IMAGE_SIZE, unit = Unit.Kbytes, groups = Image2Checks.class)
 	@ImageFile(groups = Image3Checks.class)
 	private MultipartFile image;
 
 	// Name of this field must match with the value of DownloadImageInterceptor.URL_PARAMETER_NAME.
-	@URL
+	@URL(groups = AddSeriesForm.ImageUrl2Checks.class)
 	private String imageUrl;
 
 	// This field holds a file that was downloaded from imageUrl.
 	// Name of this field must match with the value of
 	// DownloadImageInterceptor.DOWNLOADED_IMAGE_FIELD_NAME.
-	//@NotEmptyFilename(groups = Image1Checks.class)
-	@NotEmptyFile(groups = Image2Checks.class)
-	@MaxFileSize(value = MAX_IMAGE_SIZE, unit = Unit.Kbytes, groups = Image3Checks.class)
+	@NotEmptyFile(groups = Image1Checks.class)
+	@MaxFileSize(value = MAX_IMAGE_SIZE, unit = Unit.Kbytes, groups = Image2Checks.class)
 	@ImageFile(groups = Image3Checks.class)
 	private MultipartFile downloadedImage;
 
@@ -195,6 +195,22 @@ public interface ReleaseDate2Checks {
 	public interface ReleaseDate3Checks {
 	}
 
+	public interface RequireImageCheck {
+	}
+	
+	@GroupSequence({
+		ImageUrl1Checks.class,
+		ImageUrl2Checks.class,
+	})
+	public interface ImageUrlChecks {
+	}
+	
+	public interface ImageUrl1Checks {
+	}
+	
+	public interface ImageUrl2Checks {
+	}
+	
 	@GroupSequence({
 		Image1Checks.class,
 		Image2Checks.class,