Improve assertion for ensuring that all allowed domains are ascii-pri…

…ntable
PavlidisLab · Dec 12, 2023 · 61681c6 · 61681c6
1 parent ac73a88
commit 61681c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/main/java/ubc/pavlab/rdp/validation/RecaptchaValidator.java b/src/main/java/ubc/pavlab/rdp/validation/RecaptchaValidator.java
@@ -21,7 +21,6 @@
  * @author poirigui
  */
 public class RecaptchaValidator implements Validator {
-
  private final RestTemplate restTemplate;
  private final String secret;
 

diff --git a/src/main/java/ubc/pavlab/rdp/validation/SetBasedAllowedDomainStrategy.java b/src/main/java/ubc/pavlab/rdp/validation/SetBasedAllowedDomainStrategy.java
@@ -1,6 +1,7 @@
 package ubc.pavlab.rdp.validation;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.Assert;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -19,9 +20,8 @@ public class SetBasedAllowedDomainStrategy implements AllowedDomainStrategy {
 
  public SetBasedAllowedDomainStrategy( Collection<String> allowedDomains ) {
  // ascii-only domains, case-insensitive
- if ( allowedDomains.stream().anyMatch( d -> !StringUtils.isAsciiPrintable( d ) ) ) {
- throw new IllegalArgumentException( "Allowed domains must only contain ASCII-printable characters." );
- }
+ Assert.isTrue( allowedDomains.stream().allMatch( StringUtils::isAsciiPrintable ),
+ "Allowed domains must only contain ASCII-printable characters." );
  this.allowedDomains = new TreeSet<>( String.CASE_INSENSITIVE_ORDER );
  this.allowedDomains.addAll( allowedDomains );
  }