Skip to content

Commit b627e1c

Browse files
ksn-partisiaksn-partisia
authored
[Bug] [Java] Fix raw type compilation warning in ApiClient for jersey2 and jersey3 (#19966)
* Add type annotation to raw type Iterable in jersey templates * Regenerate samples
1 parent 4a21dea commit b627e1c

File tree

13 files changed

+26
-26
lines changed
  • modules/openapi-generator/src/main/resources/Java/libraries
  • samples
    • client
      • others/java
        • jersey2-oneOf-Mixed/src/main/java/org/openapitools/client
        • jersey2-oneOf-duplicates/src/main/java/org/openapitools/client
      • petstore/java
    • openapi3/client
      • extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client
      • petstore/java
        • jersey2-java8-special-characters/src/main/java/org/openapitools/client
        • jersey2-java8-swagger1/src/main/java/org/openapitools/client
        • jersey2-java8-swagger2/src/main/java/org/openapitools/client
        • jersey2-java8/src/main/java/org/openapitools/client

13 files changed

+26
-26
lines changed

‎modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -988,8 +988,8 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
988988
if (contentType.startsWith("multipart/form-data")) {
989989
MultiPart multiPart = new MultiPart();
990990
for (Entry<String, Object> param: formParams.entrySet()) {
991-
if (param.getValue() instanceof Iterable) {
992-
((Iterable)param.getValue()).forEach(v -> addParamToMultipart(v, param.getKey(), multiPart));
991+
if (param.getValue() instanceof Iterable<?>) {
992+
((Iterable<?>)param.getValue()).forEach(v -> addParamToMultipart(v, param.getKey(), multiPart));
993993
} else {
994994
addParamToMultipart(param.getValue(), param.getKey(), multiPart);
995995
}

‎modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -988,8 +988,8 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
988988
if (contentType.startsWith("multipart/form-data")) {
989989
MultiPart multiPart = new MultiPart();
990990
for (Entry<String, Object> param: formParams.entrySet()) {
991-
if (param.getValue() instanceof Iterable) {
992-
((Iterable)param.getValue()).forEach(v -> addParamToMultipart(v, param.getKey(), multiPart));
991+
if (param.getValue() instanceof Iterable<?>) {
992+
((Iterable<?>)param.getValue()).forEach(v -> addParamToMultipart(v, param.getKey(), multiPart));
993993
} else {
994994
addParamToMultipart(param.getValue(), param.getKey(), multiPart);
995995
}

‎samples/client/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -767,8 +767,8 @@ public Entity<?> serialize(Object obj, Map<String, Object> formParams, String co
767767
if (contentType.startsWith("multipart/form-data")) {
768768
MultiPart multiPart = new MultiPart();
769769
for (Entry<String, Object> param: formParams.entrySet()) {
770-
if (param.getValue() instanceof Iterable) {
771-
((Iterable)param.getValue()).forEach(v -> addParamToMultipart(v, param.getKey(), multiPart));
770+
if (param.getValue() instanceof Iterable<?>) {
771+
((Iterable<?>)param.getValue()).forEach(v -> addParamToMultipart(v, param.getKey(), multiPart));
772772
} else {
773773
addParamToMultipart(param.getValue(), param.getKey(), multiPart);
774774
}

‎samples/client/others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -767,8 +767,8 @@ public Entity<?> serialize(Object obj, Map<String, Object> formParams, String co
767767
if (contentType.startsWith("multipart/form-data")) {
768768
MultiPart multiPart = new MultiPart();
769769
for (Entry<String, Object> param: formParams.entrySet()) {
770-
if (param.getValue() instanceof Iterable) {
771-
((Iterable)param.getValue()).forEach(v -> addParamToMultipart(v, param.getKey(), multiPart));
770+
if (param.getValue() instanceof Iterable<?>) {
771+
((Iterable<?>)param.getValue()).forEach(v -> addParamToMultipart(v, param.getKey(), multiPart));
772772
} else {
773773
addParamToMultipart(param.getValue(), param.getKey(), multiPart);
774774
}

‎samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -908,8 +908,8 @@ public Entity<?> serialize(Object obj, Map<String, Object> formParams, String co
908908
if (contentType.startsWith("multipart/form-data")) {
909909
MultiPart multiPart = new MultiPart();
910910
for (Entry<String, Object> param: formParams.entrySet()) {
911-
if (param.getValue() instanceof Iterable) {
912-
((Iterable)param.getValue()).forEach(v -> addParamToMultipart(v, param.getKey(), multiPart));
911+
if (param.getValue() instanceof Iterable<?>) {
912+
((Iterable<?>)param.getValue()).forEach(v -> addParamToMultipart(v, param.getKey(), multiPart));
913913
} else {
914914
addParamToMultipart(param.getValue(), param.getKey(), multiPart);
915915
}

‎samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -908,8 +908,8 @@ public Entity<?> serialize(Object obj, Map<String, Object> formParams, String co
908908
if (contentType.startsWith("multipart/form-data")) {
909909
MultiPart multiPart = new MultiPart();
910910
for (Entry<String, Object> param: formParams.entrySet()) {
911-
if (param.getValue() instanceof Iterable) {
912-
((Iterable)param.getValue()).forEach(v -> addParamToMultipart(v, param.getKey(), multiPart));
911+
if (param.getValue() instanceof Iterable<?>) {
912+
((Iterable<?>)param.getValue()).forEach(v -> addParamToMultipart(v, param.getKey(), multiPart));
913913
} else {
914914
addParamToMultipart(param.getValue(), param.getKey(), multiPart);
915915
}

‎samples/client/petstore/java/jersey3-oneOf/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -767,8 +767,8 @@ public Entity<?> serialize(Object obj, Map<String, Object> formParams, String co
767767
if (contentType.startsWith("multipart/form-data")) {
768768
MultiPart multiPart = new MultiPart();
769769
for (Entry<String, Object> param: formParams.entrySet()) {
770-
if (param.getValue() instanceof Iterable) {
771-
((Iterable)param.getValue()).forEach(v -> addParamToMultipart(v, param.getKey(), multiPart));
770+
if (param.getValue() instanceof Iterable<?>) {
771+
((Iterable<?>)param.getValue()).forEach(v -> addParamToMultipart(v, param.getKey(), multiPart));
772772
} else {
773773
addParamToMultipart(param.getValue(), param.getKey(), multiPart);
774774
}

‎samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -990,8 +990,8 @@ public Entity<?> serialize(Object obj, Map<String, Object> formParams, String co
990990
if (contentType.startsWith("multipart/form-data")) {
991991
MultiPart multiPart = new MultiPart();
992992
for (Entry<String, Object> param: formParams.entrySet()) {
993-
if (param.getValue() instanceof Iterable) {
994-
((Iterable)param.getValue()).forEach(v -> addParamToMultipart(v, param.getKey(), multiPart));
993+
if (param.getValue() instanceof Iterable<?>) {
994+
((Iterable<?>)param.getValue()).forEach(v -> addParamToMultipart(v, param.getKey(), multiPart));
995995
} else {
996996
addParamToMultipart(param.getValue(), param.getKey(), multiPart);
997997
}

‎samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -816,8 +816,8 @@ public Entity<?> serialize(Object obj, Map<String, Object> formParams, String co
816816
if (contentType.startsWith("multipart/form-data")) {
817817
MultiPart multiPart = new MultiPart();
818818
for (Entry<String, Object> param: formParams.entrySet()) {
819-
if (param.getValue() instanceof Iterable) {
820-
((Iterable)param.getValue()).forEach(v -> addParamToMultipart(v, param.getKey(), multiPart));
819+
if (param.getValue() instanceof Iterable<?>) {
820+
((Iterable<?>)param.getValue()).forEach(v -> addParamToMultipart(v, param.getKey(), multiPart));
821821
} else {
822822
addParamToMultipart(param.getValue(), param.getKey(), multiPart);
823823
}

‎samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -767,8 +767,8 @@ public Entity<?> serialize(Object obj, Map<String, Object> formParams, String co
767767
if (contentType.startsWith("multipart/form-data")) {
768768
MultiPart multiPart = new MultiPart();
769769
for (Entry<String, Object> param: formParams.entrySet()) {
770-
if (param.getValue() instanceof Iterable) {
771-
((Iterable)param.getValue()).forEach(v -> addParamToMultipart(v, param.getKey(), multiPart));
770+
if (param.getValue() instanceof Iterable<?>) {
771+
((Iterable<?>)param.getValue()).forEach(v -> addParamToMultipart(v, param.getKey(), multiPart));
772772
} else {
773773
addParamToMultipart(param.getValue(), param.getKey(), multiPart);
774774
}

0 commit comments

Comments
 (0)