From 7478354469bce13a83063e6b9fc0607cd8d58ece Mon Sep 17 00:00:00 2001 From: "Staehler, Michael" Date: Fri, 5 Apr 2024 08:56:20 +0200 Subject: [PATCH] refactoring --- .../ChangePasswordCommandValidator.java | 59 ++++++++----------- .../web/validation/TeamResultValidator.java | 36 +++++------ .../web/validation/ValidMatchValidator.java | 47 ++------------- 3 files changed, 46 insertions(+), 96 deletions(-) diff --git a/src/main/java/de/fred4jupiter/fredbet/web/validation/ChangePasswordCommandValidator.java b/src/main/java/de/fred4jupiter/fredbet/web/validation/ChangePasswordCommandValidator.java index 487715bb9..466759307 100644 --- a/src/main/java/de/fred4jupiter/fredbet/web/validation/ChangePasswordCommandValidator.java +++ b/src/main/java/de/fred4jupiter/fredbet/web/validation/ChangePasswordCommandValidator.java @@ -1,48 +1,41 @@ package de.fred4jupiter.fredbet.web.validation; +import de.fred4jupiter.fredbet.web.profile.ChangePasswordCommand; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.fred4jupiter.fredbet.web.profile.ChangePasswordCommand; - /** * Validates the new password against the password repeat. - * - * @author michael * + * @author michael */ public class ChangePasswordCommandValidator implements ConstraintValidator { - private static final Logger LOG = LoggerFactory.getLogger(ChangePasswordCommandValidator.class); - - @Override - public void initialize(PasswordChangeConstraint passwordChangeConstraint) { - } - - @Override - public boolean isValid(ChangePasswordCommand value, ConstraintValidatorContext context) { - if (value == null) { - return true; - } - - if (!value.getNewPassword().equals(value.getNewPasswordRepeat())) { - context.buildConstraintViolationWithTemplate("{msg.passwordChange.passwordMismatch}") - .addPropertyNode("newPassword").addConstraintViolation().disableDefaultConstraintViolation(); - LOG.error("newPassword and newPasswordRepeat are different"); - return false; - } - - if (value.getOldPassword().equals(value.getNewPassword())) { - context.buildConstraintViolationWithTemplate("{msg.passwordChange.oldAndNewPasswordAreSame}") - .addPropertyNode("newPassword").addConstraintViolation().disableDefaultConstraintViolation(); - LOG.error("newPassword and newPasswordRepeat are different"); - return false; - } - - return true; - } + private static final Logger LOG = LoggerFactory.getLogger(ChangePasswordCommandValidator.class); + + @Override + public boolean isValid(ChangePasswordCommand value, ConstraintValidatorContext context) { + if (value == null) { + return true; + } + + if (!value.getNewPassword().equals(value.getNewPasswordRepeat())) { + context.buildConstraintViolationWithTemplate("{msg.passwordChange.passwordMismatch}") + .addPropertyNode("newPassword").addConstraintViolation().disableDefaultConstraintViolation(); + LOG.error("newPassword and newPasswordRepeat are different"); + return false; + } + + if (value.getOldPassword().equals(value.getNewPassword())) { + context.buildConstraintViolationWithTemplate("{msg.passwordChange.oldAndNewPasswordAreSame}") + .addPropertyNode("newPassword").addConstraintViolation().disableDefaultConstraintViolation(); + LOG.error("newPassword and newPasswordRepeat are different"); + return false; + } + + return true; + } } diff --git a/src/main/java/de/fred4jupiter/fredbet/web/validation/TeamResultValidator.java b/src/main/java/de/fred4jupiter/fredbet/web/validation/TeamResultValidator.java index a1a56e7e8..e7f1e577f 100644 --- a/src/main/java/de/fred4jupiter/fredbet/web/validation/TeamResultValidator.java +++ b/src/main/java/de/fred4jupiter/fredbet/web/validation/TeamResultValidator.java @@ -1,36 +1,30 @@ package de.fred4jupiter.fredbet.web.validation; +import de.fred4jupiter.fredbet.web.matches.MatchResultCommand; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; -import de.fred4jupiter.fredbet.web.matches.MatchResultCommand; - /** * Validator that checks if you enter both goal results. - * - * @author michael * + * @author michael */ public class TeamResultValidator implements ConstraintValidator { - @Override - public void initialize(TeamResultConstraint constraintAnnotation) { - } + @Override + public boolean isValid(MatchResultCommand value, ConstraintValidatorContext context) { + if (value == null) { + return true; + } + + Integer teamResultOne = value.getTeamResultOne(); + Integer teamResultTwo = value.getTeamResultTwo(); - @Override - public boolean isValid(MatchResultCommand value, ConstraintValidatorContext context) { - if (value == null) { - return true; - } + if (teamResultOne == null && teamResultTwo == null) { + return true; + } - Integer teamResultOne = value.getTeamResultOne(); - Integer teamResultTwo = value.getTeamResultTwo(); - - if (teamResultOne == null && teamResultTwo == null) { - return true; - } - - return (teamResultOne != null && teamResultOne >= 0) && (teamResultTwo != null && teamResultTwo >= 0); - } + return (teamResultOne != null && teamResultOne >= 0) && (teamResultTwo != null && teamResultTwo >= 0); + } } diff --git a/src/main/java/de/fred4jupiter/fredbet/web/validation/ValidMatchValidator.java b/src/main/java/de/fred4jupiter/fredbet/web/validation/ValidMatchValidator.java index c41806be3..4f5d9e7c7 100644 --- a/src/main/java/de/fred4jupiter/fredbet/web/validation/ValidMatchValidator.java +++ b/src/main/java/de/fred4jupiter/fredbet/web/validation/ValidMatchValidator.java @@ -3,21 +3,16 @@ import de.fred4jupiter.fredbet.domain.Country; import de.fred4jupiter.fredbet.util.Validator; import de.fred4jupiter.fredbet.web.matches.CreateEditMatchCommand; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import jakarta.validation.ConstraintValidator; -import jakarta.validation.ConstraintValidatorContext; - public class ValidMatchValidator implements ConstraintValidator { private static final Logger LOG = LoggerFactory.getLogger(ValidMatchValidator.class); - @Override - public void initialize(ValidMatchConstraint constraintAnnotation) { - } - @Override public boolean isValid(CreateEditMatchCommand value, ConstraintValidatorContext context) { if (value == null) { @@ -41,38 +36,6 @@ public boolean isValid(CreateEditMatchCommand value, ConstraintValidatorContext return true; } - private boolean isInvalidTeamSelection(CreateEditMatchCommand value) { - Country countryTeamOne = value.getCountryTeamOne(); - Country countryTeamTwo = value.getCountryTeamTwo(); - - String teamNameOne = value.getTeamNameOne(); - String teamNameTwo = value.getTeamNameTwo(); - - // nothing selected - if ((Validator.isNull(countryTeamOne) && Validator.isNull(countryTeamTwo)) - && (StringUtils.isBlank(teamNameOne) && StringUtils.isBlank(teamNameTwo))) { - return true; - } - - if (Validator.isNull(countryTeamOne) && Validator.isNotNull(countryTeamTwo)) { - return true; - } - - if (Validator.isNotNull(countryTeamOne) && Validator.isNull(countryTeamTwo)) { - return true; - } - - if (StringUtils.isBlank(teamNameOne) && StringUtils.isNotBlank(teamNameTwo)) { - return true; - } - - if (StringUtils.isNotBlank(teamNameOne) && StringUtils.isBlank(teamNameTwo)) { - return true; - } - - return false; - } - private boolean oneTeamNotSelected(CreateEditMatchCommand value) { Country countryTeamOne = value.getCountryTeamOne(); Country countryTeamTwo = value.getCountryTeamTwo(); @@ -81,9 +44,9 @@ private boolean oneTeamNotSelected(CreateEditMatchCommand value) { String teamNameTwo = value.getTeamNameTwo(); return (Validator.isNull(countryTeamOne) && StringUtils.isBlank(teamNameOne)) - || (Validator.isNotNull(countryTeamOne) && StringUtils.isNotBlank(teamNameOne)) - || (Validator.isNull(countryTeamTwo) && StringUtils.isBlank(teamNameTwo)) - || (Validator.isNotNull(countryTeamTwo) && StringUtils.isNotBlank(teamNameTwo)); + || (Validator.isNotNull(countryTeamOne) && StringUtils.isNotBlank(teamNameOne)) + || (Validator.isNull(countryTeamTwo) && StringUtils.isBlank(teamNameTwo)) + || (Validator.isNotNull(countryTeamTwo) && StringUtils.isNotBlank(teamNameTwo)); } private boolean hasSameTeamsPlayingAgainstEachOther(CreateEditMatchCommand value) {