Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Jan 18, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26ff514
Address [rawtypes] and [this-escape] warnings in generated API clients
welandaz Jan 14, 2025
9e0b76f
Commit updated sample files
welandaz Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions modules/openapi-generator/src/main/resources/Java/libraries/native/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -199,11 +199,11 @@ public class ApiClient {
return mapper;
}

protected String getDefaultBaseUri() {
private String getDefaultBaseUri() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

generally i'm ok with the PR but if later users have a use case that need protected method here for example, we will need to provide a way to fallback.

return "{{{basePath}}}";
}

protected HttpClient.Builder createDefaultHttpClientBuilder() {
public static HttpClient.Builder createDefaultHttpClientBuilder() {
return HttpClient.newBuilder();
}

Expand Down
2 changes: 1 addition & 1 deletion ...ient/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions samples/client/echo_api/java/native/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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();
}

Expand Down
2 changes: 1 addition & 1 deletion ...ient/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...es/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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();
}

Expand Down
6 changes: 3 additions & 3 deletions .../client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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();
}

Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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();
}

Expand Down
Loading