Skip to content

Commit 5144000

Browse files
johanbrandhorstjohanbrandhorst
authored
Revert 4c79b45 (#3856)
Revert #3072 which introduced a regression in the handling of nested query parameters. Fixes #3848
1 parent 2c837f2 commit 5144000

22 files changed

+180
-1389
lines changed

‎examples/internal/clients/echo/api/swagger.yaml

Lines changed: 0 additions & 214 deletions
Original file line numberDiff line numberDiff line change
@@ -11,88 +11,6 @@ consumes:
1111
produces:
1212
- "application/json"
1313
paths:
14-
/v1/example/echo/resource/{resourceId}:
15-
get:
16-
tags:
17-
- "EchoService"
18-
summary: "Echo method receives a simple message and returns it."
19-
description: "The message posted as the id parameter will also be\nreturned."
20-
operationId: "EchoService_Echo6"
21-
parameters:
22-
- name: "resourceId"
23-
in: "path"
24-
required: true
25-
type: "string"
26-
x-exportParamName: "ResourceId"
27-
- name: "id"
28-
in: "query"
29-
description: "Id represents the message identifier."
30-
required: false
31-
type: "string"
32-
x-exportParamName: "Id"
33-
x-optionalDataType: "String"
34-
- name: "num"
35-
in: "query"
36-
required: false
37-
type: "string"
38-
format: "int64"
39-
x-exportParamName: "Num"
40-
x-optionalDataType: "String"
41-
- name: "lineNum"
42-
in: "query"
43-
required: false
44-
type: "string"
45-
format: "int64"
46-
x-exportParamName: "LineNum"
47-
x-optionalDataType: "String"
48-
- name: "lang"
49-
in: "query"
50-
required: false
51-
type: "string"
52-
x-exportParamName: "Lang"
53-
x-optionalDataType: "String"
54-
- name: "status.progress"
55-
in: "query"
56-
required: false
57-
type: "string"
58-
format: "int64"
59-
x-exportParamName: "StatusProgress"
60-
x-optionalDataType: "String"
61-
- name: "status.note"
62-
in: "query"
63-
required: false
64-
type: "string"
65-
x-exportParamName: "StatusNote"
66-
x-optionalDataType: "String"
67-
- name: "en"
68-
in: "query"
69-
required: false
70-
type: "string"
71-
format: "int64"
72-
x-exportParamName: "En"
73-
x-optionalDataType: "String"
74-
- name: "no.progress"
75-
in: "query"
76-
required: false
77-
type: "string"
78-
format: "int64"
79-
x-exportParamName: "NoProgress"
80-
x-optionalDataType: "String"
81-
- name: "no.note"
82-
in: "query"
83-
required: false
84-
type: "string"
85-
x-exportParamName: "NoNote"
86-
x-optionalDataType: "String"
87-
responses:
88-
200:
89-
description: "A successful response."
90-
schema:
91-
$ref: "#/definitions/examplepbSimpleMessage"
92-
default:
93-
description: "An unexpected error response."
94-
schema:
95-
$ref: "#/definitions/rpcStatus"
9614
/v1/example/echo/{id}:
9715
post:
9816
tags:
@@ -160,12 +78,6 @@ paths:
16078
type: "string"
16179
x-exportParamName: "NoNote"
16280
x-optionalDataType: "String"
163-
- name: "resourceId"
164-
in: "query"
165-
required: false
166-
type: "string"
167-
x-exportParamName: "ResourceId"
168-
x-optionalDataType: "String"
16981
responses:
17082
200:
17183
description: "A successful response."
@@ -241,12 +153,6 @@ paths:
241153
type: "string"
242154
x-exportParamName: "NoNote"
243155
x-optionalDataType: "String"
244-
- name: "resourceId"
245-
in: "query"
246-
required: false
247-
type: "string"
248-
x-exportParamName: "ResourceId"
249-
x-optionalDataType: "String"
250156
responses:
251157
200:
252158
description: "A successful response."
@@ -321,12 +227,6 @@ paths:
321227
type: "string"
322228
x-exportParamName: "NoNote"
323229
x-optionalDataType: "String"
324-
- name: "resourceId"
325-
in: "query"
326-
required: false
327-
type: "string"
328-
x-exportParamName: "ResourceId"
329-
x-optionalDataType: "String"
330230
responses:
331231
200:
332232
description: "A successful response."
@@ -395,12 +295,6 @@ paths:
395295
format: "int64"
396296
x-exportParamName: "NoProgress"
397297
x-optionalDataType: "String"
398-
- name: "resourceId"
399-
in: "query"
400-
required: false
401-
type: "string"
402-
x-exportParamName: "ResourceId"
403-
x-optionalDataType: "String"
404298
responses:
405299
200:
406300
description: "A successful response."
@@ -471,12 +365,6 @@ paths:
471365
format: "int64"
472366
x-exportParamName: "NoProgress"
473367
x-optionalDataType: "String"
474-
- name: "resourceId"
475-
in: "query"
476-
required: false
477-
type: "string"
478-
x-exportParamName: "ResourceId"
479-
x-optionalDataType: "String"
480368
responses:
481369
200:
482370
description: "A successful response."
@@ -568,93 +456,6 @@ paths:
568456
format: "int64"
569457
x-exportParamName: "En"
570458
x-optionalDataType: "String"
571-
- name: "resourceId"
572-
in: "query"
573-
required: false
574-
type: "string"
575-
x-exportParamName: "ResourceId"
576-
x-optionalDataType: "String"
577-
responses:
578-
200:
579-
description: "A successful response."
580-
schema:
581-
$ref: "#/definitions/examplepbSimpleMessage"
582-
default:
583-
description: "An unexpected error response."
584-
schema:
585-
$ref: "#/definitions/rpcStatus"
586-
/v1/example/echo_body2/{id}:
587-
put:
588-
tags:
589-
- "EchoService"
590-
summary: "EchoBody method receives a simple message and returns it."
591-
operationId: "EchoService_EchoBody3"
592-
parameters:
593-
- name: "id"
594-
in: "path"
595-
description: "Id represents the message identifier."
596-
required: true
597-
type: "string"
598-
x-exportParamName: "Id"
599-
- in: "body"
600-
name: "resourceId"
601-
required: true
602-
schema:
603-
type: "string"
604-
x-exportParamName: "ResourceId"
605-
- name: "num"
606-
in: "query"
607-
required: false
608-
type: "string"
609-
format: "int64"
610-
x-exportParamName: "Num"
611-
x-optionalDataType: "String"
612-
- name: "lineNum"
613-
in: "query"
614-
required: false
615-
type: "string"
616-
format: "int64"
617-
x-exportParamName: "LineNum"
618-
x-optionalDataType: "String"
619-
- name: "lang"
620-
in: "query"
621-
required: false
622-
type: "string"
623-
x-exportParamName: "Lang"
624-
x-optionalDataType: "String"
625-
- name: "status.progress"
626-
in: "query"
627-
required: false
628-
type: "string"
629-
format: "int64"
630-
x-exportParamName: "StatusProgress"
631-
x-optionalDataType: "String"
632-
- name: "status.note"
633-
in: "query"
634-
required: false
635-
type: "string"
636-
x-exportParamName: "StatusNote"
637-
x-optionalDataType: "String"
638-
- name: "en"
639-
in: "query"
640-
required: false
641-
type: "string"
642-
format: "int64"
643-
x-exportParamName: "En"
644-
x-optionalDataType: "String"
645-
- name: "no.progress"
646-
in: "query"
647-
required: false
648-
type: "string"
649-
format: "int64"
650-
x-exportParamName: "NoProgress"
651-
x-optionalDataType: "String"
652-
- name: "no.note"
653-
in: "query"
654-
required: false
655-
type: "string"
656-
x-exportParamName: "NoNote"
657-
x-optionalDataType: "String"
658459
responses:
659460
200:
660461
description: "A successful response."
@@ -731,12 +532,6 @@ paths:
731532
type: "string"
732533
x-exportParamName: "NoNote"
733534
x-optionalDataType: "String"
734-
- name: "resourceId"
735-
in: "query"
736-
required: false
737-
type: "string"
738-
x-exportParamName: "ResourceId"
739-
x-optionalDataType: "String"
740535
responses:
741536
200:
742537
description: "A successful response."
@@ -837,12 +632,6 @@ paths:
837632
type: "string"
838633
x-exportParamName: "NoNote"
839634
x-optionalDataType: "String"
840-
- name: "resourceId"
841-
in: "query"
842-
required: false
843-
type: "string"
844-
x-exportParamName: "ResourceId"
845-
x-optionalDataType: "String"
846635
responses:
847636
200:
848637
description: "A successful response."
@@ -910,14 +699,11 @@ definitions:
910699
format: "int64"
911700
"no":
912701
$ref: "#/definitions/examplepbEmbedded"
913-
resourceId:
914-
type: "string"
915702
description: "SimpleMessage represents a simple message sent to the Echo service."
916703
example:
917704
"no":
918705
note: "note"
919706
progress: "progress"
920-
resourceId: "resourceId"
921707
num: "num"
922708
lineNum: "lineNum"
923709
en: "en"

0 commit comments

Comments
 (0)