change type of dynamicPath in failure object from JsonPointer to DynamicPath so that it includes the root document source as well

Author: erosb

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.github.erosb</groupId>
     <artifactId>json-sKema</artifactId>
-    <version>0.22.0</version>
+    <version>0.23.0-SNAPSHOT</version>
 
     <name>json-sKema</name>
     <description>JSON Schema Parser and Validator</description>

src/main/kotlin/com/github/erosb/jsonsKema/AllOf.kt

@@ -16,7 +16,7 @@ data class AllOfValidationFailure(
     override val schema: AllOfSchema,
     override val instance: IJsonValue,
     override val causes: Set<ValidationFailure>,
-    override val dynamicPath: JsonPointer
+    override val dynamicPath: DynamicPath
 ) : ValidationFailure(
     message = "${causes.size} subschemas out of ${schema.subschemas.size} failed to validate",
     schema = schema,

src/main/kotlin/com/github/erosb/jsonsKema/AnyOf.kt

@@ -17,7 +17,7 @@ data class AnyOfValidationFailure(
     override val schema: AnyOfSchema,
     override val instance: IJsonValue,
     override val causes: Set<ValidationFailure>,
-    override val dynamicPath: JsonPointer
+    override val dynamicPath: DynamicPath
 ) : ValidationFailure(
     message = "no subschema out of ${schema.subschemas.size} matched",
     schema = schema,

src/main/kotlin/com/github/erosb/jsonsKema/Const.kt

@@ -9,7 +9,7 @@ internal val constLoader: KeywordLoader = { ctx -> ConstSchema(ctx.keywordValue,
 data class ConstValidationFailure(
     override val schema: ConstSchema,
     override val instance: IJsonValue,
-    override val dynamicPath: JsonPointer
+    override val dynamicPath: DynamicPath
 ) : ValidationFailure(
     "actual instance is not the same as expected constant value",
     schema,

src/main/kotlin/com/github/erosb/jsonsKema/Contains.kt

@@ -20,7 +20,7 @@ data class ContainsValidationFailure(
     override val message: String,
     override val schema: ContainsSchema,
     override val instance: IJsonArray<*>,
-    override val dynamicPath: JsonPointer
+    override val dynamicPath: DynamicPath
 ) : ValidationFailure(
     message,
     schema,

src/main/kotlin/com/github/erosb/jsonsKema/DependentRequired.kt

@@ -16,5 +16,5 @@ data class DependentRequiredValidationFailure(
     val missingKeys: Set<String>,
     override val schema: DependentRequiredSchema,
     override val instance: IJsonObj,
-    override val dynamicPath: JsonPointer
+    override val dynamicPath: DynamicPath
 ) : ValidationFailure("property $presentKey is present in the object but the following properties are missing: ${missingKeys.joinToString(", ")}", schema, instance, Keyword.DEPENDENT_REQUIRED)

src/main/kotlin/com/github/erosb/jsonsKema/DependentSchemas.kt

@@ -20,7 +20,7 @@ data class DependentSchemasValidationFailure(
     override val schema: DependentSchemasSchema,
     override val instance: IJsonValue,
     val causesByProperty: Map<String, ValidationFailure>,
-    override val dynamicPath: JsonPointer
+    override val dynamicPath: DynamicPath
 ) : ValidationFailure(
     message = "some dependent subschemas did not match",
     schema = schema,

src/main/kotlin/com/github/erosb/jsonsKema/DynamicPath.kt

@@ -1,26 +1,67 @@
 package com.github.erosb.jsonsKema
 
-class DynamicPath {
+import java.net.URI
+
+class DynamicPath() {
+
+    constructor(rootDocumentSource: URI, path: List<String>): this() {
+        this.rootDocumentSource = rootDocumentSource
+        this.path.addAll(path)
+    }
 
     private val path = mutableListOf<String>()
 
-    fun <P> inSegmentPath(seg: String, cb: () -> P?): P? {
+    internal lateinit var rootDocumentSource: URI
+
+    fun <P> inSegmentPath(
+        seg: String,
+        cb: () -> P?,
+    ): P? {
         path.add(seg)
         val rval = cb()
         path.removeLast()
         return rval
     }
 
-    fun <P> inSegmentPath(seg: List<String>, cb: () -> P?): P? {
+    fun <P> inSegmentPath(
+        seg: List<String>,
+        cb: () -> P?,
+    ): P? {
         path.addAll(seg)
         val rval = cb()
         val count = seg.size
         for (i in 1..count) path.removeLast()
         return rval
     }
 
+    val pointer: JsonPointer
+        get() = JsonPointer(path.toList())
+
+    fun copy() = DynamicPath(rootDocumentSource, path.toMutableList())
+
+    operator fun plus(keyword: Keyword): DynamicPath = plus(keyword.value)
+
+    operator fun plus(keyword: String): DynamicPath = DynamicPath(rootDocumentSource, path + keyword)
 
-    fun asPointer(): JsonPointer = JsonPointer(path.toList())
+    override fun toString(): String = rootDocumentSource.toString() + pointer.toString()
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as DynamicPath
+
+        if (path != other.path) return false
+        if (rootDocumentSource != other.rootDocumentSource) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = path.hashCode()
+        result = 31 * result + rootDocumentSource.hashCode()
+        return result
+    }
 
 
 }

src/main/kotlin/com/github/erosb/jsonsKema/Enum.kt

@@ -11,5 +11,5 @@ internal val enumLoader: KeywordLoader = { ctx ->
 class EnumValidationFailure(
     override val schema: EnumSchema,
     override val instance: IJsonValue,
-    override val dynamicPath: JsonPointer
+    override val dynamicPath: DynamicPath
 ) : ValidationFailure("the instance is not equal to any enum values", schema, instance, Keyword.ENUM)

src/main/kotlin/com/github/erosb/jsonsKema/ExclusiveMaximum.kt

@@ -11,5 +11,5 @@ internal val exclusiveMaximumLoader: KeywordLoader = { ctx ->
 data class ExclusiveMaximumValidationFailure(
     override val schema: ExclusiveMaximumSchema,
     override val instance: IJsonNumber,
-    override val dynamicPath: JsonPointer
+    override val dynamicPath: DynamicPath
 ) : ValidationFailure("${instance.value} is greater than or equal to maximum ${schema.maximum}", schema, instance, Keyword.EXCLUSIVE_MAXIMUM)