Skip to content

Commit 424cc29

Browse files
kuhnroyalkuhnroyal
committed
Only use first prioritized content-type in dio generators
* don't default to any content-type in dio-next, dio defaults itself to JSON
1 parent 4068fd3 commit 424cc29

File tree

19 files changed

+88
-317
lines changed

19 files changed

+88
-317
lines changed

‎modules/openapi-generator/src/main/resources/dart-dio/api.mustache

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,7 @@ class {{classname}} {
6363
...?extra,
6464
},
6565
validateStatus: validateStatus,
66-
contentType: [{{^hasConsumes}}
67-
'application/json',{{/hasConsumes}}{{#hasConsumes}}{{#prioritizedContentTypes}}
68-
'{{{mediaType}}}',{{/prioritizedContentTypes}}{{/hasConsumes}}
69-
].first,
66+
contentType: '{{^hasConsumes}}application/json{{/hasConsumes}}{{#hasConsumes}}{{#prioritizedContentTypes}}{{#-first}}{{{mediaType}}}{{/-first}}{{/prioritizedContentTypes}}{{/hasConsumes}}',
7067
cancelToken: cancelToken,
7168
onSendProgress: onSendProgress,
7269
onReceiveProgress: onReceiveProgress,

‎modules/openapi-generator/src/main/resources/dart/libraries/dio/api.mustache

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,8 @@ class {{classname}} {
6060
},{{/authMethods}}
6161
],{{/hasAuthMethods}}
6262
...?extra,
63-
},
64-
contentType: [{{^hasConsumes}}
65-
'application/json',{{/hasConsumes}}{{#hasConsumes}}{{#prioritizedContentTypes}}
66-
'{{{mediaType}}}',{{/prioritizedContentTypes}}{{/hasConsumes}}
67-
].first,
63+
},{{#hasConsumes}}
64+
contentType: '{{#prioritizedContentTypes}}{{#-first}}{{{mediaType}}}{{/-first}}{{/prioritizedContentTypes}}',{{/hasConsumes}}
6865
validateStatus: validateStatus,
6966
);
7067

‎samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/another_fake_api.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ class AnotherFakeApi {
3939
'secure': <Map<String, String>>[],
4040
...?extra,
4141
},
42-
contentType: [
43-
'application/json',
44-
].first,
42+
contentType: 'application/json',
4543
validateStatus: validateStatus,
4644
);
4745

‎samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/default_api.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ class DefaultApi {
3838
'secure': <Map<String, String>>[],
3939
...?extra,
4040
},
41-
contentType: [
42-
'application/json',
43-
].first,
4441
validateStatus: validateStatus,
4542
);
4643

‎samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/fake_api.dart

Lines changed: 13 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ class FakeApi {
4848
'secure': <Map<String, String>>[],
4949
...?extra,
5050
},
51-
contentType: [
52-
'application/json',
53-
].first,
5451
validateStatus: validateStatus,
5552
);
5653

@@ -126,10 +123,7 @@ class FakeApi {
126123
],
127124
...?extra,
128125
},
129-
contentType: [
130-
'application/json',
131-
'application/xml',
132-
].first,
126+
contentType: 'application/json',
133127
validateStatus: validateStatus,
134128
);
135129

@@ -190,9 +184,7 @@ class FakeApi {
190184
'secure': <Map<String, String>>[],
191185
...?extra,
192186
},
193-
contentType: [
194-
'application/json',
195-
].first,
187+
contentType: 'application/json',
196188
validateStatus: validateStatus,
197189
);
198190

@@ -274,9 +266,7 @@ class FakeApi {
274266
'secure': <Map<String, String>>[],
275267
...?extra,
276268
},
277-
contentType: [
278-
'application/json',
279-
].first,
269+
contentType: 'application/json',
280270
validateStatus: validateStatus,
281271
);
282272

@@ -363,9 +353,7 @@ class FakeApi {
363353
'secure': <Map<String, String>>[],
364354
...?extra,
365355
},
366-
contentType: [
367-
'application/json',
368-
].first,
356+
contentType: 'application/json',
369357
validateStatus: validateStatus,
370358
);
371359

@@ -447,9 +435,7 @@ class FakeApi {
447435
'secure': <Map<String, String>>[],
448436
...?extra,
449437
},
450-
contentType: [
451-
'application/json',
452-
].first,
438+
contentType: 'application/json',
453439
validateStatus: validateStatus,
454440
);
455441

@@ -531,9 +517,7 @@ class FakeApi {
531517
'secure': <Map<String, String>>[],
532518
...?extra,
533519
},
534-
contentType: [
535-
'application/json',
536-
].first,
520+
contentType: 'application/json',
537521
validateStatus: validateStatus,
538522
);
539523

@@ -620,9 +604,7 @@ class FakeApi {
620604
'secure': <Map<String, String>>[],
621605
...?extra,
622606
},
623-
contentType: [
624-
'application/json',
625-
].first,
607+
contentType: 'application/json',
626608
validateStatus: validateStatus,
627609
);
628610

@@ -683,9 +665,7 @@ class FakeApi {
683665
'secure': <Map<String, String>>[],
684666
...?extra,
685667
},
686-
contentType: [
687-
'application/json',
688-
].first,
668+
contentType: 'application/json',
689669
validateStatus: validateStatus,
690670
);
691671

@@ -746,9 +726,7 @@ class FakeApi {
746726
'secure': <Map<String, String>>[],
747727
...?extra,
748728
},
749-
contentType: [
750-
'application/json',
751-
].first,
729+
contentType: 'application/json',
752730
validateStatus: validateStatus,
753731
);
754732

