Restore backward compatibility (for kotlin). Add deprecations

Author: OptimumCode

json-schema-validator/api/json-schema-validator.api

@@ -340,6 +340,12 @@ public abstract interface class io/github/optimumcode/json/schema/extension/Exte
 
 public abstract interface class io/github/optimumcode/json/schema/extension/ExternalAssertion {
 	public abstract fun validate (Lio/github/optimumcode/json/schema/model/AbstractElement;Lio/github/optimumcode/json/schema/extension/ExternalAssertionContext;Lio/github/optimumcode/json/schema/ErrorCollector;)Z
+	public abstract fun validate (Lkotlinx/serialization/json/JsonElement;Lio/github/optimumcode/json/schema/extension/ExternalAssertionContext;Lio/github/optimumcode/json/schema/ErrorCollector;)Z
+}
+
+public final class io/github/optimumcode/json/schema/extension/ExternalAssertion$DefaultImpls {
+	public static fun validate (Lio/github/optimumcode/json/schema/extension/ExternalAssertion;Lio/github/optimumcode/json/schema/model/AbstractElement;Lio/github/optimumcode/json/schema/extension/ExternalAssertionContext;Lio/github/optimumcode/json/schema/ErrorCollector;)Z
+	public static fun validate (Lio/github/optimumcode/json/schema/extension/ExternalAssertion;Lkotlinx/serialization/json/JsonElement;Lio/github/optimumcode/json/schema/extension/ExternalAssertionContext;Lio/github/optimumcode/json/schema/ErrorCollector;)Z
 }
 
 public abstract interface class io/github/optimumcode/json/schema/extension/ExternalAssertionContext {

json-schema-validator/src/commonMain/kotlin/io/github/optimumcode/json/schema/extension/ExternalAssertion.kt

@@ -2,13 +2,16 @@ package io.github.optimumcode.json.schema.extension
 
 import io.github.optimumcode.json.schema.ErrorCollector
 import io.github.optimumcode.json.schema.ExperimentalApi
+import io.github.optimumcode.json.schema.internal.wrapper.JsonWrapper
 import io.github.optimumcode.json.schema.model.AbstractElement
+import kotlinx.serialization.json.JsonElement
 
 /**
  * This interface allows you to implement your own schema assertion.
  * This interface **does not** allow implementing custom applicators.
  * Only simple assertions (like: _format_, _type_) can be implemented.
  */
+@Suppress("detekt:ForbiddenComment")
 @ExperimentalApi
 public interface ExternalAssertion {
   /**
@@ -30,5 +33,24 @@ public interface ExternalAssertion {
     element: AbstractElement,
     context: ExternalAssertionContext,
     errorCollector: ErrorCollector,
-  ): Boolean
-}
+  ): Boolean =
+    // TODO: remove it after two minor/major release
+    validate(element.unwrap(), context, errorCollector)
+
+  // TODO: increase level to error in the next release
+  @Deprecated(
+    message = "override validate(AbstractElement, ExternalAssertionContext, ErrorCollector) instead",
+    level = DeprecationLevel.WARNING,
+  )
+  public fun validate(
+    element: JsonElement,
+    context: ExternalAssertionContext,
+    errorCollector: ErrorCollector,
+  ): Boolean = throw UnsupportedOperationException()
+}
+
+internal fun AbstractElement.unwrap(): JsonElement =
+  when (this) {
+    is JsonWrapper -> unwrap()
+    else -> error("unsupported element type: ${this::class.simpleName}")
+  }

json-schema-validator/src/commonMain/kotlin/io/github/optimumcode/json/schema/internal/wrapper/JsonWrappers.kt

@@ -14,10 +14,14 @@ import kotlinx.serialization.json.doubleOrNull
 import kotlinx.serialization.json.longOrNull
 import kotlin.jvm.JvmInline
 
+internal interface JsonWrapper {
+  fun unwrap(): JsonElement
+}
+
 @JvmInline
 internal value class JsonObjectWrapper(
   private val obj: JsonObject,
-) : ObjectElement {
+) : ObjectElement, JsonWrapper {
   override val keys: Set<String>
     get() = obj.keys
 
@@ -35,13 +39,15 @@ internal value class JsonObjectWrapper(
         it.key to it.value.wrap()
       }.iterator()
 
+  override fun unwrap(): JsonElement = obj
+
   override fun toString(): String = obj.toString()
 }
 
 @JvmInline
 internal value class JsonArrayWrapper(
   private val array: JsonArray,
-) : ArrayElement {
+) : ArrayElement, JsonWrapper {
   override fun iterator(): Iterator<AbstractElement> = array.asSequence().map { it.wrap() }.iterator()
 
   override fun get(index: Int): AbstractElement = array[index].wrap()
@@ -50,12 +56,14 @@ internal value class JsonArrayWrapper(
     get() = array.size
 
   override fun toString(): String = array.toString()
+
+  override fun unwrap(): JsonElement = array
 }
 
 @JvmInline
 internal value class JsonPrimitiveWrapper(
   private val primitive: JsonPrimitive,
-) : PrimitiveElement {
+) : PrimitiveElement, JsonWrapper {
   override val isNull: Boolean
     get() = primitive is JsonNull
   override val isString: Boolean
@@ -73,6 +81,8 @@ internal value class JsonPrimitiveWrapper(
     get() = primitive.content
 
   override fun toString(): String = primitive.toString()
+
+  override fun unwrap(): JsonElement = primitive
 }
 
 internal fun JsonElement.wrap(): AbstractElement =
@@ -85,7 +95,7 @@ internal fun JsonElement.wrap(): AbstractElement =
 @JvmInline
 internal value class StringWrapper(
   private val value: String,
-) : PrimitiveElement {
+) : PrimitiveElement, JsonWrapper {
   override val isNull: Boolean
     get() = false
   override val isString: Boolean
@@ -100,4 +110,6 @@ internal value class StringWrapper(
     get() = value
 
   override fun toString(): String = value
+
+  override fun unwrap(): JsonElement = JsonPrimitive(value)
 }