|
27 | 27 | import javax.validation.constraints.Pattern;
|
28 | 28 | import javax.validation.constraints.Size;
|
29 | 29 |
|
| 30 | +import static ru.mystamps.web.feature.account.AccountValidation.ACT_KEY_REGEXP; |
| 31 | +import static ru.mystamps.web.feature.account.AccountValidation.NAME_MAX_LENGTH; |
| 32 | + |
30 | 33 | @Getter
|
31 | 34 | @Setter
|
32 | 35 | @FieldsMismatch(
|
@@ -71,11 +74,7 @@ public class ActivateAccountForm implements ActivateAccountDto {
|
71 | 74 | @UniqueLogin(groups = Login5Checks.class)
|
72 | 75 | private String login;
|
73 | 76 |
|
74 |
| - @Size( |
75 |
| - max = AccountValidation.NAME_MAX_LENGTH, |
76 |
| - message = "{value.too-long}", |
77 |
| - groups = Name1Checks.class |
78 |
| - ) |
| 77 | + @Size(max = NAME_MAX_LENGTH, message = "{value.too-long}", groups = Name1Checks.class) |
79 | 78 | @Pattern.List({
|
80 | 79 | @Pattern(
|
81 | 80 | regexp = AccountValidation.NAME_REGEXP,
|
@@ -115,11 +114,7 @@ public class ActivateAccountForm implements ActivateAccountDto {
|
115 | 114 | message = "{value.invalid-length}",
|
116 | 115 | groups = ActKey2Checks.class
|
117 | 116 | )
|
118 |
| - @Pattern( |
119 |
| - regexp = AccountValidation.ACT_KEY_REGEXP, |
120 |
| - message = "{key.invalid}", |
121 |
| - groups = ActKey3Checks.class |
122 |
| - ) |
| 117 | + @Pattern(regexp = ACT_KEY_REGEXP, message = "{key.invalid}", groups = ActKey3Checks.class) |
123 | 118 | @ExistingActivationKey(groups = ActKey4Checks.class)
|
124 | 119 | private String activationKey;
|
125 | 120 |
|
|
0 commit comments