From 6ece68f1665f102682b17322aa79201d2b10240b Mon Sep 17 00:00:00 2001
From: Simon Bullik <sbu@wbt-solutions.de>
Date: Mon, 15 Mar 2021 16:33:50 +0100
Subject: [PATCH 1/2] [DART] Add standard generated classes as reserved
---
.../codegen/languages/AbstractDartCodegen.java | 3 ++-
.../codegen/languages/DartClientCodegen.java | 13 +++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
index 0322228f975..0ee7c3aa1f7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
@@ -164,7 +164,8 @@ public abstract class AbstractDartCodegen extends DefaultCodegen {
"File",
"Client",
"Future",
- "Response"
+ "Response",
+ "StreamedRequest"
);
cliOptions.add(new CliOption(PUB_LIBRARY, "Library name in generated code"));
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 266fbee0136..a51533079f3 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
@@ -17,6 +17,7 @@
package org.openapitools.codegen.languages;
+import com.google.common.collect.Sets;
import org.openapitools.codegen.CliOption;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.SupportingFile;
@@ -37,6 +38,18 @@ public class DartClientCodegen extends AbstractDartCodegen {
public DartClientCodegen() {
super();
+ additionalReservedWords.addAll(
+ Sets.newHashSet(
+ "ApiClient",
+ "QueryParam",
+ "Authentication",
+ "HttpBasicAuth",
+ "HttpBearerAuth",
+ "ApiKeyAuth",
+ "OAuth"
+ )
+ );
+
final CliOption serializationLibrary = new CliOption(CodegenConstants.SERIALIZATION_LIBRARY,
"Specify serialization library");
serializationLibrary.setDefault(SERIALIZATION_LIBRARY_NATIVE);
--
GitLab
From 316bb76fd6303d045dbbcceebd15ee90f42b90b2 Mon Sep 17 00:00:00 2001
From: Simon Bullik <sbu@wbt-solutions.de>
Date: Mon, 15 Mar 2021 18:13:48 +0100
Subject: [PATCH 2/2] Move StreamedRequest into dart client
---
.../openapitools/codegen/languages/AbstractDartCodegen.java | 3 +--
.../org/openapitools/codegen/languages/DartClientCodegen.java | 1 +
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
index 0ee7c3aa1f7..0322228f975 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
@@ -164,8 +164,7 @@ public abstract class AbstractDartCodegen extends DefaultCodegen {
"File",
"Client",
"Future",
- "Response",
- "StreamedRequest"
+ "Response"
);
cliOptions.add(new CliOption(PUB_LIBRARY, "Library name in generated code"));
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 a51533079f3..2c84f7f747b 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
@@ -40,6 +40,7 @@ public class DartClientCodegen extends AbstractDartCodegen {
additionalReservedWords.addAll(
Sets.newHashSet(
+ "StreamedRequest",
"ApiClient",
"QueryParam",
"Authentication",
--
GitLab