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 index c0dbc5f13839..b2e38d70ff03 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -3907,9 +3907,7 @@ protected String getCommonSchemaType(List schemas) { } if (ModelUtils.isEnumSchema(first)) { // inline enum, use the least common denominator - String simpleType = typeMapping.get("enum"); - - return simpleType != null? simpleType: typeMapping.get("object"); + return getCommonEnumType(); } return typeMapping.get(getPrimitiveType(first)); } catch (Exception e) { @@ -3947,10 +3945,7 @@ protected String getCommonTypeMapping(List schemas) { boolean allEnums = schemas.stream().allMatch(ModelUtils::isEnumSchema); if (allEnums) { // non matching enums. Use enum if if the langage can map it. - if (typeMapping.containsKey("enum")) { - simpleType = "enum"; - } - return typeMapping.get(simpleType); + return getCommonEnumType(); } if (schemas.stream().noneMatch(ModelUtils::isEnumSchema)) { Set types = schemas.stream().map(this::getPrimitiveType).collect(Collectors.toSet()); @@ -3965,6 +3960,18 @@ protected String getCommonTypeMapping(List schemas) { return typeMapping.get(simpleType); } + /** + * Get the common type name for enum schemas when multiple or inline enums cannot be unified to a specific enum model. + * + * @return the common enum type name (e.g. "Enum" for Java, or mapped "object" if unsupported) + */ + protected String getCommonEnumType() { + if (typeMapping.containsKey("enum")) { + return typeMapping.get("enum"); + } + return typeMapping.get("object"); + } + /** * Handle the model for the 'additionalProperties' keyword in the OAS schema. * diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index 6e115b043d85..7978041815be 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -307,7 +307,6 @@ public AbstractJavaCodegen() { typeMapping.put("file", "File"); typeMapping.put("AnyType", "Object"); typeMapping.put("null", "Object"); - typeMapping.put("enum", "Enum"); importMapping.put("BigDecimal", "java.math.BigDecimal"); importMapping.put("UUID", "java.util.UUID"); @@ -3080,4 +3079,12 @@ public void keepAnnotation(String keep) { this.keep = keep; } } + + @Override + protected String getCommonEnumType() { + if (typeMapping.containsKey("enum")) { + return typeMapping.get("enum"); + } + return "Enum"; + } } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index 43f9b8d6ec18..5792a2934fb9 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -2804,6 +2804,45 @@ public void testEnumDiscriminatorDefaultValueIsNotString() { } } + @Test + public void testEnumFormatStringSchema_issue24950() { + final OpenAPI openAPI = TestUtils.parseContent( + "openapi: 3.0.3\n" + + "info:\n" + + " title: Enum format test\n" + + " version: 1.0.0\n" + + "paths: {}\n" + + "components:\n" + + " schemas:\n" + + " Ruleset:\n" + + " type: object\n" + + " properties:\n" + + " bypassMode:\n" + + " type: string\n" + + " format: enum\n" + + " enum:\n" + + " - RULESET_BYPASS_MODE_UNSPECIFIED\n" + + " - RULESET_BYPASS_MODE_ALLOWED\n" + + " - RULESET_BYPASS_MODE_DISABLED\n" + + " plainEnumFormat:\n" + + " type: string\n" + + " format: enum\n" + ); + final JavaClientCodegen codegen = new JavaClientCodegen(); + codegen.setOpenAPI(openAPI); + codegen.setOutputDir(newTempFolder().toString()); + + Map files = new DefaultGenerator().opts(new ClientOptInput().openAPI(openAPI).config(codegen)) + .generate().stream().collect(Collectors.toMap(File::getName, Function.identity())); + + File rulesetFile = files.get("Ruleset.java"); + assertNotNull(rulesetFile); + JavaFileAssert.assertThat(rulesetFile) + .hasNoImports("org.openapitools.client.model.Enum") + .fileContains("public enum BypassModeEnum {", "private String value;", "BypassModeEnum(String value)", "public String getValue()", "public static BypassModeEnum fromValue(String value)", "private String plainEnumFormat;") + .fileDoesNotContain("private Enum value;", "Enum.valueOf(", "private Enum plainEnumFormat;"); + } + @Test public void testRestTemplateHandleURIEnum() { String[] expectedInnerEnumLines = new String[]{