@@ -853,9 +831,7 @@ class FakeApi {
853831
],
854832
...?extra,
855833
},
856-
contentType: [
857-
'application/x-www-form-urlencoded',
858-
].first,
834+
contentType: 'application/x-www-form-urlencoded',
859835
validateStatus: validateStatus,
860836
);
861837

@@ -938,9 +914,7 @@ class FakeApi {
938914
'secure': <Map<String, String>>[],
939915
...?extra,
940916
},
941-
contentType: [
942-
'application/x-www-form-urlencoded',
943-
].first,
917+
contentType: 'application/x-www-form-urlencoded',
944918
validateStatus: validateStatus,
945919
);
946920

@@ -1018,9 +992,6 @@ class FakeApi {
1018992
],
1019993
...?extra,
1020994
},
1021-
contentType: [
1022-
'application/json',
1023-
].first,
1024995
validateStatus: validateStatus,
1025996
);
1026997

@@ -1065,9 +1036,7 @@ class FakeApi {
10651036
'secure': <Map<String, String>>[],
10661037
...?extra,
10671038
},
1068-
contentType: [
1069-
'application/json',
1070-
].first,
1039+
contentType: 'application/json',
10711040
validateStatus: validateStatus,
10721041
);
10731042

@@ -1128,9 +1097,7 @@ class FakeApi {
11281097
'secure': <Map<String, String>>[],
11291098
...?extra,
11301099
},
1131-
contentType: [
1132-
'application/x-www-form-urlencoded',
1133-
].first,
1100+
contentType: 'application/x-www-form-urlencoded',
11341101
validateStatus: validateStatus,
11351102
);
11361103

@@ -1196,9 +1163,6 @@ class FakeApi {
11961163
'secure': <Map<String, String>>[],
11971164
...?extra,
11981165
},
1199-
contentType: [
1200-
'application/json',
1201-
].first,
12021166
validateStatus: validateStatus,
12031167
);
12041168

‎samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/fake_classname_tags123_api.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ class FakeClassnameTags123Api {
4646
],
4747
...?extra,
4848
},
49-
contentType: [
50-
'application/json',
51-
].first,
49+
contentType: 'application/json',
5250
validateStatus: validateStatus,
5351
);
5452

‎samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/pet_api.dart

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,7 @@ class PetApi {
4848
],
4949
...?extra,
5050
},
51-
contentType: [
52-
'application/json',
53-
'application/xml',
54-
].first,
51+
contentType: 'application/json',
5552
validateStatus: validateStatus,
5653
);
5754

@@ -118,9 +115,6 @@ class PetApi {
118115
],
119116
...?extra,
120117
},
121-
contentType: [
122-
'application/json',
123-
].first,
124118
validateStatus: validateStatus,
125119
);
126120

@@ -166,9 +160,6 @@ class PetApi {
166160
],
167161
...?extra,
168162
},
169-
contentType: [
170-
'application/json',
171-
].first,
172163
validateStatus: validateStatus,
173164
);
174165

@@ -242,9 +233,6 @@ class PetApi {
242233
],
243234
...?extra,
244235
},
245-
contentType: [
246-
'application/json',
247-
].first,
248236
validateStatus: validateStatus,
249237
);
250238

@@ -320,9 +308,6 @@ class PetApi {
320308
],
321309
...?extra,
322310
},
323-
contentType: [
324-
'application/json',
325-
].first,
326311
validateStatus: validateStatus,
327312
);
328313

@@ -395,10 +380,7 @@ class PetApi {
395380
],
396381
...?extra,
397382
},
398-
contentType: [
399-
'application/json',
400-
'application/xml',
401-
].first,
383+
contentType: 'application/json',
402384
validateStatus: validateStatus,
403385
);
404386

@@ -465,9 +447,7 @@ class PetApi {
465447
],
466448
...?extra,
467449
},
468-
contentType: [
469-
'application/x-www-form-urlencoded',
470-
].first,
450+
contentType: 'application/x-www-form-urlencoded',
471451
validateStatus: validateStatus,
472452
);
473453

@@ -536,9 +516,7 @@ class PetApi {
536516
],
537517
...?extra,
538518
},
539-
contentType: [
540-
'multipart/form-data',
541-
].first,
519+
contentType: 'multipart/form-data',
542520
validateStatus: validateStatus,
543521
);
544522

@@ -634,9 +612,7 @@ class PetApi {
634612
],
635613
...?extra,
636614
},
637-
contentType: [
638-
'multipart/form-data',
639-
].first,
615+
contentType: 'multipart/form-data',
640616
validateStatus: validateStatus,
641617
);
642618

‎samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/store_api.dart

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ class StoreApi {
4040
'secure': <Map<String, String>>[],
4141
...?extra,
4242
},
43-
contentType: [
44-
'application/json',
45-
].first,
4643
validateStatus: validateStatus,
4744
);
4845

@@ -89,9 +86,6 @@ class StoreApi {
8986
],
9087
...?extra,
9188
},
92-
contentType: [
93-
'application/json',
94-
].first,
9589
validateStatus: validateStatus,
9690
);
9791

@@ -159,9 +153,6 @@ class StoreApi {
159153
'secure': <Map<String, String>>[],
160154
...?extra,
161155
},
162-
contentType: [
163-
'application/json',
164-
].first,
165156
validateStatus: validateStatus,
166157
);
167158

@@ -229,9 +220,7 @@ class StoreApi {
229220
'secure': <Map<String, String>>[],
230221
...?extra,
231222
},
232-
contentType: [
233-
'application/json',
234-
].first,
223+
contentType: 'application/json',
235224
validateStatus: validateStatus,
236225
);
237226

0 commit comments

Comments
 (0)