Skip to content

Commit 7fa1008

Browse files
committed
ValidationRules: inline constant.
Removed last reference to User entity. Addressed to #120 No functional changes.
1 parent 57bc795 commit 7fa1008

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/main/java/ru/mystamps/web/Db.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,9 @@ public static final class UsersActivation {
4242
public static final int EMAIL_LENGTH = 255;
4343
}
4444

45+
public static final class User {
46+
public static final int LOGIN_LENGTH = 15;
47+
public static final int NAME_LENGTH = 100;
48+
}
49+
4550
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@
1818
package ru.mystamps.web.validation;
1919

2020
import ru.mystamps.web.Db;
21-
import ru.mystamps.web.entity.User;
2221

2322
public final class ValidationRules {
2423

2524
public static final int LOGIN_MIN_LENGTH = 2;
26-
public static final int LOGIN_MAX_LENGTH = User.LOGIN_LENGTH;
25+
public static final int LOGIN_MAX_LENGTH = Db.User.LOGIN_LENGTH;
2726
public static final String LOGIN_REGEXP = "[-_\\.a-zA-Z0-9]+";
2827

29-
public static final int NAME_MAX_LENGTH = User.NAME_LENGTH;
28+
public static final int NAME_MAX_LENGTH = Db.User.NAME_LENGTH;
3029
public static final String NAME_REGEXP1 = "[- \\p{L}]+";
3130
public static final String NAME_REGEXP2 = "[ \\p{L}]([- \\p{L}]+[ \\p{L}])*";
3231

0 commit comments

Comments
 (0)