refactor: unify getTypeDeclaration for rust

OpenAPITools · Feb 21, 2024 · 401bedb · 401bedb
1 parent 91e0dce
commit 401bedb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRustCodegen.java b/...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRustCodegen.java
@@ -250,7 +250,7 @@ public String getTypeDeclaration(Schema p) {
             String datatype;
             try {
                 datatype = toModelName(ModelUtils.getSimpleRef(p.get$ref()));
-                datatype = "models::" + datatype;
+                datatype = "models::" + toModelName(datatype);
             } catch (Exception e) {
                 LOGGER.warn("Error obtaining the datatype from schema (model):{}. Datatype default to Object", p);
                 datatype = "Object";
@@ -261,7 +261,20 @@ public String getTypeDeclaration(Schema p) {
             return typeMapping.get("file");
         }
 
-        return super.getTypeDeclaration(p);
+        String oasType = getSchemaType(p);
+        if (typeMapping.containsKey(oasType)) {
+            return typeMapping.get(oasType);
+        }
+
+        if (typeMapping.containsValue(oasType)) {
+            return oasType;
+        }
+
+        if (languageSpecificPrimitives.contains(oasType)) {
+            return oasType;
+        }
+
+        return "models::" + toModelName(oasType);
     }
 
     @Override

diff --git a/...openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java b/...openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
@@ -439,24 +439,9 @@ public String modelDocFileFolder() {
 
     @Override
     public String getTypeDeclaration(Schema p) {
+        // use unaliased schema for client-side
         Schema unaliasSchema = unaliasSchema(p);
-        String typeDeclaration = super.getTypeDeclaration(unaliasSchema);
-
-        // Check if we need to UpperCamelize the type after super invocation
-        String schemaType = getSchemaType(unaliasSchema);
-        if (typeDeclaration.equals(schemaType)) {
-            if (typeMapping.containsValue(schemaType)) {
-                return schemaType;
-            }
-
-            if (languageSpecificPrimitives.contains(schemaType)) {
-                return schemaType;
-            }
-
-            typeDeclaration = "models::" + toModelName(schemaType);
-        }
-
-        return typeDeclaration;
+        return super.getTypeDeclaration(unaliasSchema);
     }
 
     @Override