From 09530b4781af20cf23663be045328103f7ad404a Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 13 Jan 2025 16:25:10 +0800 Subject: [PATCH] Set removeEnumValuePrefix to false by default (#20452) * set removeEnumValuePrefix to false by default * update tests --- bin/configs/java-okhttp-gson.yaml | 1 + .../java/org/openapitools/codegen/DefaultCodegen.java | 2 +- .../java/org/openapitools/codegen/DefaultCodegenTest.java | 2 ++ .../petstore/java/okhttp-gson-3.1/docs/CodesEnum.md | 6 +++--- .../java/org/openapitools/client/model/CodesEnum.java | 6 +++--- .../petstore/src/models/unique_item_array_testing.rs | 8 ++++---- .../petstore/src/models/unique_item_array_testing.rs | 8 ++++---- .../petstore/src/models/unique_item_array_testing.rs | 8 ++++---- .../src/models/unique_item_array_testing.rs | 8 ++++---- .../src/models/unique_item_array_testing.rs | 8 ++++---- .../src/models/unique_item_array_testing.rs | 8 ++++---- .../src/models/unique_item_array_testing.rs | 8 ++++---- .../src/models/unique_item_array_testing.rs | 8 ++++---- .../src/models/foo_unique_item_array_testing.rs | 8 ++++---- .../petstore/src/models/unique_item_array_testing.rs | 8 ++++---- .../typescript-axios/builds/with-complex-headers/api.ts | 4 ++-- 16 files changed, 52 insertions(+), 49 deletions(-) diff --git a/bin/configs/java-okhttp-gson.yaml b/bin/configs/java-okhttp-gson.yaml index 8f5c07cae49..a5c109e1a38 100644 --- a/bin/configs/java-okhttp-gson.yaml +++ b/bin/configs/java-okhttp-gson.yaml @@ -15,6 +15,7 @@ additionalProperties: useOneOfDiscriminatorLookup: true disallowAdditionalPropertiesIfNotPresent: false useReflectionEqualsHashCode:: true + removeEnumValuePrefix: true enumNameMappings: s: LOWER_CASE_S S: UPPER_CASE_S 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 3f8dd1f8042..434983fb5e0 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 @@ -297,7 +297,7 @@ public class DefaultCodegen implements CodegenConfig { // acts strictly upon a spec, potentially modifying it to have consistent behavior across generators. protected boolean strictSpecBehavior = true; // flag to indicate whether enum value prefixes are removed - protected boolean removeEnumValuePrefix = true; + protected boolean removeEnumValuePrefix = false; // Support legacy logic for evaluating discriminators @Setter protected boolean legacyDiscriminatorBehavior = true; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java index 3eef324a7bd..a59c1528086 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java @@ -889,6 +889,7 @@ public class DefaultCodegenTest { @Test public void updateCodegenPropertyEnumWithPrefixRemoved() { final DefaultCodegen codegen = new DefaultCodegen(); + codegen.setRemoveEnumValuePrefix(true); CodegenProperty enumProperty = codegenProperty(Arrays.asList("animal_dog", "animal_cat")); codegen.updateCodegenPropertyEnum(enumProperty); @@ -925,6 +926,7 @@ public class DefaultCodegenTest { @Test public void postProcessModelsEnumWithPrefixRemoved() { final DefaultCodegen codegen = new DefaultCodegen(); + codegen.setRemoveEnumValuePrefix(true); ModelsMap objs = codegenModel(Arrays.asList("animal_dog", "animal_cat")); CodegenModel cm = objs.getModels().get(0).getModel(); diff --git a/samples/client/petstore/java/okhttp-gson-3.1/docs/CodesEnum.md b/samples/client/petstore/java/okhttp-gson-3.1/docs/CodesEnum.md index efdb32e2ce3..15fb076ca72 100644 --- a/samples/client/petstore/java/okhttp-gson-3.1/docs/CodesEnum.md +++ b/samples/client/petstore/java/okhttp-gson-3.1/docs/CodesEnum.md @@ -5,11 +5,11 @@ ## Enum -* `_1` (value: `"Code 1"`) +* `CODE_1` (value: `"Code 1"`) -* `_2` (value: `"Code 2"`) +* `CODE_2` (value: `"Code 2"`) -* `_3` (value: `"Code 3"`) +* `CODE_3` (value: `"Code 3"`) diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CodesEnum.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CodesEnum.java index 9d6d575fa55..84ac24f392d 100644 --- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CodesEnum.java +++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CodesEnum.java @@ -29,11 +29,11 @@ import com.google.gson.stream.JsonWriter; @JsonAdapter(CodesEnum.Adapter.class) public enum CodesEnum { - _1("Code 1"), + CODE_1("Code 1"), - _2("Code 2"), + CODE_2("Code 2"), - _3("Code 3"); + CODE_3("Code 3"); private String value; diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/hyper/petstore/src/models/unique_item_array_testing.rs index 2a1f18ca9ce..bddcf9d5c19 100644 --- a/samples/client/petstore/rust/hyper/petstore/src/models/unique_item_array_testing.rs +++ b/samples/client/petstore/rust/hyper/petstore/src/models/unique_item_array_testing.rs @@ -31,16 +31,16 @@ impl UniqueItemArrayTesting { #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] pub enum UniqueItemArray { #[serde(rename = "unique_item_1")] - Variant1, + UniqueItem1, #[serde(rename = "unique_item_2")] - Variant2, + UniqueItem2, #[serde(rename = "unique_item_3")] - Variant3, + UniqueItem3, } impl Default for UniqueItemArray { fn default() -> UniqueItemArray { - Self::Variant1 + Self::UniqueItem1 } } diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/unique_item_array_testing.rs index 2a1f18ca9ce..bddcf9d5c19 100644 --- a/samples/client/petstore/rust/hyper0x/petstore/src/models/unique_item_array_testing.rs +++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/unique_item_array_testing.rs @@ -31,16 +31,16 @@ impl UniqueItemArrayTesting { #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] pub enum UniqueItemArray { #[serde(rename = "unique_item_1")] - Variant1, + UniqueItem1, #[serde(rename = "unique_item_2")] - Variant2, + UniqueItem2, #[serde(rename = "unique_item_3")] - Variant3, + UniqueItem3, } impl Default for UniqueItemArray { fn default() -> UniqueItemArray { - Self::Variant1 + Self::UniqueItem1 } } diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/unique_item_array_testing.rs index 2a1f18ca9ce..bddcf9d5c19 100644 --- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/unique_item_array_testing.rs +++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/unique_item_array_testing.rs @@ -31,16 +31,16 @@ impl UniqueItemArrayTesting { #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] pub enum UniqueItemArray { #[serde(rename = "unique_item_1")] - Variant1, + UniqueItem1, #[serde(rename = "unique_item_2")] - Variant2, + UniqueItem2, #[serde(rename = "unique_item_3")] - Variant3, + UniqueItem3, } impl Default for UniqueItemArray { fn default() -> UniqueItemArray { - Self::Variant1 + Self::UniqueItem1 } } diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/unique_item_array_testing.rs index 2a1f18ca9ce..bddcf9d5c19 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/unique_item_array_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/unique_item_array_testing.rs @@ -31,16 +31,16 @@ impl UniqueItemArrayTesting { #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] pub enum UniqueItemArray { #[serde(rename = "unique_item_1")] - Variant1, + UniqueItem1, #[serde(rename = "unique_item_2")] - Variant2, + UniqueItem2, #[serde(rename = "unique_item_3")] - Variant3, + UniqueItem3, } impl Default for UniqueItemArray { fn default() -> UniqueItemArray { - Self::Variant1 + Self::UniqueItem1 } } diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/unique_item_array_testing.rs index 2a1f18ca9ce..bddcf9d5c19 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/unique_item_array_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/unique_item_array_testing.rs @@ -31,16 +31,16 @@ impl UniqueItemArrayTesting { #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] pub enum UniqueItemArray { #[serde(rename = "unique_item_1")] - Variant1, + UniqueItem1, #[serde(rename = "unique_item_2")] - Variant2, + UniqueItem2, #[serde(rename = "unique_item_3")] - Variant3, + UniqueItem3, } impl Default for UniqueItemArray { fn default() -> UniqueItemArray { - Self::Variant1 + Self::UniqueItem1 } } diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/unique_item_array_testing.rs index 2a1f18ca9ce..bddcf9d5c19 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/unique_item_array_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/unique_item_array_testing.rs @@ -31,16 +31,16 @@ impl UniqueItemArrayTesting { #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] pub enum UniqueItemArray { #[serde(rename = "unique_item_1")] - Variant1, + UniqueItem1, #[serde(rename = "unique_item_2")] - Variant2, + UniqueItem2, #[serde(rename = "unique_item_3")] - Variant3, + UniqueItem3, } impl Default for UniqueItemArray { fn default() -> UniqueItemArray { - Self::Variant1 + Self::UniqueItem1 } } diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/unique_item_array_testing.rs index 2a1f18ca9ce..bddcf9d5c19 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/unique_item_array_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/unique_item_array_testing.rs @@ -31,16 +31,16 @@ impl UniqueItemArrayTesting { #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] pub enum UniqueItemArray { #[serde(rename = "unique_item_1")] - Variant1, + UniqueItem1, #[serde(rename = "unique_item_2")] - Variant2, + UniqueItem2, #[serde(rename = "unique_item_3")] - Variant3, + UniqueItem3, } impl Default for UniqueItemArray { fn default() -> UniqueItemArray { - Self::Variant1 + Self::UniqueItem1 } } diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/unique_item_array_testing.rs index 2a1f18ca9ce..bddcf9d5c19 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/unique_item_array_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/unique_item_array_testing.rs @@ -31,16 +31,16 @@ impl UniqueItemArrayTesting { #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] pub enum UniqueItemArray { #[serde(rename = "unique_item_1")] - Variant1, + UniqueItem1, #[serde(rename = "unique_item_2")] - Variant2, + UniqueItem2, #[serde(rename = "unique_item_3")] - Variant3, + UniqueItem3, } impl Default for UniqueItemArray { fn default() -> UniqueItemArray { - Self::Variant1 + Self::UniqueItem1 } } diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_unique_item_array_testing.rs index 5091809a337..22ab4a0d71e 100644 --- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_unique_item_array_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_unique_item_array_testing.rs @@ -31,16 +31,16 @@ impl FooUniqueItemArrayTesting { #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] pub enum UniqueItemArray { #[serde(rename = "unique_item_1")] - Variant1, + UniqueItem1, #[serde(rename = "unique_item_2")] - Variant2, + UniqueItem2, #[serde(rename = "unique_item_3")] - Variant3, + UniqueItem3, } impl Default for UniqueItemArray { fn default() -> UniqueItemArray { - Self::Variant1 + Self::UniqueItem1 } } diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/unique_item_array_testing.rs index 2a1f18ca9ce..bddcf9d5c19 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/models/unique_item_array_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/models/unique_item_array_testing.rs @@ -31,16 +31,16 @@ impl UniqueItemArrayTesting { #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] pub enum UniqueItemArray { #[serde(rename = "unique_item_1")] - Variant1, + UniqueItem1, #[serde(rename = "unique_item_2")] - Variant2, + UniqueItem2, #[serde(rename = "unique_item_3")] - Variant3, + UniqueItem3, } impl Default for UniqueItemArray { fn default() -> UniqueItemArray { - Self::Variant1 + Self::UniqueItem1 } } diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts index d7728f692e7..0e70f1dd2fc 100644 --- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts @@ -74,8 +74,8 @@ export interface Category { */ export const MediaType = { - Json: 'application/json', - Xml: 'application/xml' + ApplicationJson: 'application/json', + ApplicationXml: 'application/xml' } as const; export type MediaType = typeof MediaType[keyof typeof MediaType];