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

Add missing underscores for PascalCase enum values #4837 (#18594)

Browse Source 
Co-authored-by: Renato Mameli <renato.mameli@teamviewer.com>
This commit is contained in:
Renato Mameli 2024-05-21 09:29:34 +02:00 committed by GitHub
parent 9398c6444a
commit bfa26ea6be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
58 changed files with 65 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2055,7 +2055,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
}
// string
String var = value.replaceAll("\\W+", "_").toUpperCase(Locale.ROOT);
String var = underscore(value.replaceAll("\\W+", "_")).toUpperCase(Locale.ROOT);
if (var.matches("\\d.*")) {
var = "_" + var;
}

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

@ -61,6 +61,13 @@ public class AbstractJavaCodegenTest {
Assert.assertEquals(fakeJavaCodegen.toEnumVarName("==", "String"), "u");
}
@Test
public void toEnumVarNameAddUnderscoresIfValueIsPascalCase() {
Assert.assertEquals(fakeJavaCodegen.toEnumVarName("OnlyCamelCase", "String"), "ONLY_CAMEL_CASE");
Assert.assertEquals(fakeJavaCodegen.toEnumVarName("WithNumber1", "String"), "WITH_NUMBER1");
Assert.assertEquals(fakeJavaCodegen.toEnumVarName("_LeadingUnderscore", "String"), "_LEADING_UNDERSCORE");
}
@Test
public void toVarNameShouldAvoidOverloadingGetClassMethod() throws Exception {
Assert.assertEquals(fakeJavaCodegen.toVarName("class"), "propertyClass");

2
samples/client/others/java/okhttp-gson-streaming/docs/SomeObj.md
View File

@ -19,7 +19,7 @@
| Name | Value |
|---- | -----|
| SOMEOBJIDENTIFIER | &quot;SomeObjIdentifier&quot; |
| SOME_OBJ_IDENTIFIER | &quot;SomeObjIdentifier&quot; |
## Implemented Interfaces

4
samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/model/SomeObj.java
View File

@ -59,7 +59,7 @@ public class SomeObj implements Serializable {
*/
@JsonAdapter(TypeEnum.Adapter.class)
public enum TypeEnum {
SOMEOBJIDENTIFIER("SomeObjIdentifier");
SOME_OBJ_IDENTIFIER("SomeObjIdentifier");
private String value;
@ -106,7 +106,7 @@ public class SomeObj implements Serializable {
public static final String SERIALIZED_NAME_$_TYPE = "$_type";
@SerializedName(SERIALIZED_NAME_$_TYPE)
private TypeEnum $type = TypeEnum.SOMEOBJIDENTIFIER;
private TypeEnum $type = TypeEnum.SOME_OBJ_IDENTIFIER;
public static final String SERIALIZED_NAME_ID = "id";
@SerializedName(SERIALIZED_NAME_ID)

2
samples/client/petstore/java-helidon-client/v3/mp/docs/ParentWithNullable.md
View File

@ -16,7 +16,7 @@
| Name | Value |
|---- | -----|
| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |

2
samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View File

@ -31,7 +31,7 @@ public class ParentWithNullable {
public enum TypeEnum {
CHILDWITHNULLABLE(String.valueOf("ChildWithNullable"));
CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
String value;

2
samples/client/petstore/java-helidon-client/v3/se/docs/ParentWithNullable.md
View File

@ -16,7 +16,7 @@
| Name | Value |
|---- | -----|
| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |

2
samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View File

@ -31,7 +31,7 @@ public class ParentWithNullable {
public enum TypeEnum {
CHILDWITHNULLABLE(String.valueOf("ChildWithNullable"));
CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
String value;

2
samples/client/petstore/java-helidon-client/v4/mp/docs/ParentWithNullable.md
View File

@ -16,7 +16,7 @@
| Name | Value |
|---- | -----|
| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |

2
samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View File

@ -31,7 +31,7 @@ public class ParentWithNullable {
public enum TypeEnum {
CHILDWITHNULLABLE(String.valueOf("ChildWithNullable"));
CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
String value;

2
samples/client/petstore/java/apache-httpclient/docs/ParentWithNullable.md
View File

@ -16,7 +16,7 @@
| Name | Value |
|---- | -----|
| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |

2
samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View File

@ -55,7 +55,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View File

@ -52,7 +52,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/client/petstore/java/jersey3/docs/ChildCat.md
View File

@ -16,7 +16,7 @@
| Name | Value |
|---- | -----|
| CHILDCAT | &quot;ChildCat&quot; |
| CHILD_CAT | &quot;ChildCat&quot; |

2
samples/client/petstore/java/native-async/docs/ChildCat.md
View File

@ -16,7 +16,7 @@
| Name | Value |
|---- | -----|
| CHILDCAT | &quot;ChildCat&quot; |
| CHILD_CAT | &quot;ChildCat&quot; |

2
samples/client/petstore/java/native/docs/ChildCat.md
View File

@ -16,7 +16,7 @@
| Name | Value |
|---- | -----|
| CHILDCAT | &quot;ChildCat&quot; |
| CHILD_CAT | &quot;ChildCat&quot; |

2
samples/client/petstore/java/restclient-swagger2/docs/ParentWithNullable.md
View File

@ -16,7 +16,7 @@
| Name | Value |
|---- | -----|
| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |

2
samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View File

@ -53,7 +53,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/client/petstore/java/restclient/docs/ParentWithNullable.md
View File

@ -16,7 +16,7 @@
| Name | Value |
|---- | -----|
| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |

2
samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View File

@ -52,7 +52,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/client/petstore/java/resteasy/docs/ParentWithNullable.md
View File

@ -16,7 +16,7 @@
| Name | Value |
|---- | -----|
| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |

2
samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View File

@ -52,7 +52,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/client/petstore/java/resttemplate-withXml/docs/ParentWithNullable.md
View File

@ -16,7 +16,7 @@
| Name | Value |
|---- | -----|
| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |

2
samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View File

@ -62,7 +62,7 @@ public class ParentWithNullable {
@XmlEnum(String.class)
public enum TypeEnum {
@XmlEnumValue("ChildWithNullable")
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/client/petstore/java/resttemplate/docs/ParentWithNullable.md
View File

@ -16,7 +16,7 @@
| Name | Value |
|---- | -----|
| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |

2
samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View File

@ -52,7 +52,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/client/petstore/java/vertx/docs/ParentWithNullable.md
View File

@ -16,7 +16,7 @@
| Name | Value |
|---- | -----|
| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |

2
samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View File

@ -52,7 +52,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/client/petstore/java/webclient-jakarta/docs/ParentWithNullable.md
View File

@ -16,7 +16,7 @@
| Name | Value |
|---- | -----|
| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |

2
samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View File

@ -52,7 +52,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/client/petstore/java/webclient-swagger2/docs/ParentWithNullable.md
View File

@ -16,7 +16,7 @@
| Name | Value |
|---- | -----|
| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |

2
samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View File

@ -53,7 +53,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/client/petstore/java/webclient/docs/ParentWithNullable.md
View File

@ -16,7 +16,7 @@
| Name | Value |
|---- | -----|
| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |

2
samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View File

@ -52,7 +52,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java
View File

@ -39,7 +39,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ParentWithNullableDto.java
View File

@ -40,7 +40,7 @@ public class ParentWithNullableDto {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/openapi3/client/petstore/java/jersey2-java8/docs/ChildCat.md
View File

@ -16,7 +16,7 @@
| Name | Value |
|---- | -----|
| CHILDCAT | &quot;ChildCat&quot; |
| CHILD_CAT | &quot;ChildCat&quot; |

2
samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ParentWithNullable.java
View File

@ -41,7 +41,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java
View File

@ -41,7 +41,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java
View File

@ -41,7 +41,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/ParentWithNullable.java
View File

@ -31,7 +31,7 @@ public class ParentWithNullable {
public enum TypeEnum {
CHILDWITHNULLABLE(String.valueOf("ChildWithNullable"));
CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
private String value;

2
samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/ParentWithNullable.java
View File

@ -18,7 +18,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/ParentWithNullable.java
View File

@ -31,7 +31,7 @@ public class ParentWithNullable {
public enum TypeEnum {
CHILDWITHNULLABLE(String.valueOf("ChildWithNullable"));
CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
private String value;

2
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ParentWithNullable.java
View File

@ -43,7 +43,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ParentWithNullable.java
View File

@ -26,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
public class ParentWithNullable implements Serializable {
public enum TypeEnum {
CHILDWITHNULLABLE(String.valueOf("ChildWithNullable"));
CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
private String value;

2
samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ParentWithNullable.java
View File

@ -28,7 +28,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
public class ParentWithNullable implements Serializable {
public enum TypeEnum {
CHILDWITHNULLABLE(String.valueOf("ChildWithNullable"));
CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
private String value;

2
samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ParentWithNullable.java
View File

@ -42,7 +42,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ParentWithNullable.java
View File

@ -41,7 +41,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ParentWithNullable.java
View File

@ -38,7 +38,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ParentWithNullable.java
View File

@ -42,7 +42,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ParentWithNullable.java
View File

@ -42,7 +42,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java
View File

@ -42,7 +42,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java
View File

@ -42,7 +42,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java
View File

@ -42,7 +42,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java
View File

@ -42,7 +42,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ParentWithNullable.java
View File

@ -42,7 +42,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ParentWithNullable.java
View File

@ -41,7 +41,7 @@ public class ParentWithNullable {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;

2
samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java
View File

@ -43,7 +43,7 @@ public class ParentWithNullableDto {
* Gets or Sets type
*/
public enum TypeEnum {
CHILDWITHNULLABLE("ChildWithNullable");
CHILD_WITH_NULLABLE("ChildWithNullable");
private String value;