Skip to content

Commit 82d60c0

Browse files
bnasslahsenbnasslahsen
committed
Fixes tests for #3255 
1 parent 47efac0 commit 82d60c0

File tree

10 files changed

+105
-21
lines changed

10 files changed

+105
-21
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
"type": "string"
5555
},
5656
"nickname": {
57+
"nullable": true,
5758
"type": "string"
5859
}
5960
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,12 @@
5959
"type": "object",
6060
"properties": {
6161
"requiredNullableDefault": {
62+
"nullable": true,
6263
"type": "string",
6364
"default": "a default value"
6465
},
6566
"requiredNullableNoDefault": {
67+
"nullable": true,
6668
"type": "string"
6769
},
6870
"requiredNoNullableDefault": {
@@ -73,10 +75,12 @@
7375
"type": "string"
7476
},
7577
"requiredNullableDefault1": {
78+
"nullable": true,
7679
"type": "string",
7780
"default": "a default value"
7881
},
7982
"requiredNullableNoDefault1": {
83+
"nullable": true,
8084
"type": "string"
8185
},
8286
"requiredNoNullableDefault1": {
@@ -87,10 +91,12 @@
8791
"type": "string"
8892
},
8993
"noRequiredNullableDefault2": {
94+
"nullable": true,
9095
"type": "string",
9196
"default": "a default value"
9297
},
9398
"noRequiredNullableNoDefault2": {
99+
"nullable": true,
94100
"type": "string"
95101
},
96102
"noRequiredNoNullableDefault2": {
@@ -101,10 +107,12 @@
101107
"type": "string"
102108
},
103109
"noRequiredNullableDefault": {
110+
"nullable": true,
104111
"type": "string",
105112
"default": "a default value"
106113
},
107114
"noRequiredNullableNoDefault": {
115+
"nullable": true,
108116
"type": "string"
109117
},
110118
"noRequiredNoNullableDefault": {

‎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",

‎springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.0.1/app15.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,21 @@
5353
"type": "object",
5454
"properties": {
5555
"field11true": {
56+
"nullable": true,
5657
"type": "string"
5758
},
5859
"field10true": {
5960
"type": "string"
6061
},
6162
"field01false": {
63+
"nullable": true,
6264
"type": "string"
6365
},
6466
"field00false": {
6567
"type": "string"
6668
},
6769
"fieldN1false": {
70+
"nullable": true,
6871
"type": "string"
6972
},
7073
"fieldN0true": {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
"type": "string"
5555
},
5656
"nickname": {
57+
"nullable": true,
5758
"type": "string"
5859
}
5960
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,12 @@
5959
"type": "object",
6060
"properties": {
6161
"requiredNullableDefault": {
62+
"nullable": true,
6263
"type": "string",
6364
"default": "a default value"
6465
},
6566
"requiredNullableNoDefault": {
67+
"nullable": true,
6668
"type": "string"
6769
},
6870
"requiredNoNullableDefault": {
@@ -73,10 +75,12 @@
7375
"type": "string"
7476
},
7577
"requiredNullableDefault1": {
78+
"nullable": true,
7679
"type": "string",
7780
"default": "a default value"
7881
},
7982
"requiredNullableNoDefault1": {
83+
"nullable": true,
8084
"type": "string"
8185
},
8286
"requiredNoNullableDefault1": {
@@ -87,10 +91,12 @@
8791
"type": "string"
8892
},
8993
"noRequiredNullableDefault2": {
94+
"nullable": true,
9095
"type": "string",
9196
"default": "a default value"
9297
},
9398
"noRequiredNullableNoDefault2": {
99+
"nullable": true,
94100
"type": "string"
95101
},
96102
"noRequiredNoNullableDefault2": {
@@ -101,10 +107,12 @@
101107
"type": "string"
102108
},
103109
"noRequiredNullableDefault": {
110+
"nullable": true,
104111
"type": "string",
105112
"default": "a default value"
106113
},
107114
"noRequiredNullableNoDefault": {
115+
"nullable": true,
108116
"type": "string"
109117
},
110118
"noRequiredNoNullableDefault": {

‎springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app15.json‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,28 @@
4848
"type": "object",
4949
"properties": {
5050
"field11true": {
51-
"type": "string"
51+
"type": [
52+
"string",
53+
"null"
54+
]
5255
},
5356
"field10true": {
5457
"type": "string"
5558
},
5659
"field01false": {
57-
"type": "string"
60+
"type": [
61+
"string",
62+
"null"
63+
]
5864
},
5965
"field00false": {
6066
"type": "string"
6167
},
6268
"fieldN1false": {
63-
"type": "string"
69+
"type": [
70+
"string",
71+
"null"
72+
]
6473
},
6574
"fieldN0true": {
6675
"type": "string"

‎springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-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-webmvc-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)