n4js fix issue with broken module names due to same module names (#16937

)
OpenAPITools · Oct 30, 2023 · 08d5183 · 08d5183
1 parent 8827da8
commit 08d5183
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/...openapi-generator/src/main/java/org/openapitools/codegen/languages/N4jsClientCodegen.java b/...openapi-generator/src/main/java/org/openapitools/codegen/languages/N4jsClientCodegen.java
@@ -229,11 +229,10 @@ private boolean processBooleanOpt(String OPT, boolean defaultValue) {
 
     @Override
     public String toModelFilename(String name) {
-        String modelFilename = super.toModelFilename(name);
-        if (typeMapping.containsKey(modelFilename) || defaultIncludes.contains(modelFilename)) {
-            return modelFilename;
+        if (typeMapping.containsKey(name) || defaultIncludes.contains(name)) {
+            return name;
         }
-        return modelFilename;
+        return super.toModelFilename(name);
     }
 
     public boolean checkRequiredBodyPropsNotNull() {
@@ -485,10 +484,11 @@ private Map<String, String> toN4jsImports(String className, Map<String, ModelsMa
 
     @Override
     public String toModelImport(String name) {
+     String modelImportName = toModelFilename(name);
         if ("".equals(modelPackage())) {
-            return name;
+            return modelImportName;
         } else {
-            return modelPackage() + "/" + name;
+            return modelPackage() + "/" + modelImportName;
         }
     }
 
@@ -564,7 +564,11 @@ protected String getParameterDataType(Parameter parameter, Schema p) {
                 return numericEnumValuesToEnumTypeUnion(new ArrayList<Number>(p.getEnum()));
             }
         }
-        return this.getTypeDeclaration(p);
+        String result = this.getTypeDeclaration(p);
+        if (result != null) {
+            result = toModelFilename(result);
+        }
+        return result;
     }
 
     @Override
@@ -578,7 +582,11 @@ protected String getSingleSchemaType(@SuppressWarnings("rawtypes") Schema schema
                 }
             }
         }
-        return super.getSingleSchemaType(unaliasSchema);
+        String result = super.getSingleSchemaType(unaliasSchema);
+        if (result != null) {
+            result = toModelFilename(result);
+        }
+        return result;
     }
 
     /**