Check for correct api version and add extra test case.

flock-community · Nov 4, 2023 · d429699 · d429699
1 parent ef0ebf8
commit d429699
Show file tree

Hide file tree

Showing 6 changed files with 10,473 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "community.flock.kotlinx.openapi.bindings"
-version = "0.0.17"
+version = "0.0.18"
 
 
 val dokkaOutputDir = "$buildDir/dokka"

diff --git a/src/commonMain/kotlin/community/flock/kotlinx/openapi/bindings/v2/OpenAPI.kt b/src/commonMain/kotlin/community/flock/kotlinx/openapi/bindings/v2/OpenAPI.kt
@@ -31,7 +31,8 @@ sealed class OpenAPI(
 
     fun decodeFromString(string: String): SwaggerObject {
         return json
-            .decodeFromString<JsonElement>(string)
+            .decodeFromString<JsonObject>(string)
+            .validate()
             .traverse({ path, obj -> obj.encodeExtensions(path) })
             .let { json.decodeFromJsonElement(it) }
     }
@@ -47,6 +48,12 @@ sealed class OpenAPI(
     companion object Default : OpenAPI()
 }
 
+private fun JsonObject.validate() = apply {
+    if (!containsKey("swagger")){
+        error("No valid openapi v2 element 'swagger' is missing")
+    }
+}
+
 private fun JsonObject.encodeExtensions(path: String): JsonObject {
     val (known, unknown) = this.toList()
         .partition { !regex.hasMatchedRegex("$path${it.first}|") }

diff --git a/src/commonMain/kotlin/community/flock/kotlinx/openapi/bindings/v3/OpenAPI.kt b/src/commonMain/kotlin/community/flock/kotlinx/openapi/bindings/v3/OpenAPI.kt
@@ -31,7 +31,8 @@ sealed class OpenAPI(
 
     fun decodeFromString(string: String): OpenAPIObject {
         return json
-            .decodeFromString<JsonElement>(string)
+            .decodeFromString<JsonObject>(string)
+            .validate()
             .traverse({ path, obj -> obj.encodeExtensions(path) })
             .let { json.decodeFromJsonElement(it) }
     }
@@ -47,6 +48,12 @@ sealed class OpenAPI(
     companion object Default : OpenAPI()
 }
 
+private fun JsonObject.validate() = apply {
+    if (!containsKey("openapi")){
+        error("No valid openapi v3 element 'openapi' is missing")
+    }
+}
+
 private fun JsonObject.encodeExtensions(path: String): JsonObject {
     val (known, unknown) = this.toList()
         .partition { !regex.hasMatchedRegex("$path${it.first}|") }