Merge branch 'bugfix/pagedModel-use-import-mapping-and-schema-mapping' into bugfix/pagedModel-for-declarative-http-interface

Picazsoo · Picazsoo · commit ecf07b0435c5 · 2026-04-21T17:35:22.000+02:00
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
@@ -1221,7 +1221,7 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
                 String fqn = importMapping.get("PagedModel");
                 pagedModelClassName = fqn.substring(fqn.lastIndexOf('.') + 1);
                 if (!pagedModelClassName.equals("PagedModel")) {
-                    importMapping.put(pagedModelClassName, fqn);
+                    importMapping.putIfAbsent(pagedModelClassName, fqn);
                 }
                 LOGGER.info("substituteGenericPagedModel: detected {} paged-model schema(s): {}",
                         pagedModelRegistry.size(), pagedModelRegistry.keySet());

Original file line number	Diff line number	Diff line change
`@@ -1221,7 +1221,7 @@ public void preprocessOpenAPI(OpenAPI openAPI) {`
`1221`	`1221`	`String fqn = importMapping.get("PagedModel");`
`1222`	`1222`	`pagedModelClassName = fqn.substring(fqn.lastIndexOf('.') + 1);`
`1223`	`1223`	`if (!pagedModelClassName.equals("PagedModel")) {`
`1224`		`- importMapping.put(pagedModelClassName, fqn);`
	`1224`	`+ importMapping.putIfAbsent(pagedModelClassName, fqn);`
`1225`	`1225`	`}`
`1226`	`1226`	`LOGGER.info("substituteGenericPagedModel: detected {} paged-model schema(s): {}",`
`1227`	`1227`	`pagedModelRegistry.size(), pagedModelRegistry.keySet());`