mirror of
https://github.com/Athou/commafeed.git
synced 2026-09-20 19:51:09 +00:00
Merge pull request #2108 from Athou/renovate/org.passay-passay-2.x
fix(deps): update dependency org.passay:passay to v2
This commit is contained in:
@@ -404,7 +404,7 @@
|
||||
<dependency>
|
||||
<groupId>org.passay</groupId>
|
||||
<artifactId>passay</artifactId>
|
||||
<version>1.6.6</version>
|
||||
<version>2.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.rometools</groupId>
|
||||
|
||||
@@ -6,11 +6,12 @@ import jakarta.validation.ConstraintValidator;
|
||||
import jakarta.validation.ConstraintValidatorContext;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.passay.LengthRule;
|
||||
import org.passay.DefaultPasswordValidator;
|
||||
import org.passay.PasswordData;
|
||||
import org.passay.PasswordValidator;
|
||||
import org.passay.RuleResult;
|
||||
import org.passay.WhitespaceRule;
|
||||
import org.passay.ValidationResult;
|
||||
import org.passay.rule.LengthRule;
|
||||
import org.passay.rule.WhitespaceRule;
|
||||
|
||||
import lombok.Setter;
|
||||
|
||||
@@ -31,20 +32,20 @@ public class PasswordConstraintValidator implements ConstraintValidator<ValidPas
|
||||
}
|
||||
|
||||
PasswordValidator validator = buildPasswordValidator();
|
||||
RuleResult result = validator.validate(new PasswordData(value));
|
||||
ValidationResult result = validator.validate(new PasswordData(value));
|
||||
|
||||
if (result.isValid()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
List<String> messages = validator.getMessages(result);
|
||||
List<String> messages = result.getMessages();
|
||||
String message = String.join(System.lineSeparator(), messages);
|
||||
context.buildConstraintViolationWithTemplate(message).addConstraintViolation().disableDefaultConstraintViolation();
|
||||
return false;
|
||||
}
|
||||
|
||||
private PasswordValidator buildPasswordValidator() {
|
||||
return new PasswordValidator(
|
||||
return new DefaultPasswordValidator(
|
||||
// length
|
||||
new LengthRule(minimumPasswordLength, 256),
|
||||
// no whitespace
|
||||
|
||||
Reference in New Issue
Block a user