Skip to content
Snippets Groups Projects

Fix error when new required field is empty in prevalidation (usermail)

Merged Martin Lowe requested to merge (removed):malowe/main/eca-fix into main
1 file
+ 2
1
Compare changes
  • Side-by-side
  • Inline
@@ -15,7 +15,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import javax.enterprise.context.ApplicationScoped;
@@ -459,6 +458,7 @@ public class DefaultValidationService implements ValidationService {
* </p>
* <ul>
* <li>The validation status exists
* <li>The validation status has a user mail associated with it
* <li>Validation status has no present errors
* <li>Modification date is either unset or matches when set
* <li>User mail is set and matches (ignores case)
@@ -472,6 +472,7 @@ public class DefaultValidationService implements ValidationService {
*/
private boolean isValidationStatusCurrentAndValid(Optional<CommitValidationStatus> status, Commit c) {
return status.isPresent() && status.get().getErrors().isEmpty() && c.getAuthor() != null
&& StringUtils.isNotBlank(status.get().getUserMail())
&& status.get().getUserMail().equalsIgnoreCase(c.getAuthor().getMail())
&& (c.getLastModificationDate() == null || status.get().getLastModified().equals(c.getLastModificationDate()));
}
Loading