From a83377c9f93e5d2fab843b885f469b1fc15fb51b Mon Sep 17 00:00:00 2001
From: JarvanMo <jarvan.mo@gmail.com>
Date: Fri, 3 Jun 2022 21:01:26 +0800
Subject: [PATCH 1/2] fix warnings of generated code.

---
 lib/syntax.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/syntax.dart b/lib/syntax.dart
index 0dcd104..9d666f4 100644
--- a/lib/syntax.dart
+++ b/lib/syntax.dart
@@ -126,7 +126,7 @@ class TypeDefinition {
   String toJsonExpression(String key, bool privateField) {
     final fieldKey =
         fixFieldName(key, typeDef: this, privateField: privateField);
-    final thisKey = 'this.$fieldKey';
+    final thisKey = '$fieldKey';
     if (isPrimitive) {
       return "data['$key'] = $thisKey;";
     } else if (name == 'List') {
@@ -311,7 +311,7 @@ class ClassDefinition {
   String get _jsonGenFunc {
     final sb = new StringBuffer();
     sb.write(
-        '\tMap<String, dynamic> toJson() {\n\t\tfinal Map<String, dynamic> data = new Map<String, dynamic>();\n');
+        '\tMap<String, dynamic> toJson() {\n\t\tfinal Map<String, dynamic> data = <String, dynamic>{};\n');
     fields.keys.forEach((k) {
       sb.write('\t\t${fields[k]!.toJsonExpression(k, privateFields)}\n');
     });

From 2c113b5ed70852a60178bde08ca770c311180866 Mon Sep 17 00:00:00 2001
From: JarvanMo <468122151@qq.com>
Date: Sat, 4 Jun 2022 10:45:37 +0800
Subject: [PATCH 2/2] remove usless this. & new.

---
 lib/syntax.dart | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/syntax.dart b/lib/syntax.dart
index 9d666f4..30d6277 100644
--- a/lib/syntax.dart
+++ b/lib/syntax.dart
@@ -116,7 +116,7 @@ class TypeDefinition {
       return "$fieldKey = DateTime.tryParse(json['$key']);";
     } else if (name == 'List') {
       // list of class
-      return "if (json['$key'] != null) {\n\t\t\t$fieldKey = <$subtype>[];\n\t\t\tjson['$key'].forEach((v) { $fieldKey!.add(new $subtype.fromJson(v)); });\n\t\t}";
+      return "if (json['$key'] != null) {\n\t\t\t$fieldKey = <$subtype>[];\n\t\t\tjson['$key'].forEach((v) { $fieldKey!.add($subtype.fromJson(v)); });\n\t\t}";
     } else {
       // class
       return "$fieldKey = json['$key'] != null ? ${_buildParseClass(jsonKey)} : null;";
@@ -271,7 +271,7 @@ class ClassDefinition {
       final privateFieldName =
           fixFieldName(key, typeDef: f, privateField: true);
       sb.write('if ($publicFieldName != null) {\n');
-      sb.write('this.$privateFieldName = $publicFieldName;\n');
+      sb.write('$privateFieldName = $publicFieldName;\n');
       sb.write('}\n');
     });
     sb.write('}');
@@ -287,7 +287,7 @@ class ClassDefinition {
       final f = fields[key]!;
       final fieldName =
           fixFieldName(key, typeDef: f, privateField: privateFields);
-      sb.write('this.$fieldName');
+      sb.write('$fieldName');
       if (i != len) {
         sb.write(', ');
       }