dart: fix lib names for JSON and BASE64

Author: while-loop

modules/swagger-codegen/src/main/resources/dart/api_client.mustache

@@ -44,11 +44,7 @@ class ApiClient {
           {{#model}}
         case '{{classname}}':
             {{#isEnum}}
-          // Enclose the value in a list so that Dartson can use a transformer
-          // to decode it.
-          final listValue = [value];
-          final List<dynamic> listResult = dson.map(listValue, []);
-          return listResult[0];
+           return new {{classname}}.fromJson(value);
             {{/isEnum}}
             {{^isEnum}}
           return new {{classname}}.fromJson(value);
@@ -76,13 +72,13 @@ class ApiClient {
     throw new ApiException(500, 'Could not find a suitable class for deserialization');
   }
 
-  dynamic deserialize(String json, String targetType) {
+  dynamic deserialize(String jsonVal, String targetType) {
     // Remove all spaces.  Necessary for reg expressions as well.
     targetType = targetType.replaceAll(' ', '');
 
-    if (targetType == 'String') return json;
+    if (targetType == 'String') return jsonVal;
 
-    var decodedJson = JSON.decode(json);
+    var decodedJson = json.decode(jsonVal);
     return _deserialize(decodedJson, targetType);
   }
 
@@ -91,7 +87,7 @@ class ApiClient {
     if (obj == null) {
       serialized = '';
     } else {
-      serialized = JSON.encode(obj);
+      serialized = json.encode(obj);
     }
     return serialized;
   }

modules/swagger-codegen/src/main/resources/dart/auth/http_basic_auth.mustache

@@ -8,7 +8,7 @@ class HttpBasicAuth implements Authentication {
   @override
   void applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams) {
     String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);
-    headerParams["Authorization"] = "Basic " + BASE64.encode(UTF8.encode(str));
+    headerParams["Authorization"] = "Basic " + base64.encode(utf8.encode(str));
   }
 
 }