Add feature removeEnumValuePrefix from openapi codegen, fix #363

gen/main/java/issue/_363/_false/EnumWithPrefix.java

@@ -0,0 +1,34 @@
+package issue._363._false;
+
+@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
+public enum EnumWithPrefix {
+
+	AAA_FOO("aaa_foo"),
+	AAA_BAR("aaa_bar");
+
+	public static final java.lang.String AAA_FOO_VALUE = "aaa_foo";
+	public static final java.lang.String AAA_BAR_VALUE = "aaa_bar";
+
+	private final java.lang.String value;
+
+	private EnumWithPrefix(java.lang.String value) {
+		this.value = value;
+	}
+
+	@com.fasterxml.jackson.annotation.JsonCreator
+	public static EnumWithPrefix toEnum(java.lang.String value) {
+		return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'."));
+	}
+
+	public static java.util.Optional<EnumWithPrefix> toOptional(java.lang.String value) {
+		return java.util.Arrays
+				.stream(values())
+				.filter(e -> e.value.equals(value))
+				.findAny();
+	}
+
+	@com.fasterxml.jackson.annotation.JsonValue
+	public java.lang.String getValue() {
+		return value;
+	}
+}

gen/main/java/issue/_363/_false/EnumWithoutPrefix.java

@@ -0,0 +1,34 @@
+package issue._363._false;
+
+@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
+public enum EnumWithoutPrefix {
+
+	FOO("foo"),
+	BAR("bar");
+
+	public static final java.lang.String FOO_VALUE = "foo";
+	public static final java.lang.String BAR_VALUE = "bar";
+
+	private final java.lang.String value;
+
+	private EnumWithoutPrefix(java.lang.String value) {
+		this.value = value;
+	}
+
+	@com.fasterxml.jackson.annotation.JsonCreator
+	public static EnumWithoutPrefix toEnum(java.lang.String value) {
+		return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'."));
+	}
+
+	public static java.util.Optional<EnumWithoutPrefix> toOptional(java.lang.String value) {
+		return java.util.Arrays
+				.stream(values())
+				.filter(e -> e.value.equals(value))
+				.findAny();
+	}
+
+	@com.fasterxml.jackson.annotation.JsonValue
+	public java.lang.String getValue() {
+		return value;
+	}
+}

gen/main/java/issue/_363/_true/EnumWithPrefix.java

@@ -0,0 +1,34 @@
+package issue._363._true;
+
+@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
+public enum EnumWithPrefix {
+
+	FOO("aaa_foo"),
+	BAR("aaa_bar");
+
+	public static final java.lang.String FOO_VALUE = "aaa_foo";
+	public static final java.lang.String BAR_VALUE = "aaa_bar";
+
+	private final java.lang.String value;
+
+	private EnumWithPrefix(java.lang.String value) {
+		this.value = value;
+	}
+
+	@com.fasterxml.jackson.annotation.JsonCreator
+	public static EnumWithPrefix toEnum(java.lang.String value) {
+		return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'."));
+	}
+
+	public static java.util.Optional<EnumWithPrefix> toOptional(java.lang.String value) {
+		return java.util.Arrays
+				.stream(values())
+				.filter(e -> e.value.equals(value))
+				.findAny();
+	}
+
+	@com.fasterxml.jackson.annotation.JsonValue
+	public java.lang.String getValue() {
+		return value;
+	}
+}

gen/main/java/issue/_363/_true/EnumWithoutPrefix.java

@@ -0,0 +1,34 @@
+package issue._363._true;
+
+@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
+public enum EnumWithoutPrefix {
+
+	FOO("foo"),
+	BAR("bar");
+
+	public static final java.lang.String FOO_VALUE = "foo";
+	public static final java.lang.String BAR_VALUE = "bar";
+
+	private final java.lang.String value;
+
+	private EnumWithoutPrefix(java.lang.String value) {
+		this.value = value;
+	}
+
+	@com.fasterxml.jackson.annotation.JsonCreator
+	public static EnumWithoutPrefix toEnum(java.lang.String value) {
+		return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'."));
+	}
+
+	public static java.util.Optional<EnumWithoutPrefix> toOptional(java.lang.String value) {
+		return java.util.Arrays
+				.stream(values())
+				.filter(e -> e.value.equals(value))
+				.findAny();
+	}
+
+	@com.fasterxml.jackson.annotation.JsonValue
+	public java.lang.String getValue() {
+		return value;
+	}
+}

