Skip to content

Optimize hasAdjacentKeywordInEvaluationPath #1092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions src/main/java/com/networknt/schema/BaseJsonValidator.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
48 changes: 48 additions & 0 deletions src/test/java/com/networknt/schema/Issue1091Test.java
Original file line number Diff line number Diff line change
@@ -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());
}
}
Loading