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

Set removeEnumValuePrefix to false by default (#20452)

Browse Source 
* set removeEnumValuePrefix to false by default

* update tests
This commit is contained in:
William Cheng 2025-01-13 16:25:10 +08:00 committed by GitHub
parent 479cd522e0
commit 09530b4781
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/configs/java-okhttp-gson.yaml
View File

@ -15,6 +15,7 @@ additionalProperties:
useOneOfDiscriminatorLookup: true
disallowAdditionalPropertiesIfNotPresent: false
useReflectionEqualsHashCode:: true
removeEnumValuePrefix: true
enumNameMappings:
s: LOWER_CASE_S
S: UPPER_CASE_S

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
View File

@ -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;

2
modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
View File

@ -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();

6
samples/client/petstore/java/okhttp-gson-3.1/docs/CodesEnum.md
View File

@ -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
samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CodesEnum.java
View File

@ -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;

8
samples/client/petstore/rust/hyper/petstore/src/models/unique_item_array_testing.rs
View File

@ -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
samples/client/petstore/rust/hyper0x/petstore/src/models/unique_item_array_testing.rs
View File

@ -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
samples/client/petstore/rust/reqwest-trait/petstore/src/models/unique_item_array_testing.rs
View File

@ -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
samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/unique_item_array_testing.rs
View File

@ -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
samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/unique_item_array_testing.rs
View File

@ -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
samples/client/petstore/rust/reqwest/petstore-async/src/models/unique_item_array_testing.rs
View File

@ -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
samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/unique_item_array_testing.rs
View File

@ -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
samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/unique_item_array_testing.rs
View File

@ -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
samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_unique_item_array_testing.rs
View File

@ -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
samples/client/petstore/rust/reqwest/petstore/src/models/unique_item_array_testing.rs
View File

@ -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
samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts
View File

@ -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];