Skip to content

Commit 9df7788

Browse files
committed
Remove redundant custom serializer after updating kotlinx.serialization to 1.6.3
1 parent d84d1bd commit 9df7788

File tree

2 files changed

+3
-16
lines changed

2 files changed

+3
-16
lines changed

src/main/kotlin/BowtieSampsonSchemaValidatorLauncher.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import io.github.optimumcode.json.schema.JsonSchema
33
import io.github.optimumcode.json.schema.JsonSchemaLoader
44
import io.github.optimumcode.json.schema.SchemaType
55
import kotlinx.serialization.encodeToString
6+
import kotlinx.serialization.json.ClassDiscriminatorMode
67
import kotlinx.serialization.json.Json
78
import kotlinx.serialization.json.JsonElement
89
import kotlinx.serialization.json.JsonObject
@@ -21,6 +22,7 @@ fun main() {
2122
ignoreUnknownKeys = true
2223
prettyPrint = false
2324
encodeDefaults = true
25+
classDiscriminatorMode = ClassDiscriminatorMode.NONE
2426
}
2527
val processor = BowtieSampsonSchemaValidatorLauncher(outputWriter, json)
2628
input.lines().forEach {

src/main/kotlin/Responses.kt

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
import kotlinx.serialization.DeserializationStrategy
21
import kotlinx.serialization.Serializable
3-
import kotlinx.serialization.json.JsonContentPolymorphicSerializer
42
import kotlinx.serialization.json.JsonElement
5-
import kotlinx.serialization.json.JsonObject
63

74
@Serializable
85
class StartResponse(
@@ -55,7 +52,7 @@ sealed class RunResponse {
5552
) : RunResponse()
5653
}
5754

58-
@Serializable(with = TestResultSerializer::class)
55+
@Serializable
5956
sealed class TestResult {
6057

6158
@Serializable
@@ -82,15 +79,3 @@ class ErrorContext(
8279
val traceback: String? = null,
8380
val stderr: String? = null,
8481
)
85-
86-
private class TestResultSerializer : JsonContentPolymorphicSerializer<TestResult>(TestResult::class) {
87-
override fun selectDeserializer(element: JsonElement): DeserializationStrategy<TestResult> {
88-
require(element is JsonObject) { "command must be an object" }
89-
return when {
90-
"valid" in element -> TestResult.Executed.serializer()
91-
"skipped" in element -> TestResult.Skipped.serializer()
92-
"errored" in element -> TestResult.ExecutionError.serializer()
93-
else -> error("unknown object type")
94-
}
95-
}
96-
}

0 commit comments

Comments
 (0)