abstract rowsToMap

This commit is contained in:
Ashita Prasad
2023-10-05 08:59:41 +05:30
parent 1a9dc4e016
commit c479bedf12
6 changed files with 13 additions and 13 deletions

View File

@ -2,7 +2,7 @@ import 'dart:io';
import 'dart:convert'; import 'dart:convert';
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:apidash/utils/utils.dart' show padMultilineString, rowsToMap; import 'package:apidash/utils/utils.dart' show padMultilineString;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart' show RequestModel;
class DartHttpCodeGen { class DartHttpCodeGen {
@ -85,7 +85,7 @@ void main() async {
var paramsList = requestModel.requestParams; var paramsList = requestModel.requestParams;
if (paramsList != null) { if (paramsList != null) {
var params = rowsToMap(requestModel.requestParams) ?? {}; var params = requestModel.paramsMap;
if (params.isNotEmpty) { if (params.isNotEmpty) {
var templateParams = jj.Template(kTemplateParams); var templateParams = jj.Template(kTemplateParams);
var paramsString = kEncoder.convert(params); var paramsString = kEncoder.convert(params);
@ -113,7 +113,7 @@ void main() async {
var headersList = requestModel.requestHeaders; var headersList = requestModel.requestHeaders;
if (headersList != null || hasBody) { if (headersList != null || hasBody) {
var headers = rowsToMap(requestModel.requestHeaders) ?? {}; var headers = requestModel.headersMap;
if (headers.isNotEmpty || hasBody) { if (headers.isNotEmpty || hasBody) {
hasHeaders = true; hasHeaders = true;
if (hasBody) { if (hasBody) {

View File

@ -1,7 +1,7 @@
import 'dart:convert'; import 'dart:convert';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart' show getValidRequestUri, rowsToMap; import 'package:apidash/utils/utils.dart' show getValidRequestUri;
import '../../models/request_model.dart'; import '../../models/request_model.dart';
class KotlinOkHttpCodeGen { class KotlinOkHttpCodeGen {
@ -121,7 +121,7 @@ import okhttp3.MediaType.Companion.toMediaType""";
var headersList = requestModel.requestHeaders; var headersList = requestModel.requestHeaders;
if (headersList != null) { if (headersList != null) {
var headers = rowsToMap(requestModel.requestHeaders) ?? {}; var headers = requestModel.headersMap;
if (headers.isNotEmpty) { if (headers.isNotEmpty) {
hasHeaders = true; hasHeaders = true;
result += getHeaders(headers); result += getHeaders(headers);

View File

@ -3,7 +3,7 @@ import 'dart:convert';
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart'
show getValidRequestUri, padMultilineString, rowsToMap; show getValidRequestUri, padMultilineString;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart' show RequestModel;
class PythonHttpClientCodeGen { class PythonHttpClientCodeGen {
@ -99,7 +99,7 @@ print(data.decode("utf-8"))
var headersList = requestModel.requestHeaders; var headersList = requestModel.requestHeaders;
if (headersList != null || hasBody) { if (headersList != null || hasBody) {
var headers = rowsToMap(requestModel.requestHeaders) ?? {}; var headers = requestModel.headersMap;
if (headers.isNotEmpty || hasBody) { if (headers.isNotEmpty || hasBody) {
hasHeaders = true; hasHeaders = true;
if (hasBody) { if (hasBody) {

View File

@ -3,7 +3,7 @@ import 'dart:convert';
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart'
show getValidRequestUri, padMultilineString, rowsToMap; show getValidRequestUri, padMultilineString;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart' show RequestModel;
class PythonRequestsCodeGen { class PythonRequestsCodeGen {
@ -112,7 +112,7 @@ print('Response Body:', response.text)
var headersList = requestModel.requestHeaders; var headersList = requestModel.requestHeaders;
if (headersList != null || hasBody) { if (headersList != null || hasBody) {
var headers = rowsToMap(requestModel.requestHeaders) ?? {}; var headers = requestModel.headersMap;
if (headers.isNotEmpty || hasBody) { if (headers.isNotEmpty || hasBody) {
hasHeaders = true; hasHeaders = true;
if (hasBody) { if (hasBody) {

View File

@ -17,7 +17,7 @@ Future<(http.Response?, Duration?, String?)> request(
); );
if (uriRec.$1 != null) { if (uriRec.$1 != null) {
Uri requestUrl = uriRec.$1!; Uri requestUrl = uriRec.$1!;
Map<String, String> headers = rowsToMap(requestModel.requestHeaders) ?? {}; Map<String, String> headers = requestModel.headersMap;
http.Response response; http.Response response;
String? body; String? body;
try { try {

View File

@ -1,6 +1,6 @@
import 'dart:convert'; import 'dart:convert';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:apidash/utils/utils.dart' show rowsToMap, getValidRequestUri; import 'package:apidash/utils/utils.dart' show getValidRequestUri;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart' show RequestModel;
import 'package:package_info_plus/package_info_plus.dart'; import 'package:package_info_plus/package_info_plus.dart';
@ -99,7 +99,7 @@ Map<String, dynamic> requestModelToHARJsonRequest(
var paramsList = requestModel.requestParams; var paramsList = requestModel.requestParams;
if (paramsList != null) { if (paramsList != null) {
var params = rowsToMap(requestModel.requestParams) ?? {}; var params = requestModel.paramsMap;
if (params.isNotEmpty) { if (params.isNotEmpty) {
for (final k in params.keys) { for (final k in params.keys) {
var m = {"name": k, "value": params[k]}; var m = {"name": k, "value": params[k]};
@ -129,7 +129,7 @@ Map<String, dynamic> requestModelToHARJsonRequest(
var headersList = requestModel.requestHeaders; var headersList = requestModel.requestHeaders;
if (headersList != null || hasBody) { if (headersList != null || hasBody) {
var headers = rowsToMap(requestModel.requestHeaders) ?? {}; var headers = requestModel.headersMap;
if (headers.isNotEmpty || hasBody) { if (headers.isNotEmpty || hasBody) {
if (hasBody) { if (hasBody) {
var m = { var m = {