updates for null safety

Author: lohanidamodar

templates/flutter/lib/client.dart.twig

@@ -3,14 +3,14 @@ part of {{ language.params.packageName }};
 class Client {
     String endPoint;
     String type = 'unknown';
-    Map<String, String> headers;
-    Map<String, String> config;
+    Map<String, String>? headers;
+    late Map<String, String> config;
     bool selfSigned;
     bool initialized = false;
     Dio http;
-    PersistCookieJar cookieJar;
+    late PersistCookieJar cookieJar;
 
-    Client({this.endPoint = '{{spec.endpoint}}', this.selfSigned = false, Dio http}) : this.http = http ?? Dio() {
+    Client({this.endPoint = '{{spec.endpoint}}', this.selfSigned = false, Dio? http}) : this.http = http ?? Dio() {
         // Platform is not supported in web so if web, set type to web automatically and skip Platform check
         if(kIsWeb) {
             type = 'web';
@@ -68,7 +68,7 @@ class Client {
     }
 
     Client addHeader(String key, String value) {
-        headers[key] = value;
+        headers![key] = value;
 
         return this;
     }
@@ -77,21 +77,21 @@ class Client {
         // if web skip cookie implementation and origin header as those are automatically handled by browsers
         if(!kIsWeb) {
             final Directory cookieDir = await _getCookiePath();
-            cookieJar = new PersistCookieJar(dir:cookieDir.path);
+            cookieJar = new PersistCookieJar(storage: FileStorage(cookieDir.path));
             this.http.interceptors.add(CookieManager(cookieJar));
             PackageInfo packageInfo = await PackageInfo.fromPlatform();
-            addHeader('Origin', 'appwrite-$type://${packageInfo.packageName ?? packageInfo.appName}');
+            addHeader('Origin', 'appwrite-$type://${packageInfo.packageName}');
         } else {
             // if web set httpClientAdapter as BrowserHttpClientAdapter with withCredentials true to make cookies work
             this.http.options.extra['withCredentials'] = true;
         }
 
         this.http.options.baseUrl = this.endPoint;
-        this.http.options.validateStatus = (status) => status < 400;
+        this.http.options.validateStatus = (status) => status! < 400;
         initialized = true;
     }
 
-    Future<Response> call(HttpMethod method, {String path = '', Map<String, String> headers = const {}, Map<String, dynamic> params = const {}, ResponseType responseType}) async {
+    Future<Response> call(HttpMethod method, {String path = '', Map<String, String> headers = const {}, Map<String, dynamic> params = const {}, ResponseType? responseType}) async {
         if(selfSigned && !kIsWeb) {
             // Allow self signed requests
             (http.httpClientAdapter as DefaultHttpClientAdapter).onHttpClientCreate = (HttpClient client) {
@@ -106,14 +106,15 @@ class Client {
 
         // Origin is hardcoded for testing
         Options options = Options(
-            headers: {...this.headers, ...headers},
+            headers: {...this.headers!, ...headers},
             method: method.name(),
-            responseType: responseType
+            responseType: responseType,
+            listFormat: ListFormat.multiCompatible
         );
 
         try {
             if(headers['content-type'] == 'multipart/form-data') {
-                return await http.request(path, data: FormData.fromMap(params), options: options);
+                return await http.request(path, data: FormData.fromMap(params, ListFormat.multiCompatible), options: options);
             }
 
             if (method == HttpMethod.get) {
@@ -130,16 +131,16 @@ class Client {
             throw {{spec.title | caseUcfirst}}Exception(e.message);
           }
           if(responseType == ResponseType.bytes) {
-            if(e.response.headers['content-type'].contains('application/json')) {
-              final res = json.decode(utf8.decode(e.response.data));
+            if(e.response!.headers['content-type']!.contains('application/json')) {
+              final res = json.decode(utf8.decode(e.response!.data));
               throw {{spec.title | caseUcfirst}}Exception(res['message'],res['code'], e.response);
             } else {
               throw {{spec.title | caseUcfirst}}Exception(e.message);
             }
           }
-          throw {{spec.title | caseUcfirst}}Exception(e.response.data['message'],e.response.data['code'], e.response.data);
+          throw {{spec.title | caseUcfirst}}Exception(e.response!.data['message'],e.response!.data['code'], e.response!.data);
         } catch(e) {
-          throw {{spec.title | caseUcfirst}}Exception(e.message);
+          throw {{spec.title | caseUcfirst}}Exception(e.toString());
         }
     }
 }

templates/flutter/lib/exception.dart.twig

@@ -1,8 +1,8 @@
 part of {{ language.params.packageName }};
 
 class {{spec.title | caseUcfirst}}Exception implements Exception {
-  final String message;
-  final int code;
+  final String? message;
+  final int? code;
   final dynamic response;
 
   {{spec.title | caseUcfirst}}Exception([this.message = "", this.code, this.response]);

templates/flutter/lib/services/service.dart.twig

@@ -1,8 +1,8 @@
 part of {{ language.params.packageName }};
 
 {% macro parameter(parameter) %}
-{% if parameter.name == 'orderType' %}{% if parameter.required %}@required {% endif %}{{ 'OrderType orderType = OrderType.asc' }}{% else %}
-{% if parameter.required %}@required {% endif %}{{ parameter.type | typeName }} {{ parameter.name | caseCamel }}{{ parameter | escapeDollarSign | paramDefault }}{% endif %}
+{% if parameter.name == 'orderType' %}{% if parameter.required %}required {% endif %}{{ 'OrderType orderType = OrderType.asc' }}{% else %}
+{% if parameter.required %}required {% endif %}{{ parameter.type | typeName }} {{ parameter.name | caseCamel }}{{ parameter | escapeDollarSign | paramDefault }}{% endif %}
 {% endmacro %}
 {% macro method_parameters(parameters) %}
 {% if parameters.all|length > 0 %}{{ '{' }}{% for parameter in parameters.all %}{{ _self.parameter(parameter) }}{% if not loop.last %}, {% endif %}{% endfor %}{{ '}' }}{% endif %}