From 55089dbb258663ecf474265aa68e3d99e949649e Mon Sep 17 00:00:00 2001
From: ZhouXY108 <luquanlion@outlook.com>
Date: Fri, 24 Feb 2023 11:49:13 +0800
Subject: [PATCH] bugfix.

---
 .../plusone/validator/StringValidator.java    | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/java/xyz/zhouxy/plusone/validator/StringValidator.java b/src/main/java/xyz/zhouxy/plusone/validator/StringValidator.java
index e3c51c5..b833533 100644
--- a/src/main/java/xyz/zhouxy/plusone/validator/StringValidator.java
+++ b/src/main/java/xyz/zhouxy/plusone/validator/StringValidator.java
@@ -1,5 +1,6 @@
 package xyz.zhouxy.plusone.validator;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -58,18 +59,18 @@ public class StringValidator<DTO> extends PropertyValidator<DTO, String, StringV
         return this;
     }
 
-    public StringValidator<DTO> matchesOr(List<String> regexs, String errMsg) {
+    public StringValidator<DTO> matchesOr(List<Pattern> regexs, String errMsg) {
         return matchesOr(regexs, convertExceptionCreator(errMsg));
     }
 
     public <E extends RuntimeException> StringValidator<DTO> matchesOr(
-            List<String> regexs,
+            List<Pattern> regexs,
             Supplier<E> exceptionCreator) {
         return matchesOr(regexs, convertExceptionCreator(exceptionCreator));
     }
 
     public <E extends RuntimeException> StringValidator<DTO> matchesOr(
-            List<String> regexs,
+            List<Pattern> regexs,
             Function<String, E> exceptionCreator) {
         withRule(input -> RegexUtil.matchesOr(input, regexs.toArray(new Pattern[regexs.size()])), exceptionCreator);
         return this;
@@ -94,6 +95,23 @@ public class StringValidator<DTO> extends PropertyValidator<DTO, String, StringV
         return this;
     }
 
+    public StringValidator<DTO> matchesAnd(Collection<Pattern> regexs, String errMsg) {
+        return matchesAnd(regexs, convertExceptionCreator(errMsg));
+    }
+
+    public <E extends RuntimeException> StringValidator<DTO> matchesAnd(
+            Collection<Pattern> regexs,
+            Supplier<E> exceptionCreator) {
+        return matchesAnd(regexs, convertExceptionCreator(exceptionCreator));
+    }
+
+    public <E extends RuntimeException> StringValidator<DTO> matchesAnd(
+            Collection<Pattern> regexs,
+            Function<String, E> exceptionCreator) {
+        withRule(input -> RegexUtil.matchesAnd(input, regexs.toArray(new Pattern[regexs.size()])), exceptionCreator);
+        return this;
+    }
+
     // ===== notBlank =====
 
     public StringValidator<DTO> notBlank() {