From d1254ccfda3275efe034c139d0bc5d55bab89041 Mon Sep 17 00:00:00 2001
From: Val Packett <val@packett.cool>
Date: Thu, 6 Jun 2024 02:22:09 -0300
Subject: [PATCH] [dart] Apply var/param/model name mappings, handle single _
 (#18663) (#18860)

Fixes #18663
---
 .../codegen/languages/AbstractDartCodegen.java    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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 ad64d5d01a4a..fba1dcecf253 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
@@ -372,10 +372,17 @@ public abstract class AbstractDartCodegen extends DefaultCodegen {
 
     @Override
     public String toVarName(String name) {
+        if (nameMapping.containsKey(name)) {
+            return nameMapping.get(name);
+        }
+
         // replace - with _ e.g. created-at => created_at
         name = name.replace("-", "_");
 
         // always need to replace leading underscores first
+        if (name.equals("_")) {
+            return "underscore";
+        }
         name = name.replaceAll("^_", "");
 
         // if it's all upper case, do nothing
@@ -408,12 +415,20 @@ public abstract class AbstractDartCodegen extends DefaultCodegen {
 
     @Override
     public String toParamName(String name) {
+        if (parameterNameMapping.containsKey(name)) {
+            return parameterNameMapping.get(name);
+        }
+
         // should be the same as variable name
         return toVarName(name);
     }
 
     @Override
     public String toModelName(final String name) {
+        if (modelNameMapping.containsKey(name)) {
+            return modelNameMapping.get(name);
+        }
+
         String sanitizedName = sanitizeName(name);
 
         if (!StringUtils.isEmpty(modelNamePrefix)) {