Fix PatternValidator to not log for fail fast (#1106)

justin-tay · web-flow · commit ab233783af60 · 2024-08-26T08:24:44.000-04:00
diff --git a/src/main/java/com/networknt/schema/PatternValidator.java b/src/main/java/com/networknt/schema/PatternValidator.java
@@ -62,7 +62,7 @@ public Set<ValidationMessage> validate(ExecutionContext executionContext, JsonNo
                         .locale(executionContext.getExecutionConfig().getLocale())
                         .failFast(executionContext.isFailFast()).arguments(this.pattern).build());
             }
-        } catch (JsonSchemaException e) {
+        } catch (JsonSchemaException | FailFastAssertionException e) {
             throw e;
         } catch (RuntimeException e) {
             logger.error("Failed to apply pattern '{}' at {}: {}", this.pattern, instanceLocation, e.getMessage());
diff --git a/src/test/java/com/networknt/schema/PatternValidatorTest.java b/src/test/java/com/networknt/schema/PatternValidatorTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.networknt.schema;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+import com.networknt.schema.SpecVersion.VersionFlag;
+
+/**
+ * PatternValidatorTest.
+ */
+class PatternValidatorTest {
+    @Test
+    void failFast() {
+        String schemaData = "{\r\n"
+                + "  \"type\": \"string\",\r\n"
+                + "  \"pattern\": \"^(\\\\([0-9]{3}\\\\))?[0-9]{3}-[0-9]{4}$\"\r\n"
+                + "}";
+        String inputData = "\"hello\"";
+        JsonSchema schema = JsonSchemaFactory.getInstance(VersionFlag.V202012).getSchema(schemaData);
+        boolean result = schema.validate(inputData, InputFormat.JSON, OutputFormat.BOOLEAN);
+        assertFalse(result);
+    }
+
+}

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public Set<ValidationMessage> validate(ExecutionContext executionContext, JsonNo`
`62`	`62`	`.locale(executionContext.getExecutionConfig().getLocale())`
`63`	`63`	`.failFast(executionContext.isFailFast()).arguments(this.pattern).build());`
`64`	`64`	`}`
`65`		`- } catch (JsonSchemaException e) {`
	`65`	`+ } catch (JsonSchemaException \| FailFastAssertionException e) {`
`66`	`66`	`throw e;`
`67`	`67`	`} catch (RuntimeException e) {`
`68`	`68`	`logger.error("Failed to apply pattern '{}' at {}: {}", this.pattern, instanceLocation, e.getMessage());`