Optimize hasAdjacentKeywordInEvaluationPath (#1092)

* Detect when instance location changes for adjacent keyword

* Add test

Author: justin-tay

src/main/java/com/networknt/schema/BaseJsonValidator.java

@@ -391,21 +391,32 @@ public String toString() {
      * @return true if found
      */
     protected boolean hasAdjacentKeywordInEvaluationPath(String keyword) {
-        boolean hasValidator = false;
         JsonSchema schema = getEvaluationParentSchema();
+        boolean checkInstance = false;
+        boolean anchor = false;
+        boolean stop = false;
         while (schema != null) {
             for (JsonValidator validator : schema.getValidators()) {
                 if (keyword.equals(validator.getKeyword())) {
-                    hasValidator = true;
-                    break;
+                    return true;
+                }
+                if (checkInstance) {
+                    if ("properties".equals(validator.getKeyword()) || "items".equals(validator.getKeyword())) {
+                        stop = true;
+                    } else if ("$dynamicAnchor".equals(validator.getKeyword()) || "$recursiveAnchor".equals(validator.getKeyword())) {
+                        anchor = true;
+                    }
                 }
             }
-            if (hasValidator) {
-                break;
+            if (stop && !anchor) {
+                // If there is a change in instance location then return false
+                return false;
             }
             schema = schema.getEvaluationParentSchema();
+            checkInstance = true;
+            anchor = false;
         }
-        return hasValidator;
+        return false;
     }
 
     @Override

src/test/java/com/networknt/schema/Issue1091Test.java

@@ -0,0 +1,48 @@
+/*
+ * 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.assertEquals;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.networknt.schema.SpecVersion.VersionFlag;
+import com.networknt.schema.serialization.JsonMapperFactory;
+
+public class Issue1091Test {
+    @Test
+    @Disabled // Disabled as this test takes quite long to run for ci
+    void testHasAdjacentKeywordInEvaluationPath() throws Exception {
+        SchemaValidatorsConfig config = SchemaValidatorsConfig.builder().cacheRefs(false).build();
+
+        JsonSchema schema = JsonSchemaFactory.getInstance(VersionFlag.V4)
+                .getSchema(SchemaLocation.of("classpath:schema/issue1091.json"), config);
+        JsonNode node = JsonMapperFactory.getInstance()
+                .readTree(Issue1091Test.class.getClassLoader().getResource("data/issue1091.json"));
+
+        List<String> messages = schema.validate(node)
+                .stream()
+                .map(ValidationMessage::getMessage)
+                .collect(Collectors.toList());
+
+        assertEquals(0, messages.size());
+    }
+}