Skip to content

Commit 4e74e97

Browse files
webholikwebholik
committed
Merge branch 'develop' of github.com:postmanlabs/postman-code-generators into feature/fix-backslash-escape
2 parents edaf958 + 5a9668f commit 4e74e97

File tree

44 files changed

+1277
-48
lines changed

Some content is hidden

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

44 files changed

+1277
-48
lines changed

‎.github/workflows/integration.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: Test
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
- master
8+
pull_request:
49

510
jobs:
611
Unit-Tests:

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,11 @@ typings/
6464
# next.js build output
6565
.next
6666

67-
out/
67+
# Cargo
68+
target/
6869

70+
# Newman test generated files
71+
out/
6972
newmanResponses.json
7073
dummyFile*.txt
7174
dummyBinaryFile

‎README.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,16 @@ List of supported code generators:
3636
| NodeJs | Unirest |
3737
| Objective-C| NSURLSession|
3838
| OCaml | Cohttp |
39-
|PHP | cURL |
40-
|PHP | Guzzle |
41-
|PHP | pecl_http |
42-
|PHP | HTTP_Request2 |
39+
| PHP | cURL |
40+
| PHP | Guzzle |
41+
| PHP | pecl_http |
42+
| PHP | HTTP_Request2 |
4343
| PowerShell | RestMethod |
4444
| Python | http.client |
4545
| Python | Requests |
4646
| R | httr |
4747
| R | RCurl |
48+
| Rust | Reqwest |
4849
| Ruby | Net:HTTP |
4950
| Shell | Httpie |
5051
| Shell | wget |

