Skip to content

Commit 7a19bca

Browse files
committed
Fixes tests for #3255
1 parent 0b0ebab commit 7a19bca

File tree

4 files changed

+50
-14
lines changed

4 files changed

+50
-14
lines changed

springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/resources/results/3.0.1/app4.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@
5454
"type": "string"
5555
},
5656
"nickname": {
57-
"type": "string"
57+
"type": "string",
58+
"nullable": true
5859
}
5960
}
6061
}

springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/resources/results/3.0.1/app9.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,12 @@
6060
"properties": {
6161
"requiredNullableDefault": {
6262
"type": "string",
63+
"nullable": true,
6364
"default": "a default value"
6465
},
6566
"requiredNullableNoDefault": {
66-
"type": "string"
67+
"type": "string",
68+
"nullable": true
6769
},
6870
"requiredNoNullableDefault": {
6971
"type": "string",
@@ -74,10 +76,12 @@
7476
},
7577
"requiredNullableDefault1": {
7678
"type": "string",
79+
"nullable": true,
7780
"default": "a default value"
7881
},
7982
"requiredNullableNoDefault1": {
80-
"type": "string"
83+
"type": "string",
84+
"nullable": true
8185
},
8286
"requiredNoNullableDefault1": {
8387
"type": "string",
@@ -88,10 +92,12 @@
8892
},
8993
"noRequiredNullableDefault2": {
9094
"type": "string",
95+
"nullable": true,
9196
"default": "a default value"
9297
},
9398
"noRequiredNullableNoDefault2": {
94-
"type": "string"
99+
"type": "string",
100+
"nullable": true
95101
},
96102
"noRequiredNoNullableDefault2": {
97103
"type": "string",
@@ -102,10 +108,12 @@
102108
},
103109
"noRequiredNullableDefault": {
104110
"type": "string",
111+
"nullable": true,
105112
"default": "a default value"
106113
},
107114
"noRequiredNullableNoDefault": {
108-
"type": "string"
115+
"type": "string",
116+
"nullable": true
109117
},
110118
"noRequiredNoNullableDefault": {
111119
"type": "string",

springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/resources/results/3.1.0/app4.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@
5454
"type": "string"
5555
},
5656
"nickname": {
57-
"type": "string"
57+
"type": [
58+
"string",
59+
"null"
60+
]
5861
}
5962
}
6063
}

springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/resources/results/3.1.0/app9.json

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,17 @@
5959
"type": "object",
6060
"properties": {
6161
"requiredNullableDefault": {
62-
"type": "string",
62+
"type": [
63+
"string",
64+
"null"
65+
],
6366
"default": "a default value"
6467
},
6568
"requiredNullableNoDefault": {
66-
"type": "string"
69+
"type": [
70+
"string",
71+
"null"
72+
]
6773
},
6874
"requiredNoNullableDefault": {
6975
"type": "string",
@@ -73,11 +79,17 @@
7379
"type": "string"
7480
},
7581
"requiredNullableDefault1": {
76-
"type": "string",
82+
"type": [
83+
"string",
84+
"null"
85+
],
7786
"default": "a default value"
7887
},
7988
"requiredNullableNoDefault1": {
80-
"type": "string"
89+
"type": [
90+
"string",
91+
"null"
92+
]
8193
},
8294
"requiredNoNullableDefault1": {
8395
"type": "string",
@@ -87,11 +99,17 @@
8799
"type": "string"
88100
},
89101
"noRequiredNullableDefault2": {
90-
"type": "string",
102+
"type": [
103+
"string",
104+
"null"
105+
],
91106
"default": "a default value"
92107
},
93108
"noRequiredNullableNoDefault2": {
94-
"type": "string"
109+
"type": [
110+
"string",
111+
"null"
112+
]
95113
},
96114
"noRequiredNoNullableDefault2": {
97115
"type": "string",
@@ -101,11 +119,17 @@
101119
"type": "string"
102120
},
103121
"noRequiredNullableDefault": {
104-
"type": "string",
122+
"type": [
123+
"string",
124+
"null"
125+
],
105126
"default": "a default value"
106127
},
107128
"noRequiredNullableNoDefault": {
108-
"type": "string"
129+
"type": [
130+
"string",
131+
"null"
132+
]
109133
},
110134
"noRequiredNoNullableDefault": {
111135
"type": "string",

0 commit comments

Comments
 (0)