replace FormatValidator with Predicate

alibaba · Apr 15, 2023 · c1df36c · c1df36c
1 parent 4f03b1a
commit c1df36c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/core/src/main/java/com/alibaba/fastjson2/schema/FormatValidator.java b/core/src/main/java/com/alibaba/fastjson2/schema/FormatValidator.java
diff --git a/core/src/main/java/com/alibaba/fastjson2/schema/StringSchema.java b/core/src/main/java/com/alibaba/fastjson2/schema/StringSchema.java
@@ -13,6 +13,7 @@
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
+import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -33,7 +34,7 @@ final class StringSchema
     final String constValue;
     final Set<String> enumValues;
 
-    final FormatValidator formatValidator;
+    final Predicate<String> formatValidator;
 
     StringSchema(JSONObject input) {
         super(input);
@@ -169,7 +170,7 @@ public ValidateResult validate(Object value) {
             }
 
             if (formatValidator != null) {
-                if (!formatValidator.isValid(str)) {
+                if (!formatValidator.test(str)) {
                     return new ValidateResult(false, "format not match, expect %s, but %s", format, str);
                 }
             }