src/main/java/org/openapitools/codegen/languages/MicronautCodegen.java

@@ -2,6 +2,8 @@
 
 import static org.openapitools.codegen.CodegenConstants.GENERATE_API_TESTS;
 import static org.openapitools.codegen.CodegenConstants.MODEL_NAME_SUFFIX;
+import static org.openapitools.codegen.CodegenConstants.REMOVE_ENUM_VALUE_PREFIX;
+import static org.openapitools.codegen.CodegenConstants.REMOVE_ENUM_VALUE_PREFIX_DESC;
 import static org.openapitools.codegen.CodegenConstants.SOURCE_FOLDER;
 import static org.openapitools.codegen.CodegenConstants.SOURCE_FOLDER_DESC;
 
@@ -103,6 +105,8 @@ public MicronautCodegen() {
 		cliOptions.add(CliOption.newString(CLIENT_ID, "ClientId to use."));
 		cliOptions.add(CliOption.newString(SOURCE_FOLDER, SOURCE_FOLDER_DESC));
 		cliOptions.add(CliOption.newString("testFolder", "test folder for generated code"));
+		cliOptions.add(
+				CliOption.newBoolean(REMOVE_ENUM_VALUE_PREFIX, REMOVE_ENUM_VALUE_PREFIX_DESC, removeEnumValuePrefix));
 
 		// there is no documentation template yet
 
@@ -127,6 +131,7 @@ public MicronautCodegen() {
 		additionalProperties.put(GENERATE_CONSTANTS, generateConstants);
 		additionalProperties.put(SEALED, sealed);
 		additionalProperties.put(RECORD, record);
+		additionalProperties.put(REMOVE_ENUM_VALUE_PREFIX, removeEnumValuePrefix);
 		additionalProperties.put("curly", "{");
 
 		// add custom type mappings
@@ -248,6 +253,9 @@ record = convertPropertyToBooleanAndWriteBack(RECORD);
 		if (additionalProperties.containsKey(GENERATE_CONSTANTS)) {
 			generateConstants = convertPropertyToBooleanAndWriteBack(GENERATE_CONSTANTS);
 		}
+		if (additionalProperties.containsKey(REMOVE_ENUM_VALUE_PREFIX)) {
+			removeEnumValuePrefix = convertPropertyToBooleanAndWriteBack(REMOVE_ENUM_VALUE_PREFIX);
+		}
 
 		// we do not generate projects, only api, set source and test folder
 

src/test/java/org/openapitools/codegen/languages/IssueCodegenTest.java

@@ -40,6 +40,20 @@ void modelWithArrayItemsWithValidation() {
 		generate(configurator.addAdditionalProperty("clientId", "test"));
 	}
 
+	@DisplayName("enum with removeEnumValuePrefix=true")
+	@Test
+	void enumWithRemoveEnumValuePrefixTrue() {
+		generate(configurator("src/test/resources/openapi/issue-363.yaml", "issue._363._true")
+				.addAdditionalProperty(CodegenConstants.REMOVE_ENUM_VALUE_PREFIX, "true"));
+	}
+
+	@DisplayName("enum with removeEnumValuePrefix=false")
+	@Test
+	void enumWithRemoveEnumValuePrefixFalse() {
+		generate(configurator("src/test/resources/openapi/issue-363.yaml", "issue._363._false")
+				.addAdditionalProperty(CodegenConstants.REMOVE_ENUM_VALUE_PREFIX, "false"));
+	}
+
 	static void generate(CodegenConfigurator configurator) {
 		var gen = new DefaultGenerator();
 		gen.setGenerateMetadata(false);

src/test/resources/openapi/issue-363.yaml

@@ -0,0 +1,17 @@
+openapi: 3.0.3
+info:
+  title: Spec for <https://github.com/kokuwaio/micronaut-openapi-codegen/issues/363>
+  version: "1"
+paths: {}
+components:
+  schemas:
+    EnumWithoutPrefix:
+      type: string
+      enum:
+        - foo
+        - bar
+    EnumWithPrefix:
+      type: string
+      enum:
+        - aaa_foo
+        - aaa_bar