Add missing underscores for PascalCase enum values #4837

OpenAPITools · May 17, 2024 · 3a6a427 · 3a6a427
1 parent 7e94c87
commit 3a6a427
Show file tree

Hide file tree

Showing 55 changed files with 64 additions and 57 deletions.
diff --git a/...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
@@ -2055,7 +2055,7 @@ public String toEnumVarName(String value, String datatype) {
         }
 
         // string
-        String var = value.replaceAll("\\W+", "_").toUpperCase(Locale.ROOT);
+        String var = underscore(value.replaceAll("\\W+", "_")).toUpperCase(Locale.ROOT);
         if (var.matches("\\d.*")) {
             var = "_" + var;
         }

diff --git a/...penapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java b/...penapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java
@@ -61,6 +61,13 @@ public void toEnumVarNameShouldNotResultInSingleUnderscore() throws Exception {
         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");

diff --git a/samples/client/others/java/okhttp-gson-streaming/docs/SomeObj.md b/samples/client/others/java/okhttp-gson-streaming/docs/SomeObj.md
@@ -19,7 +19,7 @@
 
 | Name | Value |
 |---- | -----|
-| SOMEOBJIDENTIFIER | &quot;SomeObjIdentifier&quot; |
+| SOME_OBJ_IDENTIFIER | &quot;SomeObjIdentifier&quot; |
 
 
 ## Implemented Interfaces

diff --git a/...thers/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/model/SomeObj.java b/...thers/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/model/SomeObj.java
@@ -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 static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
 
   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)

diff --git a/samples/client/petstore/java-helidon-client/v3/mp/docs/ParentWithNullable.md b/samples/client/petstore/java-helidon-client/v3/mp/docs/ParentWithNullable.md
@@ -16,7 +16,7 @@
 
 | Name | Value |
 |---- | -----|
-| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
+| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |
 
 
 