‎codegens/curl/test/unit/fixtures/testcollection/collection.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1115,7 +1115,7 @@
11151115
"response": []
11161116
},
11171117
{
1118-
"name": "PROFIND request",
1118+
"name": "PROPFIND request",
11191119
"request": {
11201120
"method": "PROPFIND",
11211121
"header": [

‎codegens/golang/test/unit/fixtures/testcollection/collection.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,7 @@
11141114
"response": []
11151115
},
11161116
{
1117-
"name": "PROFIND request",
1117+
"name": "PROPFIND request",
11181118
"request": {
11191119
"method": "PROPFIND",
11201120
"header": [

‎codegens/http/test/resources/test-collection.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,7 @@
10461046
"response": []
10471047
},
10481048
{
1049-
"name": "PROFIND request",
1049+
"name": "PROPFIND request",
10501050
"request": {
10511051
"method": "PROPFIND",
10521052
"header": [

‎codegens/js-jquery/test/unit/fixtures/sample_collection.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1240,7 +1240,7 @@
12401240
"response": []
12411241
},
12421242
{
1243-
"name": "PROFIND request",
1243+
"name": "PROPFIND request",
12441244
"request": {
12451245
"method": "PROPFIND",
12461246
"header": [

‎codegens/js-jquery/test/unit/fixtures/snippetFixtures.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"UNLINK request": "var%20settings%20%3D%20%7B%0A%20%20%20%20%22url%22%3A%20%22https%3A//mockbin.org/request%22%2C%0A%20%20%20%20%22method%22%3A%20%22UNLINK%22%2C%0A%20%20%20%20%22timeout%22%3A%20100%2C%0A%20%20%20%20%22headers%22%3A%20%7B%0A%20%20%20%20%20%20%20%20%22Content-Type%22%3A%20%22text/plain%22%0A%20%20%20%20%7D%2C%0A%20%20%20%20%22data%22%3A%20%22Duis%20posuere%20augue%20vel%20cursus%20pharetra.%20In%20luctus%20a%20ex%20nec%20pretium.%20Praesent%20neque%20quam%2C%20tincidunt%20nec%20leo%20eget%2C%20rutrum%20vehicula%20magna.%5CnMaecenas%20consequat%20elementum%20elit%2C%20id%20semper%20sem%20tristique%20et.%20Integer%20pulvinar%20enim%20quis%20consectetur%20interdum%20volutpat.%22%2C%0A%7D%3B%0A%0A%24.ajax%28settings%29.done%28function%20%28response%29%20%7B%0A%20%20%20%20console.log%28response%29%3B%0A%7D%29%3B",
2121
"LOCK request": "var%20settings%20%3D%20%7B%0A%20%20%20%20%22url%22%3A%20%22https%3A//mockbin.org/request%22%2C%0A%20%20%20%20%22method%22%3A%20%22LOCK%22%2C%0A%20%20%20%20%22timeout%22%3A%20100%2C%0A%20%20%20%20%22headers%22%3A%20%7B%0A%20%20%20%20%20%20%20%20%22Content-Type%22%3A%20%22text/plain%22%0A%20%20%20%20%7D%2C%0A%20%20%20%20%22data%22%3A%20%22Duis%20posuere%20augue%20vel%20cursus%20pharetra.%20In%20luctus%20a%20ex%20nec%20pretium.%20Praesent%20neque%20quam%2C%20tincidunt%20nec%20leo%20eget%2C%20rutrum%20vehicula%20magna.%5CnMaecenas%20consequat%20elementum%20elit%2C%20id%20semper%20sem%20tristique%20et.%20Integer%20pulvinar%20enim%20quis%20consectetur%20interdum%20volutpat.%22%2C%0A%7D%3B%0A%0A%24.ajax%28settings%29.done%28function%20%28response%29%20%7B%0A%20%20%20%20console.log%28response%29%3B%0A%7D%29%3B",
2222
"UNLOCK request": "var%20settings%20%3D%20%7B%0A%20%20%20%20%22url%22%3A%20%22https%3A//mockbin.org/request%22%2C%0A%20%20%20%20%22method%22%3A%20%22UNLOCK%22%2C%0A%20%20%20%20%22timeout%22%3A%20100%2C%0A%7D%3B%0A%0A%24.ajax%28settings%29.done%28function%20%28response%29%20%7B%0A%20%20%20%20console.log%28response%29%3B%0A%7D%29%3B",
23-
"PROFIND request": "var%20settings%20%3D%20%7B%0A%20%20%20%20%22url%22%3A%20%22https%3A//mockbin.org/request%22%2C%0A%20%20%20%20%22method%22%3A%20%22PROPFIND%22%2C%0A%20%20%20%20%22timeout%22%3A%20100%2C%0A%20%20%20%20%22headers%22%3A%20%7B%0A%20%20%20%20%20%20%20%20%22Content-Type%22%3A%20%22text/plain%22%0A%20%20%20%20%7D%2C%0A%20%20%20%20%22data%22%3A%20%22Duis%20posuere%20augue%20vel%20cursus%20pharetra.%20In%20luctus%20a%20ex%20nec%20pretium.%20Praesent%20neque%20quam%2C%20tincidunt%20nec%20leo%20eget%2C%20rutrum%20vehicula%20magna.%5CnMaecenas%20consequat%20elementum%20elit%2C%20id%20semper%20sem%20tristique%20et.%20Integer%20pulvinar%20enim%20quis%20consectetur%20interdum%20volutpat.%22%2C%0A%7D%3B%0A%0A%24.ajax%28settings%29.done%28function%20%28response%29%20%7B%0A%20%20%20%20console.log%28response%29%3B%0A%7D%29%3B",
23+
"PROPFIND request": "var%20settings%20%3D%20%7B%0A%20%20%20%20%22url%22%3A%20%22https%3A//mockbin.org/request%22%2C%0A%20%20%20%20%22method%22%3A%20%22PROPFIND%22%2C%0A%20%20%20%20%22timeout%22%3A%20100%2C%0A%20%20%20%20%22headers%22%3A%20%7B%0A%20%20%20%20%20%20%20%20%22Content-Type%22%3A%20%22text/plain%22%0A%20%20%20%20%7D%2C%0A%20%20%20%20%22data%22%3A%20%22Duis%20posuere%20augue%20vel%20cursus%20pharetra.%20In%20luctus%20a%20ex%20nec%20pretium.%20Praesent%20neque%20quam%2C%20tincidunt%20nec%20leo%20eget%2C%20rutrum%20vehicula%20magna.%5CnMaecenas%20consequat%20elementum%20elit%2C%20id%20semper%20sem%20tristique%20et.%20Integer%20pulvinar%20enim%20quis%20consectetur%20interdum%20volutpat.%22%2C%0A%7D%3B%0A%0A%24.ajax%28settings%29.done%28function%20%28response%29%20%7B%0A%20%20%20%20console.log%28response%29%3B%0A%7D%29%3B",
2424
"VIEW request": "var%20settings%20%3D%20%7B%0A%20%20%20%20%22url%22%3A%20%22https%3A//mockbin.org/request%22%2C%0A%20%20%20%20%22method%22%3A%20%22VIEW%22%2C%0A%20%20%20%20%22timeout%22%3A%20100%2C%0A%20%20%20%20%22headers%22%3A%20%7B%0A%20%20%20%20%20%20%20%20%22Content-Type%22%3A%20%22text/plain%22%0A%20%20%20%20%7D%2C%0A%20%20%20%20%22data%22%3A%20%22Duis%20posuere%20augue%20vel%20cursus%20pharetra.%20In%20luctus%20a%20ex%20nec%20pretium.%20Praesent%20neque%20quam%2C%20tincidunt%20nec%20leo%20eget%2C%20rutrum%20vehicula%20magna.%5CnMaecenas%20consequat%20elementum%20elit%2C%20id%20semper%20sem%20tristique%20et.%20Integer%20pulvinar%20enim%20quis%20consectetur%20interdum%20volutpat.%22%2C%0A%7D%3B%0A%0A%24.ajax%28settings%29.done%28function%20%28response%29%20%7B%0A%20%20%20%20console.log%28response%29%3B%0A%7D%29%3B",
2525
"PURGE Request": "var%20settings%20%3D%20%7B%0A%20%20%20%20%22url%22%3A%20%22https%3A//9c76407d-5b8d-4b22-99fb-8c47a85d9848.mock.pstmn.io%22%2C%0A%20%20%20%20%22method%22%3A%20%22PURGE%22%2C%0A%20%20%20%20%22timeout%22%3A%20100%2C%0A%7D%3B%0A%0A%24.ajax%28settings%29.done%28function%20%28response%29%20%7B%0A%20%20%20%20console.log%28response%29%3B%0A%7D%29%3B",
2626
"COPY Request": "var%20settings%20%3D%20%7B%0A%20%20%20%20%22url%22%3A%20%22https%3A//9c76407d-5b8d-4b22-99fb-8c47a85d9848.mock.pstmn.io%22%2C%0A%20%20%20%20%22method%22%3A%20%22COPY%22%2C%0A%20%20%20%20%22timeout%22%3A%20100%2C%0A%7D%3B%0A%0A%24.ajax%28settings%29.done%28function%20%28response%29%20%7B%0A%20%20%20%20console.log%28response%29%3B%0A%7D%29%3B"

‎codegens/js-xhr/test/unit/fixtures/testcollection/collection.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1055,7 +1055,7 @@
10551055
"response": []
10561056
},
10571057
{
1058-
"name": "PROFIND request",
1058+
"name": "PROPFIND request",
10591059
"request": {
10601060
"method": "PROPFIND",
10611061
"header": [

‎codegens/kotlin-okhttp/lib/okhttp.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ const METHODS_WITHOUT_BODY = ['GET', 'HEAD', 'COPY', 'UNLOCK', 'UNLINK', 'PURGE'
1818
function makeSnippet (request, indentString, options) {
1919
let isBodyRequired = !(_.includes(METHODS_WITHOUT_BODY, request.method)),
2020
snippet = 'val client = OkHttpClient',
21-
hasNoOptions = !(options.requestTimeout || options.followRedirects),
22-
requestBody;
21+
hasNoOptions = !(options.requestTimeout || options.followRedirects);
2322

2423
if (hasNoOptions) {
2524
snippet += '()\n';
@@ -30,7 +29,7 @@ function makeSnippet (request, indentString, options) {
3029
snippet += indentString + `.connectTimeout(${options.requestTimeout}, TimeUnit.SECONDS)\n`;
3130
}
3231

33-
if (!options.followRedirect) {
32+
if (_.get(request, 'protocolProfileBehavior.followRedirects', options.followRedirect) === false) {
3433
snippet += indentString + '.followRedirects(false)\n';
3534
}
3635

@@ -73,10 +72,12 @@ function makeSnippet (request, indentString, options) {
7372
formdata: formdataArray
7473
});
7574
}
76-
requestBody = (request.body ? request.body.toJSON() : {});
75+
76+
const contentType = parseRequest.parseContentType(request),
77+
requestBody = (request.body ? request.body.toJSON() : {});
7778
// snippet for creating mediatype object in java based on content-type of request
78-
snippet += `val mediaType = "${parseRequest.parseContentType(request)}".toMediaType()\n`;
79-
snippet += parseRequest.parseBody(requestBody, indentString, options.trimRequestBody);
79+
snippet += `val mediaType = "${contentType}".toMediaType()\n`;
80+
snippet += parseRequest.parseBody(requestBody, indentString, options.trimRequestBody, contentType);
8081
}
8182

8283
snippet += 'val request = Request.Builder()\n';

0 commit comments

Comments
 (0)