Skip to content

Commit

Permalink
Set removeEnumValuePrefix to false by default (#20452)
Browse files Browse the repository at this point in the history 
* set removeEnumValuePrefix to false by default

* update tests
  • Loading branch information
@wing328
wing328 authored Jan 13, 2025
1 parent 479cd52 commit 09530b4
Show file tree
Hide file tree
Showing 16 changed files with 52 additions and 49 deletions.
1 change: 1 addition & 0 deletions bin/configs/java-okhttp-gson.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ additionalProperties:
useOneOfDiscriminatorLookup: true
disallowAdditionalPropertiesIfNotPresent: false
useReflectionEqualsHashCode:: true
removeEnumValuePrefix: true
enumNameMappings:
s: LOWER_CASE_S
S: UPPER_CASE_S
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ apiTemplateFiles are for API outputs only (controllers/handlers).
// 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;
Expand Down
2 changes: 2 additions & 0 deletions modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -889,6 +889,7 @@ public void updateCodegenPropertyEnumWithExtension() {
@Test
public void updateCodegenPropertyEnumWithPrefixRemoved() {
final DefaultCodegen codegen = new DefaultCodegen();
codegen.setRemoveEnumValuePrefix(true);
CodegenProperty enumProperty = codegenProperty(Arrays.asList("animal_dog", "animal_cat"));

codegen.updateCodegenPropertyEnum(enumProperty);
Expand Down Expand Up @@ -925,6 +926,7 @@ public void updateCodegenPropertyEnumWithoutPrefixRemoved() {
@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();

Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/java/okhttp-gson-3.1/docs/CodesEnum.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"`)



6 changes: 3 additions & 3 deletions .../petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CodesEnum.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
@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;

Expand Down
8 changes: 4 additions & 4 deletions samples/client/petstore/rust/hyper/petstore/src/models/unique_item_array_testing.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

8 changes: 4 additions & 4 deletions samples/client/petstore/rust/hyper0x/petstore/src/models/unique_item_array_testing.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

8 changes: 4 additions & 4 deletions samples/client/petstore/rust/reqwest-trait/petstore/src/models/unique_item_array_testing.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

8 changes: 4 additions & 4 deletions ...t/petstore/rust/reqwest/petstore-async-middleware/src/models/unique_item_array_testing.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

8 changes: 4 additions & 4 deletions .../petstore/rust/reqwest/petstore-async-tokensource/src/models/unique_item_array_testing.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

8 changes: 4 additions & 4 deletions samples/client/petstore/rust/reqwest/petstore-async/src/models/unique_item_array_testing.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

8 changes: 4 additions & 4 deletions ...s/client/petstore/rust/reqwest/petstore-avoid-box/src/models/unique_item_array_testing.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

8 changes: 4 additions & 4 deletions ...ent/petstore/rust/reqwest/petstore-awsv4signature/src/models/unique_item_array_testing.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

8 changes: 4 additions & 4 deletions ...store/rust/reqwest/petstore-model-name-prefix/src/models/foo_unique_item_array_testing.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

8 changes: 4 additions & 4 deletions samples/client/petstore/rust/reqwest/petstore/src/models/unique_item_array_testing.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down

0 comments on commit 09530b4

Please sign in to comment.