loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Prevent generating "pattern" and "size" to ENUM (#18658)

Browse Source
This commit is contained in:
Jorge Rodríguez Martín 2024-05-13 18:13:15 +02:00 committed by GitHub
parent 2a15270589
commit 4a872a8d69
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
View File

@ -722,6 +722,16 @@ public class ModelUtils {
&& URI_FORMAT.equals(schema.getFormat());
}
public static boolean isEnumSchema(final Schema<?> schema) {
// MyEnum:
// type: string
// enum:
// - ENUM_1
// - ENUM_2
return schema.getEnum() != null
&& !schema.getEnum().isEmpty();
}
public static boolean isEmailSchema(Schema schema) {
return (schema instanceof EmailSchema) ||
// format: email
@ -756,7 +766,8 @@ public class ModelUtils {
return ModelUtils.isByteArraySchema(schema) ||
ModelUtils.isBinarySchema(schema) ||
ModelUtils.isUUIDSchema(schema) ||
ModelUtils.isURISchema(schema);
ModelUtils.isURISchema(schema) ||
ModelUtils.isEnumSchema(schema);
}
@ -1351,7 +1362,7 @@ public class ModelUtils {
once(LOGGER).warn("{} is not defined", schema.get$ref());
}
return schema;
} else if (ref.getEnum() != null && !ref.getEnum().isEmpty()) {
} else if (isEnumSchema(ref)) {
// top-level enum class
return schema;
} else if (isArraySchema(ref)) {

8
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java
View File

@ -923,6 +923,10 @@ public class AbstractJavaCodegenTest {
schema = new Schema<>().type("string").format("binary").pattern("^[a-z]$").maxLength(36);
defaultValue = codegen.getTypeDeclaration(schema);
Assert.assertEquals(defaultValue, "File");
schema = new Schema<>().type("string")._enum(List.of("A","B")).pattern("^[a-z]$").maxLength(36);
defaultValue = codegen.getTypeDeclaration(schema);
Assert.assertEquals(defaultValue, "String");
}
@Test
@ -945,6 +949,10 @@ public class AbstractJavaCodegenTest {
schema = new ArraySchema().items(new Schema<>().type("string").format("binary").pattern("^[a-z]$").maxLength(36));
defaultValue = codegen.getTypeDeclaration(schema);
Assert.assertEquals(defaultValue, "List<File>");
schema = new ArraySchema().items(new Schema<>().type("string")._enum(List.of("A","B")).pattern("^[a-z]$").maxLength(36));
defaultValue = codegen.getTypeDeclaration(schema);
Assert.assertEquals(defaultValue, "List<String>");
}
@Test