Better isAlias detection (#16943)

* better isAlias check for allOf with single item * better code format
OpenAPITools · Oct 31, 2023 · bfe6157 · bfe6157
1 parent 6cd73eb
commit bfe6157
Show file tree

Hide file tree

Showing 3 changed files with 701 additions and 632 deletions.
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -5987,21 +5987,31 @@ Map<String, String> getAllAliases(Map<String, Schema> schemas) {
         for (Map.Entry<String, Schema> entry : schemas.entrySet()) {
             Schema schema = entry.getValue();
             if (isAliasOfSimpleTypes(schema)) {
-                String oasName = entry.getKey();
-                String schemaType = getPrimitiveType(schema);
-                aliases.put(oasName, schemaType);
+                if (schema.getAllOf() != null && schema.getAllOf().size() == 1) { // allOf with a single item
+                    Schema unaliasSchema = unaliasSchema(schema);
+                    unaliasSchema = ModelUtils.getReferencedSchema(this.openAPI, unaliasSchema);
+                    aliases.put(entry.getKey() /* schema name, e.g. Pet */, getPrimitiveType(unaliasSchema));
+                } else {
+                    aliases.put(entry.getKey() /* schema name, e.g. Pet */, getPrimitiveType(schema));
+                }
             }
-
         }
 
         return aliases;
     }
 
-    private static Boolean isAliasOfSimpleTypes(Schema schema) {
+    private Boolean isAliasOfSimpleTypes(Schema schema) {
         if (schema == null) {
             return false;
         }
 
+        // allOf with a single item
+        if (schema.getAllOf() != null && schema.getAllOf().size() == 1
+                && schema.getAllOf().get(0) instanceof Schema) {
+            schema = unaliasSchema((Schema) schema.getAllOf().get(0));
+            schema = ModelUtils.getReferencedSchema(this.openAPI, schema);
+        }
+
         return (!ModelUtils.isObjectSchema(schema)
                 && !ModelUtils.isArraySchema(schema)
                 && !ModelUtils.isMapSchema(schema)