Skip to content

Commit 0f7dea0

Browse files
HugoMarioHugoMario
authored
Merge pull request #12226 from HEYGUL/remove-querystring
[Javascript] Remove deprecated `querystring` dependency.
2 parents 67a018a + 7aaf80d commit 0f7dea0

File tree

99 files changed

+113
-112
lines changed

Some content is hidden

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

99 files changed

+113
-112
lines changed

‎modules/swagger-codegen/src/main/resources/Javascript/ApiClient.mustache

+6-5
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
(function(root, factory) {
33
if (typeof define === 'function' && define.amd) {
44
// AMD. Register as an anonymous module.
5-
define(['superagent', 'querystring'], factory);
5+
define(['superagent'], factory);
66
} else if (typeof module === 'object' && module.exports) {
77
// CommonJS-like environments that support module.exports, like Node.
8-
module.exports = factory(require('superagent'), require('querystring'));
8+
module.exports = factory(require('superagent'));
99
} else {
1010
// Browser globals (root is window)
1111
if (!root.{{moduleName}}) {
1212
root.{{moduleName}} = {};
1313
}
14-
root.{{moduleName}}.ApiClient = factory(root.superagent, root.querystring);
14+
root.{{moduleName}}.ApiClient = factory(root.superagent);
1515
}
16-
}(this, function(superagent, querystring) {
16+
}(this, function(superagent) {
1717
'use strict';
1818
1919
{{#emitJSDoc}} /**
@@ -432,7 +432,8 @@
432432
}
433433

434434
if (contentType === 'application/x-www-form-urlencoded') {
435-
request.send(querystring.stringify(this.normalizeParams(formParams)));
435+
const searchParams = new URLSearchParams(this.normalizeParams(formParams));
436+
request.send(searchParams.toString());
436437
} else if (contentType == 'multipart/form-data') {
437438
var _formParams = this.normalizeParams(formParams);
438439
for (var key in _formParams) {

‎modules/swagger-codegen/src/main/resources/Javascript/es6/ApiClient.mustache

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{{>licenseInfo}}
22
import superagent from "superagent";
3-
import querystring from "querystring";
43

54
{{#emitJSDoc}}/**
65
* @module {{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}ApiClient
@@ -420,7 +419,8 @@ export class ApiClient {
420419
}
421420

422421
if (contentType === 'application/x-www-form-urlencoded') {
423-
request.send(querystring.stringify(this.normalizeParams(formParams)));
422+
const searchParams = new URLSearchParams(this.normalizeParams(formParams));
423+
request.send(searchParams.toString());
424424
} else if (contentType == 'multipart/form-data') {
425425
var _formParams = this.normalizeParams(formParams);
426426
for (var key in _formParams) {

‎modules/swagger-codegen/src/main/resources/Javascript/package.mustache

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
"fs": false
1212
},
1313
"dependencies": {
14-
"superagent": "3.7.0",
15-
"querystring": "0.2.0"
14+
"superagent": "3.7.0"
1615
},
1716
"devDependencies": {
1817
"mocha": "~2.3.4",

‎samples/client/petstore/javascript-es6/.swagger-codegen/VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.19-SNAPSHOT
1+
2.4.33-SNAPSHOT

‎samples/client/petstore/javascript-es6/src/ApiClient.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*
1515
*/
1616

1717
import superagent from "superagent";
18-
import querystring from "querystring";
1918

2019
/**
2120
* @module ApiClient
@@ -425,7 +424,8 @@ export class ApiClient {
425424
}
426425

427426
if (contentType === 'application/x-www-form-urlencoded') {
428-
request.send(querystring.stringify(this.normalizeParams(formParams)));
427+
const searchParams = new URLSearchParams(this.normalizeParams(formParams));
428+
request.send(searchParams.toString());
429429
} else if (contentType == 'multipart/form-data') {
430430
var _formParams = this.normalizeParams(formParams);
431431
for (var key in _formParams) {

‎samples/client/petstore/javascript-es6/src/api/AnotherFakeApi.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/api/FakeApi.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/api/FakeClassnameTags123Api.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/api/PetApi.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/api/StoreApi.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/api/UserApi.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/AdditionalPropertiesClass.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/Animal.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/AnimalFarm.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/ApiResponse.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/ArrayOfArrayOfNumberOnly.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/ArrayOfNumberOnly.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/ArrayTest.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/Capitalization.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/Cat.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/Category.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/ClassModel.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/Client.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/Dog.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/EnumArrays.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/EnumClass.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/EnumTest.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/FormatTest.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/HasOnlyReadOnly.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/Ints.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/List.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/MapTest.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/MixedPropertiesAndAdditionalPropertiesClass.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/Model200Response.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/ModelBoolean.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/ModelReturn.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/Name.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

‎samples/client/petstore/javascript-es6/src/model/NumberOnly.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* NOTE: This class is auto generated by the swagger code generator program.
99
* https://github.com/swagger-api/swagger-codegen.git
1010
*
11-
* Swagger Codegen version: 2.4.19-SNAPSHOT
11+
* Swagger Codegen version: 2.4.33-SNAPSHOT
1212
*
1313
* Do not edit the class manually.
1414
*

0 commit comments

Comments
 (0)