diff --git a/...-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/...-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -31,7 +31,7 @@ public class ParentWithNullable  {
 
 public enum TypeEnum {
 
-    CHILDWITHNULLABLE(String.valueOf("ChildWithNullable"));
+    CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
 
     String value;
 

diff --git a/samples/client/petstore/java-helidon-client/v4/mp/docs/ParentWithNullable.md b/samples/client/petstore/java-helidon-client/v4/mp/docs/ParentWithNullable.md
@@ -16,7 +16,7 @@
 
 | Name | Value |
 |---- | -----|
-| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
+| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |
 
 
 
diff --git a/...-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/...-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -31,7 +31,7 @@ public class ParentWithNullable  {
 
 public enum TypeEnum {
 
-    CHILDWITHNULLABLE(String.valueOf("ChildWithNullable"));
+    CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
 
     String value;
 

diff --git a/samples/client/petstore/java/apache-httpclient/docs/ParentWithNullable.md b/samples/client/petstore/java/apache-httpclient/docs/ParentWithNullable.md
@@ -16,7 +16,7 @@
 
 | Name | Value |
 |---- | -----|
-| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
+| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |
 
 
 
diff --git a/...ava/apache-httpclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/...ava/apache-httpclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -55,7 +55,7 @@ public class ParentWithNullable {
    * Gets or Sets type
    */
   public enum TypeEnum {
-    CHILDWITHNULLABLE("ChildWithNullable");
+    CHILD_WITH_NULLABLE("ChildWithNullable");
 
     private String value;
 

diff --git a/...t/petstore/java/feign/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/...t/petstore/java/feign/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -52,7 +52,7 @@ public class ParentWithNullable {
    * Gets or Sets type
    */
   public enum TypeEnum {
-    CHILDWITHNULLABLE("ChildWithNullable");
+    CHILD_WITH_NULLABLE("ChildWithNullable");
 
     private String value;
 

diff --git a/samples/client/petstore/java/jersey3/docs/ChildCat.md b/samples/client/petstore/java/jersey3/docs/ChildCat.md
@@ -16,7 +16,7 @@
 
 | Name | Value |
 |---- | -----|
-| CHILDCAT | &quot;ChildCat&quot; |
+| CHILD_CAT | &quot;ChildCat&quot; |
 
 
 
diff --git a/samples/client/petstore/java/native-async/docs/ChildCat.md b/samples/client/petstore/java/native-async/docs/ChildCat.md
@@ -16,7 +16,7 @@
 
 | Name | Value |
 |---- | -----|
-| CHILDCAT | &quot;ChildCat&quot; |
+| CHILD_CAT | &quot;ChildCat&quot; |
 
 
 
diff --git a/samples/client/petstore/java/native/docs/ChildCat.md b/samples/client/petstore/java/native/docs/ChildCat.md
@@ -16,7 +16,7 @@
 
 | Name | Value |
 |---- | -----|
-| CHILDCAT | &quot;ChildCat&quot; |
+| CHILD_CAT | &quot;ChildCat&quot; |
 
 
 
diff --git a/samples/client/petstore/java/restclient-swagger2/docs/ParentWithNullable.md b/samples/client/petstore/java/restclient-swagger2/docs/ParentWithNullable.md
@@ -16,7 +16,7 @@
 
 | Name | Value |
 |---- | -----|
-| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
+| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |
 
 
 
diff --git a/...a/restclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/...a/restclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -53,7 +53,7 @@ public class ParentWithNullable {
    * Gets or Sets type
    */
   public enum TypeEnum {
-    CHILDWITHNULLABLE("ChildWithNullable");
+    CHILD_WITH_NULLABLE("ChildWithNullable");
 
     private String value;
 

diff --git a/samples/client/petstore/java/restclient/docs/ParentWithNullable.md b/samples/client/petstore/java/restclient/docs/ParentWithNullable.md
@@ -16,7 +16,7 @@
 
 | Name | Value |
 |---- | -----|
-| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
+| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |
 
 
 
diff --git a/...store/java/restclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/...store/java/restclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -52,7 +52,7 @@ public class ParentWithNullable {
    * Gets or Sets type
    */
   public enum TypeEnum {
-    CHILDWITHNULLABLE("ChildWithNullable");
+    CHILD_WITH_NULLABLE("ChildWithNullable");
 
     private String value;
 

diff --git a/samples/client/petstore/java/resteasy/docs/ParentWithNullable.md b/samples/client/petstore/java/resteasy/docs/ParentWithNullable.md
@@ -16,7 +16,7 @@
 
 | Name | Value |
 |---- | -----|
-| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
+| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |
 
 
 
diff --git a/...etstore/java/resteasy/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/...etstore/java/resteasy/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -52,7 +52,7 @@ public class ParentWithNullable {
    * Gets or Sets type
    */
   public enum TypeEnum {
-    CHILDWITHNULLABLE("ChildWithNullable");
+    CHILD_WITH_NULLABLE("ChildWithNullable");
 
     private String value;
 

diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/ParentWithNullable.md b/samples/client/petstore/java/resttemplate-withXml/docs/ParentWithNullable.md
@@ -16,7 +16,7 @@
 
 | Name | Value |
 |---- | -----|
-| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
+| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |
 
 
 
diff --git a/.../resttemplate-withXml/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/.../resttemplate-withXml/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -62,7 +62,7 @@ public class ParentWithNullable {
   @XmlEnum(String.class)
   public enum TypeEnum {
     @XmlEnumValue("ChildWithNullable")
-    CHILDWITHNULLABLE("ChildWithNullable");
+    CHILD_WITH_NULLABLE("ChildWithNullable");
 
     private String value;
 

diff --git a/samples/client/petstore/java/resttemplate/docs/ParentWithNullable.md b/samples/client/petstore/java/resttemplate/docs/ParentWithNullable.md
@@ -16,7 +16,7 @@
 
 | Name | Value |
 |---- | -----|
-| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
+| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |
 
 
 
diff --git a/...ore/java/resttemplate/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/...ore/java/resttemplate/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -52,7 +52,7 @@ public class ParentWithNullable {
    * Gets or Sets type
    */
   public enum TypeEnum {
-    CHILDWITHNULLABLE("ChildWithNullable");
+    CHILD_WITH_NULLABLE("ChildWithNullable");
 
     private String value;
 

diff --git a/samples/client/petstore/java/vertx/docs/ParentWithNullable.md b/samples/client/petstore/java/vertx/docs/ParentWithNullable.md
@@ -16,7 +16,7 @@
 
 | Name | Value |
 |---- | -----|
-| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
+| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |
 
 
 
diff --git a/...t/petstore/java/vertx/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/...t/petstore/java/vertx/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -52,7 +52,7 @@ public class ParentWithNullable {
    * Gets or Sets type
    */
   public enum TypeEnum {
-    CHILDWITHNULLABLE("ChildWithNullable");
+    CHILD_WITH_NULLABLE("ChildWithNullable");
 
     private String value;
 

diff --git a/samples/client/petstore/java/webclient-jakarta/docs/ParentWithNullable.md b/samples/client/petstore/java/webclient-jakarta/docs/ParentWithNullable.md
@@ -16,7 +16,7 @@
 
 | Name | Value |
 |---- | -----|
-| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
+| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |
 
 
 
diff --git a/...ava/webclient-jakarta/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/...ava/webclient-jakarta/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -52,7 +52,7 @@ public class ParentWithNullable {
    * Gets or Sets type
    */
   public enum TypeEnum {
-    CHILDWITHNULLABLE("ChildWithNullable");
+    CHILD_WITH_NULLABLE("ChildWithNullable");
 
     private String value;
 

diff --git a/samples/client/petstore/java/webclient-swagger2/docs/ParentWithNullable.md b/samples/client/petstore/java/webclient-swagger2/docs/ParentWithNullable.md
@@ -16,7 +16,7 @@
 
 | Name | Value |
 |---- | -----|
-| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
+| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |
 
 
 
diff --git a/...va/webclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/...va/webclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -53,7 +53,7 @@ public class ParentWithNullable {
    * Gets or Sets type
    */
   public enum TypeEnum {
-    CHILDWITHNULLABLE("ChildWithNullable");
+    CHILD_WITH_NULLABLE("ChildWithNullable");
 
     private String value;
 

diff --git a/samples/client/petstore/java/webclient/docs/ParentWithNullable.md b/samples/client/petstore/java/webclient/docs/ParentWithNullable.md
@@ -16,7 +16,7 @@
 
 | Name | Value |
 |---- | -----|
-| CHILDWITHNULLABLE | &quot;ChildWithNullable&quot; |
+| CHILD_WITH_NULLABLE | &quot;ChildWithNullable&quot; |
 
 
 
diff --git a/...tstore/java/webclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/...tstore/java/webclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -52,7 +52,7 @@ public class ParentWithNullable {
    * Gets or Sets type
    */
   public enum TypeEnum {
-    CHILDWITHNULLABLE("ChildWithNullable");
+    CHILD_WITH_NULLABLE("ChildWithNullable");
 
     private String value;
 

diff --git a/...ring-http-interface-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java b/...ring-http-interface-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java
@@ -39,7 +39,7 @@ public class ParentWithNullable {
    * Gets or Sets type
    */
   public enum TypeEnum {
-    CHILDWITHNULLABLE("ChildWithNullable");
+    CHILD_WITH_NULLABLE("ChildWithNullable");
 
     private String value;
 

diff --git a/...ore/spring-http-interface/src/main/java/org/openapitools/model/ParentWithNullableDto.java b/...ore/spring-http-interface/src/main/java/org/openapitools/model/ParentWithNullableDto.java
@@ -40,7 +40,7 @@ public class ParentWithNullableDto {
    * Gets or Sets type
    */
   public enum TypeEnum {
-    CHILDWITHNULLABLE("ChildWithNullable");
+    CHILD_WITH_NULLABLE("ChildWithNullable");
 
     private String value;
 

diff --git a/samples/documentation/html2/index.html b/samples/documentation/html2/index.html
@@ -9591,19 +9591,19 @@ <h3 id="examples-User-loginUser-title-200"></h3>
                                               <th>Description</th>
                                           </tr>
                                               <tr>
-                                                  <td>SetDashCookie</td>
+                                                  <td>SetMinusCookie</td>
                                                   <td>String</td>
                                                   <td></td>
                                                   <td>Cookie authentication key for use with the &#x60;api_key&#x60; apiKey authentication.</td>
                                               </tr>
                                               <tr>
-                                                  <td>XDashRateDashLimit</td>
+                                                  <td>XMinusRateMinusLimit</td>
                                                   <td>Integer</td>
                                                   <td>int32</td>
                                                   <td>calls per hour allowed by the user</td>
                                               </tr>
                                               <tr>
-                                                  <td>XDashExpiresDashAfter</td>
+                                                  <td>XMinusExpiresMinusAfter</td>
                                                   <td>Date</td>
                                                   <td>date-time</td>
                                                   <td>date in UTC when token expires</td>

diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ChildCat.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ChildCat.md
@@ -16,7 +16,7 @@
 
 | Name | Value |
 |---- | -----|
-| CHILDCAT | &quot;ChildCat&quot; |
+| CHILD_CAT | &quot;ChildCat&quot; |
 
 
 
diff --git a/...re/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ParentWithNullable.java b/...re/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ParentWithNullable.java
@@ -41,7 +41,7 @@ public class ParentWithNullable {
    * Gets or Sets type
    */
   public enum TypeEnum {
-    CHILDWITHNULLABLE("ChildWithNullable");
+    CHILD_WITH_NULLABLE("ChildWithNullable");
 
     private String value;
 

diff --git a/...petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java b/...petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java
@@ -41,7 +41,7 @@ public class ParentWithNullable {
    * Gets or Sets type
    */
   public enum TypeEnum {
-    CHILDWITHNULLABLE("ChildWithNullable");
+    CHILD_WITH_NULLABLE("ChildWithNullable");
 
     private String value;
 

diff --git a/...e/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java b/...e/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java
@@ -41,7 +41,7 @@ public class ParentWithNullable {
    * Gets or Sets type
    */
   public enum TypeEnum {
-    CHILDWITHNULLABLE("ChildWithNullable");
+    CHILD_WITH_NULLABLE("ChildWithNullable");
 
     private String value;
 

diff --git a/...-helidon-server/v3/se/src/main/java/org/openapitools/server/model/ParentWithNullable.java b/...-helidon-server/v3/se/src/main/java/org/openapitools/server/model/ParentWithNullable.java
@@ -18,7 +18,7 @@ public class ParentWithNullable   {
     * Gets or Sets type
     */
     public enum TypeEnum {
-        CHILDWITHNULLABLE("ChildWithNullable");
+        CHILD_WITH_NULLABLE("ChildWithNullable");
 
         private String value;
 

diff --git a/...-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/ParentWithNullable.java b/...-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/ParentWithNullable.java
@@ -31,7 +31,7 @@ public class ParentWithNullable  {
 
 public enum TypeEnum {
 
-    CHILDWITHNULLABLE(String.valueOf("ChildWithNullable"));
+    CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
 
 
     private String value;