Merge branch 'develop' into release

SMILEY4 · Oct 13, 2024 · 9a6767e · 9a6767e
2 parents 81bb931 + 4f0f0de
commit 9a6767e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ kotlin.code.style=official
 # project id
 projectGroupId=io.github.smiley4
 projectArtifactIdBase=ktor-swagger-ui
-projectVersion=3.5.0
+projectVersion=3.5.1
 
 # publishing information
 projectNameBase=Ktor Swagger UI
@@ -16,10 +16,10 @@ projectDeveloperName=smiley4
 projectDeveloperUrl=https://github.com/SMILEY4
 
 # dependency versions
-versionKtor=2.3.11
+versionKtor=2.3.12
 versionSwaggerUI=5.17.11
 versionSwaggerParser=2.1.22
-versionSchemaKenerator=1.4.1
+versionSchemaKenerator=1.4.3
 versionKotlinLogging=3.0.5
 versionKotest=5.8.0
 versionKotlinTest=1.8.21

diff --git a/ktor-swagger-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/SwaggerPlugin.kt b/ktor-swagger-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/SwaggerPlugin.kt
@@ -39,10 +39,9 @@ import io.ktor.server.application.hooks.MonitoringEvent
 import io.ktor.server.application.install
 import io.ktor.server.application.plugin
 import io.ktor.server.application.pluginOrNull
-import io.ktor.server.config.*
 import io.ktor.server.routing.Routing
 import io.ktor.server.webjars.Webjars
-import io.swagger.v3.core.util.Json
+import io.swagger.v3.core.util.Json31
 import mu.KotlinLogging
 
 /**
@@ -101,7 +100,7 @@ private fun buildOpenApiSpec(specName: String, pluginConfig: PluginConfigData, r
         }
         val openApi = builder(pluginConfig, schemaContext, exampleContext).build(routes)
         pluginConfig.postBuild?.let { it(openApi, specName) }
-        Json.pretty(openApi)
+        Json31.pretty(openApi)
     } catch (e: Exception) {
         logger.error("Error during openapi-generation", e)
         "{}"

diff --git a/...wagger-ui/src/test/kotlin/io/github/smiley4/ktorswaggerui/builder/OperationBuilderTest.kt b/...wagger-ui/src/test/kotlin/io/github/smiley4/ktorswaggerui/builder/OperationBuilderTest.kt
@@ -287,8 +287,8 @@ class OperationBuilderTest : StringSpec({
                                     mediaType.schema
                                         .also { it.shouldNotBeNull() }
                                         ?.also { schema ->
-                                            schema.type shouldBe "array"
-                                            schema.items.also { item -> item.type shouldBe "string" }
+                                            schema.types shouldContainExactlyInAnyOrder setOf("array")
+                                            schema.items.also { item -> item.types shouldContainExactlyInAnyOrder setOf("string") }
                                         }
                                     mediaType.example shouldBe null
                                     mediaType.examples shouldBe null
@@ -348,7 +348,7 @@ class OperationBuilderTest : StringSpec({
                         ?.also { header ->
                             header.schema
                                 .also { it.shouldNotBeNull() }
-                                ?.also { it.type shouldBe "string" }
+                                ?.also { it.types shouldContainExactlyInAnyOrder setOf("string") }
                         }
 
                     response.content
@@ -359,8 +359,8 @@ class OperationBuilderTest : StringSpec({
                             mediaType.schema
                                 .also { it.shouldNotBeNull() }
                                 ?.also { schema ->
-                                    schema.type shouldBe "array"
-                                    schema.items.also { item -> item.type shouldBe "string" }
+                                    schema.types shouldContainExactlyInAnyOrder setOf("array")
+                                    schema.items.also { item -> item.types shouldContainExactlyInAnyOrder setOf("string") }
                                 }
                             mediaType.example shouldBe null
                             mediaType.examples shouldBe null
@@ -467,7 +467,7 @@ class OperationBuilderTest : StringSpec({
                                 ?.also { mediaType ->
                                     mediaType.schema
                                         .also { it.shouldNotBeNull() }
-                                        ?.also { it.type shouldBe "string" }
+                                        ?.also { it.types shouldContainExactlyInAnyOrder setOf("string") }
                                     mediaType.example shouldBe null
                                     mediaType.examples
                                         .also { it shouldHaveSize 1 }
@@ -491,7 +491,7 @@ class OperationBuilderTest : StringSpec({
                                 ?.also { mediaType ->
                                     mediaType.schema
                                         .also { it.shouldNotBeNull() }
-                                        ?.also { it.type shouldBe "string" }
+                                        ?.also { it.types shouldContainExactlyInAnyOrder setOf("string") }
                                     mediaType.example shouldBe null
                                     mediaType.examples
                                         .also { it shouldHaveSize 1 }
@@ -827,7 +827,7 @@ class OperationBuilderTest : StringSpec({
                                     mediaType.schema
                                         .also { it.shouldNotBeNull() }
                                         ?.also { schema ->
-                                            schema.type shouldBe "array"
+                                            schema.types shouldContainExactlyInAnyOrder setOf("array")
                                             schema.items.also { item ->
                                                 item.type shouldBe null
                                                 item.`$ref` shouldBe "#/components/schemas/io.github.smiley4." +
@@ -852,7 +852,7 @@ class OperationBuilderTest : StringSpec({
                 "io.github.smiley4.ktorswaggerui.builder.OperationBuilderTest.Companion.SimpleObject"
             )
             section["io.github.smiley4.ktorswaggerui.builder.OperationBuilderTest.Companion.SimpleObject"]?.also { schema ->
-                schema.type shouldBe "object"
+                schema.types shouldContainExactlyInAnyOrder setOf("object")
                 schema.properties.keys shouldContainExactlyInAnyOrder listOf("number", "text")
             }
         }