Skip to content

Commit 0640917

Browse files
committed
AddImageForm: simplify by not using Default validation group.
No functional changes.
1 parent e43450b commit 0640917

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.util.Objects;
2929

3030
import javax.servlet.http.HttpServletResponse;
31+
import javax.validation.Valid;
3132
import javax.validation.groups.Default;
3233

3334
import org.apache.commons.lang3.StringUtils;
@@ -232,7 +233,7 @@ public String showInfo(
232233

233234
@RequestMapping(value = Url.ADD_IMAGE_SERIES_PAGE, method = RequestMethod.POST)
234235
public String processImage(
235-
@Validated({ Default.class, AddImageForm.ImageChecks.class }) AddImageForm form,
236+
@Valid AddImageForm form,
236237
BindingResult result,
237238
@PathVariable("id") Integer seriesId,
238239
Model model,

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,21 @@
3636

3737
@Getter
3838
@Setter
39+
@GroupSequence({
40+
AddImageForm.class,
41+
Group.Level1.class,
42+
Group.Level2.class,
43+
Group.Level3.class,
44+
Group.Level4.class,
45+
Group.Level5.class
46+
})
3947
public class AddImageForm implements AddImageDto {
4048

41-
@NotNull
42-
@NotEmptyFilename(groups = Group.Level1.class)
43-
@NotEmptyFile(groups = Group.Level2.class)
44-
@MaxFileSize(value = MAX_IMAGE_SIZE, unit = Unit.Kbytes, groups = Group.Level3.class)
45-
@ImageFile(groups = Group.Level3.class)
49+
@NotNull(groups = Group.Level1.class)
50+
@NotEmptyFilename(groups = Group.Level2.class)
51+
@NotEmptyFile(groups = Group.Level3.class)
52+
@MaxFileSize(value = MAX_IMAGE_SIZE, unit = Unit.Kbytes, groups = Group.Level4.class)
53+
@ImageFile(groups = Group.Level5.class)
4654
private MultipartFile image;
4755

48-
@GroupSequence({
49-
Group.Level1.class,
50-
Group.Level2.class,
51-
Group.Level3.class
52-
})
53-
public interface ImageChecks {
54-
}
55-
5656
}

0 commit comments

Comments
 (0)