Skip to content

Commit 6d97a43

Browse files
committed
Merge branch 'develop' into release
2 parents 22c6653 + a8e4634 commit 6d97a43

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kotlin.code.style=official
33
# project id
44
projectGroupId=io.github.smiley4
55
projectArtifactIdBase=ktor-swagger-ui
6-
projectVersion=3.3.1
6+
projectVersion=3.4.0
77

88
# publishing information
99
projectNameBase=Ktor Swagger UI
@@ -19,7 +19,7 @@ projectDeveloperUrl=https://github.com/SMILEY4
1919
versionKtor=2.3.11
2020
versionSwaggerUI=5.17.11
2121
versionSwaggerParser=2.1.22
22-
versionSchemaKenerator=1.1.1
22+
versionSchemaKenerator=1.2.2
2323
versionKotlinLogging=3.0.5
2424
versionKotest=5.8.0
2525
versionKotlinTest=1.8.21

ktor-swagger-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/data/OpenApiRequestParameterData.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ data class OpenApiRequestParameterData(
1313
val example: ExampleDescriptor?,
1414
val required: Boolean,
1515
val deprecated: Boolean,
16-
val allowEmptyValue: Boolean,
16+
val allowEmptyValue: Boolean?,
1717
val explode: Boolean,
18-
val allowReserved: Boolean,
18+
val allowReserved: Boolean?,
1919
val style: Parameter.StyleEnum?,
2020
)

ktor-swagger-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/dsl/routes/OpenApiRequestParameter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ class OpenApiRequestParameter(
118118
example = example,
119119
required = required ?: (location == ParameterLocation.PATH),
120120
deprecated = deprecated ?: false,
121-
allowEmptyValue = allowEmptyValue ?: true,
121+
allowEmptyValue = allowEmptyValue,
122122
explode = explode ?: false,
123-
allowReserved = allowReserved ?: true,
123+
allowReserved = allowReserved,
124124
style = style
125125
)
126126

ktor-swagger-ui/src/test/kotlin/io/github/smiley4/ktorswaggerui/builder/OperationBuilderTest.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,11 @@ class OperationBuilderTest : StringSpec({
219219
param.description shouldBe null
220220
param.required shouldBe false
221221
param.deprecated shouldBe false
222-
param.allowEmptyValue shouldBe true
222+
param.allowEmptyValue shouldBe null
223223
param.`$ref` shouldBe null
224224
param.style shouldBe null
225225
param.explode shouldBe false
226-
param.allowReserved shouldBe true
226+
param.allowReserved shouldBe null
227227
param.schema
228228
.also { it.shouldNotBeNull() }
229229
?.also { it.type = "string" }
@@ -239,11 +239,11 @@ class OperationBuilderTest : StringSpec({
239239
param.description shouldBe null
240240
param.required shouldBe true
241241
param.deprecated shouldBe false
242-
param.allowEmptyValue shouldBe true
242+
param.allowEmptyValue shouldBe null
243243
param.`$ref` shouldBe null
244244
param.style shouldBe null
245245
param.explode shouldBe false
246-
param.allowReserved shouldBe true
246+
param.allowReserved shouldBe null
247247
param.schema
248248
.also { it.shouldNotBeNull() }
249249
?.also { it.type = "integer" }
@@ -259,11 +259,11 @@ class OperationBuilderTest : StringSpec({
259259
param.description shouldBe null
260260
param.required shouldBe false
261261
param.deprecated shouldBe false
262-
param.allowEmptyValue shouldBe true
262+
param.allowEmptyValue shouldBe null
263263
param.`$ref` shouldBe null
264264
param.style shouldBe null
265265
param.explode shouldBe false
266-
param.allowReserved shouldBe true
266+
param.allowReserved shouldBe null
267267
param.schema
268268
.also { it.shouldNotBeNull() }
269269
?.also { it.type = "boolean" }

0 commit comments

Comments
 (0)