From 5c73334210906468eacad598fbc20ecf611d5516 Mon Sep 17 00:00:00 2001
From: Simon Bullik <sbu@wbt-solutions.de>
Date: Mon, 13 Jul 2020 20:41:01 +0200
Subject: [PATCH 1/2] [Dart] Treat float as double

---
 .../openapitools/codegen/languages/DartClientCodegen.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java
index 2ba3d7be485a..5f52b34f9a94 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java
@@ -447,6 +447,13 @@ public String getSchemaType(Schema p) {
         return toModelName(type);
     }
 
+    @Override
+    public CodegenProperty fromProperty(String name, Schema p) {
+        CodegenProperty property = super.fromProperty(name, p);
+        if (property.isFloat) property.isDouble = true;
+        return property;
+    }
+
     @Override
     public Map<String, Object> postProcessModels(Map<String, Object> objs) {
         return postProcessModelsEnum(objs);

From 73d3e1e7f06b572c9bf145d67ce82d738368e9ea Mon Sep 17 00:00:00 2001
From: Simon Bullik <sbu@wbt-solutions.de>
Date: Thu, 30 Jul 2020 14:14:20 +0200
Subject: [PATCH 2/2] [Dart] Treat float as double in mustache with isNumber

---
 .../openapitools/codegen/languages/DartClientCodegen.java | 7 -------
 .../src/main/resources/dart2/class.mustache               | 8 ++++----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java
index 5f52b34f9a94..2ba3d7be485a 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java
@@ -447,13 +447,6 @@ public String getSchemaType(Schema p) {
         return toModelName(type);
     }
 
-    @Override
-    public CodegenProperty fromProperty(String name, Schema p) {
-        CodegenProperty property = super.fromProperty(name, p);
-        if (property.isFloat) property.isDouble = true;
-        return property;
-    }
-
     @Override
     public Map<String, Object> postProcessModels(Map<String, Object> objs) {
         return postProcessModelsEnum(objs);
diff --git a/modules/openapi-generator/src/main/resources/dart2/class.mustache b/modules/openapi-generator/src/main/resources/dart2/class.mustache
index 6c7eca10552a..c5543efdf791 100644
--- a/modules/openapi-generator/src/main/resources/dart2/class.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/class.mustache
@@ -72,14 +72,14 @@ class {{classname}} {
       (json['{{baseName}}'] as Map).cast<String, {{items.datatype}}>();
         {{/isMapContainer}}
         {{^isMapContainer}}
-          {{#isDouble}}
+          {{#isNumber}}
     {{name}} = (json['{{baseName}}'] == null) ?
       null :
       json['{{baseName}}'].toDouble();
-          {{/isDouble}}
-          {{^isDouble}}
+          {{/isNumber}}
+          {{^isNumber}}
     {{name}} = json['{{baseName}}'];
-          {{/isDouble}}
+          {{/isNumber}}
         {{/isMapContainer}}
       {{/isListContainer}}
     {{/complexType}}