Skip to content

Commit 50b2fa8

Browse files
committed
swagger-core upgrade to 2.2.29
1 parent eed01f3 commit 50b2fa8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+791
-710
lines changed

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
6161
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
6262
<nexus-staging-maven-plugin>1.6.8</nexus-staging-maven-plugin>
63-
<swagger-api.version>2.2.28</swagger-api.version>
63+
<swagger-api.version>2.2.29</swagger-api.version>
6464
<swagger-ui.version>5.20.0</swagger-ui.version>
6565
<gmavenplus-plugin.version>1.13.1</gmavenplus-plugin.version>
6666
<jjwt.version>0.9.1</jjwt.version>

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java

+5
Original file line numberDiff line numberDiff line change
@@ -1029,6 +1029,11 @@ public Extension[] extensions() {
10291029
public String ref() {
10301030
return parameter.ref();
10311031
}
1032+
1033+
@Override
1034+
public Class<?>[] validationGroups() {
1035+
return new Class[0];
1036+
}
10321037
};
10331038
return Optional.of(parameterNew);
10341039
}

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/parameter/Builder.java

+10
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,11 @@ public class Builder {
132132
*/
133133
private String ref = "";
134134

135+
/**
136+
* The Validation groups.
137+
*/
138+
private Class<?>[] validationGroups = {};
139+
135140

136141
/**
137142
* Instantiates a new Parameter builder.
@@ -454,6 +459,11 @@ public Extension[] extensions() {
454459
public String ref() {
455460
return ref;
456461
}
462+
463+
@Override
464+
public Class<?>[] validationGroups() {
465+
return validationGroups;
466+
}
457467
};
458468
}
459469
}

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/GenericParameterService.java

+5
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,11 @@ public Extension[] extensions() {
715715
public String ref() {
716716
return schema.ref();
717717
}
718+
719+
@Override
720+
public Class<?>[] validationGroups() {
721+
return new Class[0];
722+
}
718723
};
719724
}
720725

springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app102.json

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"description": "parameter from child of RequestParams",
3333
"required": true,
3434
"schema": {
35+
"minLength": 1,
3536
"type": "string"
3637
}
3738
},

springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app3.json

+85-86
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,25 @@
1515
}
1616
],
1717
"paths": {
18-
"/tweets": {
18+
"/tweets/{id}": {
1919
"get": {
2020
"tags": [
2121
"tweet-controller"
2222
],
23-
"operationId": "getAllTweets",
23+
"operationId": "getTweetById",
24+
"parameters": [
25+
{
26+
"name": "id",
27+
"in": "path",
28+
"required": true,
29+
"schema": {
30+
"type": "string"
31+
}
32+
}
33+
],
2434
"responses": {
25-
"404": {
26-
"description": "Not Found",
35+
"409": {
36+
"description": "Conflict",
2737
"content": {
2838
"*/*": {
2939
"schema": {
@@ -32,8 +42,8 @@
3242
}
3343
}
3444
},
35-
"409": {
36-
"description": "Conflict",
45+
"404": {
46+
"description": "tweet not found",
3747
"content": {
3848
"*/*": {
3949
"schema": {
@@ -43,25 +53,32 @@
4353
}
4454
},
4555
"200": {
46-
"description": "get All Tweets",
56+
"description": "get Tweet By Id",
4757
"content": {
4858
"*/*": {
4959
"schema": {
50-
"type": "array",
51-
"items": {
52-
"$ref": "#/components/schemas/TweetDTO"
53-
}
60+
"$ref": "#/components/schemas/TweetDTO"
5461
}
5562
}
5663
}
5764
}
5865
}
5966
},
60-
"post": {
67+
"put": {
6168
"tags": [
6269
"tweet-controller"
6370
],
64-
"operationId": "createTweets",
71+
"operationId": "updateTweet",
72+
"parameters": [
73+
{
74+
"name": "id",
75+
"in": "path",
76+
"required": true,
77+
"schema": {
78+
"type": "string"
79+
}
80+
}
81+
],
6582
"requestBody": {
6683
"content": {
6784
"application/json": {
@@ -73,8 +90,8 @@
7390
"required": true
7491
},
7592
"responses": {
76-
"404": {
77-
"description": "Not Found",
93+
"409": {
94+
"description": "Conflict",
7895
"content": {
7996
"*/*": {
8097
"schema": {
@@ -83,8 +100,8 @@
83100
}
84101
}
85102
},
86-
"409": {
87-
"description": "Conflict",
103+
"404": {
104+
"description": "tweet not found",
88105
"content": {
89106
"*/*": {
90107
"schema": {
@@ -94,7 +111,7 @@
94111
}
95112
},
96113
"200": {
97-
"description": "create Tweets",
114+
"description": "update Tweet",
98115
"content": {
99116
"*/*": {
100117
"schema": {
@@ -104,14 +121,12 @@
104121
}
105122
}
106123
}
107-
}
108-
},
109-
"/tweets/{id}": {
110-
"get": {
124+
},
125+
"delete": {
111126
"tags": [
112127
"tweet-controller"
113128
],
114-
"operationId": "getTweetById",
129+
"operationId": "deleteTweet",
115130
"parameters": [
116131
{
117132
"name": "id",
@@ -123,8 +138,8 @@
123138
}
124139
],
125140
"responses": {
126-
"404": {
127-
"description": "tweet not found",
141+
"409": {
142+
"description": "Conflict",
128143
"content": {
129144
"*/*": {
130145
"schema": {
@@ -133,8 +148,8 @@
133148
}
134149
}
135150
},
136-
"409": {
137-
"description": "Conflict",
151+
"404": {
152+
"description": "tweet not found",
138153
"content": {
139154
"*/*": {
140155
"schema": {
@@ -144,45 +159,20 @@
144159
}
145160
},
146161
"200": {
147-
"description": "get Tweet By Id",
148-
"content": {
149-
"*/*": {
150-
"schema": {
151-
"$ref": "#/components/schemas/TweetDTO"
152-
}
153-
}
154-
}
162+
"description": "delete Tweet"
155163
}
156164
}
157-
},
158-
"put": {
165+
}
166+
},
167+
"/tweets": {
168+
"get": {
159169
"tags": [
160170
"tweet-controller"
161171
],
162-
"operationId": "updateTweet",
163-
"parameters": [
164-
{
165-
"name": "id",
166-
"in": "path",
167-
"required": true,
168-
"schema": {
169-
"type": "string"
170-
}
171-
}
172-
],
173-
"requestBody": {
174-
"content": {
175-
"application/json": {
176-
"schema": {
177-
"$ref": "#/components/schemas/TweetDTO"
178-
}
179-
}
180-
},
181-
"required": true
182-
},
172+
"operationId": "getAllTweets",
183173
"responses": {
184-
"404": {
185-
"description": "tweet not found",
174+
"409": {
175+
"description": "Conflict",
186176
"content": {
187177
"*/*": {
188178
"schema": {
@@ -191,8 +181,8 @@
191181
}
192182
}
193183
},
194-
"409": {
195-
"description": "Conflict",
184+
"404": {
185+
"description": "Not Found",
196186
"content": {
197187
"*/*": {
198188
"schema": {
@@ -202,35 +192,38 @@
202192
}
203193
},
204194
"200": {
205-
"description": "update Tweet",
195+
"description": "get All Tweets",
206196
"content": {
207197
"*/*": {
208198
"schema": {
209-
"$ref": "#/components/schemas/TweetDTO"
199+
"type": "array",
200+
"items": {
201+
"$ref": "#/components/schemas/TweetDTO"
202+
}
210203
}
211204
}
212205
}
213206
}
214207
}
215208
},
216-
"delete": {
209+
"post": {
217210
"tags": [
218211
"tweet-controller"
219212
],
220-
"operationId": "deleteTweet",
221-
"parameters": [
222-
{
223-
"name": "id",
224-
"in": "path",
225-
"required": true,
226-
"schema": {
227-
"type": "string"
213+
"operationId": "createTweets",
214+
"requestBody": {
215+
"content": {
216+
"application/json": {
217+
"schema": {
218+
"$ref": "#/components/schemas/TweetDTO"
219+
}
228220
}
229-
}
230-
],
221+
},
222+
"required": true
223+
},
231224
"responses": {
232-
"404": {
233-
"description": "tweet not found",
225+
"409": {
226+
"description": "Conflict",
234227
"content": {
235228
"*/*": {
236229
"schema": {
@@ -239,8 +232,8 @@
239232
}
240233
}
241234
},
242-
"409": {
243-
"description": "Conflict",
235+
"404": {
236+
"description": "Not Found",
244237
"content": {
245238
"*/*": {
246239
"schema": {
@@ -250,7 +243,14 @@
250243
}
251244
},
252245
"200": {
253-
"description": "delete Tweet"
246+
"description": "create Tweets",
247+
"content": {
248+
"*/*": {
249+
"schema": {
250+
"$ref": "#/components/schemas/TweetDTO"
251+
}
252+
}
253+
}
254254
}
255255
}
256256
}
@@ -263,8 +263,8 @@
263263
"description": "Tweets are Sent to the client as Server Sent Events",
264264
"operationId": "streamAllTweets",
265265
"responses": {
266-
"404": {
267-
"description": "Not Found",
266+
"409": {
267+
"description": "Conflict",
268268
"content": {
269269
"*/*": {
270270
"schema": {
@@ -273,8 +273,8 @@
273273
}
274274
}
275275
},
276-
"409": {
277-
"description": "Conflict",
276+
"404": {
277+
"description": "Not Found",
278278
"content": {
279279
"*/*": {
280280
"schema": {
@@ -304,8 +304,7 @@
304304
"schemas": {
305305
"TweetDTO": {
306306
"required": [
307-
"createdAt",
308-
"text"
307+
"createdAt"
309308
],
310309
"type": "object",
311310
"properties": {

0 commit comments

Comments
 (0)