File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed
src/main/java/ru/mystamps/web Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -77,12 +77,12 @@ public class ActivateAccountForm implements ActivateAccountDto {
77
77
)
78
78
@ Pattern .List ({
79
79
@ Pattern (
80
- regexp = ValidationRules .NAME_REGEXP1 ,
80
+ regexp = ValidationRules .NAME_REGEXP ,
81
81
message = "{name.invalid}" ,
82
82
groups = Name2Checks .class
83
83
),
84
84
@ Pattern (
85
- regexp = ValidationRules .NAME_REGEXP2 ,
85
+ regexp = ValidationRules .NAME_NO_HYPHEN_REGEXP ,
86
86
message = "{value.hyphen}" ,
87
87
groups = Name3Checks .class
88
88
)
Original file line number Diff line number Diff line change @@ -26,8 +26,8 @@ public final class ValidationRules {
26
26
public static final String LOGIN_REGEXP = "[-_\\ .a-zA-Z0-9]+" ;
27
27
28
28
public static final int NAME_MAX_LENGTH = Db .User .NAME_LENGTH ;
29
- public static final String NAME_REGEXP1 = "[- \\ p{L}]+" ;
30
- public static final String NAME_REGEXP2 = "[ \\ p{L}]([- \\ p{L}]+[ \\ p{L}])*" ;
29
+ public static final String NAME_REGEXP = "[- \\ p{L}]+" ;
30
+ public static final String NAME_NO_HYPHEN_REGEXP = "[ \\ p{L}]([- \\ p{L}]+[ \\ p{L}])*" ;
31
31
32
32
public static final int PASSWORD_MIN_LENGTH = 4 ;
33
33
You can’t perform that action at this time.
0 commit comments