diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache
index 668200778ea..8d236677b00 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache
@@ -99,7 +99,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
     }
 
     // store a list of schema names defined in anyOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public {{classname}}() {
         super("anyOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache
index ca2dc49a2e0..eb47106559d 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache
@@ -132,7 +132,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
     }
 
     // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public {{classname}}() {
         super("oneOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache
index 8cba2615105..456f8309c09 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache
@@ -99,7 +99,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
     }
 
     // store a list of schema names defined in anyOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public {{classname}}() {
         super("anyOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache
index f130362ea3d..f2345ab33be 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache
@@ -132,7 +132,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
     }
 
     // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public {{classname}}() {
         super("oneOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/apiServiceFactory.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/apiServiceFactory.mustache
index 0f321034999..5a4226224ff 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/apiServiceFactory.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/apiServiceFactory.mustache
@@ -5,7 +5,7 @@ import {{package}}.impl.{{classname}}ServiceImpl;
 
 {{>generatedAnnotation}}
 public class {{classname}}ServiceFactory {
-    private final static {{classname}}Service service = new {{classname}}ServiceImpl();
+    private static final {{classname}}Service service = new {{classname}}ServiceImpl();
 
     public static {{classname}}Service get{{classname}}() {
         return service;
diff --git a/modules/openapi-generator/src/main/resources/JavaVertXServer/MainApiVerticle.mustache b/modules/openapi-generator/src/main/resources/JavaVertXServer/MainApiVerticle.mustache
index 0a2a5a73c58..034d83b8f21 100644
--- a/modules/openapi-generator/src/main/resources/JavaVertXServer/MainApiVerticle.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaVertXServer/MainApiVerticle.mustache
@@ -19,7 +19,7 @@ import io.vertx.core.Vertx;
 import io.vertx.ext.web.Router;
 
 public class MainApiVerticle extends AbstractVerticle {
-    final static Logger LOGGER = LoggerFactory.getLogger(MainApiVerticle.class);
+    static final Logger LOGGER = LoggerFactory.getLogger(MainApiVerticle.class);
 
     private int serverPort = {{serverPort}};
     protected Router router;
diff --git a/modules/openapi-generator/src/main/resources/JavaVertXServer/apiVerticle.mustache b/modules/openapi-generator/src/main/resources/JavaVertXServer/apiVerticle.mustache
index 288e926541b..884426b8d5f 100644
--- a/modules/openapi-generator/src/main/resources/JavaVertXServer/apiVerticle.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaVertXServer/apiVerticle.mustache
@@ -15,9 +15,9 @@ import java.util.List;
 import java.util.Map;
 
 public class {{classname}}Verticle extends AbstractVerticle {
-    final static Logger LOGGER = LoggerFactory.getLogger({{classname}}Verticle.class); 
+    static final Logger LOGGER = LoggerFactory.getLogger({{classname}}Verticle.class);
     
-    {{#operations}}{{#operation}}{{#vendorExtensions}}final static String {{x-serviceid-varname}} = "{{x-serviceid}}";
+    {{#operations}}{{#operation}}{{#vendorExtensions}}static final String {{x-serviceid-varname}} = "{{x-serviceid}}";
     {{/vendorExtensions}}{{/operation}}{{/operations}}
     final {{classname}} service;
 
diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/apiServiceFactory.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/apiServiceFactory.mustache
index a638548227f..3c607a9cb0e 100644
--- a/modules/openapi-generator/src/main/resources/java-msf4j-server/apiServiceFactory.mustache
+++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/apiServiceFactory.mustache
@@ -4,7 +4,7 @@ import {{package}}.{{classname}}Service;
 import {{package}}.impl.{{classname}}ServiceImpl;
 
 public class {{classname}}ServiceFactory {
-    private final static {{classname}}Service service = new {{classname}}ServiceImpl();
+    private static final {{classname}}Service service = new {{classname}}ServiceImpl();
 
     public static {{classname}}Service get{{classname}}() {
         return service;
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Fruit.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Fruit.java
index 4e25e5534d7..d76364f20f8 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Fruit.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Fruit.java
@@ -164,7 +164,7 @@ public class Fruit extends AbstractOpenApiSchema {
     }
 
     // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public Fruit() {
         super("oneOf", Boolean.FALSE);
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java
index eb7dda9e472..bdd9ecf4df7 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java
@@ -166,7 +166,7 @@ public class FruitReq extends AbstractOpenApiSchema {
     }
 
     // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public FruitReq() {
         super("oneOf", Boolean.TRUE);
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GmFruit.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GmFruit.java
index c4f97a7e93b..3ea0e3cbc86 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GmFruit.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GmFruit.java
@@ -124,7 +124,7 @@ public class GmFruit extends AbstractOpenApiSchema {
     }
 
     // store a list of schema names defined in anyOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public GmFruit() {
         super("anyOf", Boolean.FALSE);
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Mammal.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Mammal.java
index 1bf5ddf9e75..d9e132a9e01 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Mammal.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Mammal.java
@@ -216,7 +216,7 @@ public class Mammal extends AbstractOpenApiSchema {
     }
 
     // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public Mammal() {
         super("oneOf", Boolean.FALSE);
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java
index 6a0d58edaa9..7c4e8781774 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java
@@ -187,7 +187,7 @@ public class NullableShape extends AbstractOpenApiSchema {
     }
 
     // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public NullableShape() {
         super("oneOf", Boolean.TRUE);
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pig.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pig.java
index 3a0baa419d2..6e409da3710 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pig.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pig.java
@@ -185,7 +185,7 @@ public class Pig extends AbstractOpenApiSchema {
     }
 
     // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public Pig() {
         super("oneOf", Boolean.FALSE);
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Quadrilateral.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Quadrilateral.java
index 85572723405..393e4ef9df4 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Quadrilateral.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Quadrilateral.java
@@ -185,7 +185,7 @@ public class Quadrilateral extends AbstractOpenApiSchema {
     }
 
     // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public Quadrilateral() {
         super("oneOf", Boolean.FALSE);
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java
index 32c60730b70..2d8044a437f 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java
@@ -185,7 +185,7 @@ public class Shape extends AbstractOpenApiSchema {
     }
 
     // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public Shape() {
         super("oneOf", Boolean.FALSE);
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java
index 3b5057aab25..845ad8c7fee 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java
@@ -187,7 +187,7 @@ public class ShapeOrNull extends AbstractOpenApiSchema {
     }
 
     // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public ShapeOrNull() {
         super("oneOf", Boolean.TRUE);
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Triangle.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Triangle.java
index 6c1de98e864..aa322747ce6 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Triangle.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Triangle.java
@@ -216,7 +216,7 @@ public class Triangle extends AbstractOpenApiSchema {
     }
 
     // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public Triangle() {
         super("oneOf", Boolean.FALSE);
diff --git a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Fruit.java b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Fruit.java
index c92bb6c18b0..25e84ad2db6 100644
--- a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Fruit.java
+++ b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Fruit.java
@@ -164,7 +164,7 @@ public class Fruit extends AbstractOpenApiSchema {
     }
 
     // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public Fruit() {
         super("oneOf", Boolean.FALSE);
diff --git a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/FruitReq.java b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/FruitReq.java
index 2bf1b8a5683..04f50c3e967 100644
--- a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/FruitReq.java
+++ b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/FruitReq.java
@@ -166,7 +166,7 @@ public class FruitReq extends AbstractOpenApiSchema {
     }
 
     // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public FruitReq() {
         super("oneOf", Boolean.TRUE);
diff --git a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/GmFruit.java b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/GmFruit.java
index 7bd6b7da781..a4f634f1f0f 100644
--- a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/GmFruit.java
+++ b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/GmFruit.java
@@ -124,7 +124,7 @@ public class GmFruit extends AbstractOpenApiSchema {
     }
 
     // store a list of schema names defined in anyOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public GmFruit() {
         super("anyOf", Boolean.FALSE);
diff --git a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Mammal.java b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Mammal.java
index cc2e77dd077..84bef3e0ee9 100644
--- a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Mammal.java
+++ b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Mammal.java
@@ -212,7 +212,7 @@ public class Mammal extends AbstractOpenApiSchema {
     }
 
     // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public Mammal() {
         super("oneOf", Boolean.FALSE);
diff --git a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java
index b27334df360..d97ae0c6590 100644
--- a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java
+++ b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java
@@ -183,7 +183,7 @@ public class NullableShape extends AbstractOpenApiSchema {
     }
 
     // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public NullableShape() {
         super("oneOf", Boolean.TRUE);
diff --git a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pig.java b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pig.java
index d115d6bc161..ef222218c0b 100644
--- a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pig.java
+++ b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pig.java
@@ -181,7 +181,7 @@ public class Pig extends AbstractOpenApiSchema {
     }
 
     // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public Pig() {
         super("oneOf", Boolean.FALSE);
diff --git a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Quadrilateral.java b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Quadrilateral.java
index 9cc1455e686..ef9a42ed3af 100644
--- a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Quadrilateral.java
+++ b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Quadrilateral.java
@@ -181,7 +181,7 @@ public class Quadrilateral extends AbstractOpenApiSchema {
     }
 
     // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public Quadrilateral() {
         super("oneOf", Boolean.FALSE);
diff --git a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Shape.java b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Shape.java
index 524d376ad75..7bc86b5c044 100644
--- a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Shape.java
+++ b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Shape.java
@@ -181,7 +181,7 @@ public class Shape extends AbstractOpenApiSchema {
     }
 
     // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public Shape() {
         super("oneOf", Boolean.FALSE);
diff --git a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeOrNull.java
index 9d269955c14..52e23108f27 100644
--- a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeOrNull.java
+++ b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeOrNull.java
@@ -183,7 +183,7 @@ public class ShapeOrNull extends AbstractOpenApiSchema {
     }
 
     // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public ShapeOrNull() {
         super("oneOf", Boolean.TRUE);
diff --git a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Triangle.java b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Triangle.java
index f09daf103d5..1a694545442 100644
--- a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Triangle.java
+++ b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Triangle.java
@@ -212,7 +212,7 @@ public class Triangle extends AbstractOpenApiSchema {
     }
 
     // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
 
     public Triangle() {
         super("oneOf", Boolean.FALSE);
diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
index 73f1985c1c0..b914d071c54 100644
--- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
+++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
@@ -4,7 +4,7 @@ import org.openapitools.api.AnotherFakeApiService;
 import org.openapitools.api.impl.AnotherFakeApiServiceImpl;
 
 public class AnotherFakeApiServiceFactory {
-    private final static AnotherFakeApiService service = new AnotherFakeApiServiceImpl();
+    private static final AnotherFakeApiService service = new AnotherFakeApiServiceImpl();
 
     public static AnotherFakeApiService getAnotherFakeApi() {
         return service;
diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
index e587a1f6baf..2c2b2a4d79e 100644
--- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
+++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
@@ -4,7 +4,7 @@ import org.openapitools.api.FakeApiService;
 import org.openapitools.api.impl.FakeApiServiceImpl;
 
 public class FakeApiServiceFactory {
-    private final static FakeApiService service = new FakeApiServiceImpl();
+    private static final FakeApiService service = new FakeApiServiceImpl();
 
     public static FakeApiService getFakeApi() {
         return service;
diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
index 640b3bcf5c5..3e92c9be5d4 100644
--- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
+++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
@@ -4,7 +4,7 @@ import org.openapitools.api.FakeClassnameTestApiService;
 import org.openapitools.api.impl.FakeClassnameTestApiServiceImpl;
 
 public class FakeClassnameTestApiServiceFactory {
-    private final static FakeClassnameTestApiService service = new FakeClassnameTestApiServiceImpl();
+    private static final FakeClassnameTestApiService service = new FakeClassnameTestApiServiceImpl();
 
     public static FakeClassnameTestApiService getFakeClassnameTestApi() {
         return service;
diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
index 88c216dad01..2ae4e070deb 100644
--- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
+++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
@@ -4,7 +4,7 @@ import org.openapitools.api.PetApiService;
 import org.openapitools.api.impl.PetApiServiceImpl;
 
 public class PetApiServiceFactory {
-    private final static PetApiService service = new PetApiServiceImpl();
+    private static final PetApiService service = new PetApiServiceImpl();
 
     public static PetApiService getPetApi() {
         return service;
diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
index 4e0fd1b3ec9..cbff2e3d571 100644
--- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
+++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
@@ -4,7 +4,7 @@ import org.openapitools.api.StoreApiService;
 import org.openapitools.api.impl.StoreApiServiceImpl;
 
 public class StoreApiServiceFactory {
-    private final static StoreApiService service = new StoreApiServiceImpl();
+    private static final StoreApiService service = new StoreApiServiceImpl();
 
     public static StoreApiService getStoreApi() {
         return service;
diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
index bb94d3a073e..eb520c1e3af 100644
--- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
+++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
@@ -4,7 +4,7 @@ import org.openapitools.api.UserApiService;
 import org.openapitools.api.impl.UserApiServiceImpl;
 
 public class UserApiServiceFactory {
-    private final static UserApiService service = new UserApiServiceImpl();
+    private static final UserApiService service = new UserApiServiceImpl();
 
     public static UserApiService getUserApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
index ae72e4771a3..7379318e8b1 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.AnotherFakeApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApiServiceFactory {
-    private final static AnotherFakeApiService service = new AnotherFakeApiServiceImpl();
+    private static final AnotherFakeApiService service = new AnotherFakeApiServiceImpl();
 
     public static AnotherFakeApiService getAnotherFakeApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
index 97bf41219fd..18b76487194 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.FakeApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApiServiceFactory {
-    private final static FakeApiService service = new FakeApiServiceImpl();
+    private static final FakeApiService service = new FakeApiServiceImpl();
 
     public static FakeApiService getFakeApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
index 4963e03dd25..b90c9304e0f 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.FakeClassnameTestApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTestApiServiceFactory {
-    private final static FakeClassnameTestApiService service = new FakeClassnameTestApiServiceImpl();
+    private static final FakeClassnameTestApiService service = new FakeClassnameTestApiServiceImpl();
 
     public static FakeClassnameTestApiService getFakeClassnameTestApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
index 932873718a3..633bdd35b01 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.PetApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApiServiceFactory {
-    private final static PetApiService service = new PetApiServiceImpl();
+    private static final PetApiService service = new PetApiServiceImpl();
 
     public static PetApiService getPetApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
index 8ffaff0ba97..f28a610abd2 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.StoreApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApiServiceFactory {
-    private final static StoreApiService service = new StoreApiServiceImpl();
+    private static final StoreApiService service = new StoreApiServiceImpl();
 
     public static StoreApiService getStoreApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
index eebfb22f280..7346601e834 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.UserApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApiServiceFactory {
-    private final static UserApiService service = new UserApiServiceImpl();
+    private static final UserApiService service = new UserApiServiceImpl();
 
     public static UserApiService getUserApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
index ae72e4771a3..7379318e8b1 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.AnotherFakeApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApiServiceFactory {
-    private final static AnotherFakeApiService service = new AnotherFakeApiServiceImpl();
+    private static final AnotherFakeApiService service = new AnotherFakeApiServiceImpl();
 
     public static AnotherFakeApiService getAnotherFakeApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
index 97bf41219fd..18b76487194 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.FakeApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApiServiceFactory {
-    private final static FakeApiService service = new FakeApiServiceImpl();
+    private static final FakeApiService service = new FakeApiServiceImpl();
 
     public static FakeApiService getFakeApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
index 4963e03dd25..b90c9304e0f 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.FakeClassnameTestApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTestApiServiceFactory {
-    private final static FakeClassnameTestApiService service = new FakeClassnameTestApiServiceImpl();
+    private static final FakeClassnameTestApiService service = new FakeClassnameTestApiServiceImpl();
 
     public static FakeClassnameTestApiService getFakeClassnameTestApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FooApiServiceFactory.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FooApiServiceFactory.java
index c3252a4a672..dc7836ab6e0 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FooApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FooApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.FooApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FooApiServiceFactory {
-    private final static FooApiService service = new FooApiServiceImpl();
+    private static final FooApiService service = new FooApiServiceImpl();
 
     public static FooApiService getFooApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
index 932873718a3..633bdd35b01 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.PetApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApiServiceFactory {
-    private final static PetApiService service = new PetApiServiceImpl();
+    private static final PetApiService service = new PetApiServiceImpl();
 
     public static PetApiService getPetApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
index 8ffaff0ba97..f28a610abd2 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.StoreApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApiServiceFactory {
-    private final static StoreApiService service = new StoreApiServiceImpl();
+    private static final StoreApiService service = new StoreApiServiceImpl();
 
     public static StoreApiService getStoreApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
index eebfb22f280..7346601e834 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.UserApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApiServiceFactory {
-    private final static UserApiService service = new UserApiServiceImpl();
+    private static final UserApiService service = new UserApiServiceImpl();
 
     public static UserApiService getUserApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
index ae72e4771a3..7379318e8b1 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.AnotherFakeApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApiServiceFactory {
-    private final static AnotherFakeApiService service = new AnotherFakeApiServiceImpl();
+    private static final AnotherFakeApiService service = new AnotherFakeApiServiceImpl();
 
     public static AnotherFakeApiService getAnotherFakeApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
index 97bf41219fd..18b76487194 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.FakeApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApiServiceFactory {
-    private final static FakeApiService service = new FakeApiServiceImpl();
+    private static final FakeApiService service = new FakeApiServiceImpl();
 
     public static FakeApiService getFakeApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/FakeClassnameTags123ApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/FakeClassnameTags123ApiServiceFactory.java
index ca6da8cb538..ea1be45df73 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/FakeClassnameTags123ApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/FakeClassnameTags123ApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.FakeClassnameTags123ApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTags123ApiServiceFactory {
-    private final static FakeClassnameTags123ApiService service = new FakeClassnameTags123ApiServiceImpl();
+    private static final FakeClassnameTags123ApiService service = new FakeClassnameTags123ApiServiceImpl();
 
     public static FakeClassnameTags123ApiService getFakeClassnameTags123Api() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
index 932873718a3..633bdd35b01 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.PetApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApiServiceFactory {
-    private final static PetApiService service = new PetApiServiceImpl();
+    private static final PetApiService service = new PetApiServiceImpl();
 
     public static PetApiService getPetApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
index 8ffaff0ba97..f28a610abd2 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.StoreApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApiServiceFactory {
-    private final static StoreApiService service = new StoreApiServiceImpl();
+    private static final StoreApiService service = new StoreApiServiceImpl();
 
     public static StoreApiService getStoreApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
index eebfb22f280..7346601e834 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.UserApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApiServiceFactory {
-    private final static UserApiService service = new UserApiServiceImpl();
+    private static final UserApiService service = new UserApiServiceImpl();
 
     public static UserApiService getUserApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
index ae72e4771a3..7379318e8b1 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.AnotherFakeApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApiServiceFactory {
-    private final static AnotherFakeApiService service = new AnotherFakeApiServiceImpl();
+    private static final AnotherFakeApiService service = new AnotherFakeApiServiceImpl();
 
     public static AnotherFakeApiService getAnotherFakeApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
index 97bf41219fd..18b76487194 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.FakeApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApiServiceFactory {
-    private final static FakeApiService service = new FakeApiServiceImpl();
+    private static final FakeApiService service = new FakeApiServiceImpl();
 
     public static FakeApiService getFakeApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
index 4963e03dd25..b90c9304e0f 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.FakeClassnameTestApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTestApiServiceFactory {
-    private final static FakeClassnameTestApiService service = new FakeClassnameTestApiServiceImpl();
+    private static final FakeClassnameTestApiService service = new FakeClassnameTestApiServiceImpl();
 
     public static FakeClassnameTestApiService getFakeClassnameTestApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
index 932873718a3..633bdd35b01 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.PetApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApiServiceFactory {
-    private final static PetApiService service = new PetApiServiceImpl();
+    private static final PetApiService service = new PetApiServiceImpl();
 
     public static PetApiService getPetApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
index 8ffaff0ba97..f28a610abd2 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.StoreApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApiServiceFactory {
-    private final static StoreApiService service = new StoreApiServiceImpl();
+    private static final StoreApiService service = new StoreApiServiceImpl();
 
     public static StoreApiService getStoreApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
index eebfb22f280..7346601e834 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.UserApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApiServiceFactory {
-    private final static UserApiService service = new UserApiServiceImpl();
+    private static final UserApiService service = new UserApiServiceImpl();
 
     public static UserApiService getUserApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
index ae72e4771a3..7379318e8b1 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.AnotherFakeApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApiServiceFactory {
-    private final static AnotherFakeApiService service = new AnotherFakeApiServiceImpl();
+    private static final AnotherFakeApiService service = new AnotherFakeApiServiceImpl();
 
     public static AnotherFakeApiService getAnotherFakeApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
index 97bf41219fd..18b76487194 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.FakeApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApiServiceFactory {
-    private final static FakeApiService service = new FakeApiServiceImpl();
+    private static final FakeApiService service = new FakeApiServiceImpl();
 
     public static FakeApiService getFakeApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/FakeClassnameTags123ApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/FakeClassnameTags123ApiServiceFactory.java
index ca6da8cb538..ea1be45df73 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/FakeClassnameTags123ApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/FakeClassnameTags123ApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.FakeClassnameTags123ApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTags123ApiServiceFactory {
-    private final static FakeClassnameTags123ApiService service = new FakeClassnameTags123ApiServiceImpl();
+    private static final FakeClassnameTags123ApiService service = new FakeClassnameTags123ApiServiceImpl();
 
     public static FakeClassnameTags123ApiService getFakeClassnameTags123Api() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
index 932873718a3..633bdd35b01 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.PetApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApiServiceFactory {
-    private final static PetApiService service = new PetApiServiceImpl();
+    private static final PetApiService service = new PetApiServiceImpl();
 
     public static PetApiService getPetApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
index 8ffaff0ba97..f28a610abd2 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.StoreApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApiServiceFactory {
-    private final static StoreApiService service = new StoreApiServiceImpl();
+    private static final StoreApiService service = new StoreApiServiceImpl();
 
     public static StoreApiService getStoreApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
index eebfb22f280..7346601e834 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.UserApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApiServiceFactory {
-    private final static UserApiService service = new UserApiServiceImpl();
+    private static final UserApiService service = new UserApiServiceImpl();
 
     public static UserApiService getUserApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
index ae72e4771a3..7379318e8b1 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.AnotherFakeApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApiServiceFactory {
-    private final static AnotherFakeApiService service = new AnotherFakeApiServiceImpl();
+    private static final AnotherFakeApiService service = new AnotherFakeApiServiceImpl();
 
     public static AnotherFakeApiService getAnotherFakeApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
index 97bf41219fd..18b76487194 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.FakeApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApiServiceFactory {
-    private final static FakeApiService service = new FakeApiServiceImpl();
+    private static final FakeApiService service = new FakeApiServiceImpl();
 
     public static FakeApiService getFakeApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
index 4963e03dd25..b90c9304e0f 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.FakeClassnameTestApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTestApiServiceFactory {
-    private final static FakeClassnameTestApiService service = new FakeClassnameTestApiServiceImpl();
+    private static final FakeClassnameTestApiService service = new FakeClassnameTestApiServiceImpl();
 
     public static FakeClassnameTestApiService getFakeClassnameTestApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
index 932873718a3..633bdd35b01 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.PetApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApiServiceFactory {
-    private final static PetApiService service = new PetApiServiceImpl();
+    private static final PetApiService service = new PetApiServiceImpl();
 
     public static PetApiService getPetApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
index 8ffaff0ba97..f28a610abd2 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.StoreApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApiServiceFactory {
-    private final static StoreApiService service = new StoreApiServiceImpl();
+    private static final StoreApiService service = new StoreApiServiceImpl();
 
     public static StoreApiService getStoreApi() {
         return service;
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
index eebfb22f280..7346601e834 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
@@ -5,7 +5,7 @@ import org.openapitools.api.impl.UserApiServiceImpl;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApiServiceFactory {
-    private final static UserApiService service = new UserApiServiceImpl();
+    private static final UserApiService service = new UserApiServiceImpl();
 
     public static UserApiService getUserApi() {
         return service;