Dart - update generator to support null safety

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java

@@ -64,7 +64,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
     public String defaultValue;
     public String arrayModelType;
     public boolean isAlias; // Is this effectively an alias of another simple type
-    public boolean isString, isInteger, isLong, isNumber, isNumeric, isFloat, isDouble, isDate, isDateTime, isShort, isUnboundedInteger, isBoolean;
+    public boolean isString, isInteger, isLong, isNumber, isNumeric, isFloat, isDouble, isDate, isDateTime, isShort, isUnboundedInteger, isPrimitiveType, isBoolean;
     private boolean additionalPropertiesIsAnyType;
     public List<CodegenProperty> vars = new ArrayList<>(); // all properties (without parent's properties)
     public List<CodegenProperty> allVars = new ArrayList<>(); // all properties (with parent's properties)
@@ -637,6 +637,14 @@ public void setIsUnboundedInteger(boolean isUnboundedInteger)   {
         this.isUnboundedInteger = isUnboundedInteger;
     }
 
+    @Override
+    public boolean getIsPrimitiveType() { return isPrimitiveType; }
+
+    @Override
+    public void setIsPrimitiveType(boolean isPrimitiveType)  {
+        this.isPrimitiveType = isPrimitiveType;
+    }
+
     @Override
     public CodegenProperty getAdditionalProperties() { return additionalProperties; }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java

@@ -611,6 +611,14 @@ public void setIsUnboundedInteger(boolean isUnboundedInteger)  {
         this.isUnboundedInteger = isUnboundedInteger;
     }
 
+    @Override
+    public boolean getIsPrimitiveType() { return isPrimitiveType; }
+
+    @Override
+    public void setIsPrimitiveType(boolean isPrimitiveType)  {
+        this.isPrimitiveType = isPrimitiveType;
+    }
+
     @Override
     public CodegenProperty getAdditionalProperties() { return additionalProperties; }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java

@@ -536,6 +536,14 @@ public void setIsUnboundedInteger(boolean isUnboundedInteger)  {
         this.isUnboundedInteger = isUnboundedInteger;
     }
 
+    @Override
+    public boolean getIsPrimitiveType() { return isPrimitiveType; }
+
+    @Override
+    public void setIsPrimitiveType(boolean isPrimitiveType)  {
+        this.isPrimitiveType = isPrimitiveType;
+    }
+
     public Map<String, Object> getVendorExtensions() {
         return vendorExtensions;
     }

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java

@@ -351,6 +351,14 @@ public void setIsUnboundedInteger(boolean isUnboundedInteger)  {
         this.isUnboundedInteger = isUnboundedInteger;
     }
 
+    @Override
+    public boolean getIsPrimitiveType() { return primitiveType; }
+
+    @Override
+    public void setIsPrimitiveType(boolean isPrimitiveType)  {
+        this.primitiveType = isPrimitiveType;
+    }
+
     @Override
     public void setIsModel(boolean isModel)  {
         this.isModel = isModel;

modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java

@@ -95,6 +95,10 @@ public interface IJsonSchemaValidationProperties {
 
     void setIsUnboundedInteger(boolean isUnboundedInteger);
 
+    boolean getIsPrimitiveType();
+
+    void setIsPrimitiveType(boolean isPrimitiveType);
+
     CodegenProperty getAdditionalProperties();
 
     void setAdditionalProperties(CodegenProperty additionalProperties);
@@ -213,4 +217,4 @@ default void setTypeProperties(Schema p) {
             setIsAnyType(true);
         }
     }
-}
+}

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java

@@ -1,5 +1,7 @@
 package org.openapitools.codegen.languages;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.Schema;
