Update codegens

This commit is contained in:
Ankit Mahato
2024-04-19 19:26:19 +05:30
parent 61f78985ce
commit a5e5fc400d
57 changed files with 488 additions and 399 deletions

View File

@ -1,7 +1,7 @@
import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart'
show getValidRequestUri, stripUriParams;
import 'package:apidash/models/models.dart' show RequestModel;
import 'package:apidash/models/models.dart';
import 'package:apidash/consts.dart';
class JavaAsyncHttpClientGen {
@ -114,7 +114,7 @@ public class Main {
''';
String? getCode(
RequestModel requestModel,
HttpRequestModel requestModel,
) {
try {
String result = '';
@ -122,7 +122,7 @@ public class Main {
var rec = getValidRequestUri(
requestModel.url,
requestModel.enabledRequestParams,
requestModel.enabledParams,
);
Uri? uri = rec.$1;
@ -153,8 +153,7 @@ public class Main {
// we need to parse the body as it is, and write it to the body
if (requestModel.hasTextData || requestModel.hasJsonData) {
var templateBodyContent = jj.Template(kTemplateRequestBodyContent);
result +=
templateBodyContent.render({"body": requestModel.requestBody});
result += templateBodyContent.render({"body": requestModel.body});
hasBody = true;
}
@ -170,8 +169,7 @@ public class Main {
var headers = requestModel.enabledHeadersMap;
if (hasBody && !requestModel.hasContentTypeHeader) {
headers[kHeaderContentType] =
requestModel.requestBodyContentType.header;
headers[kHeaderContentType] = requestModel.bodyContentType.header;
}
// setting up rest of the request headers

View File

@ -1,7 +1,7 @@
import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart'
show getValidRequestUri, requestModelToHARJsonRequest;
import 'package:apidash/models/models.dart' show RequestModel;
import 'package:apidash/models/models.dart';
import 'package:apidash/consts.dart';
class JavaHttpClientCodeGen {
@ -110,12 +110,12 @@ multipart/form-data; boundary={{boundary}}''';
""";
String? getCode(
RequestModel requestModel, {
HttpRequestModel requestModel, {
String? boundary,
}) {
try {
String result = "";
var requestBody = requestModel.requestBody;
var requestBody = requestModel.body;
String url = requestModel.url;
result += jj.Template(kTemplateStart).render({
@ -124,7 +124,7 @@ multipart/form-data; boundary={{boundary}}''';
var rec = getValidRequestUri(
url,
requestModel.enabledRequestParams,
requestModel.enabledParams,
);
Uri? uri = rec.$1;
@ -159,12 +159,12 @@ multipart/form-data; boundary={{boundary}}''';
"hasBody": requestModel.hasBody,
});
var headersList = requestModel.enabledRequestHeaders;
var headersList = requestModel.enabledHeaders;
if (headersList != null || requestModel.hasBody) {
var headers = requestModel.enabledHeadersMap;
if (requestModel.hasJsonData || requestModel.hasTextData) {
headers.putIfAbsent(kHeaderContentType,
() => requestModel.requestBodyContentType.header);
headers.putIfAbsent(
kHeaderContentType, () => requestModel.bodyContentType.header);
}
if (requestModel.hasFormData) {
var formDataHeader = jj.Template(kTemplateFormHeaderContentType);

View File

@ -2,7 +2,7 @@ import 'dart:convert';
import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart'
show getValidRequestUri, stripUriParams;
import '../../models/request_model.dart';
import 'package:apidash/models/models.dart';
import 'package:apidash/consts.dart';
class JavaOkHttpCodeGen {
@ -92,7 +92,7 @@ import okhttp3.MultipartBody;""";
''';
String? getCode(
RequestModel requestModel,
HttpRequestModel requestModel,
) {
try {
String result = "";
@ -102,7 +102,7 @@ import okhttp3.MultipartBody;""";
var rec = getValidRequestUri(
requestModel.url,
requestModel.enabledRequestParams,
requestModel.enabledParams,
);
Uri? uri = rec.$1;
@ -124,7 +124,7 @@ import okhttp3.MultipartBody;""";
}
var method = requestModel.method;
var requestBody = requestModel.requestBody;
var requestBody = requestModel.body;
if (requestModel.hasFormData) {
hasFormData = true;
var formDataTemplate = jj.Template(kFormDataBody);
@ -136,7 +136,7 @@ import okhttp3.MultipartBody;""";
var contentLength = utf8.encode(requestBody).length;
if (contentLength > 0) {
hasBody = true;
String contentType = requestModel.requestBodyContentType.header;
String contentType = requestModel.bodyContentType.header;
var templateBody = jj.Template(kTemplateRequestBody);
result += templateBody.render({
"contentType": contentType,
@ -155,7 +155,7 @@ import okhttp3.MultipartBody;""";
result = stringStart + result;
result += kStringRequestStart;
var headersList = requestModel.enabledRequestHeaders;
var headersList = requestModel.enabledHeaders;
if (headersList != null) {
var headers = requestModel.enabledHeadersMap;
if (headers.isNotEmpty) {
@ -176,7 +176,9 @@ import okhttp3.MultipartBody;""";
}
String getQueryParams(Map<String, String> params) {
final paramStrings = params.entries.map((entry) => '.addQueryParameter("${entry.key}", "${entry.value}")').toList();
final paramStrings = params.entries
.map((entry) => '.addQueryParameter("${entry.key}", "${entry.value}")')
.toList();
return paramStrings.join('\n ');
}
@ -187,4 +189,4 @@ import okhttp3.MultipartBody;""";
}
return result;
}
}
}

View File

@ -1,5 +1,5 @@
import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/models/models.dart' show RequestModel;
import 'package:apidash/models/models.dart';
import 'package:apidash/utils/http_utils.dart';
import 'package:apidash/consts.dart';
@ -61,14 +61,14 @@ public class Main {
}
""";
String? getCode(RequestModel requestModel) {
String? getCode(HttpRequestModel requestModel) {
try {
String result = '';
bool hasBody = false;
var rec = getValidRequestUri(
requestModel.url,
requestModel.enabledRequestParams,
requestModel.enabledParams,
);
// uri is already generated based on url and enabled request params
@ -101,7 +101,7 @@ public class Main {
if (requestModel.hasTextData || requestModel.hasJsonData) {
var templateBodyContent = jj.Template(kTemplateRequestBodyContent);
result += templateBodyContent.render({
"body": requestModel.requestBody,
"body": requestModel.body,
});
hasBody = true;
}
@ -114,8 +114,7 @@ public class Main {
var headers = requestModel.enabledHeadersMap;
if (hasBody && !requestModel.hasContentTypeHeader) {
headers[kHeaderContentType] =
requestModel.requestBodyContentType.header;
headers[kHeaderContentType] = requestModel.bodyContentType.header;
}
var templateRequestHeader = jj.Template(kTemplateRequestHeader);