Split number property into longOrNull and doubleOrNull (#196)

Related to #191
OptimumCode · Sep 5, 2024 · 2cb7fdd · 2cb7fdd · github-actions · Sep 5, 2024
1 parent 2f973dd
commit 2cb7fdd
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 9 deletions.
diff --git a/json-schema-validator/api/json-schema-validator.api b/json-schema-validator/api/json-schema-validator.api
@@ -380,7 +380,8 @@ public abstract interface class io/github/optimumcode/json/schema/model/ObjectEl
 
 public abstract interface class io/github/optimumcode/json/schema/model/PrimitiveElement : io/github/optimumcode/json/schema/model/AbstractElement {
 	public abstract fun getContent ()Ljava/lang/String;
-	public abstract fun getNumber ()Ljava/lang/Number;
+	public abstract fun getDoubleOrNull ()Ljava/lang/Double;
+	public abstract fun getLongOrNull ()Ljava/lang/Long;
 	public abstract fun isBoolean ()Z
 	public abstract fun isNull ()Z
 	public abstract fun isNumber ()Z

diff --git a/...github/optimumcode/json/schema/internal/factories/number/Draft4MaximumAssertionFactory.kt b/...github/optimumcode/json/schema/internal/factories/number/Draft4MaximumAssertionFactory.kt
@@ -5,6 +5,7 @@ import io.github.optimumcode.json.schema.internal.JsonSchemaAssertion
 import io.github.optimumcode.json.schema.internal.LoadingContext
 import io.github.optimumcode.json.schema.internal.factories.number.util.NumberComparisonAssertion
 import io.github.optimumcode.json.schema.internal.factories.number.util.compareTo
+import io.github.optimumcode.json.schema.internal.util.number
 import io.github.optimumcode.json.schema.internal.wrapper.JsonPrimitiveWrapper
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject

diff --git a/...github/optimumcode/json/schema/internal/factories/number/Draft4MinimumAssertionFactory.kt b/...github/optimumcode/json/schema/internal/factories/number/Draft4MinimumAssertionFactory.kt
@@ -5,6 +5,7 @@ import io.github.optimumcode.json.schema.internal.JsonSchemaAssertion
 import io.github.optimumcode.json.schema.internal.LoadingContext
 import io.github.optimumcode.json.schema.internal.factories.number.util.NumberComparisonAssertion
 import io.github.optimumcode.json.schema.internal.factories.number.util.compareTo
+import io.github.optimumcode.json.schema.internal.util.number
 import io.github.optimumcode.json.schema.internal.wrapper.JsonPrimitiveWrapper
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject

diff --git a/...hub/optimumcode/json/schema/internal/factories/number/ExclusiveMaximumAssertionFactory.kt b/...hub/optimumcode/json/schema/internal/factories/number/ExclusiveMaximumAssertionFactory.kt
@@ -5,6 +5,7 @@ import io.github.optimumcode.json.schema.internal.LoadingContext
 import io.github.optimumcode.json.schema.internal.factories.AbstractAssertionFactory
 import io.github.optimumcode.json.schema.internal.factories.number.util.NumberComparisonAssertion
 import io.github.optimumcode.json.schema.internal.factories.number.util.compareTo
+import io.github.optimumcode.json.schema.internal.util.number
 import io.github.optimumcode.json.schema.internal.wrapper.JsonPrimitiveWrapper
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonPrimitive

diff --git a/...hub/optimumcode/json/schema/internal/factories/number/ExclusiveMinimumAssertionFactory.kt b/...hub/optimumcode/json/schema/internal/factories/number/ExclusiveMinimumAssertionFactory.kt
@@ -5,6 +5,7 @@ import io.github.optimumcode.json.schema.internal.LoadingContext
 import io.github.optimumcode.json.schema.internal.factories.AbstractAssertionFactory
 import io.github.optimumcode.json.schema.internal.factories.number.util.NumberComparisonAssertion
 import io.github.optimumcode.json.schema.internal.factories.number.util.compareTo
+import io.github.optimumcode.json.schema.internal.util.number
 import io.github.optimumcode.json.schema.internal.wrapper.JsonPrimitiveWrapper
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonPrimitive

diff --git a/...in/io/github/optimumcode/json/schema/internal/factories/number/MaximumAssertionFactory.kt b/...in/io/github/optimumcode/json/schema/internal/factories/number/MaximumAssertionFactory.kt
@@ -5,6 +5,7 @@ import io.github.optimumcode.json.schema.internal.LoadingContext
 import io.github.optimumcode.json.schema.internal.factories.AbstractAssertionFactory
 import io.github.optimumcode.json.schema.internal.factories.number.util.NumberComparisonAssertion
 import io.github.optimumcode.json.schema.internal.factories.number.util.compareTo
+import io.github.optimumcode.json.schema.internal.util.number
 import io.github.optimumcode.json.schema.internal.wrapper.JsonPrimitiveWrapper
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonPrimitive

diff --git a/...in/io/github/optimumcode/json/schema/internal/factories/number/MinimumAssertionFactory.kt b/...in/io/github/optimumcode/json/schema/internal/factories/number/MinimumAssertionFactory.kt
@@ -5,6 +5,7 @@ import io.github.optimumcode.json.schema.internal.LoadingContext
 import io.github.optimumcode.json.schema.internal.factories.AbstractAssertionFactory
 import io.github.optimumcode.json.schema.internal.factories.number.util.NumberComparisonAssertion
 import io.github.optimumcode.json.schema.internal.factories.number.util.compareTo
+import io.github.optimumcode.json.schema.internal.util.number
 import io.github.optimumcode.json.schema.internal.wrapper.JsonPrimitiveWrapper
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonPrimitive

diff --git a/...io/github/optimumcode/json/schema/internal/factories/number/MultipleOfAssertionFactory.kt b/...io/github/optimumcode/json/schema/internal/factories/number/MultipleOfAssertionFactory.kt
@@ -4,6 +4,7 @@ import io.github.optimumcode.json.schema.internal.JsonSchemaAssertion
 import io.github.optimumcode.json.schema.internal.LoadingContext
 import io.github.optimumcode.json.schema.internal.factories.AbstractAssertionFactory
 import io.github.optimumcode.json.schema.internal.factories.number.util.NumberComparisonAssertion
+import io.github.optimumcode.json.schema.internal.util.number
 import io.github.optimumcode.json.schema.internal.wrapper.JsonPrimitiveWrapper
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonPrimitive

diff --git a/...ain/kotlin/io/github/optimumcode/json/schema/internal/factories/number/util/NumberUtil.kt b/...ain/kotlin/io/github/optimumcode/json/schema/internal/factories/number/util/NumberUtil.kt
@@ -5,6 +5,7 @@ import io.github.optimumcode.json.schema.OutputCollector
 import io.github.optimumcode.json.schema.ValidationError
 import io.github.optimumcode.json.schema.internal.AssertionContext
 import io.github.optimumcode.json.schema.internal.JsonSchemaAssertion
+import io.github.optimumcode.json.schema.internal.util.number
 import io.github.optimumcode.json.schema.model.AbstractElement
 import io.github.optimumcode.json.schema.model.PrimitiveElement
 

diff --git a/...ator/src/commonMain/kotlin/io/github/optimumcode/json/schema/internal/util/NumberParts.kt b/...ator/src/commonMain/kotlin/io/github/optimumcode/json/schema/internal/util/NumberParts.kt
@@ -21,6 +21,9 @@ private const val E_SMALL_CHAR: Char = 'e'
 private const val E_BIG_CHAR: Char = 'E'
 private const val TEN: Double = 10.0
 
+internal val PrimitiveElement.number: Number?
+  get() = longOrNull ?: doubleOrNull
+
 /**
  * This function should be used only if you are certain that the [element] is a number
  */

diff --git a/.../src/commonMain/kotlin/io/github/optimumcode/json/schema/internal/wrapper/JsonWrappers.kt b/.../src/commonMain/kotlin/io/github/optimumcode/json/schema/internal/wrapper/JsonWrappers.kt
@@ -68,8 +68,10 @@ internal value class JsonPrimitiveWrapper(
     get() = primitive is JsonNull
   override val isString: Boolean
     get() = primitive.isString
-  override val number: Number?
-    get() = primitive.run { longOrNull ?: doubleOrNull }
+  override val longOrNull: Long?
+    get() = primitive.longOrNull
+  override val doubleOrNull: Double?
+    get() = primitive.doubleOrNull
   override val isBoolean: Boolean
     get() = primitive.run { !isString && booleanOrNull != null }
   override val isNumber: Boolean
@@ -100,8 +102,10 @@ internal value class StringWrapper(
     get() = false
   override val isString: Boolean
     get() = true
-  override val number: Number?
-    get() = value.toLongOrNull() ?: value.toDoubleOrNull()
+  override val longOrNull: Long?
+    get() = value.toLongOrNull()
+  override val doubleOrNull: Double?
+    get() = value.toDoubleOrNull()
   override val isBoolean: Boolean
     get() = false
   override val isNumber: Boolean

diff --git a/json-schema-validator/src/commonMain/kotlin/io/github/optimumcode/json/schema/model/Model.kt b/json-schema-validator/src/commonMain/kotlin/io/github/optimumcode/json/schema/model/Model.kt
@@ -43,11 +43,16 @@ public interface PrimitiveElement : AbstractElement {
   public val isNumber: Boolean
 
   /**
-   * Tries to parse the element as a [Number].
-   * Must return either [Long] or [Double].
-   * If the element cannot be interpreted as a number, returns `null`.
+   * Tries to represent the element as a [Long].
+   * If the element cannot be interpreted as a [Long], returns `null`.
    */
-  public val number: Number?
+  public val longOrNull: Long?
+
+  /**
+   * Tries to represent the element as a [Double].
+   * If the element cannot be interpreted as a [Double], returns `null`.
+   */
+  public val doubleOrNull: Double?
 
   /**
    * Returns the content of the element as plain string