From 75b5853c3a385ebe7ff3029cbac64dc200b49958 Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 17:44:27 +0530 Subject: [PATCH 01/24] added JavaUnirestCodeGen class --- lib/codegen/java/unirest.dart | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 lib/codegen/java/unirest.dart diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart new file mode 100644 index 00000000..16d51606 --- /dev/null +++ b/lib/codegen/java/unirest.dart @@ -0,0 +1,9 @@ +import 'dart:convert'; +import 'package:apidash/utils/har_utils.dart'; +import 'package:apidash/utils/http_utils.dart'; +import 'package:jinja/jinja.dart' as jj; +import 'package:apidash/models/models.dart' show RequestModel; +import 'package:apidash/consts.dart'; + +class JavaUnirestGen { +} From 4afbb364bc56d0b1d0e27e58a1516aa9277ed673 Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 17:47:07 +0530 Subject: [PATCH 02/24] added template for importing Unirest --- lib/codegen/java/unirest.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index 16d51606..ec2e66bc 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -6,4 +6,8 @@ import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/consts.dart'; class JavaUnirestGen { + final String kTemplateUnirestImports = ''' +import kong.unirest.core.*;\n +'''; + } From f9f73256d565361c92147fe36c7fedfae3012993 Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 17:48:22 +0530 Subject: [PATCH 03/24] added template to import necessary Java files --- lib/codegen/java/unirest.dart | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index ec2e66bc..56bf1f17 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -10,4 +10,10 @@ class JavaUnirestGen { import kong.unirest.core.*;\n '''; + final String kTemplateFileIoImports = ''' +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream;\n +'''; } From e114637935cb87c4d804dcbecca9d1ce9b4330f9 Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 17:49:29 +0530 Subject: [PATCH 04/24] added tenmplate for starting main class --- lib/codegen/java/unirest.dart | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index 56bf1f17..b93f6cf8 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -16,4 +16,9 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream;\n '''; + final String kTemplateStart = ''' +public class Main { + public static void main(String[] args) { +'''; + } From ec877d14b8c72421a95c493624a465c95febd6a2 Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 17:52:20 +0530 Subject: [PATCH 05/24] added template to initialise the request URL string --- lib/codegen/java/unirest.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index b93f6cf8..ccac32b4 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -21,4 +21,8 @@ public class Main { public static void main(String[] args) { '''; + final String kTemplateUrl = ''' + final String requestURL = "{{url}}";\n +'''; + } From 095c0d6109a74cc64a3d6ecfdc1054af6131724f Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 17:52:58 +0530 Subject: [PATCH 06/24] added template for requestBody --- lib/codegen/java/unirest.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index ccac32b4..2de59438 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -25,4 +25,8 @@ public class Main { final String requestURL = "{{url}}";\n '''; + final String kTemplateRequestBodyContent = ''' + final String requestBody = "{{body}}";\n +'''; + } From f47f3a5d74b1e13019ff0917dfd0680de2346276 Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 17:53:46 +0530 Subject: [PATCH 07/24] added template for generating request --- lib/codegen/java/unirest.dart | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index 2de59438..9d10eae9 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -29,4 +29,9 @@ public class Main { final String requestBody = "{{body}}";\n '''; + final String kTemplateRequestCreation = ''' + HttpResponse response = Unirest + .{{method}}(requestURL)\n +'''; + } From bcee13e9892c5016043b0ecbec94ed35b9ae9b03 Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 17:54:33 +0530 Subject: [PATCH 08/24] added template for adding headers to the request --- lib/codegen/java/unirest.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index 9d10eae9..7d8530d5 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -34,4 +34,8 @@ public class Main { .{{method}}(requestURL)\n '''; + final String kTemplateRequestHeader = ''' + .header("{{name}}", "{{value}}")\n +'''; + } From fb59227b071e95c483178e81ad2a46afa5ee468f Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 17:55:23 +0530 Subject: [PATCH 09/24] added template for adding content-type to the request --- lib/codegen/java/unirest.dart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index 7d8530d5..ee9cab4c 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -38,4 +38,7 @@ public class Main { .header("{{name}}", "{{value}}")\n '''; + final String kTemplateContentType = ''' + .contentType("{{contentType}}")\n +'''; } From 39bcbede6671e48230d29245c0c6a9cdfad8ac29 Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 17:56:47 +0530 Subject: [PATCH 10/24] added template for add query parameters to the request --- lib/codegen/java/unirest.dart | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index ee9cab4c..0e78700b 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -41,4 +41,9 @@ public class Main { final String kTemplateContentType = ''' .contentType("{{contentType}}")\n '''; + + final String kTemplateUrlQueryParam = ''' + .queryString("{{name}}", "{{value}}")\n +'''; + } From 3ef00229475f2e5b9f32a94aa58fd86f752b25cd Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 17:57:33 +0530 Subject: [PATCH 11/24] added template for adding fields for FormData of type Text --- lib/codegen/java/unirest.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index 0e78700b..f27c9fcd 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -46,4 +46,8 @@ public class Main { .queryString("{{name}}", "{{value}}")\n '''; + final String kTemplateRequestTextFormData = ''' + .field("{{name}}", "{{value}}")\n +'''; + } From 19d717f79154c5f93e08f4e5cede276181d42c27 Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 17:58:25 +0530 Subject: [PATCH 12/24] added template for adding fields for formData of type File --- lib/codegen/java/unirest.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index f27c9fcd..6158ec56 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -50,4 +50,8 @@ public class Main { .field("{{name}}", "{{value}}")\n '''; + final String kTemplateRequestFileFormData = ''' + .field("{{name}}", new File("{{value}}"))\n +'''; + } From ff85ed12c764f03241d4c9d7ac2b9abf1f0566d4 Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 17:59:34 +0530 Subject: [PATCH 13/24] added template for setting up body and boundary for multipart/form-data in the request --- lib/codegen/java/unirest.dart | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index 6158ec56..acd54741 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -54,4 +54,12 @@ public class Main { .field("{{name}}", new File("{{value}}"))\n '''; + final String kTemplateRequestBodySetup = ''' + .body(requestBody)\n +'''; + + final String kTemplateBoundarySetup = ''' + .boundary("{{boundary}}")\n +'''; + } From a6b640102c5f9945827a151e63a921c6bbd6874c Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 18:00:09 +0530 Subject: [PATCH 14/24] added the ending template --- lib/codegen/java/unirest.dart | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index acd54741..b336d08e 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -62,4 +62,12 @@ public class Main { .boundary("{{boundary}}")\n '''; + final String kTemplateRequestEnd = """ + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +}\n +"""; + } From 9c4f7ef56bc87499a07e94da124b4b27e1299753 Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 18:03:45 +0530 Subject: [PATCH 15/24] added getCode function --- lib/codegen/java/unirest.dart | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index b336d08e..f98dbe84 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -70,4 +70,14 @@ public class Main { }\n """; + String? getCode(RequestModel requestModel, String? boundary) { + try { + String result = ''; + bool hasBody = false; + + return result; + } catch (e) { + return null; + } + } } From 6e8642228596b30c4c32b069b48a880347c3dae2 Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 18:07:17 +0530 Subject: [PATCH 16/24] added starting request part for getCode --- lib/codegen/java/unirest.dart | 66 +++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index f98dbe84..78613ea2 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -74,6 +74,72 @@ public class Main { try { String result = ''; bool hasBody = false; + var rec = getValidRequestUri( + requestModel.url, + requestModel.enabledRequestParams, + ); + + // uri is already generated based on url and enabled request params + Uri? uri = rec.$1; + + if (uri == null) { + return ""; + } + + // this is the common import and will be imported for every generated code snippet + result += kTemplateUnirestImports; + + // java file io packages are to be imported only when there is a form with file present + if (requestModel.hasBody && + kMethodsWithBody.contains(requestModel.method) && + requestModel.hasFormData && + requestModel.hasFileInFormData) { + result += kTemplateFileIoImports; + } + + // adding the main method under Main class + result += kTemplateStart; + + var url = stripUriParams(uri); + + // contains the HTTP method associated with the request + var method = requestModel.method; + + // contains the entire request body as a string if body is present + var requestBody = requestModel.requestBody; + + // generating the URL to which the request has to be submitted + var templateUrl = jj.Template(kTemplateUrl); + result += templateUrl.render({"url": url}); + + // creating request body if available + var rM = requestModel.copyWith(url: url); + var harJson = requestModelToHARJsonRequest(rM, useEnabled: true); + + // if request type is not form data, the request method can include + // a body, and the body of the request is not null, in that case + // we need to parse the body as it is, and write it to the body + if (!requestModel.hasFormData && + kMethodsWithBody.contains(method) && + requestBody != null) { + // find out the content length for the request, i.e. request body's size + var contentLength = utf8.encode(requestBody).length; + if (contentLength > 0) { + var templateBodyContent = jj.Template(kTemplateRequestBodyContent); + hasBody = true; + if (harJson["postData"]?["text"] != null) { + result += templateBodyContent.render({ + "body": kEncoder.convert(harJson["postData"]["text"]).substring( + 1, kEncoder.convert(harJson["postData"]["text"]).length - 1) + }); + } + } + } + + var templateRequestCreation = jj.Template(kTemplateRequestCreation); + result += + templateRequestCreation.render({"method": method.name.toLowerCase()}); + return result; } catch (e) { From 0734cc2862b627a2adf853ff077da333bb44d898 Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 22:17:52 +0530 Subject: [PATCH 17/24] added request header support for code generation --- lib/codegen/java/unirest.dart | 47 +++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index 78613ea2..75068a28 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -74,6 +74,7 @@ public class Main { try { String result = ''; bool hasBody = false; + var rec = getValidRequestUri( requestModel.url, requestModel.enabledRequestParams, @@ -140,6 +141,52 @@ public class Main { result += templateRequestCreation.render({"method": method.name.toLowerCase()}); + // ~~~~~~~~~~~~~~~~~~ request header start ~~~~~~~~~~~~~~~~~~ + + var m = {}; + for (var i in harJson["headers"]) { + m[i["name"]] = i["value"]; + } + + // especially sets up Content-Type header if the request has a body + // and Content-Type is not explicitely set by the developer + if (requestModel.hasBody && + requestModel.hasFormData && + !requestModel.hasFileInFormData) { + m["Content-Type"] = "application/x-www-form-urlencoded"; + } + + // we will use this request boundary to set boundary if multipart formdata is used + String requestBoundary = ""; + String multipartTypePrefix = "multipart/form-data; boundary="; + if (m.containsKey("Content-Type") && + m["Content-Type"] != null && + m["Content-Type"]!.startsWith(RegExp(multipartTypePrefix))) { + String tmp = m["Content-Type"]!; + requestBoundary = tmp.substring(multipartTypePrefix.length); + + // if a boundary is provided, we will use that as the default boundary + if (boundary != null) { + requestBoundary = boundary; + m["Content-Type"] = multipartTypePrefix + boundary; + } + } + + var templateRequestHeader = jj.Template(kTemplateRequestHeader); + + // setting up rest of the request headers + m.forEach((name, value) { + result += templateRequestHeader.render({"name": name, "value": value}); + }); + + // if (hasBody && !m.containsKey("Content-Type")) { + // var templateContentType = jj.Template(kTemplateContentType); + // result += templateContentType.render( + // {"contentType": requestModel.requestBodyContentType.header}); + // } + + // ~~~~~~~~~~~~~~~~~~ request header ends ~~~~~~~~~~~~~~~~~~ + return result; } catch (e) { From 7a687a532bf4f6614ba9711e1592b317fe82a0e2 Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 22:18:14 +0530 Subject: [PATCH 18/24] added query parameter support for codegen --- lib/codegen/java/unirest.dart | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index 75068a28..196ca955 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -187,6 +187,19 @@ public class Main { // ~~~~~~~~~~~~~~~~~~ request header ends ~~~~~~~~~~~~~~~~~~ + // ~~~~~~~~~~~~~~~~~~ query parameters start ~~~~~~~~~~~~~~~~~~ + + if (uri.hasQuery) { + var params = uri.queryParameters; + var templateUrlQueryParam = jj.Template(kTemplateUrlQueryParam); + params.forEach((name, value) { + result += + templateUrlQueryParam.render({"name": name, "value": value}); + }); + } + + // ~~~~~~~~~~~~~~~~~~ query parameters end ~~~~~~~~~~~~~~~~~~ + return result; } catch (e) { From fb13e4de0b8a18f352c19840de4aad039e9ed503 Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 22:31:59 +0530 Subject: [PATCH 19/24] added formdata support --- lib/codegen/java/unirest.dart | 39 +++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index 196ca955..ee015119 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -200,6 +200,45 @@ public class Main { // ~~~~~~~~~~~~~~~~~~ query parameters end ~~~~~~~~~~~~~~~~~~ + // handling form data + if (requestModel.hasFormData && + requestModel.formDataMapList.isNotEmpty && + kMethodsWithBody.contains(method)) { + // including form data into the request + var formDataList = requestModel.formDataMapList; + var templateRequestTextFormData = + jj.Template(kTemplateRequestTextFormData); + var templateRequestFileFormData = + jj.Template(kTemplateRequestFileFormData); + for (var formDataMap in formDataList) { + if (formDataMap["type"] == "text") { + result += templateRequestTextFormData.render({ + "name": formDataMap['name'], // + "value": formDataMap['value'] // + }); + } else if (formDataMap["type"] == "file") { + result += templateRequestFileFormData.render({ + "name": formDataMap['name'], // + "value": formDataMap['value'] // + }); + } + } + + if (requestModel.hasFileInFormData) { + var templateBoundarySetup = jj.Template(kTemplateBoundarySetup); + result += templateBoundarySetup.render({"boundary": requestBoundary}); + } + + hasBody = true; + } + + var templateRequestBodySetup = jj.Template(kTemplateRequestBodySetup); + if (kMethodsWithBody.contains(method) && + hasBody && + !requestModel.hasFormData) { + result += templateRequestBodySetup.render(); + } + return result; } catch (e) { From a38fc47775e8431e676affac2e21009426a1ea9e Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 22:32:22 +0530 Subject: [PATCH 20/24] added response printing --- lib/codegen/java/unirest.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index ee015119..c5824ee1 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -239,6 +239,8 @@ public class Main { result += templateRequestBodySetup.render(); } + var templateRequestBodyEnd = jj.Template(kTemplateRequestEnd); + result += templateRequestBodyEnd.render(); return result; } catch (e) { From 07f8ad720df70c840c61734793afd49e5e9aa051 Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 22:32:44 +0530 Subject: [PATCH 21/24] added java Unirest as const --- lib/consts.dart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/consts.dart b/lib/consts.dart index a8828cf8..06ee28c3 100644 --- a/lib/consts.dart +++ b/lib/consts.dart @@ -288,6 +288,7 @@ enum CodegenLanguage { javaOkHttp("Java (okhttp3)", "java", 'java'), javaAsyncHttpClient("Java (asynchttpclient)", "java", "java"), javaHttpClient("Java (HttpClient)", "java", "java"), + javaUnirest("Java (Unirest)", "java", "java"), juliaHttp("Julia (HTTP)", "julia", "jl"), phpGuzzle("PHP (guzzle)", "php", "php"); @@ -312,6 +313,8 @@ const kSubTypeXml = 'xml'; const kSubTypeYaml = 'yaml'; const kSubTypeXYaml = 'x-yaml'; const kSubTypeYml = 'x-yml'; +// in future need to add support for url-encoded form data +const kSubTypeXWwwFormUrlencoded = 'x-www-form-urlencoded'; const kTypeText = 'text'; // text From 9c048816c76f70198b782f6ec1fd9009c77bb4a3 Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 22:32:58 +0530 Subject: [PATCH 22/24] added support for java unirest code generation --- lib/codegen/codegen.dart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/codegen/codegen.dart b/lib/codegen/codegen.dart index 7c66b88f..b7cfa349 100644 --- a/lib/codegen/codegen.dart +++ b/lib/codegen/codegen.dart @@ -1,3 +1,4 @@ +import 'package:apidash/codegen/java/unirest.dart'; import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/consts.dart'; import 'package:apidash/utils/utils.dart' show getNewUuid; @@ -60,6 +61,8 @@ class Codegen { return JavaAsyncHttpClientGen().getCode(rM); case CodegenLanguage.javaHttpClient: return JavaHttpClientCodeGen().getCode(rM); + case CodegenLanguage.javaUnirest: + return JavaUnirestGen().getCode(rM, boundary); case CodegenLanguage.javaOkHttp: return JavaOkHttpCodeGen().getCode(rM); case CodegenLanguage.juliaHttp: From 08272692a8f69340bb93b9fb3d7f3741a2afe1a4 Mon Sep 17 00:00:00 2001 From: Aditya Mayukh Som Date: Thu, 21 Mar 2024 22:33:17 +0530 Subject: [PATCH 23/24] added tests for java unirest --- test/codegen/java_unirest_codegen_test.dart | 656 ++++++++++++++++++++ 1 file changed, 656 insertions(+) create mode 100644 test/codegen/java_unirest_codegen_test.dart diff --git a/test/codegen/java_unirest_codegen_test.dart b/test/codegen/java_unirest_codegen_test.dart new file mode 100644 index 00000000..f760156a --- /dev/null +++ b/test/codegen/java_unirest_codegen_test.dart @@ -0,0 +1,656 @@ +import 'package:apidash/codegen/codegen.dart'; +import 'package:apidash/consts.dart'; +import 'package:test/test.dart'; +import '../request_models.dart'; + +void main() { + final codeGen = Codegen(); + + group('GET Request', () { + test('GET 1', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.apidash.dev"; + HttpResponse response = Unirest + .get(requestURL) + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelGet1, "https"), + expectedCode); + }); + + test('GET 2', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.apidash.dev/country/data"; + HttpResponse response = Unirest + .get(requestURL) + .queryString("code", "US") + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelGet2, "https"), + expectedCode); + }); + + test('GET 3', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.apidash.dev/country/data"; + HttpResponse response = Unirest + .get(requestURL) + .queryString("code", "IND") + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelGet3, "https"), + expectedCode); + }); + + test('GET 4', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.apidash.dev/humanize/social"; + HttpResponse response = Unirest + .get(requestURL) + .queryString("num", "8700000") + .queryString("digits", "3") + .queryString("system", "SS") + .queryString("add_space", "true") + .queryString("trailing_zeros", "true") + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelGet4, "https"), + expectedCode); + }); + + test('GET 5', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.github.com/repos/foss42/apidash"; + HttpResponse response = Unirest + .get(requestURL) + .header("User-Agent", "Test Agent") + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelGet5, "https"), + expectedCode); + }); + + test('GET 6', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.github.com/repos/foss42/apidash"; + HttpResponse response = Unirest + .get(requestURL) + .header("User-Agent", "Test Agent") + .queryString("raw", "true") + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelGet6, "https"), + expectedCode); + }); + + test('GET 7', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.apidash.dev"; + HttpResponse response = Unirest + .get(requestURL) + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelGet7, "https"), + expectedCode); + }); + + test('GET 8', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.github.com/repos/foss42/apidash"; + HttpResponse response = Unirest + .get(requestURL) + .header("User-Agent", "Test Agent") + .queryString("raw", "true") + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelGet8, "https"), + expectedCode); + }); + + test('GET 9', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.apidash.dev/humanize/social"; + HttpResponse response = Unirest + .get(requestURL) + .queryString("num", "8700000") + .queryString("add_space", "true") + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelGet9, "https"), + expectedCode); + }); + + test('GET 10', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.apidash.dev/humanize/social"; + HttpResponse response = Unirest + .get(requestURL) + .header("User-Agent", "Test Agent") + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, + requestModelGet10, + "https", + ), + expectedCode); + }); + + test('GET 11', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.apidash.dev/humanize/social"; + HttpResponse response = Unirest + .get(requestURL) + .header("User-Agent", "Test Agent") + .queryString("num", "8700000") + .queryString("digits", "3") + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelGet11, "https"), + expectedCode); + }); + + test('GET 12', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.apidash.dev/humanize/social"; + HttpResponse response = Unirest + .get(requestURL) + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelGet12, "https"), + expectedCode); + }); + }); + + group('HEAD Request', () { + test('HEAD 1', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.apidash.dev"; + HttpResponse response = Unirest + .head(requestURL) + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelHead1, "https"), + expectedCode); + }); + + test('HEAD 2', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "http://api.apidash.dev"; + HttpResponse response = Unirest + .head(requestURL) + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelHead2, "http"), + expectedCode); + }); + }); + + group('POST Request', () { + test('POST 1', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.apidash.dev/case/lower"; + final String requestBody = "{\n\"text\": \"I LOVE Flutter\"\n}"; + HttpResponse response = Unirest + .post(requestURL) + .header("Content-Type", "text/plain") + .body(requestBody) + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelPost1, "https"), + expectedCode); + }); + + test('POST 2', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.apidash.dev/case/lower"; + final String requestBody = "{\n\"text\": \"I LOVE Flutter\",\n\"flag\": null,\n\"male\": true,\n\"female\": false,\n\"no\": 1.2,\n\"arr\": [\"null\", \"true\", \"false\", null]\n}"; + HttpResponse response = Unirest + .post(requestURL) + .header("Content-Type", "application/json") + .body(requestBody) + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelPost2, "https"), + expectedCode); + }); + + test('POST 3', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.apidash.dev/case/lower"; + final String requestBody = "{\n\"text\": \"I LOVE Flutter\"\n}"; + HttpResponse response = Unirest + .post(requestURL) + .header("Content-Type", "application/json") + .header("User-Agent", "Test Agent") + .body(requestBody) + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelPost3, "https"), + expectedCode); + }); + test('POST 4', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.apidash.dev/io/form"; + HttpResponse response = Unirest + .post(requestURL) + .header("Content-Type", "application/x-www-form-urlencoded") + .field("text", "API") + .field("sep", "|") + .field("times", "3") + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, + requestModelPost4, + "https", + ), + expectedCode); + }); + + test('POST 5', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.apidash.dev/io/form"; + HttpResponse response = Unirest + .post(requestURL) + .header("Content-Type", "application/x-www-form-urlencoded") + .header("User-Agent", "Test Agent") + .field("text", "API") + .field("sep", "|") + .field("times", "3") + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, + requestModelPost5, + "https", + ), + expectedCode); + }); + test('POST 6', () { + const expectedCode = r"""import kong.unirest.core.*; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.apidash.dev/io/img"; + HttpResponse response = Unirest + .post(requestURL) + .header("Content-Type", "multipart/form-data; boundary=9b0411e0-aac7-1f25-8ba0-9f99ae8c34fc") + .field("token", "xyz") + .field("imfile", new File("/Documents/up/1.png")) + .boundary("9b0411e0-aac7-1f25-8ba0-9f99ae8c34fc") + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelPost6, "https", + boundary: "9b0411e0-aac7-1f25-8ba0-9f99ae8c34fc"), + expectedCode); + }); + test('POST 7', () { + const expectedCode = r"""import kong.unirest.core.*; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.apidash.dev/io/img"; + HttpResponse response = Unirest + .post(requestURL) + .header("Content-Type", "multipart/form-data; boundary=ef90cc20-c166-1f25-b663-29f0c584d89a") + .field("token", "xyz") + .field("imfile", new File("/Documents/up/1.png")) + .boundary("ef90cc20-c166-1f25-b663-29f0c584d89a") + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelPost7, "https", + boundary: "ef90cc20-c166-1f25-b663-29f0c584d89a"), + expectedCode); + }); + test('POST 8', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.apidash.dev/io/form"; + HttpResponse response = Unirest + .post(requestURL) + .header("Content-Type", "application/x-www-form-urlencoded") + .queryString("size", "2") + .queryString("len", "3") + .field("text", "API") + .field("sep", "|") + .field("times", "3") + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, + requestModelPost8, + "https", + ), + expectedCode); + }); + test('POST 9', () { + const expectedCode = r"""import kong.unirest.core.*; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://api.apidash.dev/io/img"; + HttpResponse response = Unirest + .post(requestURL) + .header("Content-Type", "multipart/form-data; boundary=62bd1880-c57b-1f25-b663-29f0c584d89a") + .header("User-Agent", "Test Agent") + .header("Keep-Alive", "true") + .queryString("size", "2") + .queryString("len", "3") + .field("token", "xyz") + .field("imfile", new File("/Documents/up/1.png")) + .boundary("62bd1880-c57b-1f25-b663-29f0c584d89a") + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, + requestModelPost9, + "https", + boundary: "62bd1880-c57b-1f25-b663-29f0c584d89a", + ), + expectedCode); + }); + }); + + group('PUT Request', () { + test('PUT 1', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://reqres.in/api/users/2"; + final String requestBody = "{\n\"name\": \"morpheus\",\n\"job\": \"zion resident\"\n}"; + HttpResponse response = Unirest + .put(requestURL) + .header("Content-Type", "application/json") + .body(requestBody) + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelPut1, "https"), + expectedCode); + }); + }); + + group('PATCH Request', () { + test('PATCH 1', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://reqres.in/api/users/2"; + final String requestBody = "{\n\"name\": \"marfeus\",\n\"job\": \"accountant\"\n}"; + HttpResponse response = Unirest + .patch(requestURL) + .header("Content-Type", "application/json") + .body(requestBody) + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelPatch1, "https"), + expectedCode); + }); + }); + + group('DELETE Request', () { + test('DELETE 1', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://reqres.in/api/users/2"; + HttpResponse response = Unirest + .delete(requestURL) + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelDelete1, "https"), + expectedCode); + }); + + test('DELETE 2', () { + const expectedCode = r"""import kong.unirest.core.*; + +public class Main { + public static void main(String[] args) { + final String requestURL = "https://reqres.in/api/users/2"; + final String requestBody = "{\n\"name\": \"marfeus\",\n\"job\": \"accountant\"\n}"; + HttpResponse response = Unirest + .delete(requestURL) + .header("Content-Type", "application/json") + .body(requestBody) + .asJson(); + System.out.println(response.getStatus()); + System.out.println(response.getBody()); + } +} +"""; + expect( + codeGen.getCode( + CodegenLanguage.javaUnirest, requestModelDelete2, "https"), + expectedCode); + }); + }); +} From 639afa489bd1d086d75ae9977e5c7ce5122604eb Mon Sep 17 00:00:00 2001 From: Ankit Mahato Date: Sun, 7 Apr 2024 15:44:08 +0530 Subject: [PATCH 24/24] fixes --- lib/codegen/codegen.dart | 2 +- lib/codegen/java/unirest.dart | 162 +++++--------------- test/codegen/java_unirest_codegen_test.dart | 94 ++++++------ 3 files changed, 91 insertions(+), 167 deletions(-) diff --git a/lib/codegen/codegen.dart b/lib/codegen/codegen.dart index 9f82b4c9..f62bc9c9 100644 --- a/lib/codegen/codegen.dart +++ b/lib/codegen/codegen.dart @@ -70,7 +70,7 @@ class Codegen { case CodegenLanguage.javaOkHttp: return JavaOkHttpCodeGen().getCode(rM); case CodegenLanguage.javaUnirest: - return JavaUnirestGen().getCode(rM, boundary); + return JavaUnirestGen().getCode(rM); case CodegenLanguage.juliaHttp: return JuliaHttpClientCodeGen().getCode(rM); case CodegenLanguage.kotlinOkHttp: diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index c5824ee1..4260f6b7 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -6,17 +6,16 @@ import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/consts.dart'; class JavaUnirestGen { - final String kTemplateUnirestImports = ''' -import kong.unirest.core.*;\n + final String kStringUnirestImports = ''' +import kong.unirest.core.*; + '''; - final String kTemplateFileIoImports = ''' + final String kStringFileIoImports = ''' import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream;\n + '''; - final String kTemplateStart = ''' + final String kStringStart = ''' public class Main { public static void main(String[] args) { '''; @@ -26,7 +25,9 @@ public class Main { '''; final String kTemplateRequestBodyContent = ''' - final String requestBody = "{{body}}";\n + final String requestBody = """ +{{body}}"""; + '''; final String kTemplateRequestCreation = ''' @@ -38,10 +39,6 @@ public class Main { .header("{{name}}", "{{value}}")\n '''; - final String kTemplateContentType = ''' - .contentType("{{contentType}}")\n -'''; - final String kTemplateUrlQueryParam = ''' .queryString("{{name}}", "{{value}}")\n '''; @@ -54,23 +51,19 @@ public class Main { .field("{{name}}", new File("{{value}}"))\n '''; - final String kTemplateRequestBodySetup = ''' - .body(requestBody)\n + final String kStringRequestBodySetup = ''' + .body(requestBody) '''; - final String kTemplateBoundarySetup = ''' - .boundary("{{boundary}}")\n -'''; - - final String kTemplateRequestEnd = """ + final String kStringRequestEnd = """ .asJson(); System.out.println(response.getStatus()); System.out.println(response.getBody()); } -}\n +} """; - String? getCode(RequestModel requestModel, String? boundary) { + String? getCode(RequestModel requestModel) { try { String result = ''; bool hasBody = false; @@ -88,103 +81,51 @@ public class Main { } // this is the common import and will be imported for every generated code snippet - result += kTemplateUnirestImports; + result += kStringUnirestImports; // java file io packages are to be imported only when there is a form with file present - if (requestModel.hasBody && - kMethodsWithBody.contains(requestModel.method) && - requestModel.hasFormData && - requestModel.hasFileInFormData) { - result += kTemplateFileIoImports; + if (requestModel.hasFormData && requestModel.hasFileInFormData) { + result += kStringFileIoImports; } // adding the main method under Main class - result += kTemplateStart; + result += kStringStart; var url = stripUriParams(uri); - // contains the HTTP method associated with the request - var method = requestModel.method; - - // contains the entire request body as a string if body is present - var requestBody = requestModel.requestBody; - // generating the URL to which the request has to be submitted var templateUrl = jj.Template(kTemplateUrl); result += templateUrl.render({"url": url}); - // creating request body if available - var rM = requestModel.copyWith(url: url); - var harJson = requestModelToHARJsonRequest(rM, useEnabled: true); - // if request type is not form data, the request method can include // a body, and the body of the request is not null, in that case // we need to parse the body as it is, and write it to the body - if (!requestModel.hasFormData && - kMethodsWithBody.contains(method) && - requestBody != null) { - // find out the content length for the request, i.e. request body's size - var contentLength = utf8.encode(requestBody).length; - if (contentLength > 0) { - var templateBodyContent = jj.Template(kTemplateRequestBodyContent); - hasBody = true; - if (harJson["postData"]?["text"] != null) { - result += templateBodyContent.render({ - "body": kEncoder.convert(harJson["postData"]["text"]).substring( - 1, kEncoder.convert(harJson["postData"]["text"]).length - 1) - }); - } - } + if (requestModel.hasTextData || requestModel.hasJsonData) { + var templateBodyContent = jj.Template(kTemplateRequestBodyContent); + result += templateBodyContent.render({ + "body": requestModel.requestBody, + }); + hasBody = true; } var templateRequestCreation = jj.Template(kTemplateRequestCreation); - result += - templateRequestCreation.render({"method": method.name.toLowerCase()}); + result += templateRequestCreation + .render({"method": requestModel.method.name.toLowerCase()}); // ~~~~~~~~~~~~~~~~~~ request header start ~~~~~~~~~~~~~~~~~~ - var m = {}; - for (var i in harJson["headers"]) { - m[i["name"]] = i["value"]; - } - - // especially sets up Content-Type header if the request has a body - // and Content-Type is not explicitely set by the developer - if (requestModel.hasBody && - requestModel.hasFormData && - !requestModel.hasFileInFormData) { - m["Content-Type"] = "application/x-www-form-urlencoded"; - } - - // we will use this request boundary to set boundary if multipart formdata is used - String requestBoundary = ""; - String multipartTypePrefix = "multipart/form-data; boundary="; - if (m.containsKey("Content-Type") && - m["Content-Type"] != null && - m["Content-Type"]!.startsWith(RegExp(multipartTypePrefix))) { - String tmp = m["Content-Type"]!; - requestBoundary = tmp.substring(multipartTypePrefix.length); - - // if a boundary is provided, we will use that as the default boundary - if (boundary != null) { - requestBoundary = boundary; - m["Content-Type"] = multipartTypePrefix + boundary; - } + var headers = requestModel.enabledHeadersMap; + if (hasBody && !requestModel.hasContentTypeHeader) { + headers[kHeaderContentType] = + requestModel.requestBodyContentType.header; } var templateRequestHeader = jj.Template(kTemplateRequestHeader); - // setting up rest of the request headers - m.forEach((name, value) { + headers.forEach((name, value) { result += templateRequestHeader.render({"name": name, "value": value}); }); - // if (hasBody && !m.containsKey("Content-Type")) { - // var templateContentType = jj.Template(kTemplateContentType); - // result += templateContentType.render( - // {"contentType": requestModel.requestBodyContentType.header}); - // } - // ~~~~~~~~~~~~~~~~~~ request header ends ~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~ query parameters start ~~~~~~~~~~~~~~~~~~ @@ -201,47 +142,28 @@ public class Main { // ~~~~~~~~~~~~~~~~~~ query parameters end ~~~~~~~~~~~~~~~~~~ // handling form data - if (requestModel.hasFormData && - requestModel.formDataMapList.isNotEmpty && - kMethodsWithBody.contains(method)) { + if (requestModel.hasFormData) { // including form data into the request - var formDataList = requestModel.formDataMapList; var templateRequestTextFormData = jj.Template(kTemplateRequestTextFormData); var templateRequestFileFormData = jj.Template(kTemplateRequestFileFormData); - for (var formDataMap in formDataList) { - if (formDataMap["type"] == "text") { - result += templateRequestTextFormData.render({ - "name": formDataMap['name'], // - "value": formDataMap['value'] // - }); - } else if (formDataMap["type"] == "file") { - result += templateRequestFileFormData.render({ - "name": formDataMap['name'], // - "value": formDataMap['value'] // - }); + for (var field in requestModel.formDataList) { + if (field.type == FormDataType.text) { + result += templateRequestTextFormData + .render({"name": field.name, "value": field.value}); + } else if (field.type == FormDataType.file) { + result += templateRequestFileFormData + .render({"name": field.name, "value": field.value}); } } - - if (requestModel.hasFileInFormData) { - var templateBoundarySetup = jj.Template(kTemplateBoundarySetup); - result += templateBoundarySetup.render({"boundary": requestBoundary}); - } - - hasBody = true; } - var templateRequestBodySetup = jj.Template(kTemplateRequestBodySetup); - if (kMethodsWithBody.contains(method) && - hasBody && - !requestModel.hasFormData) { - result += templateRequestBodySetup.render(); + if (hasBody) { + result += kStringRequestBodySetup; } - var templateRequestBodyEnd = jj.Template(kTemplateRequestEnd); - result += templateRequestBodyEnd.render(); - + result += kStringRequestEnd; return result; } catch (e) { return null; diff --git a/test/codegen/java_unirest_codegen_test.dart b/test/codegen/java_unirest_codegen_test.dart index f760156a..c3022ecb 100644 --- a/test/codegen/java_unirest_codegen_test.dart +++ b/test/codegen/java_unirest_codegen_test.dart @@ -313,12 +313,15 @@ public class Main { group('POST Request', () { test('POST 1', () { - const expectedCode = r"""import kong.unirest.core.*; + const expectedCode = r'''import kong.unirest.core.*; public class Main { public static void main(String[] args) { final String requestURL = "https://api.apidash.dev/case/lower"; - final String requestBody = "{\n\"text\": \"I LOVE Flutter\"\n}"; + final String requestBody = """ +{ +"text": "I LOVE Flutter" +}"""; HttpResponse response = Unirest .post(requestURL) .header("Content-Type", "text/plain") @@ -328,7 +331,7 @@ public class Main { System.out.println(response.getBody()); } } -"""; +'''; expect( codeGen.getCode( CodegenLanguage.javaUnirest, requestModelPost1, "https"), @@ -336,12 +339,20 @@ public class Main { }); test('POST 2', () { - const expectedCode = r"""import kong.unirest.core.*; + const expectedCode = r'''import kong.unirest.core.*; public class Main { public static void main(String[] args) { final String requestURL = "https://api.apidash.dev/case/lower"; - final String requestBody = "{\n\"text\": \"I LOVE Flutter\",\n\"flag\": null,\n\"male\": true,\n\"female\": false,\n\"no\": 1.2,\n\"arr\": [\"null\", \"true\", \"false\", null]\n}"; + final String requestBody = """ +{ +"text": "I LOVE Flutter", +"flag": null, +"male": true, +"female": false, +"no": 1.2, +"arr": ["null", "true", "false", null] +}"""; HttpResponse response = Unirest .post(requestURL) .header("Content-Type", "application/json") @@ -351,7 +362,7 @@ public class Main { System.out.println(response.getBody()); } } -"""; +'''; expect( codeGen.getCode( CodegenLanguage.javaUnirest, requestModelPost2, "https"), @@ -359,23 +370,26 @@ public class Main { }); test('POST 3', () { - const expectedCode = r"""import kong.unirest.core.*; + const expectedCode = r'''import kong.unirest.core.*; public class Main { public static void main(String[] args) { final String requestURL = "https://api.apidash.dev/case/lower"; - final String requestBody = "{\n\"text\": \"I LOVE Flutter\"\n}"; + final String requestBody = """ +{ +"text": "I LOVE Flutter" +}"""; HttpResponse response = Unirest .post(requestURL) - .header("Content-Type", "application/json") .header("User-Agent", "Test Agent") + .header("Content-Type", "application/json") .body(requestBody) .asJson(); System.out.println(response.getStatus()); System.out.println(response.getBody()); } } -"""; +'''; expect( codeGen.getCode( CodegenLanguage.javaUnirest, requestModelPost3, "https"), @@ -389,7 +403,6 @@ public class Main { final String requestURL = "https://api.apidash.dev/io/form"; HttpResponse response = Unirest .post(requestURL) - .header("Content-Type", "application/x-www-form-urlencoded") .field("text", "API") .field("sep", "|") .field("times", "3") @@ -416,7 +429,6 @@ public class Main { final String requestURL = "https://api.apidash.dev/io/form"; HttpResponse response = Unirest .post(requestURL) - .header("Content-Type", "application/x-www-form-urlencoded") .header("User-Agent", "Test Agent") .field("text", "API") .field("sep", "|") @@ -439,19 +451,14 @@ public class Main { const expectedCode = r"""import kong.unirest.core.*; import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; public class Main { public static void main(String[] args) { final String requestURL = "https://api.apidash.dev/io/img"; HttpResponse response = Unirest .post(requestURL) - .header("Content-Type", "multipart/form-data; boundary=9b0411e0-aac7-1f25-8ba0-9f99ae8c34fc") .field("token", "xyz") .field("imfile", new File("/Documents/up/1.png")) - .boundary("9b0411e0-aac7-1f25-8ba0-9f99ae8c34fc") .asJson(); System.out.println(response.getStatus()); System.out.println(response.getBody()); @@ -460,27 +467,21 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelPost6, "https", - boundary: "9b0411e0-aac7-1f25-8ba0-9f99ae8c34fc"), + CodegenLanguage.javaUnirest, requestModelPost6, "https"), expectedCode); }); test('POST 7', () { const expectedCode = r"""import kong.unirest.core.*; import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; public class Main { public static void main(String[] args) { final String requestURL = "https://api.apidash.dev/io/img"; HttpResponse response = Unirest .post(requestURL) - .header("Content-Type", "multipart/form-data; boundary=ef90cc20-c166-1f25-b663-29f0c584d89a") .field("token", "xyz") .field("imfile", new File("/Documents/up/1.png")) - .boundary("ef90cc20-c166-1f25-b663-29f0c584d89a") .asJson(); System.out.println(response.getStatus()); System.out.println(response.getBody()); @@ -489,8 +490,7 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelPost7, "https", - boundary: "ef90cc20-c166-1f25-b663-29f0c584d89a"), + CodegenLanguage.javaUnirest, requestModelPost7, "https"), expectedCode); }); test('POST 8', () { @@ -501,7 +501,6 @@ public class Main { final String requestURL = "https://api.apidash.dev/io/form"; HttpResponse response = Unirest .post(requestURL) - .header("Content-Type", "application/x-www-form-urlencoded") .queryString("size", "2") .queryString("len", "3") .field("text", "API") @@ -525,23 +524,18 @@ public class Main { const expectedCode = r"""import kong.unirest.core.*; import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; public class Main { public static void main(String[] args) { final String requestURL = "https://api.apidash.dev/io/img"; HttpResponse response = Unirest .post(requestURL) - .header("Content-Type", "multipart/form-data; boundary=62bd1880-c57b-1f25-b663-29f0c584d89a") .header("User-Agent", "Test Agent") .header("Keep-Alive", "true") .queryString("size", "2") .queryString("len", "3") .field("token", "xyz") .field("imfile", new File("/Documents/up/1.png")) - .boundary("62bd1880-c57b-1f25-b663-29f0c584d89a") .asJson(); System.out.println(response.getStatus()); System.out.println(response.getBody()); @@ -550,23 +544,23 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, - requestModelPost9, - "https", - boundary: "62bd1880-c57b-1f25-b663-29f0c584d89a", - ), + CodegenLanguage.javaUnirest, requestModelPost9, "https"), expectedCode); }); }); group('PUT Request', () { test('PUT 1', () { - const expectedCode = r"""import kong.unirest.core.*; + const expectedCode = r'''import kong.unirest.core.*; public class Main { public static void main(String[] args) { final String requestURL = "https://reqres.in/api/users/2"; - final String requestBody = "{\n\"name\": \"morpheus\",\n\"job\": \"zion resident\"\n}"; + final String requestBody = """ +{ +"name": "morpheus", +"job": "zion resident" +}"""; HttpResponse response = Unirest .put(requestURL) .header("Content-Type", "application/json") @@ -576,7 +570,7 @@ public class Main { System.out.println(response.getBody()); } } -"""; +'''; expect( codeGen.getCode( CodegenLanguage.javaUnirest, requestModelPut1, "https"), @@ -586,12 +580,16 @@ public class Main { group('PATCH Request', () { test('PATCH 1', () { - const expectedCode = r"""import kong.unirest.core.*; + const expectedCode = r'''import kong.unirest.core.*; public class Main { public static void main(String[] args) { final String requestURL = "https://reqres.in/api/users/2"; - final String requestBody = "{\n\"name\": \"marfeus\",\n\"job\": \"accountant\"\n}"; + final String requestBody = """ +{ +"name": "marfeus", +"job": "accountant" +}"""; HttpResponse response = Unirest .patch(requestURL) .header("Content-Type", "application/json") @@ -601,7 +599,7 @@ public class Main { System.out.println(response.getBody()); } } -"""; +'''; expect( codeGen.getCode( CodegenLanguage.javaUnirest, requestModelPatch1, "https"), @@ -631,12 +629,16 @@ public class Main { }); test('DELETE 2', () { - const expectedCode = r"""import kong.unirest.core.*; + const expectedCode = r'''import kong.unirest.core.*; public class Main { public static void main(String[] args) { final String requestURL = "https://reqres.in/api/users/2"; - final String requestBody = "{\n\"name\": \"marfeus\",\n\"job\": \"accountant\"\n}"; + final String requestBody = """ +{ +"name": "marfeus", +"job": "accountant" +}"""; HttpResponse response = Unirest .delete(requestURL) .header("Content-Type", "application/json") @@ -646,7 +648,7 @@ public class Main { System.out.println(response.getBody()); } } -"""; +'''; expect( codeGen.getCode( CodegenLanguage.javaUnirest, requestModelDelete2, "https"),