Skip to content

Commit fcbcf1a

Browse files
added ignoreCase to the new validator
1 parent 85f274e commit fcbcf1a

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/validator/GwtValidators.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,11 @@ private GwtValidators() {
5252
public static List<Validator<String>> newPassword(final Optional<String> identityName,
5353
final GwtPasswordStrenghtRequirements userOptions) {
5454

55-
final List<Validator<String>> defaultValidators = Arrays.asList(stringLength(255, MSGS.pwdMaxLength()),
56-
noWhitespaceCharacters(MSGS.pwdWhitespaceCharacters()), nonEmpty(MSGS.pwdEmpty()));
55+
final List<Validator<String>> defaultValidators = new ArrayList<>();
56+
57+
defaultValidators.add(stringLength(255, MSGS.pwdMaxLength()));
58+
defaultValidators.add(noWhitespaceCharacters(MSGS.pwdWhitespaceCharacters()));
59+
defaultValidators.add(nonEmpty(MSGS.pwdEmpty()));
5760

5861
identityName.ifPresent(
5962
id -> defaultValidators.add(notEqualsIdentityName(id, MSGS.pwdStrengthNotEqualsIdentityName())));
@@ -96,7 +99,7 @@ public static Validator<String> nonEmpty(final String message) {
9699
}
97100

98101
public static Validator<String> notEqualsIdentityName(final String identityName, final String message) {
99-
return new ValidatorWrapper<>(new PredicateValidator(v -> !v.equals(identityName), message), Priority.MEDIUM);
102+
return new ValidatorWrapper<>(new PredicateValidator(v -> !v.equalsIgnoreCase(identityName), message), Priority.MEDIUM);
100103
}
101104

102105
public static <T> Validator<T> notInList(final List<T> values, final String message) {

bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/validator/PasswordStrengthValidators.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ private static Validator<String> containsBothCases(final Messages messages) {
9090
private static Validator<String> requireDifferentNameAndPassword(final String identityName,
9191
final Messages messages) {
9292

93-
return new PredicateValidator(v -> !v.equals(identityName), messages.pwdNotEqualsUsername());
93+
return new PredicateValidator(v -> !v.equalsIgnoreCase(identityName), messages.pwdNotEqualsUsername());
9494
}
9595

9696
public interface Messages {

0 commit comments

Comments
 (0)