Merge branch 'develop' into release

SMILEY4 · Sep 17, 2024 · 6d97a43 · 6d97a43
2 parents 22c6653 + a8e4634
commit 6d97a43
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 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.3.1
+projectVersion=3.4.0
 
 # publishing information
 projectNameBase=Ktor Swagger UI
@@ -19,7 +19,7 @@ projectDeveloperUrl=https://github.com/SMILEY4
 versionKtor=2.3.11
 versionSwaggerUI=5.17.11
 versionSwaggerParser=2.1.22
-versionSchemaKenerator=1.1.1
+versionSchemaKenerator=1.2.2
 versionKotlinLogging=3.0.5
 versionKotest=5.8.0
 versionKotlinTest=1.8.21

diff --git a/...er-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/data/OpenApiRequestParameterData.kt b/...er-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/data/OpenApiRequestParameterData.kt
@@ -13,8 +13,8 @@ data class OpenApiRequestParameterData(
     val example: ExampleDescriptor?,
     val required: Boolean,
     val deprecated: Boolean,
-    val allowEmptyValue: Boolean,
+    val allowEmptyValue: Boolean?,
     val explode: Boolean,
-    val allowReserved: Boolean,
+    val allowReserved: Boolean?,
     val style: Parameter.StyleEnum?,
 )
diff --git a/...-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/dsl/routes/OpenApiRequestParameter.kt b/...-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/dsl/routes/OpenApiRequestParameter.kt
@@ -118,9 +118,9 @@ class OpenApiRequestParameter(
         example = example,
         required = required ?: (location == ParameterLocation.PATH),
         deprecated = deprecated ?: false,
-        allowEmptyValue = allowEmptyValue ?: true,
+        allowEmptyValue = allowEmptyValue,
         explode = explode ?: false,
-        allowReserved = allowReserved ?: true,
+        allowReserved = allowReserved,
         style = style
     )
 

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
@@ -219,11 +219,11 @@ class OperationBuilderTest : StringSpec({
                         param.description shouldBe null
                         param.required shouldBe false
                         param.deprecated shouldBe false
-                        param.allowEmptyValue shouldBe true
+                        param.allowEmptyValue shouldBe null
                         param.`$ref` shouldBe null
                         param.style shouldBe null
                         param.explode shouldBe false
-                        param.allowReserved shouldBe true
+                        param.allowReserved shouldBe null
                         param.schema
                             .also { it.shouldNotBeNull() }
                             ?.also { it.type = "string" }
@@ -239,11 +239,11 @@ class OperationBuilderTest : StringSpec({
                         param.description shouldBe null
                         param.required shouldBe true
                         param.deprecated shouldBe false
-                        param.allowEmptyValue shouldBe true
+                        param.allowEmptyValue shouldBe null
                         param.`$ref` shouldBe null
                         param.style shouldBe null
                         param.explode shouldBe false
-                        param.allowReserved shouldBe true
+                        param.allowReserved shouldBe null
                         param.schema
                             .also { it.shouldNotBeNull() }
                             ?.also { it.type = "integer" }
@@ -259,11 +259,11 @@ class OperationBuilderTest : StringSpec({
                         param.description shouldBe null
                         param.required shouldBe false
                         param.deprecated shouldBe false
-                        param.allowEmptyValue shouldBe true
+                        param.allowEmptyValue shouldBe null
                         param.`$ref` shouldBe null
                         param.style shouldBe null
                         param.explode shouldBe false
-                        param.allowReserved shouldBe true
+                        param.allowReserved shouldBe null
                         param.schema
                             .also { it.shouldNotBeNull() }
                             ?.also { it.type = "boolean" }