Skip to content

Commit 41651f3

Browse files
committed
ValidationRules.NAME_REGEXP{1,2}: rename to make more readable.
Fix #152 No functional changes.
1 parent d92994b commit 41651f3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ public class ActivateAccountForm implements ActivateAccountDto {
7777
)
7878
@Pattern.List({
7979
@Pattern(
80-
regexp = ValidationRules.NAME_REGEXP1,
80+
regexp = ValidationRules.NAME_REGEXP,
8181
message = "{name.invalid}",
8282
groups = Name2Checks.class
8383
),
8484
@Pattern(
85-
regexp = ValidationRules.NAME_REGEXP2,
85+
regexp = ValidationRules.NAME_NO_HYPHEN_REGEXP,
8686
message = "{value.hyphen}",
8787
groups = Name3Checks.class
8888
)

src/main/java/ru/mystamps/web/validation/ValidationRules.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public final class ValidationRules {
2626
public static final String LOGIN_REGEXP = "[-_\\.a-zA-Z0-9]+";
2727

2828
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}])*";
3131

3232
public static final int PASSWORD_MIN_LENGTH = 4;
3333

0 commit comments

Comments
 (0)