Skip to content

Commit 8abdc75

Browse files
jryan128jryan128
committed
Move to 120
1 parent 1da94a7 commit 8abdc75

File tree

4 files changed

+336
-4
lines changed

4 files changed

+336
-4
lines changed

‎springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app119/AccountId.java‎ renamed to ‎springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app120/AccountId.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* * limitations under the License.
1616
*
1717
*/
18-
package test.org.springdoc.api.app119;
18+
package test.org.springdoc.api.app120;
1919

2020
import java.lang.annotation.Retention;
2121
import java.lang.annotation.RetentionPolicy;

‎springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app119/MetaAnnotationController.java‎ renamed to ‎springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app120/MetaAnnotationController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* * limitations under the License.
1616
*
1717
*/
18-
package test.org.springdoc.api.app119;
18+
package test.org.springdoc.api.app120;
1919

2020
import java.lang.annotation.Retention;
2121
import java.lang.annotation.RetentionPolicy;

‎springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app119/SpringDocApp118Test.java‎ renamed to ‎springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app120/SpringDocApp120Test.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* * limitations under the License.
1616
*
1717
*/
18-
package test.org.springdoc.api.app119;
18+
package test.org.springdoc.api.app120;
1919

2020
import org.springframework.boot.autoconfigure.SpringBootApplication;
2121
import test.org.springdoc.api.AbstractSpringDocTest;
@@ -24,7 +24,7 @@
2424
/**
2525
* Tests Spring meta-annotations as method parameters
2626
*/
27-
public class SpringDocApp118Test extends AbstractSpringDocTest {
27+
public class SpringDocApp120Test extends AbstractSpringDocTest {
2828

2929
@SpringBootApplication
3030
static class SpringDocTestApp {}

‎springdoc-openapi-webmvc-core/src/test/resources/results/app120.json‎

Lines changed: 332 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,332 @@
1+
{
2+
<<<<<<< HEAD
3+
"openapi": "3.0.1",
4+
"info": {
5+
"title": "OpenAPI definition",
6+
"version": "v0"
7+
},
8+
"servers": [
9+
{
10+
"url": "http://localhost",
11+
"description": "Generated server url"
12+
}
13+
],
14+
"paths": {
15+
"/simpleTest/{accountId}": {
16+
"get": {
17+
"tags": [
18+
"hello-controller"
19+
],
20+
"operationId": "simpleTest",
21+
"parameters": [
22+
{
23+
"name": "accountId",
24+
"in": "path",
25+
"description": "non alias description",
26+
"required": true,
27+
"schema": {
28+
"type": "string"
29+
},
30+
"example": 123456
31+
}
32+
],
33+
"responses": {
34+
"200": {
35+
"description": "OK",
36+
"content": {
37+
"*/*": {
38+
"schema": {
39+
"type": "string"
40+
}
41+
}
42+
}
43+
}
44+
}
45+
}
46+
},
47+
"/testTopLevelParamAnnotationOverrides/{accountId}": {
48+
"get": {
49+
"tags": [
50+
"hello-controller"
51+
],
52+
"operationId": "testTopLevelParamAnnotationOverrides",
53+
"parameters": [
54+
{
55+
"name": "id",
56+
"in": "path",
57+
"required": true,
58+
"schema": {
59+
"type": "string"
60+
}
61+
}
62+
],
63+
"responses": {
64+
"200": {
65+
"description": "OK",
66+
"content": {
67+
"*/*": {
68+
"schema": {
69+
"type": "string"
70+
}
71+
}
72+
}
73+
}
74+
}
75+
}
76+
},
77+
"/testQueryParam": {
78+
"get": {
79+
"tags": [
80+
"hello-controller"
81+
],
82+
"operationId": "testQueryParam",
83+
"parameters": [
84+
{
85+
"name": "accountId",
86+
"in": "query",
87+
"description": "non alias description",
88+
"required": true,
89+
"schema": {
90+
"type": "string"
91+
},
92+
"example": 123456
93+
}
94+
],
95+
"responses": {
96+
"200": {
97+
"description": "OK",
98+
"content": {
99+
"*/*": {
100+
"schema": {
101+
"type": "string"
102+
}
103+
}
104+
}
105+
}
106+
}
107+
}
108+
},
109+
"/testAliasFor": {
110+
"get": {
111+
"tags": [
112+
"hello-controller"
113+
],
114+
"operationId": "testAliasFor",
115+
"parameters": [
116+
{
117+
"name": "accountId",
118+
"in": "query",
119+
"description": "non alias description",
120+
"required": true,
121+
"schema": {
122+
"type": "string"
123+
},
124+
"example": "OVERRIDDEN EXAMPLE"
125+
}
126+
],
127+
"responses": {
128+
"200": {
129+
"description": "OK",
130+
"content": {
131+
"*/*": {
132+
"schema": {
133+
"type": "string"
134+
}
135+
}
136+
}
137+
}
138+
}
139+
}
140+
},
141+
"/testMetaMetaAnnotation/{accountId}": {
142+
"get": {
143+
"tags": [
144+
"hello-controller"
145+
],
146+
"operationId": "testMetaMetaAnnotation",
147+
"parameters": [
148+
{
149+
"name": "queryAccountId",
150+
"in": "query",
151+
"description": "non alias description",
152+
"required": true,
153+
"schema": {
154+
"type": "string"
155+
},
156+
"example": 123456
157+
},
158+
{
159+
"name": "accountId",
160+
"in": "path",
161+
"description": "non alias description",
162+
"required": true,
163+
"schema": {
164+
"type": "string"
165+
},
166+
"example": 123456
167+
}
168+
],
169+
"responses": {
170+
"200": {
171+
"description": "OK",
172+
"content": {
173+
"*/*": {
174+
"schema": {
175+
"type": "string"
176+
}
177+
}
178+
}
179+
}
180+
}
181+
}
182+
},
183+
"/testAllAttributesAsAlias/": {
184+
"get": {
185+
"tags": [
186+
"hello-controller"
187+
],
188+
"operationId": "testAllAttributesAsAlias",
189+
"parameters": [
190+
{
191+
"name": "name",
192+
"in": "query",
193+
"description": "desc",
194+
"required": true,
195+
"deprecated": true,
196+
"allowEmptyValue": true,
197+
"style": "deepObject",
198+
"explode": true,
199+
"allowReserved": true,
200+
"schema": {
201+
"type": "boolean"
202+
},
203+
"example": 1234
204+
}
205+
],
206+
"responses": {
207+
"200": {
208+
"description": "OK",
209+
"content": {
210+
"*/*": {
211+
"schema": {
212+
"type": "string"
213+
}
214+
}
215+
}
216+
}
217+
}
218+
}
219+
},
220+
"/testNoAliasFors/": {
221+
"get": {
222+
"tags": [
223+
"hello-controller"
224+
],
225+
"operationId": "testNoAliasFors",
226+
"parameters": [
227+
{
228+
"name": "name",
229+
"in": "query",
230+
"description": "desc",
231+
"required": true,
232+
"deprecated": true,
233+
"allowEmptyValue": true,
234+
"style": "deepObject",
235+
"explode": true,
236+
"allowReserved": true,
237+
"schema": {
238+
"type": "boolean"
239+
},
240+
"example": 1234
241+
}
242+
],
243+
"responses": {
244+
"200": {
245+
"description": "OK",
246+
"content": {
247+
"*/*": {
248+
"schema": {
249+
"type": "string"
250+
}
251+
}
252+
}
253+
}
254+
}
255+
}
256+
}
257+
},
258+
"components": {}
259+
=======
260+
"openapi": "3.0.1",
261+
"info": {
262+
"title": "OpenAPI definition",
263+
"version": "v0"
264+
},
265+
"servers": [
266+
{
267+
"url": "http://localhost",
268+
"description": "Generated server url"
269+
}
270+
],
271+
"paths": {
272+
"/multi": {
273+
"post": {
274+
"tags": [
275+
"hello-controller"
276+
],
277+
"summary": "Multiple files and JSON payloads as multi part request",
278+
"operationId": "multiFilesInMultiPart",
279+
"requestBody": {
280+
"content": {
281+
"multipart/form-data": {
282+
"schema": {
283+
"type": "object",
284+
"properties": {
285+
"params": {
286+
"$ref": "#/components/schemas/JsonRequest"
287+
},
288+
"file1": {
289+
"type": "string",
290+
"description": "This is file1",
291+
"format": "binary"
292+
},
293+
"file2": {
294+
"type": "string",
295+
"description": "This is file2",
296+
"format": "binary"
297+
}
298+
}
299+
}
300+
}
301+
}
302+
},
303+
"responses": {
304+
"200": {
305+
"description": "OK",
306+
"content": {
307+
"text/plain": {
308+
"schema": {
309+
"type": "string"
310+
}
311+
}
312+
}
313+
}
314+
}
315+
}
316+
}
317+
},
318+
"components": {
319+
"schemas": {
320+
"JsonRequest": {
321+
"type": "object",
322+
"properties": {
323+
"name": {
324+
"type": "string"
325+
}
326+
},
327+
"description": "This is the configuration"
328+
}
329+
}
330+
}
331+
>>>>>>> origin/master
332+
}

0 commit comments

Comments
 (0)