Bump dart2 code compatibility to Dart 2.14 and introduce sound null-safety

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

@@ -69,7 +69,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<CodegenProperty>(); // all properties (without parent's properties)
     public List<CodegenProperty> allVars = new ArrayList<CodegenProperty>(); // all properties (with parent's properties)
@@ -640,6 +640,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

@@ -601,6 +601,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

@@ -534,6 +534,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

@@ -347,6 +347,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);
@@ -205,4 +209,4 @@ default void setTypeProperties(Schema p) {
             setIsAnyType(true);
         }
     }
-}
+}

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

@@ -98,9 +98,6 @@ public AbstractDartCodegen() {
         modelDocTemplateFiles.put("object_doc.mustache", ".md");
         apiDocTemplateFiles.put("api_doc.mustache", ".md");
 
-        modelTestTemplateFiles.put("model_test.mustache", ".dart");
-        apiTestTemplateFiles.put("api_test.mustache", ".dart");
-
         final List<String> reservedWordsList = new ArrayList<>();
         try(BufferedReader reader = new BufferedReader(
                 new InputStreamReader(DartClientCodegen.class.getResourceAsStream("/dart/dart-keywords.txt"),
@@ -507,6 +504,21 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
     @Override
     public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
         super.postProcessModelProperty(model, property);
+        if (property.dataType.equals("Object") || property.baseType.equals("Object") || (property.complexType != null && property.complexType.equals("Object"))) {
+            String dataType = "Map<String, dynamic>";
+            String complexType = dataType;
+            if (property.isArray) {
+                dataType = "List<"+dataType+">";
+            }
+            if (property.required) {
+                dataType += "?";
+                complexType += "?";
+            }
+            property.setDatatypeWithEnum(dataType);
+            property.setDatatype(dataType);
+            property.setComplexType(complexType);
+            property.setIsPrimitiveType(true);
+        }
         if (!model.isEnum && property.isEnum) {
             // These are inner enums, enums which do not exist as models, just as properties.
             // They are handled via the enum_inline template and and are generated in the
@@ -532,6 +544,12 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert
     @Override
     public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, List<Server> servers) {
         final CodegenOperation op = super.fromOperation(path, httpMethod, operation, servers);
+        String returnType = op.returnType;
+        if (returnType == null || returnType.equals("Object")) {
+            op.returnType = "Map<String, dynamic>";
+            op.returnBaseType = "Map<String, dynamic>";
+            op.returnTypeIsPrimitive = true;
+        }
         for (CodegenResponse r : op.responses) {
             // By default only set types are automatically added to operation imports, not sure why.
             // Add all container type imports here, by default 'dart:core' imports are skipped
@@ -644,15 +662,20 @@ protected void updateEnumVarsWithExtensions(List<Map<String, Object>> enumVars,
         }
     }
 
+    boolean needsEnumEscape(String datatype) {
+        // TODO: is this complete?
+        return !("num".equalsIgnoreCase(datatype) ||
+                "int".equalsIgnoreCase(datatype) ||
+                "double".equalsIgnoreCase(datatype)||
+                "float".equalsIgnoreCase(datatype));
+    }
+
     @Override
     public String toEnumVarName(String value, String datatype) {
         if (value.length() == 0) {
             return "empty";
         }
-        if (("number".equalsIgnoreCase(datatype) ||
-                "double".equalsIgnoreCase(datatype) ||
-                "int".equalsIgnoreCase(datatype)) &&
-                value.matches("^-?\\d.*")) {
+        if (!needsEnumEscape(datatype) && value.matches("^-?\\d.*")) {
             // Only rename numeric values when the datatype is numeric
             // AND the name is not changed by enum extensions (matches a numeric value).
             boolean isNegative = value.startsWith("-");
@@ -663,8 +686,7 @@ public String toEnumVarName(String value, String datatype) {
 
     @Override
     public String toEnumValue(String value, String datatype) {
-        if ("number".equalsIgnoreCase(datatype) ||
-                "int".equalsIgnoreCase(datatype)) {
+        if (!needsEnumEscape(datatype)) {
             return value;
         } else {
             return "'" + escapeText(value) + "'";

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.14 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);
@@ -225,7 +214,6 @@ class {{{classname}}} {
     {{/isArray}}
     {{/json_serializable}}
     }
-    return Future<{{{returnType}}}>.value();
     {{/returnType}}
   }
   {{/operation}}

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

@@ -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,10 +61,10 @@ 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);
@@ -149,12 +144,12 @@ class ApiClient {
   }
 {{#native_serialization}}
 
-  Future<dynamic> deserializeAsync(String json, String targetType, {bool growable}) async =>
+  Future<dynamic> deserializeAsync(String json, String targetType, {bool? growable}) 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}) {
     // Remove all spaces. Necessary for regular expressions as well.
     targetType = targetType.replaceAll(' ', ''); // ignore: parameter_assignments
 
@@ -166,10 +161,10 @@ class ApiClient {
 {{/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 +183,7 @@ class ApiClient {
   }
 
 {{#native_serialization}}
-  static dynamic _deserialize(dynamic value, String targetType, {bool growable}) {
+  static dynamic _deserialize(dynamic value, String targetType, {bool? growable}) {
     try {
       switch (targetType) {
         case 'String':
@@ -216,21 +211,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);
+              .toList(growable: growable == true);
           }
           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)),
@@ -249,8 +244,8 @@ class ApiClient {
 /// Primarily intended for use in an isolate.
 class DeserializationMessage {
   const DeserializationMessage({
-    @required this.json,
-    @required this.targetType,
+    required this.json,
+    required this.targetType,
     this.growable,
   });
 
@@ -261,7 +256,7 @@ class DeserializationMessage {
   final String targetType;
 
   /// Whether to make deserialized lists or maps growable.
-  final bool growable;
+  final bool? growable;
 }
 
 /// Primarily intended for use in an isolate.
@@ -281,4 +276,4 @@ Future<dynamic> deserializeAsync(DeserializationMessage message) async {
 {{/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() {