schema path fixes in oneOf,allOf and anyOf validators (#628)

Co-authored-by: Prashanth Josyula <prashanth.chaitanya@prashan-wsmtedt.internal.salesforce.com>
networknt · Dec 8, 2022 · acd5839 · acd5839
1 parent ba3c84a
commit acd5839
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/com/networknt/schema/AllOfValidator.java b/src/main/java/com/networknt/schema/AllOfValidator.java
@@ -34,7 +34,7 @@ public AllOfValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentS
         int size = schemaNode.size();
         for (int i = 0; i < size; i++) {
             schemas.add(new JsonSchema(validationContext,
-                            parentSchema.getSchemaPath() + "/" + getValidatorType().getValue(),
+                            parentSchema.getSchemaPath() + "/" + getValidatorType().getValue() + "/" + i,
                                        parentSchema.getCurrentUri(),
                                        schemaNode.get(i),
                                        parentSchema));

diff --git a/src/main/java/com/networknt/schema/AnyOfValidator.java b/src/main/java/com/networknt/schema/AnyOfValidator.java
@@ -37,7 +37,7 @@ public AnyOfValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentS
         int size = schemaNode.size();
         for (int i = 0; i < size; i++) {
             schemas.add(new JsonSchema(validationContext,
-                    parentSchema.getSchemaPath() + "/" + getValidatorType().getValue(),
+                    parentSchema.getSchemaPath() + "/" + getValidatorType().getValue() + "/" + i,
                     parentSchema.getCurrentUri(),
                     schemaNode.get(i),
                     parentSchema));

diff --git a/src/main/java/com/networknt/schema/BaseJsonValidator.java b/src/main/java/com/networknt/schema/BaseJsonValidator.java
@@ -182,7 +182,7 @@ protected void preloadJsonSchemas(final Collection<JsonSchema> schemas) {
     }
 
     protected boolean isPartOfOneOfMultipleType() {
-        return parentSchema.schemaPath.endsWith(ValidatorTypeCode.ONE_OF.getValue());
+        return parentSchema.schemaPath.contains("/" + ValidatorTypeCode.ONE_OF.getValue() + "/");
     }
 
     /* ********************** START OF OpenAPI 3.0.x DISCRIMINATOR METHODS ********************************* */

diff --git a/src/main/java/com/networknt/schema/OneOfValidator.java b/src/main/java/com/networknt/schema/OneOfValidator.java
@@ -119,7 +119,7 @@ public OneOfValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentS
         int size = schemaNode.size();
         for (int i = 0; i < size; i++) {
             JsonNode childNode = schemaNode.get(i);
-            JsonSchema childSchema = new JsonSchema(validationContext,  parentSchema.getSchemaPath() + "/" + getValidatorType().getValue(), parentSchema.getCurrentUri(), childNode, parentSchema);
+            JsonSchema childSchema = new JsonSchema(validationContext,  parentSchema.getSchemaPath() + "/" + getValidatorType().getValue() + "/" + i, parentSchema.getCurrentUri(), childNode, parentSchema);
             schemas.add(new ShortcutValidator(childNode, parentSchema, validationContext, childSchema));
         }
         parseErrorCode(getValidatorType().getErrorCodeKey());