Skip to content

Commit 6d56051

Browse files
committed
validate image size and type in one shot
[ci skip]
1 parent 66e34c4 commit 6d56051

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

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

+3-7
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public class AddSeriesForm implements AddSeriesDto, HasImageOrImageUrl {
140140
@NotEmptyFilename(groups = RequireImageCheck.class)
141141
@NotEmptyFile(groups = Image1Checks.class)
142142
@MaxFileSize(value = MAX_IMAGE_SIZE, unit = Unit.Kbytes, groups = Image2Checks.class)
143-
@ImageFile(groups = Image3Checks.class)
143+
@ImageFile(groups = Image2Checks.class)
144144
private MultipartFile image;
145145

146146
// Name of this field must match with the value of DownloadImageInterceptor.URL_PARAMETER_NAME.
@@ -152,7 +152,7 @@ public class AddSeriesForm implements AddSeriesDto, HasImageOrImageUrl {
152152
// DownloadImageInterceptor.DOWNLOADED_IMAGE_FIELD_NAME.
153153
@NotEmptyFile(groups = Image1Checks.class)
154154
@MaxFileSize(value = MAX_IMAGE_SIZE, unit = Unit.Kbytes, groups = Image2Checks.class)
155-
@ImageFile(groups = Image3Checks.class)
155+
@ImageFile(groups = Image2Checks.class)
156156
private MultipartFile downloadedImage;
157157

158158
@Override
@@ -213,8 +213,7 @@ public interface ImageUrl2Checks {
213213

214214
@GroupSequence({
215215
Image1Checks.class,
216-
Image2Checks.class,
217-
Image3Checks.class
216+
Image2Checks.class
218217
})
219218
public interface ImageChecks {
220219
}
@@ -225,7 +224,4 @@ public interface Image1Checks {
225224
public interface Image2Checks {
226225
}
227226

228-
public interface Image3Checks {
229-
}
230-
231227
}

0 commit comments

Comments
 (0)