diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache
index 2fd82b68e36..7f396c34041 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache
@@ -132,7 +132,7 @@ public interface {{classname}} {
 {{/jdk8-default-interface}}
 {{#operation}}
 
-    public static final String PATH_{{#lambda.uppercase}}{{#lambda.snakecase}}{{{operationId}}}{{/lambda.snakecase}}{{/lambda.uppercase}} = "{{{path}}}";
+    String PATH_{{#lambda.uppercase}}{{#lambda.snakecase}}{{{operationId}}}{{/lambda.snakecase}}{{/lambda.uppercase}} = "{{{path}}}";
     /**
      * {{httpMethod}} {{{path}}}{{#summary}} : {{.}}{{/summary}}
     {{#notes}}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
index 88095c75b3f..c4336353810 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
@@ -1171,7 +1171,7 @@ public class SpringCodegenTest {
         // Check that the @RequestMapping annotation is generated in the Api file
         JavaFileAssert.assertThat(files.get("PetApi.java"))
                 .fileContains("@RequestMapping(\"${openapi.openAPIPetstore.base-path:/v2}\")",
-                        "public static final String PATH_ADD_PET = \"/pet\";",
+                        "String PATH_ADD_PET = \"/pet\";",
                         "value = PetApi.PATH_ADD_PET");
 
         // Check that the @RequestMapping annotation is not generated in the Controller file
diff --git a/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java b/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java
index 58369e47bf9..44155f4811c 100644
--- a/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java
+++ b/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java
@@ -21,7 +21,7 @@ import javax.annotation.Generated;
 @Validated
 public interface SomeApi {
 
-    public static final String PATH_SOME_ENDPOINT_GET = "/some/endpoint";
+    String PATH_SOME_ENDPOINT_GET = "/some/endpoint";
     /**
      * GET /some/endpoint
      *
diff --git a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java
index c0a29ca8f6d..7c7bb057ba3 100644
--- a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java
+++ b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java
@@ -27,7 +27,7 @@ import javax.annotation.Generated;
 @Api(value = "Default", description = "the Default API")
 public interface DefaultApi {
 
-    public static final String PATH_GET = "/thingy/{date}";
+    String PATH_GET = "/thingy/{date}";
     /**
      * GET /thingy/{date}
      *
@@ -57,7 +57,7 @@ public interface DefaultApi {
     );
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/thingy/{date}";
+    String PATH_UPDATE_PET_WITH_FORM = "/thingy/{date}";
     /**
      * POST /thingy/{date}
      * update with form data
diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java
index da20f831126..9b2029d8ee4 100644
--- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java
@@ -37,7 +37,7 @@ import javax.annotation.Generated;
 @Tag(name = "pet", description = "Everything about your Pets")
 public interface PetApi {
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -67,7 +67,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -98,7 +98,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -133,7 +133,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -171,7 +171,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -208,7 +208,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -242,7 +242,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -276,7 +276,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java
index 036376def01..29c4bb0d77f 100644
--- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java
@@ -36,7 +36,7 @@ import javax.annotation.Generated;
 @Tag(name = "store", description = "Access to Petstore orders")
 public interface StoreApi {
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{orderId}";
+    String PATH_DELETE_ORDER = "/store/order/{orderId}";
     /**
      * DELETE /store/order/{orderId} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -64,7 +64,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -95,7 +95,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -129,7 +129,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java
index 151a2068124..163322a385a 100644
--- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java
@@ -36,7 +36,7 @@ import javax.annotation.Generated;
 @Tag(name = "user", description = "Operations about user")
 public interface UserApi {
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -66,7 +66,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -96,7 +96,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -126,7 +126,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -157,7 +157,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -191,7 +191,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -225,7 +225,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -253,7 +253,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java
index f57b7e59164..f28f16aa267 100644
--- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java
@@ -26,7 +26,7 @@ import javax.annotation.Generated;
 @Api(value = "pet", description = "Everything about your Pets")
 public interface PetApi {
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -63,7 +63,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -97,7 +97,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -133,7 +133,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -171,7 +171,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -206,7 +206,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -249,7 +249,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -286,7 +286,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java
index 51bea31244b..7a6e0182927 100644
--- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java
@@ -25,7 +25,7 @@ import javax.annotation.Generated;
 @Api(value = "store", description = "Access to Petstore orders")
 public interface StoreApi {
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{orderId}";
+    String PATH_DELETE_ORDER = "/store/order/{orderId}";
     /**
      * DELETE /store/order/{orderId} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -53,7 +53,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -84,7 +84,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -116,7 +116,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java
index db344c02909..f7147e9b480 100644
--- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java
@@ -25,7 +25,7 @@ import javax.annotation.Generated;
 @Api(value = "user", description = "Operations about user")
 public interface UserApi {
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -55,7 +55,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -85,7 +85,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -115,7 +115,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -146,7 +146,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -178,7 +178,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -210,7 +210,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -238,7 +238,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java
index 103c533db2e..5217b02c7ba 100644
--- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java
+++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java
@@ -28,7 +28,7 @@ import javax.annotation.Generated;
 @Api(value = "pet tag", description = "the pet tag API")
 public interface PetController {
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      *
@@ -60,7 +60,7 @@ public interface PetController {
     );
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      *
@@ -93,7 +93,7 @@ public interface PetController {
     );
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -131,7 +131,7 @@ public interface PetController {
     );
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -171,7 +171,7 @@ public interface PetController {
     );
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -206,7 +206,7 @@ public interface PetController {
     );
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      *
@@ -242,7 +242,7 @@ public interface PetController {
     );
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      *
@@ -278,7 +278,7 @@ public interface PetController {
     );
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      *
diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java
index 301860a8c9f..647ad6de10a 100644
--- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java
+++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java
@@ -25,7 +25,7 @@ import javax.annotation.Generated;
 @Api(value = "store tag", description = "the store tag API")
 public interface StoreController {
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{orderId}";
+    String PATH_DELETE_ORDER = "/store/order/{orderId}";
     /**
      * DELETE /store/order/{orderId} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -53,7 +53,7 @@ public interface StoreController {
     );
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -84,7 +84,7 @@ public interface StoreController {
     );
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -116,7 +116,7 @@ public interface StoreController {
     );
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      *
diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/UserController.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/UserController.java
index 7e2ee198329..a9c772b5ba8 100644
--- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/UserController.java
+++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/UserController.java
@@ -25,7 +25,7 @@ import javax.annotation.Generated;
 @Api(value = "user tag", description = "the user tag API")
 public interface UserController {
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -51,7 +51,7 @@ public interface UserController {
     );
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      *
@@ -76,7 +76,7 @@ public interface UserController {
     );
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      *
@@ -101,7 +101,7 @@ public interface UserController {
     );
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -129,7 +129,7 @@ public interface UserController {
     );
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      *
@@ -160,7 +160,7 @@ public interface UserController {
     );
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      *
@@ -191,7 +191,7 @@ public interface UserController {
     );
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      *
@@ -215,7 +215,7 @@ public interface UserController {
     );
 
 
-    public static final String PATH_LOGOUT_USER_OPTIONS = "/user/logout";
+    String PATH_LOGOUT_USER_OPTIONS = "/user/logout";
     /**
      * OPTIONS /user/logout : logoutUserOptions
      *
@@ -239,7 +239,7 @@ public interface UserController {
     );
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
index f57b7e59164..f28f16aa267 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
@@ -26,7 +26,7 @@ import javax.annotation.Generated;
 @Api(value = "pet", description = "Everything about your Pets")
 public interface PetApi {
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -63,7 +63,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -97,7 +97,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -133,7 +133,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -171,7 +171,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -206,7 +206,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -249,7 +249,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -286,7 +286,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
index 51bea31244b..7a6e0182927 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
@@ -25,7 +25,7 @@ import javax.annotation.Generated;
 @Api(value = "store", description = "Access to Petstore orders")
 public interface StoreApi {
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{orderId}";
+    String PATH_DELETE_ORDER = "/store/order/{orderId}";
     /**
      * DELETE /store/order/{orderId} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -53,7 +53,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -84,7 +84,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -116,7 +116,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
index db344c02909..f7147e9b480 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
@@ -25,7 +25,7 @@ import javax.annotation.Generated;
 @Api(value = "user", description = "Operations about user")
 public interface UserApi {
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -55,7 +55,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -85,7 +85,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -115,7 +115,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -146,7 +146,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -178,7 +178,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -210,7 +210,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -238,7 +238,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/PetApi.java
index 2a3194e6814..6b83c634c61 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/PetApi.java
@@ -24,7 +24,7 @@ import jakarta.annotation.Generated;
 @Validated
 public interface PetApi {
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -44,7 +44,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -63,7 +63,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -82,7 +82,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -103,7 +103,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -123,7 +123,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -147,7 +147,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -169,7 +169,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java
index 13dd99c2d73..c5818964644 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java
@@ -23,7 +23,7 @@ import jakarta.annotation.Generated;
 @Validated
 public interface StoreApi {
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{orderId}";
+    String PATH_DELETE_ORDER = "/store/order/{orderId}";
     /**
      * DELETE /store/order/{orderId} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -41,7 +41,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -58,7 +58,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -78,7 +78,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/UserApi.java
index 12e7e509fdd..eaa48da4cf0 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/UserApi.java
@@ -23,7 +23,7 @@ import jakarta.annotation.Generated;
 @Validated
 public interface UserApi {
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -41,7 +41,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -59,7 +59,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -77,7 +77,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -95,7 +95,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -115,7 +115,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -136,7 +136,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -152,7 +152,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java
index ace782ef248..ea5353c19cf 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java
@@ -37,7 +37,7 @@ import jakarta.annotation.Generated;
 @Tag(name = "pet", description = "Everything about your Pets")
 public interface PetApi {
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -73,7 +73,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -104,7 +104,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -139,7 +139,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -177,7 +177,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -214,7 +214,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -257,7 +257,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -291,7 +291,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java
index a2c26a7abc7..793e6a4d4f2 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java
@@ -36,7 +36,7 @@ import jakarta.annotation.Generated;
 @Tag(name = "store", description = "Access to Petstore orders")
 public interface StoreApi {
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{orderId}";
+    String PATH_DELETE_ORDER = "/store/order/{orderId}";
     /**
      * DELETE /store/order/{orderId} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -64,7 +64,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -95,7 +95,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -129,7 +129,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java
index b5a19e43000..6035237324a 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java
@@ -36,7 +36,7 @@ import jakarta.annotation.Generated;
 @Tag(name = "user", description = "Operations about user")
 public interface UserApi {
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -66,7 +66,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -96,7 +96,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -126,7 +126,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -157,7 +157,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -191,7 +191,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -225,7 +225,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -253,7 +253,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java
index 630421e0083..86e5acb3193 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java
@@ -38,7 +38,7 @@ import javax.annotation.Generated;
 @Tag(name = "pet", description = "Everything about your Pets")
 public interface PetApi {
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -74,7 +74,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -105,7 +105,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -140,7 +140,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -178,7 +178,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -215,7 +215,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -258,7 +258,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -292,7 +292,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java
index 8b82aaeb6d6..1536c69c4ce 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java
@@ -37,7 +37,7 @@ import javax.annotation.Generated;
 @Tag(name = "store", description = "Access to Petstore orders")
 public interface StoreApi {
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{orderId}";
+    String PATH_DELETE_ORDER = "/store/order/{orderId}";
     /**
      * DELETE /store/order/{orderId} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -65,7 +65,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -96,7 +96,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -130,7 +130,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java
index 8ecefe5a5ec..a40dc05ed7c 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java
@@ -37,7 +37,7 @@ import javax.annotation.Generated;
 @Tag(name = "user", description = "Operations about user")
 public interface UserApi {
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -67,7 +67,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -97,7 +97,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -127,7 +127,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -158,7 +158,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -192,7 +192,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -226,7 +226,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -254,7 +254,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java
index 2564ee73063..136cc16eb39 100644
--- a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java
@@ -38,7 +38,7 @@ import javax.annotation.Generated;
 @Tag(name = "Default", description = "the Default API")
 public interface DefaultApi {
 
-    public static final String PATH_GET = "/thingy/{date}";
+    String PATH_GET = "/thingy/{date}";
     /**
      * GET /thingy/{date}
      *
@@ -66,7 +66,7 @@ public interface DefaultApi {
     );
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/thingy/{date}";
+    String PATH_UPDATE_PET_WITH_FORM = "/thingy/{date}";
     /**
      * POST /thingy/{date}
      * update with form data
diff --git a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java
index 9f3a89a82f5..69d772682f3 100644
--- a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java
@@ -35,7 +35,7 @@ import javax.annotation.Generated;
 @Tag(name = "pet", description = "Everything about your Pets")
 public interface PetApi {
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 61b0748691d..7c0f5533d6e 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -35,7 +35,7 @@ import javax.annotation.Generated;
 @Tag(name = "$another-fake?", description = "the $another-fake? API")
 public interface AnotherFakeApi {
 
-    public static final String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
+    String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
     /**
      * PATCH /another-fake/dummy : To test special tags
      * To test special tags and operation ID starting with number
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java
index 084d9aa92d6..755f0b7f366 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java
@@ -46,7 +46,7 @@ import javax.annotation.Generated;
 @Tag(name = "fake", description = "the fake API")
 public interface FakeApi {
 
-    public static final String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
+    String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
     /**
      * POST /fake/create_xml_item : creates an XmlItem
      * this route creates an XmlItem
@@ -73,7 +73,7 @@ public interface FakeApi {
     );
 
 
-    public static final String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
+    String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
     /**
      * POST /fake/outer/boolean
      * Test serialization of outer boolean types
@@ -102,7 +102,7 @@ public interface FakeApi {
     );
 
 
-    public static final String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
+    String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
     /**
      * POST /fake/outer/composite
      * Test serialization of object with outer number type
@@ -131,7 +131,7 @@ public interface FakeApi {
     );
 
 
-    public static final String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
+    String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
     /**
      * POST /fake/outer/number
      * Test serialization of outer number types
@@ -160,7 +160,7 @@ public interface FakeApi {
     );
 
 
-    public static final String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
+    String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
     /**
      * POST /fake/outer/string
      * Test serialization of outer string types
@@ -189,7 +189,7 @@ public interface FakeApi {
     );
 
 
-    public static final String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
+    String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named `File`.
@@ -215,7 +215,7 @@ public interface FakeApi {
     );
 
 
-    public static final String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
+    String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
     /**
      * PUT /fake/body-with-query-params
      *
@@ -241,7 +241,7 @@ public interface FakeApi {
     );
 
 
-    public static final String PATH_TEST_CLIENT_MODEL = "/fake";
+    String PATH_TEST_CLIENT_MODEL = "/fake";
     /**
      * PATCH /fake : To test \"client\" model
      * To test \"client\" model
@@ -271,7 +271,7 @@ public interface FakeApi {
     );
 
 
-    public static final String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
+    String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
     /**
      * POST /fake : Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -329,7 +329,7 @@ public interface FakeApi {
     );
 
 
-    public static final String PATH_TEST_ENUM_PARAMETERS = "/fake";
+    String PATH_TEST_ENUM_PARAMETERS = "/fake";
     /**
      * GET /fake : To test enum parameters
      * To test enum parameters
@@ -372,7 +372,7 @@ public interface FakeApi {
     );
 
 
-    public static final String PATH_TEST_GROUP_PARAMETERS = "/fake";
+    String PATH_TEST_GROUP_PARAMETERS = "/fake";
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
@@ -408,7 +408,7 @@ public interface FakeApi {
     );
 
 
-    public static final String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
+    String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
     /**
      * POST /fake/inline-additionalProperties : test inline additionalProperties
      * 
@@ -435,7 +435,7 @@ public interface FakeApi {
     );
 
 
-    public static final String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
+    String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
     /**
      * GET /fake/jsonFormData : test json serialization of form data
      * 
@@ -464,7 +464,7 @@ public interface FakeApi {
     );
 
 
-    public static final String PATH_TEST_NULLABLE = "/fake/nullable";
+    String PATH_TEST_NULLABLE = "/fake/nullable";
     /**
      * POST /fake/nullable : test nullable parent property
      * 
@@ -491,7 +491,7 @@ public interface FakeApi {
     );
 
 
-    public static final String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
+    String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
     /**
      * PUT /fake/test-query-parameters
      * To test the collection format in query parameters
@@ -522,7 +522,7 @@ public interface FakeApi {
     );
 
 
-    public static final String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
+    String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
     /**
      * GET /fake/response-with-example
      * This endpoint defines an example value for its response schema.
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java
index baf4d2056f7..64cf50f5b36 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java
@@ -35,7 +35,7 @@ import javax.annotation.Generated;
 @Tag(name = "fake_classname_tags 123#$%^", description = "the fake_classname_tags 123#$%^ API")
 public interface FakeClassnameTags123Api {
 
-    public static final String PATH_TEST_CLASSNAME = "/fake_classname_test";
+    String PATH_TEST_CLASSNAME = "/fake_classname_test";
     /**
      * PATCH /fake_classname_test : To test class name in snake case
      * To test class name in snake case
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java
index 89808fad5d6..74b6ff7dd37 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java
@@ -39,7 +39,7 @@ import javax.annotation.Generated;
 @Tag(name = "pet", description = "Everything about your Pets")
 public interface PetApi {
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -71,7 +71,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -104,7 +104,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -139,7 +139,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -177,7 +177,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -214,7 +214,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
+    String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
     /**
      * GET /fake/{petId}/response-object-different-names
      *
@@ -240,7 +240,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -276,7 +276,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -310,7 +310,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
@@ -347,7 +347,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
+    String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
     /**
      * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required)
      * 
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java
index b50420d3bcb..a3c658982f6 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java
@@ -36,7 +36,7 @@ import javax.annotation.Generated;
 @Tag(name = "store", description = "Access to Petstore orders")
 public interface StoreApi {
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{order_id}";
+    String PATH_DELETE_ORDER = "/store/order/{order_id}";
     /**
      * DELETE /store/order/{order_id} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -64,7 +64,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -95,7 +95,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -129,7 +129,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java
index 09fb474a7e4..af7c1ee6da5 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java
@@ -36,7 +36,7 @@ import javax.annotation.Generated;
 @Tag(name = "user", description = "Operations about user")
 public interface UserApi {
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -63,7 +63,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -90,7 +90,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -117,7 +117,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -145,7 +145,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -179,7 +179,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -213,7 +213,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -238,7 +238,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java
index 327b4c3dd95..baad3f42e58 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java
@@ -39,7 +39,7 @@ import javax.annotation.Generated;
 @Tag(name = "pet", description = "Everything about your Pets")
 public interface PetApi {
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      *
@@ -67,7 +67,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      *
@@ -96,7 +96,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -132,7 +132,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -173,7 +173,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -210,7 +210,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      *
@@ -242,7 +242,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      *
@@ -274,7 +274,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      *
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java
index b3a2f187e29..96074863206 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java
@@ -36,7 +36,7 @@ import javax.annotation.Generated;
 @Tag(name = "store", description = "Access to Petstore orders")
 public interface StoreApi {
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{orderId}";
+    String PATH_DELETE_ORDER = "/store/order/{orderId}";
     /**
      * DELETE /store/order/{orderId} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -64,7 +64,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -95,7 +95,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -129,7 +129,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      *
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java
index f08071739bc..bc641a690da 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java
@@ -36,7 +36,7 @@ import javax.annotation.Generated;
 @Tag(name = "user", description = "Operations about user")
 public interface UserApi {
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -62,7 +62,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      *
@@ -86,7 +86,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      *
@@ -110,7 +110,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -138,7 +138,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      *
@@ -170,7 +170,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      *
@@ -202,7 +202,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      *
@@ -225,7 +225,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_LOGOUT_USER_OPTIONS = "/user/logout";
+    String PATH_LOGOUT_USER_OPTIONS = "/user/logout";
     /**
      * OPTIONS /user/logout : logoutUserOptions
      *
@@ -248,7 +248,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
index 4ddd92ea2f9..45d0eb4f466 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
@@ -37,7 +37,7 @@ import javax.annotation.Generated;
 @Tag(name = "pet", description = "Everything about your Pets")
 public interface PetApi {
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -73,7 +73,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -104,7 +104,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -139,7 +139,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -177,7 +177,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -214,7 +214,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -257,7 +257,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -291,7 +291,7 @@ public interface PetApi {
     );
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
index 036376def01..29c4bb0d77f 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
@@ -36,7 +36,7 @@ import javax.annotation.Generated;
 @Tag(name = "store", description = "Access to Petstore orders")
 public interface StoreApi {
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{orderId}";
+    String PATH_DELETE_ORDER = "/store/order/{orderId}";
     /**
      * DELETE /store/order/{orderId} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -64,7 +64,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -95,7 +95,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -129,7 +129,7 @@ public interface StoreApi {
     );
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
index 4b04bfab0d7..24d4c63d0e0 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
@@ -36,7 +36,7 @@ import javax.annotation.Generated;
 @Tag(name = "user", description = "Operations about user")
 public interface UserApi {
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -66,7 +66,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -96,7 +96,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -126,7 +126,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -157,7 +157,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -191,7 +191,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -225,7 +225,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -253,7 +253,7 @@ public interface UserApi {
     );
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java
index 736f1edeb59..ca302f3c11a 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java
@@ -37,7 +37,7 @@ import javax.annotation.Generated;
 @Tag(name = "pet", description = "Everything about your Pets")
 public interface PetApi {
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -73,7 +73,7 @@ public interface PetApi {
     ) throws Exception;
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -104,7 +104,7 @@ public interface PetApi {
     ) throws Exception;
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -139,7 +139,7 @@ public interface PetApi {
     ) throws Exception;
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -177,7 +177,7 @@ public interface PetApi {
     ) throws Exception;
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -214,7 +214,7 @@ public interface PetApi {
     ) throws Exception;
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -257,7 +257,7 @@ public interface PetApi {
     ) throws Exception;
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -291,7 +291,7 @@ public interface PetApi {
     ) throws Exception;
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java
index b20cf1f5d7a..2416449ec47 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java
@@ -36,7 +36,7 @@ import javax.annotation.Generated;
 @Tag(name = "store", description = "Access to Petstore orders")
 public interface StoreApi {
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{orderId}";
+    String PATH_DELETE_ORDER = "/store/order/{orderId}";
     /**
      * DELETE /store/order/{orderId} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -64,7 +64,7 @@ public interface StoreApi {
     ) throws Exception;
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -95,7 +95,7 @@ public interface StoreApi {
     ) throws Exception;
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -129,7 +129,7 @@ public interface StoreApi {
     ) throws Exception;
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java
index cde6cbc53bf..b527426c6cb 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java
@@ -36,7 +36,7 @@ import javax.annotation.Generated;
 @Tag(name = "user", description = "Operations about user")
 public interface UserApi {
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -66,7 +66,7 @@ public interface UserApi {
     ) throws Exception;
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -96,7 +96,7 @@ public interface UserApi {
     ) throws Exception;
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -126,7 +126,7 @@ public interface UserApi {
     ) throws Exception;
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -157,7 +157,7 @@ public interface UserApi {
     ) throws Exception;
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -191,7 +191,7 @@ public interface UserApi {
     ) throws Exception;
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -225,7 +225,7 @@ public interface UserApi {
     ) throws Exception;
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -253,7 +253,7 @@ public interface UserApi {
     ) throws Exception;
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
index 3f37daf3e25..b8f54ac5b59 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
@@ -44,7 +44,7 @@ public interface PetApi {
         return Optional.empty();
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -97,7 +97,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -131,7 +131,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -183,7 +183,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -238,7 +238,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -292,7 +292,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -352,7 +352,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -389,7 +389,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
index cf3a794b040..270f72a6ab4 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
@@ -43,7 +43,7 @@ public interface StoreApi {
         return Optional.empty();
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{orderId}";
+    String PATH_DELETE_ORDER = "/store/order/{orderId}";
     /**
      * DELETE /store/order/{orderId} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -74,7 +74,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -108,7 +108,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -159,7 +159,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java
index 9c1cec05525..6144dc1f5da 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java
@@ -43,7 +43,7 @@ public interface UserApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -76,7 +76,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -109,7 +109,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -142,7 +142,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -176,7 +176,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -227,7 +227,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -264,7 +264,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -295,7 +295,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java
index 1bc808177f0..5b8ef68002b 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java
@@ -43,7 +43,7 @@ public interface BarApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_BAR = "/bar";
+    String PATH_CREATE_BAR = "/bar";
     /**
      * POST /bar : Create a Bar
      *
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/FooApi.java
index d0482fc3033..bd711b847b3 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/FooApi.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/FooApi.java
@@ -44,7 +44,7 @@ public interface FooApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_FOO = "/foo";
+    String PATH_CREATE_FOO = "/foo";
     /**
      * POST /foo : Create a Foo
      *
@@ -84,7 +84,7 @@ public interface FooApi {
     }
 
 
-    public static final String PATH_GET_ALL_FOOS = "/foo";
+    String PATH_GET_ALL_FOOS = "/foo";
     /**
      * GET /foo : GET all Foos
      *
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java
index 1bc808177f0..5b8ef68002b 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java
@@ -43,7 +43,7 @@ public interface BarApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_BAR = "/bar";
+    String PATH_CREATE_BAR = "/bar";
     /**
      * POST /bar : Create a Bar
      *
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/FooApi.java
index d0482fc3033..bd711b847b3 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/FooApi.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/FooApi.java
@@ -44,7 +44,7 @@ public interface FooApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_FOO = "/foo";
+    String PATH_CREATE_FOO = "/foo";
     /**
      * POST /foo : Create a Foo
      *
@@ -84,7 +84,7 @@ public interface FooApi {
     }
 
 
-    public static final String PATH_GET_ALL_FOOS = "/foo";
+    String PATH_GET_ALL_FOOS = "/foo";
     /**
      * GET /foo : GET all Foos
      *
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java
index 1bc808177f0..5b8ef68002b 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java
@@ -43,7 +43,7 @@ public interface BarApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_BAR = "/bar";
+    String PATH_CREATE_BAR = "/bar";
     /**
      * POST /bar : Create a Bar
      *
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java
index d0482fc3033..bd711b847b3 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java
@@ -44,7 +44,7 @@ public interface FooApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_FOO = "/foo";
+    String PATH_CREATE_FOO = "/foo";
     /**
      * POST /foo : Create a Foo
      *
@@ -84,7 +84,7 @@ public interface FooApi {
     }
 
 
-    public static final String PATH_GET_ALL_FOOS = "/foo";
+    String PATH_GET_ALL_FOOS = "/foo";
     /**
      * GET /foo : GET all Foos
      *
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java
index a4631376c6a..b996cdfae1b 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java
@@ -44,7 +44,7 @@ public interface PetApi {
         return Optional.empty();
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -97,7 +97,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -131,7 +131,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -183,7 +183,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -238,7 +238,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -292,7 +292,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -352,7 +352,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -389,7 +389,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java
index 0b728722950..c7fb58c879b 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java
@@ -43,7 +43,7 @@ public interface StoreApi {
         return Optional.empty();
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{orderId}";
+    String PATH_DELETE_ORDER = "/store/order/{orderId}";
     /**
      * DELETE /store/order/{orderId} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -74,7 +74,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -108,7 +108,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -159,7 +159,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java
index e8f439f85b1..6b15e3298e8 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java
@@ -43,7 +43,7 @@ public interface UserApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -76,7 +76,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -109,7 +109,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -142,7 +142,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -176,7 +176,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -227,7 +227,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -264,7 +264,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -295,7 +295,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java
index 7b868a7a23d..0d23f2e8832 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java
@@ -44,7 +44,7 @@ public interface PetApi {
         return Optional.empty();
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -97,7 +97,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -131,7 +131,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -183,7 +183,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -238,7 +238,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -292,7 +292,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -352,7 +352,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -389,7 +389,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java
index 8f30c300a37..e8e06c81ae6 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java
@@ -43,7 +43,7 @@ public interface StoreApi {
         return Optional.empty();
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{orderId}";
+    String PATH_DELETE_ORDER = "/store/order/{orderId}";
     /**
      * DELETE /store/order/{orderId} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -74,7 +74,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -108,7 +108,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -159,7 +159,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java
index 90afaef5332..83476943a42 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java
@@ -43,7 +43,7 @@ public interface UserApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -76,7 +76,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -109,7 +109,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -142,7 +142,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -176,7 +176,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -227,7 +227,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -264,7 +264,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -295,7 +295,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
index e4e1c9848c4..388461fde29 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -38,7 +38,7 @@ public interface AnotherFakeApi {
         return new AnotherFakeApiDelegate() {};
     }
 
-    public static final String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
+    String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
     /**
      * PATCH /another-fake/dummy : To test special tags
      * To test special tags and operation ID starting with number
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
index 644eba8e147..f4b5cf89e04 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
@@ -51,7 +51,7 @@ public interface FakeApi {
         return new FakeApiDelegate() {};
     }
 
-    public static final String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
+    String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
     /**
      * POST /fake/create_xml_item : creates an XmlItem
      * this route creates an XmlItem
@@ -80,7 +80,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
+    String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
     /**
      * POST /fake/outer/boolean
      * Test serialization of outer boolean types
@@ -111,7 +111,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
+    String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
     /**
      * POST /fake/outer/composite
      * Test serialization of object with outer number type
@@ -142,7 +142,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
+    String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
     /**
      * POST /fake/outer/number
      * Test serialization of outer number types
@@ -173,7 +173,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
+    String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
     /**
      * POST /fake/outer/string
      * Test serialization of outer string types
@@ -204,7 +204,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
+    String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
     /**
      * GET /fake/{petId}/response-object-different-names
      *
@@ -232,7 +232,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
+    String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named `File`.
@@ -260,7 +260,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
+    String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
     /**
      * PUT /fake/body-with-query-params
      *
@@ -288,7 +288,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_CLIENT_MODEL = "/fake";
+    String PATH_TEST_CLIENT_MODEL = "/fake";
     /**
      * PATCH /fake : To test \"client\" model
      * To test \"client\" model
@@ -320,7 +320,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
+    String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
     /**
      * POST /fake : Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -380,7 +380,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENUM_PARAMETERS = "/fake";
+    String PATH_TEST_ENUM_PARAMETERS = "/fake";
     /**
      * GET /fake : To test enum parameters
      * To test enum parameters
@@ -425,7 +425,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_GROUP_PARAMETERS = "/fake";
+    String PATH_TEST_GROUP_PARAMETERS = "/fake";
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
@@ -463,7 +463,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
+    String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
     /**
      * POST /fake/inline-additionalProperties : test inline additionalProperties
      * 
@@ -492,7 +492,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
+    String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
     /**
      * GET /fake/jsonFormData : test json serialization of form data
      * 
@@ -523,7 +523,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_NULLABLE = "/fake/nullable";
+    String PATH_TEST_NULLABLE = "/fake/nullable";
     /**
      * POST /fake/nullable : test nullable parent property
      * 
@@ -552,7 +552,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
+    String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
     /**
      * PUT /fake/test-query-parameters
      * To test the collection format in query parameters
@@ -585,7 +585,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
+    String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
     /**
      * GET /fake/response-with-example
      * This endpoint defines an example value for its response schema.
@@ -614,7 +614,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
+    String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
     /**
      * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required)
      * 
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index e662344c8ef..68a6980a7c1 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -38,7 +38,7 @@ public interface FakeClassnameTestApi {
         return new FakeClassnameTestApiDelegate() {};
     }
 
-    public static final String PATH_TEST_CLASSNAME = "/fake_classname_test";
+    String PATH_TEST_CLASSNAME = "/fake_classname_test";
     /**
      * PATCH /fake_classname_test : To test class name in snake case
      * To test class name in snake case
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
index 1e0862d4128..292258d84b9 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
@@ -41,7 +41,7 @@ public interface PetApi {
         return new PetApiDelegate() {};
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -75,7 +75,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -110,7 +110,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -147,7 +147,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -187,7 +187,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -226,7 +226,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -264,7 +264,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -300,7 +300,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
index b9d16839d25..cf41ecad6ed 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
@@ -39,7 +39,7 @@ public interface StoreApi {
         return new StoreApiDelegate() {};
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{order_id}";
+    String PATH_DELETE_ORDER = "/store/order/{order_id}";
     /**
      * DELETE /store/order/{order_id} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -69,7 +69,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -102,7 +102,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -138,7 +138,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
index e3686e69d7c..01474b16614 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
@@ -39,7 +39,7 @@ public interface UserApi {
         return new UserApiDelegate() {};
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -68,7 +68,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -97,7 +97,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -126,7 +126,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -156,7 +156,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -192,7 +192,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -228,7 +228,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -255,7 +255,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
index fbbb29270bf..45a5ad6f390 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -42,7 +42,7 @@ public interface AnotherFakeApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
+    String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
     /**
      * PATCH /another-fake/dummy : To test special tags
      * To test special tags and operation ID starting with number
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
index 6f2ee8256fe..4b20f5d1121 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
@@ -55,7 +55,7 @@ public interface FakeApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
+    String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
     /**
      * POST /fake/create_xml_item : creates an XmlItem
      * this route creates an XmlItem
@@ -85,7 +85,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
+    String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
     /**
      * POST /fake/outer/boolean
      * Test serialization of outer boolean types
@@ -117,7 +117,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
+    String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
     /**
      * POST /fake/outer/composite
      * Test serialization of object with outer number type
@@ -158,7 +158,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
+    String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
     /**
      * POST /fake/outer/number
      * Test serialization of outer number types
@@ -190,7 +190,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
+    String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
     /**
      * POST /fake/outer/string
      * Test serialization of outer string types
@@ -222,7 +222,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
+    String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
     /**
      * GET /fake/{petId}/response-object-different-names
      *
@@ -260,7 +260,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
+    String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named `File`.
@@ -289,7 +289,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
+    String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
     /**
      * PUT /fake/body-with-query-params
      *
@@ -318,7 +318,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_CLIENT_MODEL = "/fake";
+    String PATH_TEST_CLIENT_MODEL = "/fake";
     /**
      * PATCH /fake : To test \"client\" model
      * To test \"client\" model
@@ -360,7 +360,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
+    String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
     /**
      * POST /fake : Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -421,7 +421,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENUM_PARAMETERS = "/fake";
+    String PATH_TEST_ENUM_PARAMETERS = "/fake";
     /**
      * GET /fake : To test enum parameters
      * To test enum parameters
@@ -467,7 +467,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_GROUP_PARAMETERS = "/fake";
+    String PATH_TEST_GROUP_PARAMETERS = "/fake";
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
@@ -506,7 +506,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
+    String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
     /**
      * POST /fake/inline-additionalProperties : test inline additionalProperties
      * 
@@ -536,7 +536,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
+    String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
     /**
      * GET /fake/jsonFormData : test json serialization of form data
      * 
@@ -568,7 +568,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_NULLABLE = "/fake/nullable";
+    String PATH_TEST_NULLABLE = "/fake/nullable";
     /**
      * POST /fake/nullable : test nullable parent property
      * 
@@ -598,7 +598,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
+    String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
     /**
      * PUT /fake/test-query-parameters
      * To test the collection format in query parameters
@@ -632,7 +632,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
+    String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
     /**
      * GET /fake/response-with-example
      * This endpoint defines an example value for its response schema.
@@ -671,7 +671,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
+    String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
     /**
      * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required)
      * 
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index a7a822e1d73..24e07cb5385 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -42,7 +42,7 @@ public interface FakeClassnameTestApi {
         return Optional.empty();
     }
 
-    public static final String PATH_TEST_CLASSNAME = "/fake_classname_test";
+    String PATH_TEST_CLASSNAME = "/fake_classname_test";
     /**
      * PATCH /fake_classname_test : To test class name in snake case
      * To test class name in snake case
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
index ed905a90769..9d2b912600f 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
@@ -45,7 +45,7 @@ public interface PetApi {
         return Optional.empty();
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -80,7 +80,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -117,7 +117,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -169,7 +169,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -224,7 +224,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -278,7 +278,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -317,7 +317,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -354,7 +354,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
index 4c0c4abc7e6..739c1d89168 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
@@ -43,7 +43,7 @@ public interface StoreApi {
         return Optional.empty();
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{order_id}";
+    String PATH_DELETE_ORDER = "/store/order/{order_id}";
     /**
      * DELETE /store/order/{order_id} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -74,7 +74,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -108,7 +108,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -159,7 +159,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
index 82624b5fe8a..62f41d81ae8 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
@@ -43,7 +43,7 @@ public interface UserApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -73,7 +73,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -103,7 +103,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -133,7 +133,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -164,7 +164,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -215,7 +215,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -252,7 +252,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -280,7 +280,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java
index 605099084c8..9094aae9528 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java
@@ -31,7 +31,7 @@ public interface PetApi {
         return Optional.empty();
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -68,7 +68,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -90,7 +90,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -126,7 +126,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -164,7 +164,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -201,7 +201,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -242,7 +242,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -267,7 +267,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java
index 71b0fe5b224..e13098e32d6 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java
@@ -30,7 +30,7 @@ public interface StoreApi {
         return Optional.empty();
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{orderId}";
+    String PATH_DELETE_ORDER = "/store/order/{orderId}";
     /**
      * DELETE /store/order/{orderId} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -51,7 +51,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -71,7 +71,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -108,7 +108,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java
index 7e352e3345a..7133ac48548 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java
@@ -30,7 +30,7 @@ public interface UserApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -51,7 +51,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -72,7 +72,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -93,7 +93,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -114,7 +114,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -151,7 +151,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -175,7 +175,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -194,7 +194,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
index 2a6363c0394..93ba799f77f 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
@@ -45,7 +45,7 @@ public interface PetApi {
         return Optional.empty();
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -98,7 +98,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -132,7 +132,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -184,7 +184,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -239,7 +239,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -293,7 +293,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -353,7 +353,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -390,7 +390,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
index 754a65c4aef..5344bdfab47 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
@@ -44,7 +44,7 @@ public interface StoreApi {
         return Optional.empty();
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{orderId}";
+    String PATH_DELETE_ORDER = "/store/order/{orderId}";
     /**
      * DELETE /store/order/{orderId} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -75,7 +75,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -109,7 +109,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -160,7 +160,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
index 7fb600cae42..e6205e24996 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
@@ -44,7 +44,7 @@ public interface UserApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -77,7 +77,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -110,7 +110,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -143,7 +143,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -177,7 +177,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -228,7 +228,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -265,7 +265,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -296,7 +296,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 7283d7f9a0b..e0f6a3bfb84 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -35,7 +35,7 @@ import javax.annotation.Generated;
 @Tag(name = "$another-fake?", description = "the $another-fake? API")
 public interface AnotherFakeApi {
 
-    public static final String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
+    String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
     /**
      * PATCH /another-fake/dummy : To test special tags
      * To test special tags and operation ID starting with number
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java
index c9be57f342d..832869a28a1 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java
@@ -48,7 +48,7 @@ import javax.annotation.Generated;
 @Tag(name = "fake", description = "the fake API")
 public interface FakeApi {
 
-    public static final String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
+    String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
     /**
      * POST /fake/create_xml_item : creates an XmlItem
      * this route creates an XmlItem
@@ -75,7 +75,7 @@ public interface FakeApi {
     ) throws Exception;
 
 
-    public static final String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
+    String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
     /**
      * POST /fake/outer/boolean
      * Test serialization of outer boolean types
@@ -104,7 +104,7 @@ public interface FakeApi {
     ) throws Exception;
 
 
-    public static final String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
+    String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
     /**
      * POST /fake/outer/composite
      * Test serialization of object with outer number type
@@ -133,7 +133,7 @@ public interface FakeApi {
     ) throws Exception;
 
 
-    public static final String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
+    String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
     /**
      * POST /fake/outer/number
      * Test serialization of outer number types
@@ -162,7 +162,7 @@ public interface FakeApi {
     ) throws Exception;
 
 
-    public static final String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
+    String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
     /**
      * POST /fake/outer/string
      * Test serialization of outer string types
@@ -191,7 +191,7 @@ public interface FakeApi {
     ) throws Exception;
 
 
-    public static final String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
+    String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
     /**
      * GET /fake/{petId}/response-object-different-names
      *
@@ -217,7 +217,7 @@ public interface FakeApi {
     ) throws Exception;
 
 
-    public static final String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
+    String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named `File`.
@@ -243,7 +243,7 @@ public interface FakeApi {
     ) throws Exception;
 
 
-    public static final String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
+    String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
     /**
      * PUT /fake/body-with-query-params
      *
@@ -269,7 +269,7 @@ public interface FakeApi {
     ) throws Exception;
 
 
-    public static final String PATH_TEST_CLIENT_MODEL = "/fake";
+    String PATH_TEST_CLIENT_MODEL = "/fake";
     /**
      * PATCH /fake : To test \"client\" model
      * To test \"client\" model
@@ -299,7 +299,7 @@ public interface FakeApi {
     ) throws Exception;
 
 
-    public static final String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
+    String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
     /**
      * POST /fake : Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -357,7 +357,7 @@ public interface FakeApi {
     ) throws Exception;
 
 
-    public static final String PATH_TEST_ENUM_PARAMETERS = "/fake";
+    String PATH_TEST_ENUM_PARAMETERS = "/fake";
     /**
      * GET /fake : To test enum parameters
      * To test enum parameters
@@ -400,7 +400,7 @@ public interface FakeApi {
     ) throws Exception;
 
 
-    public static final String PATH_TEST_GROUP_PARAMETERS = "/fake";
+    String PATH_TEST_GROUP_PARAMETERS = "/fake";
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
@@ -436,7 +436,7 @@ public interface FakeApi {
     ) throws Exception;
 
 
-    public static final String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
+    String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
     /**
      * POST /fake/inline-additionalProperties : test inline additionalProperties
      * 
@@ -463,7 +463,7 @@ public interface FakeApi {
     ) throws Exception;
 
 
-    public static final String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
+    String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
     /**
      * GET /fake/jsonFormData : test json serialization of form data
      * 
@@ -492,7 +492,7 @@ public interface FakeApi {
     ) throws Exception;
 
 
-    public static final String PATH_TEST_NULLABLE = "/fake/nullable";
+    String PATH_TEST_NULLABLE = "/fake/nullable";
     /**
      * POST /fake/nullable : test nullable parent property
      * 
@@ -519,7 +519,7 @@ public interface FakeApi {
     ) throws Exception;
 
 
-    public static final String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
+    String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
     /**
      * PUT /fake/test-query-parameters
      * To test the collection format in query parameters
@@ -550,7 +550,7 @@ public interface FakeApi {
     ) throws Exception;
 
 
-    public static final String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
+    String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
     /**
      * GET /fake/response-with-example
      * This endpoint defines an example value for its response schema.
@@ -577,7 +577,7 @@ public interface FakeApi {
     ) throws Exception;
 
 
-    public static final String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
+    String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
     /**
      * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required)
      * 
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 36ccf3d1b3c..04098afa3bd 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -35,7 +35,7 @@ import javax.annotation.Generated;
 @Tag(name = "fake_classname_tags 123#$%^", description = "the fake_classname_tags 123#$%^ API")
 public interface FakeClassnameTestApi {
 
-    public static final String PATH_TEST_CLASSNAME = "/fake_classname_test";
+    String PATH_TEST_CLASSNAME = "/fake_classname_test";
     /**
      * PATCH /fake_classname_test : To test class name in snake case
      * To test class name in snake case
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java
index b30461cba9b..ff877b33d84 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java
@@ -38,7 +38,7 @@ import javax.annotation.Generated;
 @Tag(name = "pet", description = "Everything about your Pets")
 public interface PetApi {
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -70,7 +70,7 @@ public interface PetApi {
     ) throws Exception;
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -103,7 +103,7 @@ public interface PetApi {
     ) throws Exception;
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -138,7 +138,7 @@ public interface PetApi {
     ) throws Exception;
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -176,7 +176,7 @@ public interface PetApi {
     ) throws Exception;
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -213,7 +213,7 @@ public interface PetApi {
     ) throws Exception;
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -249,7 +249,7 @@ public interface PetApi {
     ) throws Exception;
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -283,7 +283,7 @@ public interface PetApi {
     ) throws Exception;
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java
index 2593fd6f9f1..8a6846bfa9d 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java
@@ -36,7 +36,7 @@ import javax.annotation.Generated;
 @Tag(name = "store", description = "Access to Petstore orders")
 public interface StoreApi {
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{order_id}";
+    String PATH_DELETE_ORDER = "/store/order/{order_id}";
     /**
      * DELETE /store/order/{order_id} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -64,7 +64,7 @@ public interface StoreApi {
     ) throws Exception;
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -95,7 +95,7 @@ public interface StoreApi {
     ) throws Exception;
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -129,7 +129,7 @@ public interface StoreApi {
     ) throws Exception;
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java
index 41d3f20fc07..fa8ea71351e 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java
@@ -36,7 +36,7 @@ import javax.annotation.Generated;
 @Tag(name = "user", description = "Operations about user")
 public interface UserApi {
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -63,7 +63,7 @@ public interface UserApi {
     ) throws Exception;
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -90,7 +90,7 @@ public interface UserApi {
     ) throws Exception;
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -117,7 +117,7 @@ public interface UserApi {
     ) throws Exception;
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -145,7 +145,7 @@ public interface UserApi {
     ) throws Exception;
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -179,7 +179,7 @@ public interface UserApi {
     ) throws Exception;
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -213,7 +213,7 @@ public interface UserApi {
     ) throws Exception;
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -238,7 +238,7 @@ public interface UserApi {
     ) throws Exception;
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java
index 479d1a6894a..31942329f54 100644
--- a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java
+++ b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java
@@ -43,7 +43,7 @@ public interface NullableApi {
         return Optional.empty();
     }
 
-    public static final String PATH_NULLABLE_TEST = "/nullable";
+    String PATH_NULLABLE_TEST = "/nullable";
     /**
      * POST /nullable
      * nullable test
diff --git a/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/api/DogsApi.java b/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/api/DogsApi.java
index 4d1b0ee3ac2..b884af228d5 100644
--- a/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/api/DogsApi.java
+++ b/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/api/DogsApi.java
@@ -40,7 +40,7 @@ public interface DogsApi {
         return new DogsApiDelegate() {};
     }
 
-    public static final String PATH_CREATE_DOG = "/dogs";
+    String PATH_CREATE_DOG = "/dogs";
     /**
      * POST /dogs : Create a dog
      *
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 2588f2f086a..ede9da33f0d 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -31,7 +31,7 @@ public interface AnotherFakeApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
+    String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
     /**
      * PATCH /another-fake/dummy : To test special tags
      * To test special tags and operation ID starting with number
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java
index ac00ee51f10..14c6729a292 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java
@@ -44,7 +44,7 @@ public interface FakeApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
+    String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
     /**
      * POST /fake/create_xml_item : creates an XmlItem
      * this route creates an XmlItem
@@ -74,7 +74,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
+    String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
     /**
      * POST /fake/outer/boolean
      * Test serialization of outer boolean types
@@ -106,7 +106,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
+    String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
     /**
      * POST /fake/outer/composite
      * Test serialization of object with outer number type
@@ -147,7 +147,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
+    String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
     /**
      * POST /fake/outer/number
      * Test serialization of outer number types
@@ -179,7 +179,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
+    String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
     /**
      * POST /fake/outer/string
      * Test serialization of outer string types
@@ -211,7 +211,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
+    String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
     /**
      * GET /fake/{petId}/response-object-different-names
      *
@@ -250,7 +250,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
+    String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named `File`.
@@ -280,7 +280,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
+    String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
     /**
      * PUT /fake/body-with-query-params
      *
@@ -311,7 +311,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_CLIENT_MODEL = "/fake";
+    String PATH_TEST_CLIENT_MODEL = "/fake";
     /**
      * PATCH /fake : To test \"client\" model
      * To test \"client\" model
@@ -352,7 +352,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
+    String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
     /**
      * POST /fake : Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -413,7 +413,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENUM_PARAMETERS = "/fake";
+    String PATH_TEST_ENUM_PARAMETERS = "/fake";
     /**
      * GET /fake : To test enum parameters
      * To test enum parameters
@@ -459,7 +459,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_GROUP_PARAMETERS = "/fake";
+    String PATH_TEST_GROUP_PARAMETERS = "/fake";
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
@@ -498,7 +498,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
+    String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
     /**
      * POST /fake/inline-additionalProperties : test inline additionalProperties
      * 
@@ -528,7 +528,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
+    String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
     /**
      * GET /fake/jsonFormData : test json serialization of form data
      * 
@@ -560,7 +560,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_NULLABLE = "/fake/nullable";
+    String PATH_TEST_NULLABLE = "/fake/nullable";
     /**
      * POST /fake/nullable : test nullable parent property
      * 
@@ -590,7 +590,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
+    String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
     /**
      * PUT /fake/test-query-parameters
      * To test the collection format in query parameters
@@ -625,7 +625,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
+    String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
     /**
      * GET /fake/response-with-example
      * This endpoint defines an example value for its response schema.
@@ -664,7 +664,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
+    String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
     /**
      * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required)
      * 
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index b85253ce229..09cd7208502 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -31,7 +31,7 @@ public interface FakeClassnameTestApi {
         return Optional.empty();
     }
 
-    public static final String PATH_TEST_CLASSNAME = "/fake_classname_test";
+    String PATH_TEST_CLASSNAME = "/fake_classname_test";
     /**
      * PATCH /fake_classname_test : To test class name in snake case
      * To test class name in snake case
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java
index fc3b959a6ae..4a1bfaf26c6 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java
@@ -34,7 +34,7 @@ public interface PetApi {
         return Optional.empty();
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -72,7 +72,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -111,7 +111,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -165,7 +165,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -221,7 +221,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -273,7 +273,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -315,7 +315,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -355,7 +355,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java
index e4a86f629aa..68ab448257c 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java
@@ -32,7 +32,7 @@ public interface StoreApi {
         return Optional.empty();
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{order_id}";
+    String PATH_DELETE_ORDER = "/store/order/{order_id}";
     /**
      * DELETE /store/order/{order_id} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -63,7 +63,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -97,7 +97,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -146,7 +146,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java
index b2b46c7dcbc..87f660929e6 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java
@@ -32,7 +32,7 @@ public interface UserApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -62,7 +62,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -92,7 +92,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -122,7 +122,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -153,7 +153,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -202,7 +202,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -237,7 +237,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -265,7 +265,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 2588f2f086a..ede9da33f0d 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -31,7 +31,7 @@ public interface AnotherFakeApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
+    String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
     /**
      * PATCH /another-fake/dummy : To test special tags
      * To test special tags and operation ID starting with number
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
index ac00ee51f10..14c6729a292 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
@@ -44,7 +44,7 @@ public interface FakeApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
+    String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
     /**
      * POST /fake/create_xml_item : creates an XmlItem
      * this route creates an XmlItem
@@ -74,7 +74,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
+    String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
     /**
      * POST /fake/outer/boolean
      * Test serialization of outer boolean types
@@ -106,7 +106,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
+    String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
     /**
      * POST /fake/outer/composite
      * Test serialization of object with outer number type
@@ -147,7 +147,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
+    String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
     /**
      * POST /fake/outer/number
      * Test serialization of outer number types
@@ -179,7 +179,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
+    String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
     /**
      * POST /fake/outer/string
      * Test serialization of outer string types
@@ -211,7 +211,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
+    String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
     /**
      * GET /fake/{petId}/response-object-different-names
      *
@@ -250,7 +250,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
+    String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named `File`.
@@ -280,7 +280,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
+    String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
     /**
      * PUT /fake/body-with-query-params
      *
@@ -311,7 +311,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_CLIENT_MODEL = "/fake";
+    String PATH_TEST_CLIENT_MODEL = "/fake";
     /**
      * PATCH /fake : To test \"client\" model
      * To test \"client\" model
@@ -352,7 +352,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
+    String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
     /**
      * POST /fake : Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -413,7 +413,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENUM_PARAMETERS = "/fake";
+    String PATH_TEST_ENUM_PARAMETERS = "/fake";
     /**
      * GET /fake : To test enum parameters
      * To test enum parameters
@@ -459,7 +459,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_GROUP_PARAMETERS = "/fake";
+    String PATH_TEST_GROUP_PARAMETERS = "/fake";
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
@@ -498,7 +498,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
+    String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
     /**
      * POST /fake/inline-additionalProperties : test inline additionalProperties
      * 
@@ -528,7 +528,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
+    String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
     /**
      * GET /fake/jsonFormData : test json serialization of form data
      * 
@@ -560,7 +560,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_NULLABLE = "/fake/nullable";
+    String PATH_TEST_NULLABLE = "/fake/nullable";
     /**
      * POST /fake/nullable : test nullable parent property
      * 
@@ -590,7 +590,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
+    String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
     /**
      * PUT /fake/test-query-parameters
      * To test the collection format in query parameters
@@ -625,7 +625,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
+    String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
     /**
      * GET /fake/response-with-example
      * This endpoint defines an example value for its response schema.
@@ -664,7 +664,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
+    String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
     /**
      * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required)
      * 
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index b85253ce229..09cd7208502 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -31,7 +31,7 @@ public interface FakeClassnameTestApi {
         return Optional.empty();
     }
 
-    public static final String PATH_TEST_CLASSNAME = "/fake_classname_test";
+    String PATH_TEST_CLASSNAME = "/fake_classname_test";
     /**
      * PATCH /fake_classname_test : To test class name in snake case
      * To test class name in snake case
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
index fc3b959a6ae..4a1bfaf26c6 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
@@ -34,7 +34,7 @@ public interface PetApi {
         return Optional.empty();
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -72,7 +72,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -111,7 +111,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -165,7 +165,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -221,7 +221,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -273,7 +273,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -315,7 +315,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -355,7 +355,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
index e4a86f629aa..68ab448257c 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
@@ -32,7 +32,7 @@ public interface StoreApi {
         return Optional.empty();
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{order_id}";
+    String PATH_DELETE_ORDER = "/store/order/{order_id}";
     /**
      * DELETE /store/order/{order_id} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -63,7 +63,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -97,7 +97,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -146,7 +146,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java
index b2b46c7dcbc..87f660929e6 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java
@@ -32,7 +32,7 @@ public interface UserApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -62,7 +62,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -92,7 +92,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -122,7 +122,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -153,7 +153,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -202,7 +202,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -237,7 +237,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -265,7 +265,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 7e1a18ddaf7..08c7d2733d1 100644
--- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -31,7 +31,7 @@ public interface AnotherFakeApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
+    String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
     /**
      * PATCH /another-fake/dummy : To test special tags
      * To test special tags and operation ID starting with number
diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeApi.java
index 0159b2e50c9..9dd60ecdf47 100644
--- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeApi.java
@@ -44,7 +44,7 @@ public interface FakeApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
+    String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
     /**
      * POST /fake/create_xml_item : creates an XmlItem
      * this route creates an XmlItem
@@ -74,7 +74,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
+    String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
     /**
      * POST /fake/outer/boolean
      * Test serialization of outer boolean types
@@ -106,7 +106,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
+    String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
     /**
      * POST /fake/outer/composite
      * Test serialization of object with outer number type
@@ -147,7 +147,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
+    String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
     /**
      * POST /fake/outer/number
      * Test serialization of outer number types
@@ -179,7 +179,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
+    String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
     /**
      * POST /fake/outer/string
      * Test serialization of outer string types
@@ -211,7 +211,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
+    String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
     /**
      * GET /fake/{petId}/response-object-different-names
      *
@@ -250,7 +250,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
+    String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named `File`.
@@ -280,7 +280,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
+    String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
     /**
      * PUT /fake/body-with-query-params
      *
@@ -311,7 +311,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_CLIENT_MODEL = "/fake";
+    String PATH_TEST_CLIENT_MODEL = "/fake";
     /**
      * PATCH /fake : To test \"client\" model
      * To test \"client\" model
@@ -352,7 +352,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
+    String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
     /**
      * POST /fake : Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -413,7 +413,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENUM_PARAMETERS = "/fake";
+    String PATH_TEST_ENUM_PARAMETERS = "/fake";
     /**
      * GET /fake : To test enum parameters
      * To test enum parameters
@@ -459,7 +459,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_GROUP_PARAMETERS = "/fake";
+    String PATH_TEST_GROUP_PARAMETERS = "/fake";
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
@@ -498,7 +498,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
+    String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
     /**
      * POST /fake/inline-additionalProperties : test inline additionalProperties
      * 
@@ -528,7 +528,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
+    String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
     /**
      * GET /fake/jsonFormData : test json serialization of form data
      * 
@@ -560,7 +560,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_NULLABLE = "/fake/nullable";
+    String PATH_TEST_NULLABLE = "/fake/nullable";
     /**
      * POST /fake/nullable : test nullable parent property
      * 
@@ -590,7 +590,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
+    String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
     /**
      * PUT /fake/test-query-parameters
      * To test the collection format in query parameters
@@ -625,7 +625,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
+    String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
     /**
      * GET /fake/response-with-example
      * This endpoint defines an example value for its response schema.
@@ -664,7 +664,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
+    String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
     /**
      * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required)
      * 
diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 557d13c3a4d..e92230820e8 100644
--- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -31,7 +31,7 @@ public interface FakeClassnameTestApi {
         return Optional.empty();
     }
 
-    public static final String PATH_TEST_CLASSNAME = "/fake_classname_test";
+    String PATH_TEST_CLASSNAME = "/fake_classname_test";
     /**
      * PATCH /fake_classname_test : To test class name in snake case
      * To test class name in snake case
diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/PetApi.java
index 95e0a482d3a..3bae88c3acb 100644
--- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/PetApi.java
@@ -34,7 +34,7 @@ public interface PetApi {
         return Optional.empty();
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -72,7 +72,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -111,7 +111,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -165,7 +165,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -221,7 +221,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -273,7 +273,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -315,7 +315,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -355,7 +355,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/StoreApi.java
index 2c0cc67de54..9656f1b3be1 100644
--- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/StoreApi.java
@@ -32,7 +32,7 @@ public interface StoreApi {
         return Optional.empty();
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{order_id}";
+    String PATH_DELETE_ORDER = "/store/order/{order_id}";
     /**
      * DELETE /store/order/{order_id} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -63,7 +63,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -97,7 +97,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -146,7 +146,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/UserApi.java
index 586a0418753..210c662f08c 100644
--- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/UserApi.java
@@ -32,7 +32,7 @@ public interface UserApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -62,7 +62,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -92,7 +92,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -122,7 +122,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -153,7 +153,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -202,7 +202,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -237,7 +237,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -265,7 +265,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 6f56affa854..4be8dc60a27 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -27,7 +27,7 @@ public interface AnotherFakeApi {
         return new AnotherFakeApiDelegate() {};
     }
 
-    public static final String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
+    String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
     /**
      * PATCH /another-fake/dummy : To test special tags
      * To test special tags and operation ID starting with number
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
index 0eaf9bc0996..b4410c7e041 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
@@ -40,7 +40,7 @@ public interface FakeApi {
         return new FakeApiDelegate() {};
     }
 
-    public static final String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
+    String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
     /**
      * POST /fake/create_xml_item : creates an XmlItem
      * this route creates an XmlItem
@@ -69,7 +69,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
+    String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
     /**
      * POST /fake/outer/boolean
      * Test serialization of outer boolean types
@@ -100,7 +100,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
+    String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
     /**
      * POST /fake/outer/composite
      * Test serialization of object with outer number type
@@ -131,7 +131,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
+    String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
     /**
      * POST /fake/outer/number
      * Test serialization of outer number types
@@ -162,7 +162,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
+    String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
     /**
      * POST /fake/outer/string
      * Test serialization of outer string types
@@ -193,7 +193,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
+    String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
     /**
      * GET /fake/{petId}/response-object-different-names
      *
@@ -222,7 +222,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
+    String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named `File`.
@@ -251,7 +251,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
+    String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
     /**
      * PUT /fake/body-with-query-params
      *
@@ -281,7 +281,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_CLIENT_MODEL = "/fake";
+    String PATH_TEST_CLIENT_MODEL = "/fake";
     /**
      * PATCH /fake : To test \"client\" model
      * To test \"client\" model
@@ -312,7 +312,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
+    String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
     /**
      * POST /fake : Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -372,7 +372,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENUM_PARAMETERS = "/fake";
+    String PATH_TEST_ENUM_PARAMETERS = "/fake";
     /**
      * GET /fake : To test enum parameters
      * To test enum parameters
@@ -417,7 +417,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_GROUP_PARAMETERS = "/fake";
+    String PATH_TEST_GROUP_PARAMETERS = "/fake";
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
@@ -455,7 +455,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
+    String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
     /**
      * POST /fake/inline-additionalProperties : test inline additionalProperties
      * 
@@ -484,7 +484,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
+    String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
     /**
      * GET /fake/jsonFormData : test json serialization of form data
      * 
@@ -515,7 +515,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_NULLABLE = "/fake/nullable";
+    String PATH_TEST_NULLABLE = "/fake/nullable";
     /**
      * POST /fake/nullable : test nullable parent property
      * 
@@ -544,7 +544,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
+    String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
     /**
      * PUT /fake/test-query-parameters
      * To test the collection format in query parameters
@@ -578,7 +578,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
+    String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
     /**
      * GET /fake/response-with-example
      * This endpoint defines an example value for its response schema.
@@ -607,7 +607,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
+    String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
     /**
      * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required)
      * 
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index d436aea5249..9bf9643acdb 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -27,7 +27,7 @@ public interface FakeClassnameTestApi {
         return new FakeClassnameTestApiDelegate() {};
     }
 
-    public static final String PATH_TEST_CLASSNAME = "/fake_classname_test";
+    String PATH_TEST_CLASSNAME = "/fake_classname_test";
     /**
      * PATCH /fake_classname_test : To test class name in snake case
      * To test class name in snake case
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
index f1a6e8a0af8..bae4cfe7a8e 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
@@ -30,7 +30,7 @@ public interface PetApi {
         return new PetApiDelegate() {};
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -67,7 +67,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -105,7 +105,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -144,7 +144,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -185,7 +185,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -222,7 +222,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -263,7 +263,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -302,7 +302,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
index b20c1341128..119e70a7561 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
@@ -28,7 +28,7 @@ public interface StoreApi {
         return new StoreApiDelegate() {};
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{order_id}";
+    String PATH_DELETE_ORDER = "/store/order/{order_id}";
     /**
      * DELETE /store/order/{order_id} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -58,7 +58,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -91,7 +91,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -125,7 +125,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java
index feff084b571..77ceb2dda08 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java
@@ -28,7 +28,7 @@ public interface UserApi {
         return new UserApiDelegate() {};
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -57,7 +57,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -86,7 +86,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -115,7 +115,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -145,7 +145,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -179,7 +179,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -213,7 +213,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -240,7 +240,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java
index a8e9b13064d..53f663d6c5a 100644
--- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java
@@ -29,7 +29,7 @@ public interface PetApi {
         return new PetApiDelegate() {};
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -69,7 +69,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -106,7 +106,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -145,7 +145,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -186,7 +186,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -224,7 +224,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -270,7 +270,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -310,7 +310,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java
index 439410811af..c3e237545bf 100644
--- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java
@@ -28,7 +28,7 @@ public interface StoreApi {
         return new StoreApiDelegate() {};
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{orderId}";
+    String PATH_DELETE_ORDER = "/store/order/{orderId}";
     /**
      * DELETE /store/order/{orderId} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -59,7 +59,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -93,7 +93,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -128,7 +128,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java
index 88b1b01226f..4de36bd6b7d 100644
--- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java
@@ -28,7 +28,7 @@ public interface UserApi {
         return new UserApiDelegate() {};
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -61,7 +61,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -94,7 +94,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -127,7 +127,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -161,7 +161,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -196,7 +196,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -231,7 +231,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -262,7 +262,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 6f56affa854..4be8dc60a27 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -27,7 +27,7 @@ public interface AnotherFakeApi {
         return new AnotherFakeApiDelegate() {};
     }
 
-    public static final String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
+    String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
     /**
      * PATCH /another-fake/dummy : To test special tags
      * To test special tags and operation ID starting with number
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
index 0eaf9bc0996..b4410c7e041 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
@@ -40,7 +40,7 @@ public interface FakeApi {
         return new FakeApiDelegate() {};
     }
 
-    public static final String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
+    String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
     /**
      * POST /fake/create_xml_item : creates an XmlItem
      * this route creates an XmlItem
@@ -69,7 +69,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
+    String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
     /**
      * POST /fake/outer/boolean
      * Test serialization of outer boolean types
@@ -100,7 +100,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
+    String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
     /**
      * POST /fake/outer/composite
      * Test serialization of object with outer number type
@@ -131,7 +131,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
+    String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
     /**
      * POST /fake/outer/number
      * Test serialization of outer number types
@@ -162,7 +162,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
+    String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
     /**
      * POST /fake/outer/string
      * Test serialization of outer string types
@@ -193,7 +193,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
+    String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
     /**
      * GET /fake/{petId}/response-object-different-names
      *
@@ -222,7 +222,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
+    String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named `File`.
@@ -251,7 +251,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
+    String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
     /**
      * PUT /fake/body-with-query-params
      *
@@ -281,7 +281,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_CLIENT_MODEL = "/fake";
+    String PATH_TEST_CLIENT_MODEL = "/fake";
     /**
      * PATCH /fake : To test \"client\" model
      * To test \"client\" model
@@ -312,7 +312,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
+    String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
     /**
      * POST /fake : Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -372,7 +372,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENUM_PARAMETERS = "/fake";
+    String PATH_TEST_ENUM_PARAMETERS = "/fake";
     /**
      * GET /fake : To test enum parameters
      * To test enum parameters
@@ -417,7 +417,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_GROUP_PARAMETERS = "/fake";
+    String PATH_TEST_GROUP_PARAMETERS = "/fake";
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
@@ -455,7 +455,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
+    String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
     /**
      * POST /fake/inline-additionalProperties : test inline additionalProperties
      * 
@@ -484,7 +484,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
+    String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
     /**
      * GET /fake/jsonFormData : test json serialization of form data
      * 
@@ -515,7 +515,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_NULLABLE = "/fake/nullable";
+    String PATH_TEST_NULLABLE = "/fake/nullable";
     /**
      * POST /fake/nullable : test nullable parent property
      * 
@@ -544,7 +544,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
+    String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
     /**
      * PUT /fake/test-query-parameters
      * To test the collection format in query parameters
@@ -578,7 +578,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
+    String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
     /**
      * GET /fake/response-with-example
      * This endpoint defines an example value for its response schema.
@@ -607,7 +607,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
+    String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
     /**
      * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required)
      * 
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index d436aea5249..9bf9643acdb 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -27,7 +27,7 @@ public interface FakeClassnameTestApi {
         return new FakeClassnameTestApiDelegate() {};
     }
 
-    public static final String PATH_TEST_CLASSNAME = "/fake_classname_test";
+    String PATH_TEST_CLASSNAME = "/fake_classname_test";
     /**
      * PATCH /fake_classname_test : To test class name in snake case
      * To test class name in snake case
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
index f1a6e8a0af8..bae4cfe7a8e 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
@@ -30,7 +30,7 @@ public interface PetApi {
         return new PetApiDelegate() {};
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -67,7 +67,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -105,7 +105,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -144,7 +144,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -185,7 +185,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -222,7 +222,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -263,7 +263,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -302,7 +302,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
index b20c1341128..119e70a7561 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
@@ -28,7 +28,7 @@ public interface StoreApi {
         return new StoreApiDelegate() {};
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{order_id}";
+    String PATH_DELETE_ORDER = "/store/order/{order_id}";
     /**
      * DELETE /store/order/{order_id} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -58,7 +58,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -91,7 +91,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -125,7 +125,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
index feff084b571..77ceb2dda08 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
@@ -28,7 +28,7 @@ public interface UserApi {
         return new UserApiDelegate() {};
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -57,7 +57,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -86,7 +86,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -115,7 +115,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -145,7 +145,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -179,7 +179,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -213,7 +213,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -240,7 +240,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/springboot-file-delegate-optional/src/main/java/org/openapitools/api/DummyApi.java b/samples/server/petstore/springboot-file-delegate-optional/src/main/java/org/openapitools/api/DummyApi.java
index c1c4b5cfde4..96429b13875 100644
--- a/samples/server/petstore/springboot-file-delegate-optional/src/main/java/org/openapitools/api/DummyApi.java
+++ b/samples/server/petstore/springboot-file-delegate-optional/src/main/java/org/openapitools/api/DummyApi.java
@@ -39,7 +39,7 @@ public interface DummyApi {
         return new DummyApiDelegate() {};
     }
 
-    public static final String PATH_UPLOAD_FILE = "/dummy";
+    String PATH_UPLOAD_FILE = "/dummy";
     /**
      * POST /dummy
      * 
diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java
index 4eba5794d3d..b8eda493dbe 100644
--- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java
@@ -31,7 +31,7 @@ public interface PetApi {
         return Optional.empty();
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -68,7 +68,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -88,7 +88,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -124,7 +124,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -162,7 +162,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -199,7 +199,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -240,7 +240,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -265,7 +265,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java
index 71b0fe5b224..e13098e32d6 100644
--- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java
@@ -30,7 +30,7 @@ public interface StoreApi {
         return Optional.empty();
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{orderId}";
+    String PATH_DELETE_ORDER = "/store/order/{orderId}";
     /**
      * DELETE /store/order/{orderId} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -51,7 +51,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -71,7 +71,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -108,7 +108,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java
index 7e352e3345a..7133ac48548 100644
--- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java
@@ -30,7 +30,7 @@ public interface UserApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -51,7 +51,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -72,7 +72,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -93,7 +93,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -114,7 +114,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -151,7 +151,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -175,7 +175,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -194,7 +194,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 2588f2f086a..ede9da33f0d 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -31,7 +31,7 @@ public interface AnotherFakeApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
+    String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
     /**
      * PATCH /another-fake/dummy : To test special tags
      * To test special tags and operation ID starting with number
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
index 358c73e3717..d559873b6a0 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
@@ -44,7 +44,7 @@ public interface FakeApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
+    String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
     /**
      * POST /fake/create_xml_item : creates an XmlItem
      * this route creates an XmlItem
@@ -74,7 +74,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
+    String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
     /**
      * POST /fake/outer/boolean
      * Test serialization of outer boolean types
@@ -106,7 +106,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
+    String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
     /**
      * POST /fake/outer/composite
      * Test serialization of object with outer number type
@@ -147,7 +147,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
+    String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
     /**
      * POST /fake/outer/number
      * Test serialization of outer number types
@@ -179,7 +179,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
+    String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
     /**
      * POST /fake/outer/string
      * Test serialization of outer string types
@@ -211,7 +211,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
+    String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
     /**
      * GET /fake/{petId}/response-object-different-names
      *
@@ -250,7 +250,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
+    String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named `File`.
@@ -280,7 +280,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
+    String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
     /**
      * PUT /fake/body-with-query-params
      *
@@ -311,7 +311,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_CLIENT_MODEL = "/fake";
+    String PATH_TEST_CLIENT_MODEL = "/fake";
     /**
      * PATCH /fake : To test \"client\" model
      * To test \"client\" model
@@ -352,7 +352,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
+    String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
     /**
      * POST /fake : Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -413,7 +413,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENUM_PARAMETERS = "/fake";
+    String PATH_TEST_ENUM_PARAMETERS = "/fake";
     /**
      * GET /fake : To test enum parameters
      * To test enum parameters
@@ -459,7 +459,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_GROUP_PARAMETERS = "/fake";
+    String PATH_TEST_GROUP_PARAMETERS = "/fake";
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
@@ -498,7 +498,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
+    String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
     /**
      * POST /fake/inline-additionalProperties : test inline additionalProperties
      * 
@@ -528,7 +528,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
+    String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
     /**
      * GET /fake/jsonFormData : test json serialization of form data
      * 
@@ -560,7 +560,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_NULLABLE = "/fake/nullable";
+    String PATH_TEST_NULLABLE = "/fake/nullable";
     /**
      * POST /fake/nullable : test nullable parent property
      * 
@@ -590,7 +590,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
+    String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
     /**
      * PUT /fake/test-query-parameters
      * To test the collection format in query parameters
@@ -625,7 +625,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
+    String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
     /**
      * GET /fake/response-with-example
      * This endpoint defines an example value for its response schema.
@@ -664,7 +664,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
+    String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
     /**
      * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required)
      * 
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index b85253ce229..09cd7208502 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -31,7 +31,7 @@ public interface FakeClassnameTestApi {
         return Optional.empty();
     }
 
-    public static final String PATH_TEST_CLASSNAME = "/fake_classname_test";
+    String PATH_TEST_CLASSNAME = "/fake_classname_test";
     /**
      * PATCH /fake_classname_test : To test class name in snake case
      * To test class name in snake case
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
index 6ebeb57a22d..444b775d6da 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
@@ -34,7 +34,7 @@ public interface PetApi {
         return Optional.empty();
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -72,7 +72,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -112,7 +112,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -166,7 +166,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -222,7 +222,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -274,7 +274,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -316,7 +316,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -356,7 +356,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
index e4a86f629aa..68ab448257c 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
@@ -32,7 +32,7 @@ public interface StoreApi {
         return Optional.empty();
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{order_id}";
+    String PATH_DELETE_ORDER = "/store/order/{order_id}";
     /**
      * DELETE /store/order/{order_id} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -63,7 +63,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -97,7 +97,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -146,7 +146,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
index b2b46c7dcbc..87f660929e6 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
@@ -32,7 +32,7 @@ public interface UserApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -62,7 +62,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -92,7 +92,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -122,7 +122,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -153,7 +153,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -202,7 +202,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -237,7 +237,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -265,7 +265,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/PetApi.java
index a4631376c6a..b996cdfae1b 100644
--- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/PetApi.java
@@ -44,7 +44,7 @@ public interface PetApi {
         return Optional.empty();
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -97,7 +97,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -131,7 +131,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -183,7 +183,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -238,7 +238,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -292,7 +292,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -352,7 +352,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -389,7 +389,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApi.java
index 0b728722950..c7fb58c879b 100644
--- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApi.java
@@ -43,7 +43,7 @@ public interface StoreApi {
         return Optional.empty();
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{orderId}";
+    String PATH_DELETE_ORDER = "/store/order/{orderId}";
     /**
      * DELETE /store/order/{orderId} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -74,7 +74,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -108,7 +108,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -159,7 +159,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/UserApi.java
index e8f439f85b1..6b15e3298e8 100644
--- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/UserApi.java
@@ -43,7 +43,7 @@ public interface UserApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -76,7 +76,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -109,7 +109,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -142,7 +142,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -176,7 +176,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -227,7 +227,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -264,7 +264,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -295,7 +295,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/PetApi.java
index 7b868a7a23d..0d23f2e8832 100644
--- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/PetApi.java
@@ -44,7 +44,7 @@ public interface PetApi {
         return Optional.empty();
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -97,7 +97,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -131,7 +131,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -183,7 +183,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -238,7 +238,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -292,7 +292,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -352,7 +352,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -389,7 +389,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/StoreApi.java
index 8f30c300a37..e8e06c81ae6 100644
--- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/StoreApi.java
@@ -43,7 +43,7 @@ public interface StoreApi {
         return Optional.empty();
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{orderId}";
+    String PATH_DELETE_ORDER = "/store/order/{orderId}";
     /**
      * DELETE /store/order/{orderId} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -74,7 +74,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -108,7 +108,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -159,7 +159,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/UserApi.java
index 90afaef5332..83476943a42 100644
--- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/UserApi.java
@@ -43,7 +43,7 @@ public interface UserApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -76,7 +76,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -109,7 +109,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -142,7 +142,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -176,7 +176,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -227,7 +227,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -264,7 +264,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -295,7 +295,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/PetApi.java
index 0b854fe1256..0af891e2aba 100644
--- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/PetApi.java
@@ -40,7 +40,7 @@ public interface PetApi {
         return new PetApiDelegate() {};
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -88,7 +88,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -121,7 +121,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -164,7 +164,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -204,7 +204,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -243,7 +243,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -288,7 +288,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -324,7 +324,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApi.java
index 7cf57fd7e65..0b1c533d72a 100644
--- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApi.java
@@ -39,7 +39,7 @@ public interface StoreApi {
         return new StoreApiDelegate() {};
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{orderId}";
+    String PATH_DELETE_ORDER = "/store/order/{orderId}";
     /**
      * DELETE /store/order/{orderId} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -69,7 +69,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -102,7 +102,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{orderId}";
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -138,7 +138,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApi.java
index e360d56cb03..0c0da55fac1 100644
--- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApi.java
@@ -39,7 +39,7 @@ public interface UserApi {
         return new UserApiDelegate() {};
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -71,7 +71,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -103,7 +103,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -135,7 +135,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -168,7 +168,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -204,7 +204,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -240,7 +240,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -270,7 +270,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 4633afd2073..dd88d0b35b0 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -32,7 +32,7 @@ public interface AnotherFakeApi {
         return new AnotherFakeApiDelegate() {};
     }
 
-    public static final String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
+    String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
     /**
      * PATCH /another-fake/dummy : To test special tags
      * To test special tags and operation ID starting with number
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java
index 9db7ea0e9b7..e4b5a35495f 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java
@@ -45,7 +45,7 @@ public interface FakeApi {
         return new FakeApiDelegate() {};
     }
 
-    public static final String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
+    String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
     /**
      * POST /fake/create_xml_item : creates an XmlItem
      * this route creates an XmlItem
@@ -76,7 +76,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
+    String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
     /**
      * POST /fake/outer/boolean
      * Test serialization of outer boolean types
@@ -109,7 +109,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
+    String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
     /**
      * POST /fake/outer/composite
      * Test serialization of object with outer number type
@@ -142,7 +142,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
+    String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
     /**
      * POST /fake/outer/number
      * Test serialization of outer number types
@@ -175,7 +175,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
+    String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
     /**
      * POST /fake/outer/string
      * Test serialization of outer string types
@@ -208,7 +208,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
+    String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
     /**
      * GET /fake/{petId}/response-object-different-names
      *
@@ -239,7 +239,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
+    String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named `File`.
@@ -270,7 +270,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
+    String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
     /**
      * PUT /fake/body-with-query-params
      *
@@ -302,7 +302,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_CLIENT_MODEL = "/fake";
+    String PATH_TEST_CLIENT_MODEL = "/fake";
     /**
      * PATCH /fake : To test \"client\" model
      * To test \"client\" model
@@ -335,7 +335,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
+    String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
     /**
      * POST /fake : Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -397,7 +397,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENUM_PARAMETERS = "/fake";
+    String PATH_TEST_ENUM_PARAMETERS = "/fake";
     /**
      * GET /fake : To test enum parameters
      * To test enum parameters
@@ -444,7 +444,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_GROUP_PARAMETERS = "/fake";
+    String PATH_TEST_GROUP_PARAMETERS = "/fake";
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
@@ -484,7 +484,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
+    String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
     /**
      * POST /fake/inline-additionalProperties : test inline additionalProperties
      * 
@@ -515,7 +515,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
+    String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
     /**
      * GET /fake/jsonFormData : test json serialization of form data
      * 
@@ -548,7 +548,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_NULLABLE = "/fake/nullable";
+    String PATH_TEST_NULLABLE = "/fake/nullable";
     /**
      * POST /fake/nullable : test nullable parent property
      * 
@@ -579,7 +579,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
+    String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
     /**
      * PUT /fake/test-query-parameters
      * To test the collection format in query parameters
@@ -615,7 +615,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
+    String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
     /**
      * GET /fake/response-with-example
      * This endpoint defines an example value for its response schema.
@@ -645,7 +645,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
+    String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
     /**
      * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required)
      * 
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index bcffbed1c50..2d133ee57b5 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -32,7 +32,7 @@ public interface FakeClassnameTestApi {
         return new FakeClassnameTestApiDelegate() {};
     }
 
-    public static final String PATH_TEST_CLASSNAME = "/fake_classname_test";
+    String PATH_TEST_CLASSNAME = "/fake_classname_test";
     /**
      * PATCH /fake_classname_test : To test class name in snake case
      * To test class name in snake case
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java
index 2e00bbea81b..547542ecf61 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java
@@ -35,7 +35,7 @@ public interface PetApi {
         return new PetApiDelegate() {};
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -74,7 +74,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -114,7 +114,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -155,7 +155,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -198,7 +198,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -237,7 +237,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -280,7 +280,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -321,7 +321,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java
index b8cde63fa66..886b3036fd9 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java
@@ -33,7 +33,7 @@ public interface StoreApi {
         return new StoreApiDelegate() {};
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{order_id}";
+    String PATH_DELETE_ORDER = "/store/order/{order_id}";
     /**
      * DELETE /store/order/{order_id} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -65,7 +65,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -99,7 +99,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -135,7 +135,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java
index a2ccf987417..7f555ec7879 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java
@@ -33,7 +33,7 @@ public interface UserApi {
         return new UserApiDelegate() {};
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -64,7 +64,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -95,7 +95,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -126,7 +126,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -158,7 +158,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -194,7 +194,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -230,7 +230,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -258,7 +258,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 77cbad8982b..4a11e4b54ae 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -32,7 +32,7 @@ public interface AnotherFakeApi {
         return new AnotherFakeApiDelegate() {};
     }
 
-    public static final String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
+    String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
     /**
      * PATCH /another-fake/dummy : To test special tags
      * To test special tags and operation ID starting with number
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
index dcb2823da23..2ae20b99851 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
@@ -45,7 +45,7 @@ public interface FakeApi {
         return new FakeApiDelegate() {};
     }
 
-    public static final String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
+    String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
     /**
      * POST /fake/create_xml_item : creates an XmlItem
      * this route creates an XmlItem
@@ -75,7 +75,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
+    String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
     /**
      * POST /fake/outer/boolean
      * Test serialization of outer boolean types
@@ -107,7 +107,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
+    String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
     /**
      * POST /fake/outer/composite
      * Test serialization of object with outer number type
@@ -139,7 +139,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
+    String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
     /**
      * POST /fake/outer/number
      * Test serialization of outer number types
@@ -171,7 +171,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
+    String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
     /**
      * POST /fake/outer/string
      * Test serialization of outer string types
@@ -203,7 +203,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
+    String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
     /**
      * GET /fake/{petId}/response-object-different-names
      *
@@ -233,7 +233,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
+    String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named `File`.
@@ -263,7 +263,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
+    String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
     /**
      * PUT /fake/body-with-query-params
      *
@@ -294,7 +294,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_CLIENT_MODEL = "/fake";
+    String PATH_TEST_CLIENT_MODEL = "/fake";
     /**
      * PATCH /fake : To test \"client\" model
      * To test \"client\" model
@@ -326,7 +326,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
+    String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
     /**
      * POST /fake : Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -387,7 +387,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENUM_PARAMETERS = "/fake";
+    String PATH_TEST_ENUM_PARAMETERS = "/fake";
     /**
      * GET /fake : To test enum parameters
      * To test enum parameters
@@ -433,7 +433,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_GROUP_PARAMETERS = "/fake";
+    String PATH_TEST_GROUP_PARAMETERS = "/fake";
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
@@ -472,7 +472,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
+    String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
     /**
      * POST /fake/inline-additionalProperties : test inline additionalProperties
      * 
@@ -502,7 +502,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
+    String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
     /**
      * GET /fake/jsonFormData : test json serialization of form data
      * 
@@ -534,7 +534,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_NULLABLE = "/fake/nullable";
+    String PATH_TEST_NULLABLE = "/fake/nullable";
     /**
      * POST /fake/nullable : test nullable parent property
      * 
@@ -564,7 +564,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
+    String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
     /**
      * PUT /fake/test-query-parameters
      * To test the collection format in query parameters
@@ -599,7 +599,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
+    String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
     /**
      * GET /fake/response-with-example
      * This endpoint defines an example value for its response schema.
@@ -628,7 +628,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
+    String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
     /**
      * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required)
      * 
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index e2f086dddcd..dfd2cda103c 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -32,7 +32,7 @@ public interface FakeClassnameTestApi {
         return new FakeClassnameTestApiDelegate() {};
     }
 
-    public static final String PATH_TEST_CLASSNAME = "/fake_classname_test";
+    String PATH_TEST_CLASSNAME = "/fake_classname_test";
     /**
      * PATCH /fake_classname_test : To test class name in snake case
      * To test class name in snake case
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
index 68a6385d28b..b8d65e05c85 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
@@ -35,7 +35,7 @@ public interface PetApi {
         return new PetApiDelegate() {};
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -73,7 +73,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -112,7 +112,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -152,7 +152,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -194,7 +194,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -232,7 +232,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -274,7 +274,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -314,7 +314,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
index ea00621225d..b5e659920bb 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
@@ -33,7 +33,7 @@ public interface StoreApi {
         return new StoreApiDelegate() {};
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{order_id}";
+    String PATH_DELETE_ORDER = "/store/order/{order_id}";
     /**
      * DELETE /store/order/{order_id} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -64,7 +64,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -97,7 +97,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -132,7 +132,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java
index d63f75f3a6a..b1b00df3bf7 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java
@@ -33,7 +33,7 @@ public interface UserApi {
         return new UserApiDelegate() {};
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -63,7 +63,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -93,7 +93,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -123,7 +123,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -154,7 +154,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -189,7 +189,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -224,7 +224,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -251,7 +251,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 88826c80b2b..29547268309 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -27,7 +27,7 @@ public interface AnotherFakeApi {
         return new AnotherFakeApiDelegate() {};
     }
 
-    public static final String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
+    String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
     /**
      * PATCH /another-fake/dummy : To test special tags
      * To test special tags and operation ID starting with number
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java
index 5660a7c98d3..7cfa500b6e7 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java
@@ -38,7 +38,7 @@ public interface FakeApi {
         return new FakeApiDelegate() {};
     }
 
-    public static final String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
+    String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
     /**
      * POST /fake/create_xml_item : creates an XmlItem
      * this route creates an XmlItem
@@ -67,7 +67,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
+    String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
     /**
      * POST /fake/outer/boolean
      * Test serialization of outer boolean types
@@ -97,7 +97,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
+    String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
     /**
      * POST /fake/outer/composite
      * Test serialization of object with outer number type
@@ -127,7 +127,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
+    String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
     /**
      * POST /fake/outer/number
      * Test serialization of outer number types
@@ -157,7 +157,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
+    String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
     /**
      * POST /fake/outer/string
      * Test serialization of outer string types
@@ -187,7 +187,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
+    String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named `File`.
@@ -216,7 +216,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
+    String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
     /**
      * PUT /fake/body-with-query-params
      *
@@ -246,7 +246,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_CLIENT_MODEL = "/fake";
+    String PATH_TEST_CLIENT_MODEL = "/fake";
     /**
      * PATCH /fake : To test \"client\" model
      * To test \"client\" model
@@ -277,7 +277,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
+    String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
     /**
      * POST /fake : Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
      * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -337,7 +337,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENUM_PARAMETERS = "/fake";
+    String PATH_TEST_ENUM_PARAMETERS = "/fake";
     /**
      * GET /fake : To test enum parameters
      * To test enum parameters
@@ -382,7 +382,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_GROUP_PARAMETERS = "/fake";
+    String PATH_TEST_GROUP_PARAMETERS = "/fake";
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
@@ -420,7 +420,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
+    String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
     /**
      * POST /fake/inline-additionalProperties : test inline additionalProperties
      *
@@ -448,7 +448,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
+    String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
     /**
      * GET /fake/jsonFormData : test json serialization of form data
      *
@@ -478,7 +478,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
+    String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
     /**
      * PUT /fake/test-query-parameters
      * To test the collection format in query parameters
@@ -514,7 +514,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
+    String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
     /**
      * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required)
      *
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 9aa8dd3b7ca..7413d46f5fa 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -27,7 +27,7 @@ public interface FakeClassnameTestApi {
         return new FakeClassnameTestApiDelegate() {};
     }
 
-    public static final String PATH_TEST_CLASSNAME = "/fake_classname_test";
+    String PATH_TEST_CLASSNAME = "/fake_classname_test";
     /**
      * PATCH /fake_classname_test : To test class name in snake case
      * To test class name in snake case
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java
index 2a9a5b77c95..1449bfce5cc 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java
@@ -31,7 +31,7 @@ public interface PetApi {
         return new PetApiDelegate() {};
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      *
@@ -67,7 +67,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      *
@@ -104,7 +104,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -144,7 +144,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -188,7 +188,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -225,7 +225,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_LIST_ALL_PETS = "/pet/all";
+    String PATH_LIST_ALL_PETS = "/pet/all";
     /**
      * GET /pet/all : List all pets
      *
@@ -262,7 +262,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      *
@@ -302,7 +302,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      *
@@ -340,7 +340,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      *
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java
index 6bf895db99e..17b6222c2eb 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java
@@ -28,7 +28,7 @@ public interface StoreApi {
         return new StoreApiDelegate() {};
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{order_id}";
+    String PATH_DELETE_ORDER = "/store/order/{order_id}";
     /**
      * DELETE /store/order/{order_id} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -58,7 +58,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -91,7 +91,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -125,7 +125,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      *
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java
index 56948bf7c3d..edef662bbd5 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java
@@ -28,7 +28,7 @@ public interface UserApi {
         return new UserApiDelegate() {};
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -56,7 +56,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      *
@@ -83,7 +83,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      *
@@ -110,7 +110,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -140,7 +140,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      *
@@ -173,7 +173,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      *
@@ -206,7 +206,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      *
@@ -232,7 +232,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java
index 717f6cc7d74..c05660c21c3 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java
@@ -27,7 +27,7 @@ public interface VersioningApi {
         return new VersioningApiDelegate() {};
     }
 
-    public static final String PATH_VERSIONING_HEADERS = "/versioning/headers";
+    String PATH_VERSIONING_HEADERS = "/versioning/headers";
     /**
      * POST /versioning/headers
      *
@@ -61,7 +61,7 @@ public interface VersioningApi {
     }
 
 
-    public static final String PATH_VERSIONING_MIX = "/versioning/mix";
+    String PATH_VERSIONING_MIX = "/versioning/mix";
     /**
      * POST /versioning/mix
      *
@@ -100,7 +100,7 @@ public interface VersioningApi {
     }
 
 
-    public static final String PATH_VERSIONING_QUERY_PARAMS = "/versioning/query-params";
+    String PATH_VERSIONING_QUERY_PARAMS = "/versioning/query-params";
     /**
      * POST /versioning/query-params
      *
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 88826c80b2b..29547268309 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -27,7 +27,7 @@ public interface AnotherFakeApi {
         return new AnotherFakeApiDelegate() {};
     }
 
-    public static final String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
+    String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
     /**
      * PATCH /another-fake/dummy : To test special tags
      * To test special tags and operation ID starting with number
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java
index 5660a7c98d3..7cfa500b6e7 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java
@@ -38,7 +38,7 @@ public interface FakeApi {
         return new FakeApiDelegate() {};
     }
 
-    public static final String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
+    String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
     /**
      * POST /fake/create_xml_item : creates an XmlItem
      * this route creates an XmlItem
@@ -67,7 +67,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
+    String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
     /**
      * POST /fake/outer/boolean
      * Test serialization of outer boolean types
@@ -97,7 +97,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
+    String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
     /**
      * POST /fake/outer/composite
      * Test serialization of object with outer number type
@@ -127,7 +127,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
+    String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
     /**
      * POST /fake/outer/number
      * Test serialization of outer number types
@@ -157,7 +157,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
+    String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
     /**
      * POST /fake/outer/string
      * Test serialization of outer string types
@@ -187,7 +187,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
+    String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named `File`.
@@ -216,7 +216,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
+    String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
     /**
      * PUT /fake/body-with-query-params
      *
@@ -246,7 +246,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_CLIENT_MODEL = "/fake";
+    String PATH_TEST_CLIENT_MODEL = "/fake";
     /**
      * PATCH /fake : To test \"client\" model
      * To test \"client\" model
@@ -277,7 +277,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
+    String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
     /**
      * POST /fake : Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
      * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -337,7 +337,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENUM_PARAMETERS = "/fake";
+    String PATH_TEST_ENUM_PARAMETERS = "/fake";
     /**
      * GET /fake : To test enum parameters
      * To test enum parameters
@@ -382,7 +382,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_GROUP_PARAMETERS = "/fake";
+    String PATH_TEST_GROUP_PARAMETERS = "/fake";
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
@@ -420,7 +420,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
+    String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
     /**
      * POST /fake/inline-additionalProperties : test inline additionalProperties
      *
@@ -448,7 +448,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
+    String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
     /**
      * GET /fake/jsonFormData : test json serialization of form data
      *
@@ -478,7 +478,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
+    String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
     /**
      * PUT /fake/test-query-parameters
      * To test the collection format in query parameters
@@ -514,7 +514,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
+    String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
     /**
      * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required)
      *
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 9aa8dd3b7ca..7413d46f5fa 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -27,7 +27,7 @@ public interface FakeClassnameTestApi {
         return new FakeClassnameTestApiDelegate() {};
     }
 
-    public static final String PATH_TEST_CLASSNAME = "/fake_classname_test";
+    String PATH_TEST_CLASSNAME = "/fake_classname_test";
     /**
      * PATCH /fake_classname_test : To test class name in snake case
      * To test class name in snake case
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java
index 2a9a5b77c95..1449bfce5cc 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java
@@ -31,7 +31,7 @@ public interface PetApi {
         return new PetApiDelegate() {};
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      *
@@ -67,7 +67,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      *
@@ -104,7 +104,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -144,7 +144,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -188,7 +188,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -225,7 +225,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_LIST_ALL_PETS = "/pet/all";
+    String PATH_LIST_ALL_PETS = "/pet/all";
     /**
      * GET /pet/all : List all pets
      *
@@ -262,7 +262,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      *
@@ -302,7 +302,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      *
@@ -340,7 +340,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      *
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java
index 6bf895db99e..17b6222c2eb 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java
@@ -28,7 +28,7 @@ public interface StoreApi {
         return new StoreApiDelegate() {};
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{order_id}";
+    String PATH_DELETE_ORDER = "/store/order/{order_id}";
     /**
      * DELETE /store/order/{order_id} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -58,7 +58,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -91,7 +91,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -125,7 +125,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      *
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java
index 56948bf7c3d..edef662bbd5 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java
@@ -28,7 +28,7 @@ public interface UserApi {
         return new UserApiDelegate() {};
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -56,7 +56,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      *
@@ -83,7 +83,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      *
@@ -110,7 +110,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -140,7 +140,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      *
@@ -173,7 +173,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      *
@@ -206,7 +206,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      *
@@ -232,7 +232,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java
index b405a1894fa..7326b147aff 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java
@@ -27,7 +27,7 @@ public interface VersioningApi {
         return new VersioningApiDelegate() {};
     }
 
-    public static final String PATH_VERSIONING_HEADERS = "/versioning/headers";
+    String PATH_VERSIONING_HEADERS = "/versioning/headers";
     /**
      * POST /versioning/headers
      *
@@ -61,7 +61,7 @@ public interface VersioningApi {
     }
 
 
-    public static final String PATH_VERSIONING_MIX = "/versioning/mix";
+    String PATH_VERSIONING_MIX = "/versioning/mix";
     /**
      * POST /versioning/mix
      *
@@ -100,7 +100,7 @@ public interface VersioningApi {
     }
 
 
-    public static final String PATH_VERSIONING_QUERY_PARAMS = "/versioning/query-params";
+    String PATH_VERSIONING_QUERY_PARAMS = "/versioning/query-params";
     /**
      * POST /versioning/query-params
      *
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 3970c5719b4..f0ed29e8d0a 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -31,7 +31,7 @@ public interface AnotherFakeApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
+    String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
     /**
      * PATCH /another-fake/dummy : To test special tags
      * To test special tags and operation ID starting with number
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java
index ed997b99069..2f08548f885 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java
@@ -42,7 +42,7 @@ public interface FakeApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
+    String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
     /**
      * POST /fake/create_xml_item : creates an XmlItem
      * this route creates an XmlItem
@@ -72,7 +72,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
+    String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
     /**
      * POST /fake/outer/boolean
      * Test serialization of outer boolean types
@@ -103,7 +103,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
+    String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
     /**
      * POST /fake/outer/composite
      * Test serialization of object with outer number type
@@ -143,7 +143,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
+    String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
     /**
      * POST /fake/outer/number
      * Test serialization of outer number types
@@ -174,7 +174,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
+    String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
     /**
      * POST /fake/outer/string
      * Test serialization of outer string types
@@ -205,7 +205,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
+    String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named `File`.
@@ -235,7 +235,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
+    String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
     /**
      * PUT /fake/body-with-query-params
      *
@@ -266,7 +266,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_CLIENT_MODEL = "/fake";
+    String PATH_TEST_CLIENT_MODEL = "/fake";
     /**
      * PATCH /fake : To test \"client\" model
      * To test \"client\" model
@@ -307,7 +307,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
+    String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
     /**
      * POST /fake : Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
      * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -368,7 +368,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENUM_PARAMETERS = "/fake";
+    String PATH_TEST_ENUM_PARAMETERS = "/fake";
     /**
      * GET /fake : To test enum parameters
      * To test enum parameters
@@ -414,7 +414,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_GROUP_PARAMETERS = "/fake";
+    String PATH_TEST_GROUP_PARAMETERS = "/fake";
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
@@ -453,7 +453,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
+    String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
     /**
      * POST /fake/inline-additionalProperties : test inline additionalProperties
      *
@@ -482,7 +482,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
+    String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
     /**
      * GET /fake/jsonFormData : test json serialization of form data
      *
@@ -513,7 +513,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
+    String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
     /**
      * PUT /fake/test-query-parameters
      * To test the collection format in query parameters
@@ -550,7 +550,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
+    String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
     /**
      * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required)
      *
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 6609ee2a000..e5f1fdadc70 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -31,7 +31,7 @@ public interface FakeClassnameTestApi {
         return Optional.empty();
     }
 
-    public static final String PATH_TEST_CLASSNAME = "/fake_classname_test";
+    String PATH_TEST_CLASSNAME = "/fake_classname_test";
     /**
      * PATCH /fake_classname_test : To test class name in snake case
      * To test class name in snake case
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java
index b943450c6b0..50454f71b50 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java
@@ -35,7 +35,7 @@ public interface PetApi {
         return Optional.empty();
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      *
@@ -72,7 +72,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      *
@@ -110,7 +110,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -165,7 +165,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -224,7 +224,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -276,7 +276,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_LIST_ALL_PETS = "/pet/all";
+    String PATH_LIST_ALL_PETS = "/pet/all";
     /**
      * GET /pet/all : List all pets
      *
@@ -328,7 +328,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      *
@@ -369,7 +369,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      *
@@ -408,7 +408,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      *
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java
index 75f9bea15aa..5b4882c5285 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java
@@ -32,7 +32,7 @@ public interface StoreApi {
         return Optional.empty();
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{order_id}";
+    String PATH_DELETE_ORDER = "/store/order/{order_id}";
     /**
      * DELETE /store/order/{order_id} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -63,7 +63,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -97,7 +97,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -146,7 +146,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      *
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java
index 81c6f550d92..79ffefc12e8 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java
@@ -32,7 +32,7 @@ public interface UserApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -61,7 +61,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      *
@@ -89,7 +89,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      *
@@ -117,7 +117,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -148,7 +148,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      *
@@ -196,7 +196,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      *
@@ -230,7 +230,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      *
@@ -257,7 +257,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java
index 9d25f61b995..4567664fecb 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java
@@ -31,7 +31,7 @@ public interface VersioningApi {
         return Optional.empty();
     }
 
-    public static final String PATH_VERSIONING_HEADERS = "/versioning/headers";
+    String PATH_VERSIONING_HEADERS = "/versioning/headers";
     /**
      * POST /versioning/headers
      *
@@ -75,7 +75,7 @@ public interface VersioningApi {
     }
 
 
-    public static final String PATH_VERSIONING_MIX = "/versioning/mix";
+    String PATH_VERSIONING_MIX = "/versioning/mix";
     /**
      * POST /versioning/mix
      *
@@ -124,7 +124,7 @@ public interface VersioningApi {
     }
 
 
-    public static final String PATH_VERSIONING_QUERY_PARAMS = "/versioning/query-params";
+    String PATH_VERSIONING_QUERY_PARAMS = "/versioning/query-params";
     /**
      * POST /versioning/query-params
      *
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 3970c5719b4..f0ed29e8d0a 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -31,7 +31,7 @@ public interface AnotherFakeApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
+    String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
     /**
      * PATCH /another-fake/dummy : To test special tags
      * To test special tags and operation ID starting with number
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java
index ed997b99069..2f08548f885 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java
@@ -42,7 +42,7 @@ public interface FakeApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
+    String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
     /**
      * POST /fake/create_xml_item : creates an XmlItem
      * this route creates an XmlItem
@@ -72,7 +72,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
+    String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
     /**
      * POST /fake/outer/boolean
      * Test serialization of outer boolean types
@@ -103,7 +103,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
+    String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
     /**
      * POST /fake/outer/composite
      * Test serialization of object with outer number type
@@ -143,7 +143,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
+    String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
     /**
      * POST /fake/outer/number
      * Test serialization of outer number types
@@ -174,7 +174,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
+    String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
     /**
      * POST /fake/outer/string
      * Test serialization of outer string types
@@ -205,7 +205,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
+    String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named `File`.
@@ -235,7 +235,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
+    String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
     /**
      * PUT /fake/body-with-query-params
      *
@@ -266,7 +266,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_CLIENT_MODEL = "/fake";
+    String PATH_TEST_CLIENT_MODEL = "/fake";
     /**
      * PATCH /fake : To test \"client\" model
      * To test \"client\" model
@@ -307,7 +307,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
+    String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
     /**
      * POST /fake : Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
      * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -368,7 +368,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENUM_PARAMETERS = "/fake";
+    String PATH_TEST_ENUM_PARAMETERS = "/fake";
     /**
      * GET /fake : To test enum parameters
      * To test enum parameters
@@ -414,7 +414,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_GROUP_PARAMETERS = "/fake";
+    String PATH_TEST_GROUP_PARAMETERS = "/fake";
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
@@ -453,7 +453,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
+    String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
     /**
      * POST /fake/inline-additionalProperties : test inline additionalProperties
      *
@@ -482,7 +482,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
+    String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
     /**
      * GET /fake/jsonFormData : test json serialization of form data
      *
@@ -513,7 +513,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
+    String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
     /**
      * PUT /fake/test-query-parameters
      * To test the collection format in query parameters
@@ -550,7 +550,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
+    String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
     /**
      * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required)
      *
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 6609ee2a000..e5f1fdadc70 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -31,7 +31,7 @@ public interface FakeClassnameTestApi {
         return Optional.empty();
     }
 
-    public static final String PATH_TEST_CLASSNAME = "/fake_classname_test";
+    String PATH_TEST_CLASSNAME = "/fake_classname_test";
     /**
      * PATCH /fake_classname_test : To test class name in snake case
      * To test class name in snake case
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java
index b943450c6b0..50454f71b50 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java
@@ -35,7 +35,7 @@ public interface PetApi {
         return Optional.empty();
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      *
@@ -72,7 +72,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      *
@@ -110,7 +110,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -165,7 +165,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -224,7 +224,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -276,7 +276,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_LIST_ALL_PETS = "/pet/all";
+    String PATH_LIST_ALL_PETS = "/pet/all";
     /**
      * GET /pet/all : List all pets
      *
@@ -328,7 +328,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      *
@@ -369,7 +369,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      *
@@ -408,7 +408,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      *
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java
index 75f9bea15aa..5b4882c5285 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java
@@ -32,7 +32,7 @@ public interface StoreApi {
         return Optional.empty();
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{order_id}";
+    String PATH_DELETE_ORDER = "/store/order/{order_id}";
     /**
      * DELETE /store/order/{order_id} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -63,7 +63,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -97,7 +97,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -146,7 +146,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      *
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java
index 81c6f550d92..79ffefc12e8 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java
@@ -32,7 +32,7 @@ public interface UserApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -61,7 +61,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      *
@@ -89,7 +89,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      *
@@ -117,7 +117,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -148,7 +148,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      *
@@ -196,7 +196,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      *
@@ -230,7 +230,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      *
@@ -257,7 +257,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java
index bb2a4cd7097..75628bc8bb1 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java
@@ -31,7 +31,7 @@ public interface VersioningApi {
         return Optional.empty();
     }
 
-    public static final String PATH_VERSIONING_HEADERS = "/versioning/headers";
+    String PATH_VERSIONING_HEADERS = "/versioning/headers";
     /**
      * POST /versioning/headers
      *
@@ -75,7 +75,7 @@ public interface VersioningApi {
     }
 
 
-    public static final String PATH_VERSIONING_MIX = "/versioning/mix";
+    String PATH_VERSIONING_MIX = "/versioning/mix";
     /**
      * POST /versioning/mix
      *
@@ -124,7 +124,7 @@ public interface VersioningApi {
     }
 
 
-    public static final String PATH_VERSIONING_QUERY_PARAMS = "/versioning/query-params";
+    String PATH_VERSIONING_QUERY_PARAMS = "/versioning/query-params";
     /**
      * POST /versioning/query-params
      *
diff --git a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/api/UserApi.java
index bac64874d60..96b1c12950f 100644
--- a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/api/UserApi.java
@@ -47,7 +47,7 @@ public interface UserApi {
         return Optional.empty();
     }
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      *
@@ -86,7 +86,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      *
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 2588f2f086a..ede9da33f0d 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -31,7 +31,7 @@ public interface AnotherFakeApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
+    String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
     /**
      * PATCH /another-fake/dummy : To test special tags
      * To test special tags and operation ID starting with number
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
index 65c4dc7fdbc..4a9df5b36da 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
@@ -44,7 +44,7 @@ public interface FakeApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
+    String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
     /**
      * POST /fake/create_xml_item : creates an XmlItem
      * this route creates an XmlItem
@@ -74,7 +74,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
+    String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
     /**
      * POST /fake/outer/boolean
      * Test serialization of outer boolean types
@@ -106,7 +106,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
+    String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
     /**
      * POST /fake/outer/composite
      * Test serialization of object with outer number type
@@ -147,7 +147,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
+    String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
     /**
      * POST /fake/outer/number
      * Test serialization of outer number types
@@ -179,7 +179,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
+    String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
     /**
      * POST /fake/outer/string
      * Test serialization of outer string types
@@ -211,7 +211,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
+    String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
     /**
      * GET /fake/{petId}/response-object-different-names
      *
@@ -250,7 +250,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
+    String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named `File`.
@@ -280,7 +280,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
+    String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
     /**
      * PUT /fake/body-with-query-params
      *
@@ -311,7 +311,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_CLIENT_MODEL = "/fake";
+    String PATH_TEST_CLIENT_MODEL = "/fake";
     /**
      * PATCH /fake : To test \"client\" model
      * To test \"client\" model
@@ -352,7 +352,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
+    String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
     /**
      * POST /fake : Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -413,7 +413,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENUM_PARAMETERS = "/fake";
+    String PATH_TEST_ENUM_PARAMETERS = "/fake";
     /**
      * GET /fake : To test enum parameters
      * To test enum parameters
@@ -459,7 +459,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_GROUP_PARAMETERS = "/fake";
+    String PATH_TEST_GROUP_PARAMETERS = "/fake";
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
@@ -498,7 +498,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
+    String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
     /**
      * POST /fake/inline-additionalProperties : test inline additionalProperties
      * 
@@ -528,7 +528,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
+    String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
     /**
      * GET /fake/jsonFormData : test json serialization of form data
      * 
@@ -560,7 +560,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_NULLABLE = "/fake/nullable";
+    String PATH_TEST_NULLABLE = "/fake/nullable";
     /**
      * POST /fake/nullable : test nullable parent property
      * 
@@ -590,7 +590,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
+    String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
     /**
      * PUT /fake/test-query-parameters
      * To test the collection format in query parameters
@@ -625,7 +625,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
+    String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
     /**
      * GET /fake/response-with-example
      * This endpoint defines an example value for its response schema.
@@ -664,7 +664,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
+    String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
     /**
      * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required)
      * 
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index b85253ce229..09cd7208502 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -31,7 +31,7 @@ public interface FakeClassnameTestApi {
         return Optional.empty();
     }
 
-    public static final String PATH_TEST_CLASSNAME = "/fake_classname_test";
+    String PATH_TEST_CLASSNAME = "/fake_classname_test";
     /**
      * PATCH /fake_classname_test : To test class name in snake case
      * To test class name in snake case
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
index 65b2da6269a..0fc23f10a6e 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
@@ -34,7 +34,7 @@ public interface PetApi {
         return Optional.empty();
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -72,7 +72,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -111,7 +111,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -165,7 +165,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -221,7 +221,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -273,7 +273,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -315,7 +315,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -355,7 +355,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
index e4a86f629aa..68ab448257c 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
@@ -32,7 +32,7 @@ public interface StoreApi {
         return Optional.empty();
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{order_id}";
+    String PATH_DELETE_ORDER = "/store/order/{order_id}";
     /**
      * DELETE /store/order/{order_id} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -63,7 +63,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -97,7 +97,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -146,7 +146,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java
index b2b46c7dcbc..87f660929e6 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java
@@ -32,7 +32,7 @@ public interface UserApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -62,7 +62,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -92,7 +92,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -122,7 +122,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -153,7 +153,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -202,7 +202,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -237,7 +237,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -265,7 +265,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java
index fefa88d6b95..ef17356107e 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java
@@ -45,7 +45,7 @@ public interface AnotherFakeApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
+    String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
     /**
      * PATCH /another-fake/dummy : To test special tags
      * To test special tags and operation ID starting with number
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java
index 80e3b624685..1863dbea4a3 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java
@@ -58,7 +58,7 @@ public interface FakeApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
+    String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
     /**
      * POST /fake/create_xml_item : creates an XmlItem
      * this route creates an XmlItem
@@ -89,7 +89,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
+    String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
     /**
      * POST /fake/outer/boolean
      * Test serialization of outer boolean types
@@ -122,7 +122,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
+    String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
     /**
      * POST /fake/outer/composite
      * Test serialization of object with outer number type
@@ -164,7 +164,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
+    String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
     /**
      * POST /fake/outer/number
      * Test serialization of outer number types
@@ -197,7 +197,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
+    String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
     /**
      * POST /fake/outer/string
      * Test serialization of outer string types
@@ -230,7 +230,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
+    String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
     /**
      * GET /fake/{petId}/response-object-different-names
      *
@@ -269,7 +269,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
+    String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named `File`.
@@ -299,7 +299,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
+    String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
     /**
      * PUT /fake/body-with-query-params
      *
@@ -329,7 +329,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_CLIENT_MODEL = "/fake";
+    String PATH_TEST_CLIENT_MODEL = "/fake";
     /**
      * PATCH /fake : To test \"client\" model
      * To test \"client\" model
@@ -372,7 +372,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
+    String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
     /**
      * POST /fake : Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -434,7 +434,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENUM_PARAMETERS = "/fake";
+    String PATH_TEST_ENUM_PARAMETERS = "/fake";
     /**
      * GET /fake : To test enum parameters
      * To test enum parameters
@@ -481,7 +481,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_GROUP_PARAMETERS = "/fake";
+    String PATH_TEST_GROUP_PARAMETERS = "/fake";
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
@@ -521,7 +521,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
+    String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
     /**
      * POST /fake/inline-additionalProperties : test inline additionalProperties
      * 
@@ -552,7 +552,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
+    String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
     /**
      * GET /fake/jsonFormData : test json serialization of form data
      * 
@@ -585,7 +585,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_NULLABLE = "/fake/nullable";
+    String PATH_TEST_NULLABLE = "/fake/nullable";
     /**
      * POST /fake/nullable : test nullable parent property
      * 
@@ -616,7 +616,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
+    String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
     /**
      * PUT /fake/test-query-parameters
      * To test the collection format in query parameters
@@ -651,7 +651,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
+    String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
     /**
      * GET /fake/response-with-example
      * This endpoint defines an example value for its response schema.
@@ -691,7 +691,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
+    String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
     /**
      * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required)
      * 
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java
index 0fb1913eaee..6a400e6b834 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java
@@ -45,7 +45,7 @@ public interface FakeClassnameTestApi {
         return Optional.empty();
     }
 
-    public static final String PATH_TEST_CLASSNAME = "/fake_classname_test";
+    String PATH_TEST_CLASSNAME = "/fake_classname_test";
     /**
      * PATCH /fake_classname_test : To test class name in snake case
      * To test class name in snake case
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java
index 2785bfbc9d0..b82c8708d60 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java
@@ -48,7 +48,7 @@ public interface PetApi {
         return Optional.empty();
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -84,7 +84,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -121,7 +121,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -174,7 +174,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -230,7 +230,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -285,7 +285,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -325,7 +325,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -363,7 +363,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java
index cb0e16af7ed..1ce8b19c06d 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java
@@ -46,7 +46,7 @@ public interface StoreApi {
         return Optional.empty();
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{order_id}";
+    String PATH_DELETE_ORDER = "/store/order/{order_id}";
     /**
      * DELETE /store/order/{order_id} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -78,7 +78,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -113,7 +113,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -165,7 +165,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java
index 4844c5c9728..dd61f4e8ddb 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java
@@ -46,7 +46,7 @@ public interface UserApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -77,7 +77,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -108,7 +108,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -139,7 +139,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -171,7 +171,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -223,7 +223,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -261,7 +261,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -290,7 +290,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java
index e42f58b3591..7ba946efd24 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -31,7 +31,7 @@ public interface AnotherFakeApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
+    String PATH_CALL123TEST_SPECIAL_TAGS = "/another-fake/dummy";
     /**
      * PATCH /another-fake/dummy : To test special tags
      * To test special tags and operation ID starting with number
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
index 2be5fec2ede..01ec6682003 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
@@ -44,7 +44,7 @@ public interface FakeApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
+    String PATH_CREATE_XML_ITEM = "/fake/create_xml_item";
     /**
      * POST /fake/create_xml_item : creates an XmlItem
      * this route creates an XmlItem
@@ -74,7 +74,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
+    String PATH_FAKE_OUTER_BOOLEAN_SERIALIZE = "/fake/outer/boolean";
     /**
      * POST /fake/outer/boolean
      * Test serialization of outer boolean types
@@ -106,7 +106,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
+    String PATH_FAKE_OUTER_COMPOSITE_SERIALIZE = "/fake/outer/composite";
     /**
      * POST /fake/outer/composite
      * Test serialization of object with outer number type
@@ -147,7 +147,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
+    String PATH_FAKE_OUTER_NUMBER_SERIALIZE = "/fake/outer/number";
     /**
      * POST /fake/outer/number
      * Test serialization of outer number types
@@ -179,7 +179,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
+    String PATH_FAKE_OUTER_STRING_SERIALIZE = "/fake/outer/string";
     /**
      * POST /fake/outer/string
      * Test serialization of outer string types
@@ -211,7 +211,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
+    String PATH_RESPONSE_OBJECT_DIFFERENT_NAMES = "/fake/{petId}/response-object-different-names";
     /**
      * GET /fake/{petId}/response-object-different-names
      *
@@ -250,7 +250,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
+    String PATH_TEST_BODY_WITH_FILE_SCHEMA = "/fake/body-with-file-schema";
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named `File`.
@@ -280,7 +280,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
+    String PATH_TEST_BODY_WITH_QUERY_PARAMS = "/fake/body-with-query-params";
     /**
      * PUT /fake/body-with-query-params
      *
@@ -311,7 +311,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_CLIENT_MODEL = "/fake";
+    String PATH_TEST_CLIENT_MODEL = "/fake";
     /**
      * PATCH /fake : To test \"client\" model
      * To test \"client\" model
@@ -352,7 +352,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
+    String PATH_TEST_ENDPOINT_PARAMETERS = "/fake";
     /**
      * POST /fake : Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -413,7 +413,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_ENUM_PARAMETERS = "/fake";
+    String PATH_TEST_ENUM_PARAMETERS = "/fake";
     /**
      * GET /fake : To test enum parameters
      * To test enum parameters
@@ -459,7 +459,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_GROUP_PARAMETERS = "/fake";
+    String PATH_TEST_GROUP_PARAMETERS = "/fake";
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
@@ -498,7 +498,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
+    String PATH_TEST_INLINE_ADDITIONAL_PROPERTIES = "/fake/inline-additionalProperties";
     /**
      * POST /fake/inline-additionalProperties : test inline additionalProperties
      * 
@@ -528,7 +528,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
+    String PATH_TEST_JSON_FORM_DATA = "/fake/jsonFormData";
     /**
      * GET /fake/jsonFormData : test json serialization of form data
      * 
@@ -560,7 +560,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_NULLABLE = "/fake/nullable";
+    String PATH_TEST_NULLABLE = "/fake/nullable";
     /**
      * POST /fake/nullable : test nullable parent property
      * 
@@ -590,7 +590,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
+    String PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT = "/fake/test-query-parameters";
     /**
      * PUT /fake/test-query-parameters
      * To test the collection format in query parameters
@@ -625,7 +625,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
+    String PATH_TEST_WITH_RESULT_EXAMPLE = "/fake/response-with-example";
     /**
      * GET /fake/response-with-example
      * This endpoint defines an example value for its response schema.
@@ -664,7 +664,7 @@ public interface FakeApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
+    String PATH_UPLOAD_FILE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile";
     /**
      * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required)
      * 
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 7f4c0397d17..f6ff6349c03 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -31,7 +31,7 @@ public interface FakeClassnameTestApi {
         return Optional.empty();
     }
 
-    public static final String PATH_TEST_CLASSNAME = "/fake_classname_test";
+    String PATH_TEST_CLASSNAME = "/fake_classname_test";
     /**
      * PATCH /fake_classname_test : To test class name in snake case
      * To test class name in snake case
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
index ee03b0f9b58..3d2498b85ab 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
@@ -34,7 +34,7 @@ public interface PetApi {
         return Optional.empty();
     }
 
-    public static final String PATH_ADD_PET = "/pet";
+    String PATH_ADD_PET = "/pet";
     /**
      * POST /pet : Add a new pet to the store
      * 
@@ -72,7 +72,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_DELETE_PET = "/pet/{petId}";
+    String PATH_DELETE_PET = "/pet/{petId}";
     /**
      * DELETE /pet/{petId} : Deletes a pet
      * 
@@ -111,7 +111,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
+    String PATH_FIND_PETS_BY_STATUS = "/pet/findByStatus";
     /**
      * GET /pet/findByStatus : Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -165,7 +165,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
+    String PATH_FIND_PETS_BY_TAGS = "/pet/findByTags";
     /**
      * GET /pet/findByTags : Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -221,7 +221,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_GET_PET_BY_ID = "/pet/{petId}";
+    String PATH_GET_PET_BY_ID = "/pet/{petId}";
     /**
      * GET /pet/{petId} : Find pet by ID
      * Returns a single pet
@@ -273,7 +273,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET = "/pet";
+    String PATH_UPDATE_PET = "/pet";
     /**
      * PUT /pet : Update an existing pet
      * 
@@ -315,7 +315,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
+    String PATH_UPDATE_PET_WITH_FORM = "/pet/{petId}";
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
      * 
@@ -355,7 +355,7 @@ public interface PetApi {
     }
 
 
-    public static final String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
+    String PATH_UPLOAD_FILE = "/pet/{petId}/uploadImage";
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
      * 
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
index f06b313aa9c..37940d36f54 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
@@ -32,7 +32,7 @@ public interface StoreApi {
         return Optional.empty();
     }
 
-    public static final String PATH_DELETE_ORDER = "/store/order/{order_id}";
+    String PATH_DELETE_ORDER = "/store/order/{order_id}";
     /**
      * DELETE /store/order/{order_id} : Delete purchase order by ID
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -63,7 +63,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_INVENTORY = "/store/inventory";
+    String PATH_GET_INVENTORY = "/store/inventory";
     /**
      * GET /store/inventory : Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -97,7 +97,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
+    String PATH_GET_ORDER_BY_ID = "/store/order/{order_id}";
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
@@ -146,7 +146,7 @@ public interface StoreApi {
     }
 
 
-    public static final String PATH_PLACE_ORDER = "/store/order";
+    String PATH_PLACE_ORDER = "/store/order";
     /**
      * POST /store/order : Place an order for a pet
      * 
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
index a54efff980f..0a89d81589d 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
@@ -32,7 +32,7 @@ public interface UserApi {
         return Optional.empty();
     }
 
-    public static final String PATH_CREATE_USER = "/user";
+    String PATH_CREATE_USER = "/user";
     /**
      * POST /user : Create user
      * This can only be done by the logged in user.
@@ -62,7 +62,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
+    String PATH_CREATE_USERS_WITH_ARRAY_INPUT = "/user/createWithArray";
     /**
      * POST /user/createWithArray : Creates list of users with given input array
      * 
@@ -92,7 +92,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
+    String PATH_CREATE_USERS_WITH_LIST_INPUT = "/user/createWithList";
     /**
      * POST /user/createWithList : Creates list of users with given input array
      * 
@@ -122,7 +122,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_DELETE_USER = "/user/{username}";
+    String PATH_DELETE_USER = "/user/{username}";
     /**
      * DELETE /user/{username} : Delete user
      * This can only be done by the logged in user.
@@ -153,7 +153,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_GET_USER_BY_NAME = "/user/{username}";
+    String PATH_GET_USER_BY_NAME = "/user/{username}";
     /**
      * GET /user/{username} : Get user by user name
      * 
@@ -202,7 +202,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGIN_USER = "/user/login";
+    String PATH_LOGIN_USER = "/user/login";
     /**
      * GET /user/login : Logs user into the system
      * 
@@ -237,7 +237,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_LOGOUT_USER = "/user/logout";
+    String PATH_LOGOUT_USER = "/user/logout";
     /**
      * GET /user/logout : Logs out current logged in user session
      * 
@@ -265,7 +265,7 @@ public interface UserApi {
     }
 
 
-    public static final String PATH_UPDATE_USER = "/user/{username}";
+    String PATH_UPDATE_USER = "/user/{username}";
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.