From 7291cfbde85992b530090f86454cd0df4f41bea4 Mon Sep 17 00:00:00 2001 From: windard Date: Fri, 8 May 2020 13:31:18 +0800 Subject: [PATCH 1/2] small update Change-Id: Iabdddda1142500d14da1ab9157396d9871118130 --- src/targets/java/asynchttp.js | 2 +- src/targets/java/okhttp.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/targets/java/asynchttp.js b/src/targets/java/asynchttp.js index b3c1b9455..bd60d1008 100644 --- a/src/targets/java/asynchttp.js +++ b/src/targets/java/asynchttp.js @@ -23,7 +23,7 @@ module.exports = function (source, options) { code.push('Dsl.asyncHttpClient()') - code.push(1, '.prepare%s%s("%s")', source.method.slice(0, 1).toUpperCase(), source.method.slice(1).toLowerCase(), source.fullUrl) + code.push(1, `.prepare${source.method[0].toUpperCase()}${source.method.substring(1).toLowerCase()}("${source.fullUrl}")`) // Add headers, including the cookies var headers = Object.keys(source.allHeaders) diff --git a/src/targets/java/okhttp.js b/src/targets/java/okhttp.js index c03d985d2..fec081786 100644 --- a/src/targets/java/okhttp.js +++ b/src/targets/java/okhttp.js @@ -67,6 +67,7 @@ module.exports = function (source, options) { .blank() .push('Response response = client.newCall(request).execute();') + code.push(1, "System.out.println(response.body().string());") return code.join() } From 11543640938fde87366523196a3764ee9212de69 Mon Sep 17 00:00:00 2001 From: windard Date: Fri, 8 May 2020 18:45:30 +0800 Subject: [PATCH 2/2] close async http clinet Change-Id: Ie61baf7f5e19ed06e3799799d1604e6bf32a54fd --- src/targets/java/asynchttp.js | 6 ++++-- .../output/java/asynchttp/application-form-encoded.java | 6 ++++-- test/fixtures/output/java/asynchttp/application-json.java | 6 ++++-- test/fixtures/output/java/asynchttp/cookies.java | 6 ++++-- test/fixtures/output/java/asynchttp/custom-method.java | 6 ++++-- test/fixtures/output/java/asynchttp/full.java | 6 ++++-- test/fixtures/output/java/asynchttp/headers.java | 6 ++++-- test/fixtures/output/java/asynchttp/https.java | 6 ++++-- test/fixtures/output/java/asynchttp/jsonObj-multiline.java | 6 ++++-- test/fixtures/output/java/asynchttp/jsonObj-null-value.java | 6 ++++-- test/fixtures/output/java/asynchttp/multipart-data.java | 6 ++++-- test/fixtures/output/java/asynchttp/multipart-file.java | 6 ++++-- .../fixtures/output/java/asynchttp/multipart-form-data.java | 6 ++++-- test/fixtures/output/java/asynchttp/query.java | 6 ++++-- test/fixtures/output/java/asynchttp/short.java | 6 ++++-- test/fixtures/output/java/asynchttp/text-plain.java | 6 ++++-- 16 files changed, 64 insertions(+), 32 deletions(-) diff --git a/src/targets/java/asynchttp.js b/src/targets/java/asynchttp.js index bd60d1008..e1d3114c2 100644 --- a/src/targets/java/asynchttp.js +++ b/src/targets/java/asynchttp.js @@ -21,9 +21,9 @@ module.exports = function (source, options) { // var methods = [ 'GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT' ] - code.push('Dsl.asyncHttpClient()') + code.push('AsyncHttpClient client = new DefaultAsyncHttpClient();') - code.push(1, `.prepare${source.method[0].toUpperCase()}${source.method.substring(1).toLowerCase()}("${source.fullUrl}")`) + code.push(`client.prepare${source.method[0].toUpperCase()}${source.method.substring(1).toLowerCase()}("${source.fullUrl}")`) // Add headers, including the cookies var headers = Object.keys(source.allHeaders) @@ -43,6 +43,8 @@ module.exports = function (source, options) { code.push(1, '.toCompletableFuture()') code.push(1, '.thenAccept(System.out::println)') code.push(1, '.join();') + code.blank() + code.push('client.close();') return code.join() } diff --git a/test/fixtures/output/java/asynchttp/application-form-encoded.java b/test/fixtures/output/java/asynchttp/application-form-encoded.java index 4b31cf939..d93629d66 100644 --- a/test/fixtures/output/java/asynchttp/application-form-encoded.java +++ b/test/fixtures/output/java/asynchttp/application-form-encoded.java @@ -1,8 +1,10 @@ -Dsl.asyncHttpClient() - .preparePost("http://mockbin.com/har") +AsyncHttpClient client = new DefaultAsyncHttpClient(); +client.preparePost("http://mockbin.com/har") .setHeader("content-type", "application/x-www-form-urlencoded") .setBody("foo=bar&hello=world") .execute() .toCompletableFuture() .thenAccept(System.out::println) .join(); + +client.close(); diff --git a/test/fixtures/output/java/asynchttp/application-json.java b/test/fixtures/output/java/asynchttp/application-json.java index 33fe3cbba..da6efc208 100644 --- a/test/fixtures/output/java/asynchttp/application-json.java +++ b/test/fixtures/output/java/asynchttp/application-json.java @@ -1,8 +1,10 @@ -Dsl.asyncHttpClient() - .preparePost("http://mockbin.com/har") +AsyncHttpClient client = new DefaultAsyncHttpClient(); +client.preparePost("http://mockbin.com/har") .setHeader("content-type", "application/json") .setBody("{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}],\"boolean\":false}") .execute() .toCompletableFuture() .thenAccept(System.out::println) .join(); + +client.close(); diff --git a/test/fixtures/output/java/asynchttp/cookies.java b/test/fixtures/output/java/asynchttp/cookies.java index c4a255010..b84e0b226 100644 --- a/test/fixtures/output/java/asynchttp/cookies.java +++ b/test/fixtures/output/java/asynchttp/cookies.java @@ -1,7 +1,9 @@ -Dsl.asyncHttpClient() - .preparePost("http://mockbin.com/har") +AsyncHttpClient client = new DefaultAsyncHttpClient(); +client.preparePost("http://mockbin.com/har") .setHeader("cookie", "foo=bar; bar=baz") .execute() .toCompletableFuture() .thenAccept(System.out::println) .join(); + +client.close(); diff --git a/test/fixtures/output/java/asynchttp/custom-method.java b/test/fixtures/output/java/asynchttp/custom-method.java index a28bfe827..50607d698 100644 --- a/test/fixtures/output/java/asynchttp/custom-method.java +++ b/test/fixtures/output/java/asynchttp/custom-method.java @@ -1,6 +1,8 @@ -Dsl.asyncHttpClient() - .preparePropfind("http://mockbin.com/har") +AsyncHttpClient client = new DefaultAsyncHttpClient(); +client.preparePropfind("http://mockbin.com/har") .execute() .toCompletableFuture() .thenAccept(System.out::println) .join(); + +client.close(); diff --git a/test/fixtures/output/java/asynchttp/full.java b/test/fixtures/output/java/asynchttp/full.java index 04fb0ae51..b1b67eba3 100644 --- a/test/fixtures/output/java/asynchttp/full.java +++ b/test/fixtures/output/java/asynchttp/full.java @@ -1,5 +1,5 @@ -Dsl.asyncHttpClient() - .preparePost("http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value") +AsyncHttpClient client = new DefaultAsyncHttpClient(); +client.preparePost("http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value") .setHeader("cookie", "foo=bar; bar=baz") .setHeader("accept", "application/json") .setHeader("content-type", "application/x-www-form-urlencoded") @@ -8,3 +8,5 @@ .toCompletableFuture() .thenAccept(System.out::println) .join(); + +client.close(); diff --git a/test/fixtures/output/java/asynchttp/headers.java b/test/fixtures/output/java/asynchttp/headers.java index ef90dabfe..f2600d581 100644 --- a/test/fixtures/output/java/asynchttp/headers.java +++ b/test/fixtures/output/java/asynchttp/headers.java @@ -1,8 +1,10 @@ -Dsl.asyncHttpClient() - .prepareGet("http://mockbin.com/har") +AsyncHttpClient client = new DefaultAsyncHttpClient(); +client.prepareGet("http://mockbin.com/har") .setHeader("accept", "application/json") .setHeader("x-foo", "Bar") .execute() .toCompletableFuture() .thenAccept(System.out::println) .join(); + +client.close(); diff --git a/test/fixtures/output/java/asynchttp/https.java b/test/fixtures/output/java/asynchttp/https.java index ccbb20ddc..b37516bc4 100644 --- a/test/fixtures/output/java/asynchttp/https.java +++ b/test/fixtures/output/java/asynchttp/https.java @@ -1,6 +1,8 @@ -Dsl.asyncHttpClient() - .prepareGet("https://mockbin.com/har") +AsyncHttpClient client = new DefaultAsyncHttpClient(); +client.prepareGet("https://mockbin.com/har") .execute() .toCompletableFuture() .thenAccept(System.out::println) .join(); + +client.close(); diff --git a/test/fixtures/output/java/asynchttp/jsonObj-multiline.java b/test/fixtures/output/java/asynchttp/jsonObj-multiline.java index 6a44f1025..117dd9269 100644 --- a/test/fixtures/output/java/asynchttp/jsonObj-multiline.java +++ b/test/fixtures/output/java/asynchttp/jsonObj-multiline.java @@ -1,8 +1,10 @@ -Dsl.asyncHttpClient() - .preparePost("http://mockbin.com/har") +AsyncHttpClient client = new DefaultAsyncHttpClient(); +client.preparePost("http://mockbin.com/har") .setHeader("content-type", "application/json") .setBody("{\n \"foo\": \"bar\"\n}") .execute() .toCompletableFuture() .thenAccept(System.out::println) .join(); + +client.close(); diff --git a/test/fixtures/output/java/asynchttp/jsonObj-null-value.java b/test/fixtures/output/java/asynchttp/jsonObj-null-value.java index 96882a226..0b9f6bd3f 100644 --- a/test/fixtures/output/java/asynchttp/jsonObj-null-value.java +++ b/test/fixtures/output/java/asynchttp/jsonObj-null-value.java @@ -1,8 +1,10 @@ -Dsl.asyncHttpClient() - .preparePost("http://mockbin.com/har") +AsyncHttpClient client = new DefaultAsyncHttpClient(); +client.preparePost("http://mockbin.com/har") .setHeader("content-type", "application/json") .setBody("{\"foo\":null}") .execute() .toCompletableFuture() .thenAccept(System.out::println) .join(); + +client.close(); diff --git a/test/fixtures/output/java/asynchttp/multipart-data.java b/test/fixtures/output/java/asynchttp/multipart-data.java index 51e61cc92..f83cc9f79 100644 --- a/test/fixtures/output/java/asynchttp/multipart-data.java +++ b/test/fixtures/output/java/asynchttp/multipart-data.java @@ -1,8 +1,10 @@ -Dsl.asyncHttpClient() - .preparePost("http://mockbin.com/har") +AsyncHttpClient client = new DefaultAsyncHttpClient(); +client.preparePost("http://mockbin.com/har") .setHeader("content-type", "multipart/form-data; boundary=---011000010111000001101001") .setBody("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n") .execute() .toCompletableFuture() .thenAccept(System.out::println) .join(); + +client.close(); diff --git a/test/fixtures/output/java/asynchttp/multipart-file.java b/test/fixtures/output/java/asynchttp/multipart-file.java index c75ebb86d..37ebe8c16 100644 --- a/test/fixtures/output/java/asynchttp/multipart-file.java +++ b/test/fixtures/output/java/asynchttp/multipart-file.java @@ -1,8 +1,10 @@ -Dsl.asyncHttpClient() - .preparePost("http://mockbin.com/har") +AsyncHttpClient client = new DefaultAsyncHttpClient(); +client.preparePost("http://mockbin.com/har") .setHeader("content-type", "multipart/form-data; boundary=---011000010111000001101001") .setBody("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n") .execute() .toCompletableFuture() .thenAccept(System.out::println) .join(); + +client.close(); diff --git a/test/fixtures/output/java/asynchttp/multipart-form-data.java b/test/fixtures/output/java/asynchttp/multipart-form-data.java index 946d2c308..41149bdbb 100644 --- a/test/fixtures/output/java/asynchttp/multipart-form-data.java +++ b/test/fixtures/output/java/asynchttp/multipart-form-data.java @@ -1,8 +1,10 @@ -Dsl.asyncHttpClient() - .preparePost("http://mockbin.com/har") +AsyncHttpClient client = new DefaultAsyncHttpClient(); +client.preparePost("http://mockbin.com/har") .setHeader("content-type", "multipart/form-data; boundary=---011000010111000001101001") .setBody("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n") .execute() .toCompletableFuture() .thenAccept(System.out::println) .join(); + +client.close(); diff --git a/test/fixtures/output/java/asynchttp/query.java b/test/fixtures/output/java/asynchttp/query.java index 8c7cb3810..428dbcf7e 100644 --- a/test/fixtures/output/java/asynchttp/query.java +++ b/test/fixtures/output/java/asynchttp/query.java @@ -1,6 +1,8 @@ -Dsl.asyncHttpClient() - .prepareGet("http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value") +AsyncHttpClient client = new DefaultAsyncHttpClient(); +client.prepareGet("http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value") .execute() .toCompletableFuture() .thenAccept(System.out::println) .join(); + +client.close(); diff --git a/test/fixtures/output/java/asynchttp/short.java b/test/fixtures/output/java/asynchttp/short.java index 7863d0ba1..30d448595 100644 --- a/test/fixtures/output/java/asynchttp/short.java +++ b/test/fixtures/output/java/asynchttp/short.java @@ -1,6 +1,8 @@ -Dsl.asyncHttpClient() - .prepareGet("http://mockbin.com/har") +AsyncHttpClient client = new DefaultAsyncHttpClient(); +client.prepareGet("http://mockbin.com/har") .execute() .toCompletableFuture() .thenAccept(System.out::println) .join(); + +client.close(); diff --git a/test/fixtures/output/java/asynchttp/text-plain.java b/test/fixtures/output/java/asynchttp/text-plain.java index 8556905af..b902d52a5 100644 --- a/test/fixtures/output/java/asynchttp/text-plain.java +++ b/test/fixtures/output/java/asynchttp/text-plain.java @@ -1,8 +1,10 @@ -Dsl.asyncHttpClient() - .preparePost("http://mockbin.com/har") +AsyncHttpClient client = new DefaultAsyncHttpClient(); +client.preparePost("http://mockbin.com/har") .setHeader("content-type", "text/plain") .setBody("Hello World") .execute() .toCompletableFuture() .thenAccept(System.out::println) .join(); + +client.close();