@@ -112,12 +114,13 @@ public AbstractDartCodegen() {
         setReservedWordsLowerCase(reservedWordsList);
 
         // These types return isPrimitive=true in templates
-        languageSpecificPrimitives = new HashSet<>(5);
-        languageSpecificPrimitives.add("String");
-        languageSpecificPrimitives.add("bool");
-        languageSpecificPrimitives.add("int");
-        languageSpecificPrimitives.add("num");
-        languageSpecificPrimitives.add("double");
+        languageSpecificPrimitives = Sets.newHashSet(
+                "String",
+                "bool",
+                "int",
+                "num",
+                "double"
+        );
 
         typeMapping = new HashMap<>();
         typeMapping.put("Array", "List");
@@ -148,17 +151,18 @@ public AbstractDartCodegen() {
         typeMapping.put("AnyType", "Object");
 
         // Data types of the above values which are automatically imported
-        defaultIncludes = new HashSet<>();
-        defaultIncludes.add("String");
-        defaultIncludes.add("bool");
-        defaultIncludes.add("int");
-        defaultIncludes.add("num");
-        defaultIncludes.add("double");
-        defaultIncludes.add("List");
-        defaultIncludes.add("Set");
-        defaultIncludes.add("Map");
-        defaultIncludes.add("DateTime");
-        defaultIncludes.add("Object");
+        defaultIncludes = Sets.newHashSet(
+                "String",
+                "bool",
+                "int",
+                "num",
+                "double",
+                "List",
+                "Set",
+                "Map",
+                "DateTime",
+                "Object"
+        );
 
         imports.put("String", "dart:core");
         imports.put("bool", "dart:core");

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java

@@ -36,6 +36,7 @@ public class DartClientCodegen extends AbstractDartCodegen {
 
     public DartClientCodegen() {
         super();
+
         final CliOption serializationLibrary = CliOption.newString(CodegenConstants.SERIALIZATION_LIBRARY,
                 "Specify serialization library");
         serializationLibrary.setDefault(SERIALIZATION_LIBRARY_NATIVE);

modules/openapi-generator/src/main/resources/dart2/README.mustache

@@ -19,7 +19,7 @@ For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
 
 ## Requirements
 
-Dart 2.0 or later
+Dart 2.12 or later
 
 ## Installation & Usage
 

modules/openapi-generator/src/main/resources/dart2/api.mustache

@@ -3,7 +3,7 @@
 {{#operations}}
 
 class {{{classname}}} {
-  {{{classname}}}([ApiClient apiClient]) : apiClient = apiClient ?? defaultApiClient;
+  {{{classname}}}([ApiClient? apiClient]) : apiClient = apiClient ?? defaultApiClient;
 
   final ApiClient apiClient;
   {{#operation}}
@@ -49,24 +49,13 @@ class {{{classname}}} {
   ///
     {{/-last}}
   {{/allParams}}
-  Future<Response> {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{ {{#allParams}}{{^required}}{{{dataType}}} {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}} }{{/hasOptionalParams}}) async {
-  {{#hasParams}}
-    // Verify required params are set.
-    {{#allParams}}
-      {{#required}}
-    if ({{{paramName}}} == null) {
-     throw ApiException(HttpStatus.badRequest, 'Missing required param: {{{paramName}}}');
-    }
-      {{/required}}
-    {{/allParams}}
-
-  {{/hasParams}}
+  Future<Response> {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{ {{#allParams}}{{^required}}{{{dataType}}}? {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}} }{{/hasOptionalParams}}) async {
     // ignore: prefer_const_declarations
     final path = r'{{{path}}}'{{#pathParams}}
       .replaceAll({{=<% %>=}}'{<% baseName %>}'<%={{ }}=%>, {{{paramName}}}{{^isString}}.toString(){{/isString}}){{/pathParams}};
 
     // ignore: prefer_final_locals
-    Object postBody{{#bodyParam}} = {{{paramName}}}{{/bodyParam}};
+    Object? postBody{{#bodyParam}} = {{{paramName}}}{{/bodyParam}};
 
     final queryParams = <QueryParam>[];
     final headerParams = <String, String>{};
@@ -174,7 +163,7 @@ class {{{classname}}} {
   ///
     {{/-last}}
   {{/allParams}}
-  Future<{{{returnType}}}{{^returnType}}void{{/returnType}}> {{{nickname}}}({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{ {{#allParams}}{{^required}}{{{dataType}}} {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}} }{{/hasOptionalParams}}) async {
+  Future<{{#returnType}}{{{.}}}?{{/returnType}}{{^returnType}}void{{/returnType}}> {{{nickname}}}({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{ {{#allParams}}{{^required}}{{{dataType}}}? {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}} }{{/hasOptionalParams}}) async {
     final response = await {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}} {{#allParams}}{{^required}}{{{paramName}}}: {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}} {{/hasOptionalParams}});
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -183,7 +172,7 @@ class {{{classname}}} {
     // When a remote server returns no body with a status of 204, we shall not decode it.
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
-    if (response.body != null && response.statusCode != HttpStatus.noContent) {
+    if (response.statusCode != HttpStatus.noContent) {
     {{#native_serialization}}
     {{#isArray}}
       final responseBody = await _decodeBodyBytes(response);
@@ -199,7 +188,7 @@ class {{{classname}}} {
       return await apiClient.deserializeAsync(await _decodeBodyBytes(response), '{{{returnType}}}',) as {{{returnType}}};
     {{/isMap}}{{/isArray}}{{/native_serialization}}
     }
-    return Future<{{{returnType}}}>.value();
+    return Future<{{{returnType}}}?>.value();
     {{/returnType}}
   }
   {{/operation}}

modules/openapi-generator/src/main/resources/dart2/api_client.mustache

@@ -1,16 +1,16 @@
 {{>header}}
 {{>part_of}}
 class ApiClient {
-  ApiClient({this.basePath = '{{{basePath}}}'}) {
+ApiClient({this.basePath = '{{{basePath}}}'{{#isBasicBearer}}, HttpBearerAuth? httpBearerAuth{{/isBasicBearer}}}) {
   {{#hasAuthMethods}}
     // Setup authentications (key: authentication name, value: authentication).
   {{#authMethods}}
   {{#isBasic}}
   {{#isBasicBasic}}
-    _authentications[r'{{{name}}}'] = HttpBasicAuth();
+    _authentications[r'{{{name}}}'] = HttpBasicAuth('user', 'password');
   {{/isBasicBasic}}
   {{#isBasicBearer}}
-    _authentications[r'{{{name}}}'] = HttpBearerAuth();
+    _authentications[r'{{{name}}}'] = httpBearerAuth ?? HttpBearerAuth();
   {{/isBasicBearer}}
   {{/isBasic}}
   {{#isApiKey}}
@@ -33,12 +33,7 @@ class ApiClient {
   Client get client => _client;
 
   /// Requests to use a new HTTP [Client] in this class.
-  ///
-  /// If the [newClient] is null, an [ArgumentError] is thrown.
   set client(Client newClient) {
-    if (newClient == null) {
-      throw ArgumentError('New client instance cannot be null.');
-    }
     _client = newClient;
   }
 
@@ -55,7 +50,7 @@ class ApiClient {
   /// or deleted.
   Map<String, Authentication> get authentications => Map.unmodifiable(_authentications);
 
-  T getAuthentication<T extends Authentication>(String name) {
+  T? getAuthentication<T extends Authentication>(String name) {
     final authentication = _authentications[name];
     return authentication is T ? authentication : null;
   }
@@ -66,18 +61,17 @@ class ApiClient {
     String path,
     String method,
     List<QueryParam> queryParams,
-    Object body,
+    Object? body,
     Map<String, String> headerParams,
     Map<String, String> formParams,
-    String nullableContentType,
+    String? nullableContentType,
     List<String> authNames,
   ) async {
     _updateParamsForAuth(authNames, queryParams, headerParams);
 
     headerParams.addAll(_defaultHeaderMap);
 
     final urlEncodedQueryParams = queryParams
-      .where((param) => param.value != null)
       .map((param) => '$param');
 
     final queryString = urlEncodedQueryParams.isNotEmpty
@@ -149,27 +143,27 @@ class ApiClient {
   }
 {{#native_serialization}}
 
-  Future<dynamic> deserializeAsync(String json, String targetType, {bool growable}) async =>
+  Future<dynamic> deserializeAsync(String json, String targetType, {bool growable = false}) async =>
     // ignore: deprecated_member_use_from_same_package
     deserialize(json, targetType, growable: growable);
 
   @Deprecated('Scheduled for removal in OpenAPI Generator 6.x. Use deserializeAsync() instead.')
-  dynamic deserialize(String json, String targetType, {bool growable}) {
+  dynamic deserialize(String json, String targetType, {bool growable = false}) {
     // Remove all spaces. Necessary for regular expressions as well.
     targetType = targetType.replaceAll(' ', ''); // ignore: parameter_assignments
 
     // If the expected target type is String, nothing to do...
     return targetType == 'String'
       ? json
-      : _deserialize(jsonDecode(json), targetType, growable: growable == true);
+      : _deserialize(jsonDecode(json), targetType, growable: growable);
   }
 {{/native_serialization}}
 
   // ignore: deprecated_member_use_from_same_package
-  Future<String> serializeAsync(Object value) async => serialize(value);
+  Future<String> serializeAsync(Object? value) async => serialize(value);
 
   @Deprecated('Scheduled for removal in OpenAPI Generator 6.x. Use serializeAsync() instead.')
-  String serialize(Object value) => value == null ? '' : json.encode(value);
+  String serialize(Object? value) => value == null ? '' : json.encode(value);
 
   /// Update query and header parameters based on authentication settings.
   /// @param authNames The authentications to apply
@@ -188,7 +182,7 @@ class ApiClient {
   }
 
 {{#native_serialization}}
-  static dynamic _deserialize(dynamic value, String targetType, {bool growable}) {
+  static dynamic _deserialize(dynamic value, String targetType, {bool growable = false}) {
     try {
       switch (targetType) {
         case 'String':
@@ -215,21 +209,21 @@ class ApiClient {
           {{/model}}
         {{/models}}
         default:
-          Match match;
+          Match? match;
           if (value is List && (match = _regList.firstMatch(targetType)) != null) {
-            targetType = match[1]; // ignore: parameter_assignments
+            targetType = match![1]!; // ignore: parameter_assignments
             return value
               .map<dynamic>((dynamic v) => _deserialize(v, targetType, growable: growable))
               .toList(growable: growable);
           }
           if (value is Set && (match = _regSet.firstMatch(targetType)) != null) {
-            targetType = match[1]; // ignore: parameter_assignments
+            targetType = match![1]!; // ignore: parameter_assignments
             return value
               .map<dynamic>((dynamic v) => _deserialize(v, targetType, growable: growable))
               .toSet();
           }
           if (value is Map && (match = _regMap.firstMatch(targetType)) != null) {
-            targetType = match[1]; // ignore: parameter_assignments
+            targetType = match![1]!; // ignore: parameter_assignments
             return Map<String, dynamic>.fromIterables(
               value.keys.cast<String>(),
               value.values.map<dynamic>((dynamic v) => _deserialize(v, targetType, growable: growable)),
@@ -248,9 +242,9 @@ class ApiClient {
 /// Primarily intended for use in an isolate.
 class DeserializationMessage {
   const DeserializationMessage({
-    @required this.json,
-    @required this.targetType,
-    this.growable,
+    required this.json,
+    required this.targetType,
+    this.growable = false,
   });
 
   /// The JSON value to deserialize.
@@ -274,10 +268,10 @@ Future<dynamic> deserializeAsync(DeserializationMessage message) async {
     : ApiClient._deserialize(
         jsonDecode(message.json),
         targetType,
-        growable: message.growable == true,
+        growable: message.growable,
       );
 }
 {{/native_serialization}}
 
 /// Primarily intended for use in an isolate.
-Future<String> serializeAsync(Object value) async => value == null ? '' : json.encode(value);
+Future<String> serializeAsync(Object? value) async => value == null ? '' : json.encode(value);

modules/openapi-generator/src/main/resources/dart2/api_exception.mustache

@@ -6,9 +6,9 @@ class ApiException implements Exception {
   ApiException.withInner(this.code, this.message, this.innerException, this.stackTrace);
 
   int code = 0;
-  String message;
-  Exception innerException;
-  StackTrace stackTrace;
+  String? message;
+  Exception? innerException;
+  StackTrace? stackTrace;
 
   @override
   String toString() {