[JAVA] Address [rawtypes] and [this-escape] warnings in generated API clients (#20466)

welandaz · web-flow · commit fa3e38a4b716 · 2025-01-18T15:00:16.000+08:00
* Address [rawtypes] and [this-escape] warnings in generated API clients

* Commit updated sample files
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache
@@ -622,7 +622,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * @param value The value of the parameter.
    * @return A list of {@code Pair} objects.
    */
-  public List<Pair> parameterToPairs(String collectionFormat, String name, Collection value) {
+  public List<Pair> parameterToPairs(String collectionFormat, String name, Collection<?> value) {
     List<Pair> params = new ArrayList<Pair>();
 
     // preconditions
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/ApiClient.mustache
@@ -183,7 +183,7 @@ public class ApiClient {
     asyncResponseInterceptor = null;
   }
 
-  protected ObjectMapper createDefaultObjectMapper() {
+  public static ObjectMapper createDefaultObjectMapper() {
     ObjectMapper mapper = new ObjectMapper();
     mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
     mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
@@ -199,11 +199,11 @@ public class ApiClient {
     return mapper;
   }
 
-  protected String getDefaultBaseUri() {
+  private String getDefaultBaseUri() {
     return "{{{basePath}}}";
   }
 
-  protected HttpClient.Builder createDefaultHttpClientBuilder() {
+  public static HttpClient.Builder createDefaultHttpClientBuilder() {
     return HttpClient.newBuilder();
   }
 
diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java
@@ -540,7 +540,7 @@ public List<Pair> parameterToPair(String name, Object value) {
    * @param value The value of the parameter.
    * @return A list of {@code Pair} objects.
    */
-  public List<Pair> parameterToPairs(String collectionFormat, String name, Collection value) {
+  public List<Pair> parameterToPairs(String collectionFormat, String name, Collection<?> value) {
     List<Pair> params = new ArrayList<Pair>();
 
     // preconditions
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/ApiClient.java
@@ -192,7 +192,7 @@ public ApiClient(HttpClient.Builder builder, ObjectMapper mapper, String baseUri
     asyncResponseInterceptor = null;
   }
 
-  protected ObjectMapper createDefaultObjectMapper() {
+  public static ObjectMapper createDefaultObjectMapper() {
     ObjectMapper mapper = new ObjectMapper();
     mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
     mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
@@ -206,11 +206,11 @@ protected ObjectMapper createDefaultObjectMapper() {
     return mapper;
   }
 
-  protected String getDefaultBaseUri() {
+  private String getDefaultBaseUri() {
     return "http://localhost:3000";
   }
 
-  protected HttpClient.Builder createDefaultHttpClientBuilder() {
+  public static HttpClient.Builder createDefaultHttpClientBuilder() {
     return HttpClient.newBuilder();
   }
 
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java
@@ -633,7 +633,7 @@ public List<Pair> parameterToPair(String name, Object value) {
    * @param value The value of the parameter.
    * @return A list of {@code Pair} objects.
    */
-  public List<Pair> parameterToPairs(String collectionFormat, String name, Collection value) {
+  public List<Pair> parameterToPairs(String collectionFormat, String name, Collection<?> value) {
     List<Pair> params = new ArrayList<Pair>();
 
     // preconditions
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiClient.java
@@ -192,7 +192,7 @@ public ApiClient(HttpClient.Builder builder, ObjectMapper mapper, String baseUri
     asyncResponseInterceptor = null;
   }
 
-  protected ObjectMapper createDefaultObjectMapper() {
+  public static ObjectMapper createDefaultObjectMapper() {
     ObjectMapper mapper = new ObjectMapper();
     mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
     mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
@@ -206,11 +206,11 @@ protected ObjectMapper createDefaultObjectMapper() {
     return mapper;
   }
 
-  protected String getDefaultBaseUri() {
+  private String getDefaultBaseUri() {
     return "http://petstore.swagger.io:80/v2";
   }
 
-  protected HttpClient.Builder createDefaultHttpClientBuilder() {
+  public static HttpClient.Builder createDefaultHttpClientBuilder() {
     return HttpClient.newBuilder();
   }
 
diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/ApiClient.java
@@ -192,7 +192,7 @@ public ApiClient(HttpClient.Builder builder, ObjectMapper mapper, String baseUri
     asyncResponseInterceptor = null;
   }
 
-  protected ObjectMapper createDefaultObjectMapper() {
+  public static ObjectMapper createDefaultObjectMapper() {
     ObjectMapper mapper = new ObjectMapper();
     mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
     mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
@@ -206,11 +206,11 @@ protected ObjectMapper createDefaultObjectMapper() {
     return mapper;
   }
 
-  protected String getDefaultBaseUri() {
+  private String getDefaultBaseUri() {
     return "http://petstore.swagger.io/v2";
   }
 
-  protected HttpClient.Builder createDefaultHttpClientBuilder() {
+  public static HttpClient.Builder createDefaultHttpClientBuilder() {
     return HttpClient.newBuilder();
   }
 
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java
@@ -192,7 +192,7 @@ public ApiClient(HttpClient.Builder builder, ObjectMapper mapper, String baseUri
     asyncResponseInterceptor = null;
   }
 
-  protected ObjectMapper createDefaultObjectMapper() {
+  public static ObjectMapper createDefaultObjectMapper() {
     ObjectMapper mapper = new ObjectMapper();
     mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
     mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
@@ -206,11 +206,11 @@ protected ObjectMapper createDefaultObjectMapper() {
     return mapper;
   }
 
-  protected String getDefaultBaseUri() {
+  private String getDefaultBaseUri() {
     return "http://petstore.swagger.io:80/v2";
   }
 
-  protected HttpClient.Builder createDefaultHttpClientBuilder() {
+  public static HttpClient.Builder createDefaultHttpClientBuilder() {
     return HttpClient.newBuilder();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ public class ApiClient {`
`183`	`183`	`asyncResponseInterceptor = null;`
`184`	`184`	`}`
`185`	`185`
`186`		`- protected ObjectMapper createDefaultObjectMapper() {`
	`186`	`+ public static ObjectMapper createDefaultObjectMapper() {`
`187`	`187`	`ObjectMapper mapper = new ObjectMapper();`
`188`	`188`	`mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);`
`189`	`189`	`mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);`
`@@ -199,11 +199,11 @@ public class ApiClient {`
`199`	`199`	`return mapper;`
`200`	`200`	`}`
`201`	`201`
`202`		`- protected String getDefaultBaseUri() {`
	`202`	`+ private String getDefaultBaseUri() {`
`203`	`203`	`return "{{{basePath}}}";`
`204`	`204`	`}`
`205`	`205`
`206`		`- protected HttpClient.Builder createDefaultHttpClientBuilder() {`
	`206`	`+ public static HttpClient.Builder createDefaultHttpClientBuilder() {`
`207`	`207`	`return HttpClient.newBuilder();`
`208`	`208`	`}`
`209`	`209`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ public ApiClient(HttpClient.Builder builder, ObjectMapper mapper, String baseUri`
`192`	`192`	`asyncResponseInterceptor = null;`
`193`	`193`	`}`
`194`	`194`
`195`		`- protected ObjectMapper createDefaultObjectMapper() {`
	`195`	`+ public static ObjectMapper createDefaultObjectMapper() {`
`196`	`196`	`ObjectMapper mapper = new ObjectMapper();`
`197`	`197`	`mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);`
`198`	`198`	`mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);`
`@@ -206,11 +206,11 @@ protected ObjectMapper createDefaultObjectMapper() {`
`206`	`206`	`return mapper;`
`207`	`207`	`}`
`208`	`208`
`209`		`- protected String getDefaultBaseUri() {`
	`209`	`+ private String getDefaultBaseUri() {`
`210`	`210`	`return "http://localhost:3000";`
`211`	`211`	`}`
`212`	`212`
`213`		`- protected HttpClient.Builder createDefaultHttpClientBuilder() {`
	`213`	`+ public static HttpClient.Builder createDefaultHttpClientBuilder() {`
`214`	`214`	`return HttpClient.newBuilder();`
`215`	`215`	`}`
`216`	`216`