Make sure to respect inlineSchemaNameMapping

Author: AriehSchneier

modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java

@@ -667,7 +667,7 @@ private void flattenComposedChildren(String key, List<Schema> children, boolean
                         listIterator.set(schema);
                     } else {
                         Schema schema = new Schema().$ref(existing);
-                        schema.addExtension("x-alias-name", innerModelName);
+                        schema.addExtension("x-alias-name", applyInlineSchemaNameMapping(innerModelName));
                         schema.setRequired(component.getRequired());
                         listIterator.set(schema);
                     }
@@ -827,7 +827,7 @@ private void flattenProperties(OpenAPI openAPI, Map<String, Schema> properties,
                 String existing = matchGenerated(model);
                 if (existing != null) {
                     Schema schema = new Schema().$ref(existing);
-                    schema.addExtension("x-alias-name", modelName);
+                    schema.addExtension("x-alias-name", applyInlineSchemaNameMapping(modelName));
                     schema.setRequired(op.getRequired());
                     propsToUpdate.put(key, schema);
                 } else {
@@ -848,7 +848,7 @@ private void flattenProperties(OpenAPI openAPI, Map<String, Schema> properties,
                         String existing = matchGenerated(innerModel);
                         if (existing != null) {
                             Schema schema = new Schema().$ref(existing);
-                            schema.addExtension("x-alias-name", modelName);
+                            schema.addExtension("x-alias-name", applyInlineSchemaNameMapping(modelName));
                             schema.setRequired(op.getRequired());
                             property.setItems(schema);
                         } else {
@@ -879,7 +879,7 @@ private void flattenProperties(OpenAPI openAPI, Map<String, Schema> properties,
                         String existing = matchGenerated(innerModel);
                         if (existing != null) {
                             Schema schema = new Schema().$ref(existing);
-                            schema.addExtension("x-alias-name", modelName);
+                            schema.addExtension("x-alias-name", applyInlineSchemaNameMapping(modelName));
                             schema.setRequired(op.getRequired());
                             property.setAdditionalProperties(schema);
                         } else {
@@ -989,6 +989,19 @@ private Schema modelFromProperty(OpenAPI openAPI, Schema object, String path) {
         return model;
     }
 
+    /**
+     * Apply inlineSchemaNameMapping if configured.
+     *
+     * @param name the inline schema name to map
+     * @return the mapped name if mapping exists, otherwise the original name
+     */
+    private String applyInlineSchemaNameMapping(String name) {
+        if (inlineSchemaNameMapping.containsKey(name)) {
+            return inlineSchemaNameMapping.get(name);
+        }
+        return name;
+    }
+
     /**
      * Move schema to components (if new) and return $ref to schema or
      * existing schema.
@@ -1002,8 +1015,7 @@ private Schema makeSchemaInComponents(String name, Schema schema) {
         Schema refSchema;
         if (existing != null) {
             refSchema = new Schema().$ref(existing);
-            // Store the name this schema would have had if not deduplicated
-            refSchema.addExtension("x-alias-name", name);
+            refSchema.addExtension("x-alias-name", applyInlineSchemaNameMapping(name));
         } else {
             if (resolveInlineEnums && schema.getEnum() != null && schema.getEnum().size() > 0) {
                 LOGGER.warn("Model " + name + " promoted to its own schema due to resolveInlineEnums=true");

modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java

@@ -1252,4 +1252,51 @@ public void testDeduplicationAddsAliasName() {
         // Verify the first reference does not have x-alias-name (it's the original)
         assertNull(detailsRef.getExtensions() != null ? detailsRef.getExtensions().get("x-alias-name") : null);
     }
+
+    @Test
+    public void testDeduplicationWithInlineSchemaNameMapping() {
+        // Test that x-alias-name respects inlineSchemaNameMapping configuration
+        OpenAPI openapi = new OpenAPI();
+        openapi.setComponents(new Components());
+        
+        // Create two models with identical inline schemas that will be deduplicated
+        openapi.getComponents().addSchemas("ModelA", new ObjectSchema()
+                .addProperty("name", new StringSchema())
+                .addProperty("details", new ObjectSchema()
+                        .addProperty("field1", new StringSchema())
+                        .addProperty("field2", new IntegerSchema())));
+
+        openapi.getComponents().addSchemas("ModelB", new ObjectSchema()
+                .addProperty("title", new StringSchema())
+                .addProperty("info", new ObjectSchema()
+                        .addProperty("field1", new StringSchema())
+                        .addProperty("field2", new IntegerSchema())));
+
+        // Configure inlineSchemaNameMapping to rename ModelB_info to CustomInfoName
+        InlineModelResolver resolver = new InlineModelResolver();
+        Map<String, String> inlineSchemaNames = new HashMap<>();
+        inlineSchemaNames.put("ModelB_info", "CustomInfoName");
+        resolver.setInlineSchemaNameMapping(inlineSchemaNames);
+        resolver.flatten(openapi);
+
+        // Check ModelB's property reference - should be deduplicated to ModelA_details
+        Schema modelB = openapi.getComponents().getSchemas().get("ModelB");
+        assertNotNull(modelB);
+        Schema infoRef = (Schema) modelB.getProperties().get("info");
+        assertNotNull(infoRef);
+        assertNotNull(infoRef.get$ref());
+        // The ref should point to the first schema created (ModelA_details)
+        assertEquals("#/components/schemas/ModelA_details", infoRef.get$ref());
+        
+        // Verify x-alias-name extension uses the MAPPED name, not the original name
+        assertNotNull(infoRef.getExtensions());
+        assertTrue(infoRef.getExtensions().containsKey("x-alias-name"));
+        assertEquals("CustomInfoName", infoRef.getExtensions().get("x-alias-name"));
+        
+        // Verify CustomInfoName schema was NOT created (since it was deduplicated)
+        assertNull(openapi.getComponents().getSchemas().get("CustomInfoName"));
+        
+        // Verify ModelA_details schema was created (the deduplicated schema)
+        assertNotNull(openapi.getComponents().getSchemas().get("ModelA_details"));
+    }
 }