[okhttp-gson] Make initializer block for GSON builder static #16860 (#16892)

blutorange · awa-xima · web-flow · commit 8ca914d64fb1 · 2024-02-28T12:04:44.000+08:00
* [okhttp-gson] Make initializer block for GSON builder static #16860 Make initializer block for GSON builder static, see #16860 * update sapmles --------- Co-authored-by: Andre Wachsmuth <awa@xima.de>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache
@@ -116,7 +116,7 @@ public class JSON {
         return clazz;
     }
 
-    {
+    static {
         GsonBuilder gsonBuilder = createGson();
         gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter);
         gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter);
diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java
@@ -93,7 +93,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri
         return clazz;
     }
 
-    {
+    static {
         GsonBuilder gsonBuilder = createGson();
         gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter);
         gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter);
diff --git a/samples/client/others/java/okhttp-gson-oneOf/src/main/java/org/openapitools/client/JSON.java b/samples/client/others/java/okhttp-gson-oneOf/src/main/java/org/openapitools/client/JSON.java
@@ -93,7 +93,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri
         return clazz;
     }
 
-    {
+    static {
         GsonBuilder gsonBuilder = createGson();
         gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter);
         gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter);
diff --git a/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/JSON.java b/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/JSON.java
@@ -93,7 +93,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri
         return clazz;
     }
 
-    {
+    static {
         GsonBuilder gsonBuilder = createGson();
         gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter);
         gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter);
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/JSON.java
@@ -122,7 +122,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri
         return clazz;
     }
 
-    {
+    static {
         GsonBuilder gsonBuilder = createGson();
         gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter);
         gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter);
diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/JSON.java
@@ -93,7 +93,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri
         return clazz;
     }
 
-    {
+    static {
         GsonBuilder gsonBuilder = createGson();
         gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter);
         gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter);
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/JSON.java
@@ -133,7 +133,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri
         return clazz;
     }
 
-    {
+    static {
         GsonBuilder gsonBuilder = createGson();
         gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter);
         gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter);
diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/JSON.java
@@ -93,7 +93,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri
         return clazz;
     }
 
-    {
+    static {
         GsonBuilder gsonBuilder = createGson();
         gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter);
         gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter);
diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/JSON.java
@@ -93,7 +93,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri
         return clazz;
     }
 
-    {
+    static {
         GsonBuilder gsonBuilder = createGson();
         gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter);
         gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter);
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/JSON.java
@@ -133,7 +133,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri
         return clazz;
     }
 
-    {
+    static {
         GsonBuilder gsonBuilder = createGson();
         gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter);
         gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter);
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/JSON.java
@@ -93,7 +93,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri
         return clazz;
     }
 
-    {
+    static {
         GsonBuilder gsonBuilder = createGson();
         gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter);
         gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter);
diff --git a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/JSON.java
@@ -93,7 +93,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri
         return clazz;
     }
 
-    {
+    static {
         GsonBuilder gsonBuilder = createGson();
         gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter);
         gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter);
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java
@@ -229,7 +229,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri
         return clazz;
     }
 
-    {
+    static {
         GsonBuilder gsonBuilder = createGson();
         gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter);
         gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter);

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public class JSON {`
`116`	`116`	`return clazz;`
`117`	`117`	`}`
`118`	`118`
`119`		`- {`
	`119`	`+ static {`
`120`	`120`	`GsonBuilder gsonBuilder = createGson();`
`121`	`121`	`gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter);`
`122`	`122`	`gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter);`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri`
`93`	`93`	`return clazz;`
`94`	`94`	`}`
`95`	`95`
`96`		`- {`
	`96`	`+ static {`
`97`	`97`	`GsonBuilder gsonBuilder = createGson();`
`98`	`98`	`gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter);`
`99`	`99`	`gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter);`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri`
`122`	`122`	`return clazz;`
`123`	`123`	`}`
`124`	`124`
`125`		`- {`
	`125`	`+ static {`
`126`	`126`	`GsonBuilder gsonBuilder = createGson();`
`127`	`127`	`gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter);`
`128`	`128`	`gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter);`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri`
`133`	`133`	`return clazz;`
`134`	`134`	`}`
`135`	`135`
`136`		`- {`
	`136`	`+ static {`
`137`	`137`	`GsonBuilder gsonBuilder = createGson();`
`138`	`138`	`gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter);`
`139`	`139`	`gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter);`