Skip to content

Commit b4edbb3

Browse files
author
Oleg
committed
Update library package
1 parent 20f43d3 commit b4edbb3

File tree

86 files changed

+615
-545
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+615
-545
lines changed

‎api/json-schema-validator.api

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
1-
public abstract class smirnov/oleg/json/pointer/JsonPointer {
2-
public static final field Companion Lsmirnov/oleg/json/pointer/JsonPointer$Companion;
3-
public static final field ROOT Lsmirnov/oleg/json/pointer/JsonPointer;
4-
public synthetic fun <init> (Ljava/lang/String;ILsmirnov/oleg/json/pointer/JsonPointer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
5-
public synthetic fun <init> (Ljava/lang/String;ILsmirnov/oleg/json/pointer/JsonPointer;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
6-
public static final fun compile (Ljava/lang/String;)Lsmirnov/oleg/json/pointer/JsonPointer;
1+
public abstract class com/github/optimumcode/json/pointer/JsonPointer {
2+
public static final field Companion Lcom/github/optimumcode/json/pointer/JsonPointer$Companion;
3+
public static final field ROOT Lcom/github/optimumcode/json/pointer/JsonPointer;
4+
public synthetic fun <init> (Ljava/lang/String;ILcom/github/optimumcode/json/pointer/JsonPointer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
5+
public synthetic fun <init> (Ljava/lang/String;ILcom/github/optimumcode/json/pointer/JsonPointer;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
6+
public static final fun compile (Ljava/lang/String;)Lcom/github/optimumcode/json/pointer/JsonPointer;
77
public fun equals (Ljava/lang/Object;)Z
88
public fun hashCode ()I
99
public fun toString ()Ljava/lang/String;
1010
}
1111

12-
public final class smirnov/oleg/json/pointer/JsonPointer$Companion {
13-
public final fun compile (Ljava/lang/String;)Lsmirnov/oleg/json/pointer/JsonPointer;
12+
public final class com/github/optimumcode/json/pointer/JsonPointer$Companion {
13+
public final fun compile (Ljava/lang/String;)Lcom/github/optimumcode/json/pointer/JsonPointer;
1414
}
1515

16-
public final class smirnov/oleg/json/pointer/JsonPointerExtensions {
17-
public static final fun at (Lkotlinx/serialization/json/JsonElement;Lsmirnov/oleg/json/pointer/JsonPointer;)Lkotlinx/serialization/json/JsonElement;
18-
public static final fun div (Lsmirnov/oleg/json/pointer/JsonPointer;Ljava/lang/String;)Lsmirnov/oleg/json/pointer/JsonPointer;
19-
public static final fun get (Lsmirnov/oleg/json/pointer/JsonPointer;I)Lsmirnov/oleg/json/pointer/JsonPointer;
20-
public static final fun plus (Lsmirnov/oleg/json/pointer/JsonPointer;Lsmirnov/oleg/json/pointer/JsonPointer;)Lsmirnov/oleg/json/pointer/JsonPointer;
21-
public static final fun relative (Lsmirnov/oleg/json/pointer/JsonPointer;Lsmirnov/oleg/json/pointer/JsonPointer;)Lsmirnov/oleg/json/pointer/JsonPointer;
16+
public final class com/github/optimumcode/json/pointer/JsonPointerExtensions {
17+
public static final fun at (Lkotlinx/serialization/json/JsonElement;Lcom/github/optimumcode/json/pointer/JsonPointer;)Lkotlinx/serialization/json/JsonElement;
18+
public static final fun div (Lcom/github/optimumcode/json/pointer/JsonPointer;Ljava/lang/String;)Lcom/github/optimumcode/json/pointer/JsonPointer;
19+
public static final fun get (Lcom/github/optimumcode/json/pointer/JsonPointer;I)Lcom/github/optimumcode/json/pointer/JsonPointer;
20+
public static final fun plus (Lcom/github/optimumcode/json/pointer/JsonPointer;Lcom/github/optimumcode/json/pointer/JsonPointer;)Lcom/github/optimumcode/json/pointer/JsonPointer;
21+
public static final fun relative (Lcom/github/optimumcode/json/pointer/JsonPointer;Lcom/github/optimumcode/json/pointer/JsonPointer;)Lcom/github/optimumcode/json/pointer/JsonPointer;
2222
}
2323

24-
public final class smirnov/oleg/json/pointer/JsonPointerKt {
25-
public static final fun JsonPointer (Ljava/lang/String;)Lsmirnov/oleg/json/pointer/JsonPointer;
24+
public final class com/github/optimumcode/json/pointer/JsonPointerKt {
25+
public static final fun JsonPointer (Ljava/lang/String;)Lcom/github/optimumcode/json/pointer/JsonPointer;
2626
}
2727

28-
public abstract interface class smirnov/oleg/json/schema/ErrorCollector {
29-
public static final field Companion Lsmirnov/oleg/json/schema/ErrorCollector$Companion;
30-
public static final field EMPTY Lsmirnov/oleg/json/schema/ErrorCollector;
31-
public abstract fun onError (Lsmirnov/oleg/json/schema/ValidationError;)V
28+
public abstract interface class com/github/optimumcode/json/schema/ErrorCollector {
29+
public static final field Companion Lcom/github/optimumcode/json/schema/ErrorCollector$Companion;
30+
public static final field EMPTY Lcom/github/optimumcode/json/schema/ErrorCollector;
31+
public abstract fun onError (Lcom/github/optimumcode/json/schema/ValidationError;)V
3232
}
3333

34-
public final class smirnov/oleg/json/schema/ErrorCollector$Companion {
34+
public final class com/github/optimumcode/json/schema/ErrorCollector$Companion {
3535
}
3636

37-
public final class smirnov/oleg/json/schema/JsonSchema {
38-
public static final field Companion Lsmirnov/oleg/json/schema/JsonSchema$Companion;
39-
public static final fun fromDescription (Ljava/lang/String;)Lsmirnov/oleg/json/schema/JsonSchema;
40-
public final fun validate (Lkotlinx/serialization/json/JsonElement;Lsmirnov/oleg/json/schema/ErrorCollector;)Z
37+
public final class com/github/optimumcode/json/schema/JsonSchema {
38+
public static final field Companion Lcom/github/optimumcode/json/schema/JsonSchema$Companion;
39+
public static final fun fromDescription (Ljava/lang/String;)Lcom/github/optimumcode/json/schema/JsonSchema;
40+
public final fun validate (Lkotlinx/serialization/json/JsonElement;Lcom/github/optimumcode/json/schema/ErrorCollector;)Z
4141
}
4242

43-
public final class smirnov/oleg/json/schema/JsonSchema$Companion {
44-
public final fun fromDescription (Ljava/lang/String;)Lsmirnov/oleg/json/schema/JsonSchema;
43+
public final class com/github/optimumcode/json/schema/JsonSchema$Companion {
44+
public final fun fromDescription (Ljava/lang/String;)Lcom/github/optimumcode/json/schema/JsonSchema;
4545
}
4646

47-
public final class smirnov/oleg/json/schema/ValidationError {
48-
public fun <init> (Lsmirnov/oleg/json/pointer/JsonPointer;Lsmirnov/oleg/json/pointer/JsonPointer;Ljava/lang/String;Ljava/util/Map;Lsmirnov/oleg/json/pointer/JsonPointer;)V
49-
public synthetic fun <init> (Lsmirnov/oleg/json/pointer/JsonPointer;Lsmirnov/oleg/json/pointer/JsonPointer;Ljava/lang/String;Ljava/util/Map;Lsmirnov/oleg/json/pointer/JsonPointer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
50-
public final fun component1 ()Lsmirnov/oleg/json/pointer/JsonPointer;
51-
public final fun component2 ()Lsmirnov/oleg/json/pointer/JsonPointer;
47+
public final class com/github/optimumcode/json/schema/ValidationError {
48+
public fun <init> (Lcom/github/optimumcode/json/pointer/JsonPointer;Lcom/github/optimumcode/json/pointer/JsonPointer;Ljava/lang/String;Ljava/util/Map;Lcom/github/optimumcode/json/pointer/JsonPointer;)V
49+
public synthetic fun <init> (Lcom/github/optimumcode/json/pointer/JsonPointer;Lcom/github/optimumcode/json/pointer/JsonPointer;Ljava/lang/String;Ljava/util/Map;Lcom/github/optimumcode/json/pointer/JsonPointer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
50+
public final fun component1 ()Lcom/github/optimumcode/json/pointer/JsonPointer;
51+
public final fun component2 ()Lcom/github/optimumcode/json/pointer/JsonPointer;
5252
public final fun component3 ()Ljava/lang/String;
5353
public final fun component4 ()Ljava/util/Map;
54-
public final fun component5 ()Lsmirnov/oleg/json/pointer/JsonPointer;
55-
public final fun copy (Lsmirnov/oleg/json/pointer/JsonPointer;Lsmirnov/oleg/json/pointer/JsonPointer;Ljava/lang/String;Ljava/util/Map;Lsmirnov/oleg/json/pointer/JsonPointer;)Lsmirnov/oleg/json/schema/ValidationError;
56-
public static synthetic fun copy$default (Lsmirnov/oleg/json/schema/ValidationError;Lsmirnov/oleg/json/pointer/JsonPointer;Lsmirnov/oleg/json/pointer/JsonPointer;Ljava/lang/String;Ljava/util/Map;Lsmirnov/oleg/json/pointer/JsonPointer;ILjava/lang/Object;)Lsmirnov/oleg/json/schema/ValidationError;
54+
public final fun component5 ()Lcom/github/optimumcode/json/pointer/JsonPointer;
55+
public final fun copy (Lcom/github/optimumcode/json/pointer/JsonPointer;Lcom/github/optimumcode/json/pointer/JsonPointer;Ljava/lang/String;Ljava/util/Map;Lcom/github/optimumcode/json/pointer/JsonPointer;)Lcom/github/optimumcode/json/schema/ValidationError;
56+
public static synthetic fun copy$default (Lcom/github/optimumcode/json/schema/ValidationError;Lcom/github/optimumcode/json/pointer/JsonPointer;Lcom/github/optimumcode/json/pointer/JsonPointer;Ljava/lang/String;Ljava/util/Map;Lcom/github/optimumcode/json/pointer/JsonPointer;ILjava/lang/Object;)Lcom/github/optimumcode/json/schema/ValidationError;
5757
public fun equals (Ljava/lang/Object;)Z
58-
public final fun getAbsoluteLocation ()Lsmirnov/oleg/json/pointer/JsonPointer;
58+
public final fun getAbsoluteLocation ()Lcom/github/optimumcode/json/pointer/JsonPointer;
5959
public final fun getDetails ()Ljava/util/Map;
6060
public final fun getMessage ()Ljava/lang/String;
61-
public final fun getObjectPath ()Lsmirnov/oleg/json/pointer/JsonPointer;
62-
public final fun getSchemaPath ()Lsmirnov/oleg/json/pointer/JsonPointer;
61+
public final fun getObjectPath ()Lcom/github/optimumcode/json/pointer/JsonPointer;
62+
public final fun getSchemaPath ()Lcom/github/optimumcode/json/pointer/JsonPointer;
6363
public fun hashCode ()I
6464
public fun toString ()Ljava/lang/String;
6565
}

‎gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ kotlin.code.style=official
22
kotlin.js.compiler=ir
33

44
version=0.0.1
5-
group=smirnov.oleg
5+
group=com.github.optimumcode

‎src/commonMain/kotlin/smirnov/oleg/json/pointer/JsonPointer.kt renamed to ‎src/commonMain/kotlin/com/github/optimumcode/json/pointer/JsonPointer.kt

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
package smirnov.oleg.json.pointer
1+
package com.github.optimumcode.json.pointer
22

33
import kotlin.jvm.JvmField
44
import kotlin.jvm.JvmStatic
55

6-
public fun JsonPointer(path: String): JsonPointer = JsonPointer.compile(path)
6+
public fun JsonPointer(path: String): JsonPointer =
7+
JsonPointer.compile(path)
78

89
public sealed class JsonPointer(
910
private val fullPath: String,
@@ -49,7 +50,9 @@ public sealed class JsonPointer(
4950
return if (expr.isEmpty()) {
5051
EmptyPointer
5152
} else {
52-
require(expr.startsWith(SEPARATOR)) { "JSON pointer must start from $SEPARATOR: '$expr'" }
53+
require(expr.startsWith(SEPARATOR)) {
54+
"JSON pointer must start from $SEPARATOR: '$expr'"
55+
}
5356
parseExpression(expr)
5457
}
5558
}
@@ -63,10 +66,22 @@ public sealed class JsonPointer(
6366
)
6467

6568
fun buildPath(start: Int, lastSegment: String, parent: PointerParent?): JsonPointer {
66-
var curr = SegmentPointer(expr, start, lastSegment, EmptyPointer)
69+
var curr = SegmentPointer(
70+
expr,
71+
start,
72+
lastSegment,
73+
EmptyPointer,
74+
)
6775
var parentValue = parent
6876
while (parentValue != null) {
69-
curr = parentValue.run { SegmentPointer(expr, startOffset, segment, curr) }
77+
curr = parentValue.run {
78+
SegmentPointer(
79+
expr,
80+
startOffset,
81+
segment,
82+
curr,
83+
)
84+
}
7085
parentValue = parentValue.parent
7186
}
7287
return curr

‎src/commonMain/kotlin/smirnov/oleg/json/pointer/extensions.kt renamed to ‎src/commonMain/kotlin/com/github/optimumcode/json/pointer/extensions.kt

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,37 @@
11
@file:Suppress("ktlint:standard:filename")
22
@file:JvmName("JsonPointerExtensions")
33

4-
package smirnov.oleg.json.pointer
4+
package com.github.optimumcode.json.pointer
55

66
import kotlinx.serialization.json.JsonArray
77
import kotlinx.serialization.json.JsonElement
88
import kotlinx.serialization.json.JsonObject
99
import kotlinx.serialization.json.JsonPrimitive
1010
import kotlin.jvm.JvmName
1111

12-
public operator fun JsonPointer.get(index: Int): JsonPointer = JsonPointer(
13-
buildString {
14-
val pointer = this@get.toString()
15-
append(pointer)
16-
if (!pointer.endsWith(JsonPointer.SEPARATOR)) {
17-
append(JsonPointer.SEPARATOR)
18-
}
19-
append(index)
20-
},
21-
)
12+
public operator fun JsonPointer.get(index: Int): JsonPointer =
13+
JsonPointer(
14+
buildString {
15+
val pointer = this@get.toString()
16+
append(pointer)
17+
if (!pointer.endsWith(JsonPointer.SEPARATOR)) {
18+
append(JsonPointer.SEPARATOR)
19+
}
20+
append(index)
21+
},
22+
)
2223

23-
public operator fun JsonPointer.div(property: String): JsonPointer = JsonPointer(
24-
buildString {
25-
val pointer = this@div.toString()
26-
append(pointer)
27-
if (!pointer.endsWith(JsonPointer.SEPARATOR)) {
28-
append(JsonPointer.SEPARATOR)
29-
}
30-
append(property)
31-
},
32-
)
24+
public operator fun JsonPointer.div(property: String): JsonPointer =
25+
JsonPointer(
26+
buildString {
27+
val pointer = this@div.toString()
28+
append(pointer)
29+
if (!pointer.endsWith(JsonPointer.SEPARATOR)) {
30+
append(JsonPointer.SEPARATOR)
31+
}
32+
append(property)
33+
},
34+
)
3335

3436
public operator fun JsonPointer.plus(otherPointer: JsonPointer): JsonPointer {
3537
if (this is EmptyPointer) {

‎src/commonMain/kotlin/smirnov/oleg/json/schema/ErrorCollector.kt renamed to ‎src/commonMain/kotlin/com/github/optimumcode/json/schema/ErrorCollector.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package smirnov.oleg.json.schema
1+
package com.github.optimumcode.json.schema
22

33
import kotlin.jvm.JvmField
44

‎src/commonMain/kotlin/smirnov/oleg/json/schema/JsonSchema.kt renamed to ‎src/commonMain/kotlin/com/github/optimumcode/json/schema/JsonSchema.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package smirnov.oleg.json.schema
1+
package com.github.optimumcode.json.schema
22

3+
import com.github.optimumcode.json.pointer.JsonPointer
4+
import com.github.optimumcode.json.schema.internal.DefaultAssertionContext
5+
import com.github.optimumcode.json.schema.internal.JsonSchemaAssertion
6+
import com.github.optimumcode.json.schema.internal.RefId
7+
import com.github.optimumcode.json.schema.internal.SchemaLoader
38
import kotlinx.serialization.json.Json
49
import kotlinx.serialization.json.JsonElement
5-
import smirnov.oleg.json.pointer.JsonPointer
6-
import smirnov.oleg.json.schema.internal.DefaultAssertionContext
7-
import smirnov.oleg.json.schema.internal.JsonSchemaAssertion
8-
import smirnov.oleg.json.schema.internal.RefId
9-
import smirnov.oleg.json.schema.internal.SchemaLoader
1010
import kotlin.jvm.JvmStatic
1111

1212
public class JsonSchema internal constructor(

‎src/commonMain/kotlin/smirnov/oleg/json/schema/ValidationError.kt renamed to ‎src/commonMain/kotlin/com/github/optimumcode/json/schema/ValidationError.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package smirnov.oleg.json.schema
1+
package com.github.optimumcode.json.schema
22

3-
import smirnov.oleg.json.pointer.JsonPointer
3+
import com.github.optimumcode.json.pointer.JsonPointer
44

55
/**
66
* [ValidationError] contains information about the assertion that failed during the validation

‎src/commonMain/kotlin/smirnov/oleg/json/schema/internal/AssertionContext.kt renamed to ‎src/commonMain/kotlin/com/github/optimumcode/json/schema/internal/AssertionContext.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package smirnov.oleg.json.schema.internal
1+
package com.github.optimumcode.json.schema.internal
22

3-
import smirnov.oleg.json.pointer.JsonPointer
4-
import smirnov.oleg.json.pointer.div
5-
import smirnov.oleg.json.pointer.get
3+
import com.github.optimumcode.json.pointer.JsonPointer
4+
import com.github.optimumcode.json.pointer.div
5+
import com.github.optimumcode.json.pointer.get
66

77
internal interface AssertionContext {
88
val objectPath: JsonPointer

‎src/commonMain/kotlin/smirnov/oleg/json/schema/internal/AssertionFactory.kt renamed to ‎src/commonMain/kotlin/com/github/optimumcode/json/schema/internal/AssertionFactory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package smirnov.oleg.json.schema.internal
1+
package com.github.optimumcode.json.schema.internal
22

33
import kotlinx.serialization.json.JsonElement
44

‎src/commonMain/kotlin/smirnov/oleg/json/schema/internal/AssertionsCollection.kt renamed to ‎src/commonMain/kotlin/com/github/optimumcode/json/schema/internal/AssertionsCollection.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package smirnov.oleg.json.schema.internal
1+
package com.github.optimumcode.json.schema.internal
22

3+
import com.github.optimumcode.json.schema.ErrorCollector
34
import kotlinx.serialization.json.JsonElement
4-
import smirnov.oleg.json.schema.ErrorCollector
55

66
internal class AssertionsCollection(
77
private val assertions: Collection<JsonSchemaAssertion>,

0 commit comments

Comments
 (0)