From 8d71413f7f2d8558398f99ee9875bae549bd0292 Mon Sep 17 00:00:00 2001 From: Ankit Mahato Date: Sun, 30 Apr 2023 23:29:54 +0530 Subject: [PATCH] Update Codegen --- lib/codegen/dart/pkg_http.dart | 46 ++++++---------------------------- lib/consts.dart | 8 ------ 2 files changed, 7 insertions(+), 47 deletions(-) diff --git a/lib/codegen/dart/pkg_http.dart b/lib/codegen/dart/pkg_http.dart index 0016e6ab..fd1b6345 100644 --- a/lib/codegen/dart/pkg_http.dart +++ b/lib/codegen/dart/pkg_http.dart @@ -35,15 +35,6 @@ void main() async { String body = r'''{{body}}'''; -"""; - - String kBodyImportDartConvert = """ -import 'dart:convert'; -"""; - - String kBodyLength = """ - - var contentLength = utf8.encode(body).length; """; String kTemplateHeaders = """ @@ -62,25 +53,16 @@ import 'dart:convert'; String kStringRequestBody = """, body: body"""; - String kStringRequestEnd = """); -"""; + String kStringRequestEnd = r"""); - String kTemplateSingleSuccess = """ - - if (response.statusCode == {{code}}) { -"""; - - String kTemplateMultiSuccess = """ - - if ({{codes}}.contains(response.statusCode)) {\n"""; - - String kStringResult = r""" - - print('Status Code: ${response.statusCode}'); - print('Result: ${response.body}'); + int statusCode = response.statusCode; + if (statusCode >= 200 && statusCode < 300) { + print('Status Code: $statusCode'); + print('Response Body: ${response.body}'); } else{ - print('Error Status Code: ${response.statusCode}'); + print('Error Status Code: $statusCode'); + print('Error Response Body: ${response.body}'); } } """; @@ -123,8 +105,6 @@ import 'dart:convert'; hasBody = true; var templateBody = jj.Template(kTemplateBody); result += templateBody.render({"body": requestBody}); - result = kBodyImportDartConvert + result; - result += kBodyLength; } } @@ -134,7 +114,6 @@ import 'dart:convert'; if (headers.isNotEmpty || hasBody) { hasHeaders = true; if (hasBody) { - headers[HttpHeaders.contentLengthHeader] = r"$contentLength"; headers[HttpHeaders.contentTypeHeader] = kContentTypeMap[requestModel.requestBodyContentType] ?? ""; } @@ -157,17 +136,6 @@ import 'dart:convert'; } result += kStringRequestEnd; - - var success = kCodegenSuccessStatusCodes[method]!; - if (success.length > 1) { - var templateMultiSuccess = jj.Template(kTemplateMultiSuccess); - result += templateMultiSuccess.render({"codes": success}); - } else { - var templateSingleSuccess = jj.Template(kTemplateSingleSuccess); - result += templateSingleSuccess.render({"code": success[0]}); - } - result += kStringResult; - return result; } catch (e) { return null; diff --git a/lib/consts.dart b/lib/consts.dart index 93a57ce9..2aa98fff 100644 --- a/lib/consts.dart +++ b/lib/consts.dart @@ -217,14 +217,6 @@ const kMethodsWithBody = [ HTTPVerb.delete, ]; const kDefaultHttpMethod = HTTPVerb.get; -const kCodegenSuccessStatusCodes = { - HTTPVerb.get: [200], - HTTPVerb.head: [200], - HTTPVerb.post: [200, 201, 204], - HTTPVerb.put: [200, 201, 204], - HTTPVerb.patch: [200, 201, 204], - HTTPVerb.delete: [200, 202, 204] -}; const kDefaultContentType = ContentType.json; const JsonEncoder kEncoder = JsonEncoder.withIndent(' ');