Skip to content

Commit 325c394

Browse files
wing328wing328
committed
Merge branch 'fixJersey2QueryParams' of https://github.com/DIaLOGIKa-GmbH/openapi-generator into DIaLOGIKa-GmbH-fixJersey2QueryParams
2 parents a66dd20 + 39c24d0 commit 325c394

File tree

13 files changed

+218
-218
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

+218
-218
lines changed

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,6 +1233,27 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
12331233
// to support (constant) query string in `path`, e.g. "/posts?draft=1"
12341234
WebTarget target = httpClient.target(targetURL);
12351235

1236+
// put all headers in one place
1237+
Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
1238+
allHeaderParams.putAll(headerParams);
1239+
1240+
if (authNames != null) {
1241+
// update different parameters (e.g. headers) for authentication
1242+
updateParamsForAuth(
1243+
authNames,
1244+
queryParams,
1245+
allHeaderParams,
1246+
cookieParams,
1247+
{{#hasHttpSignatureMethods}}
1248+
serializeToString(body, formParams, contentType, isBodyNullable),
1249+
{{/hasHttpSignatureMethods}}
1250+
{{^hasHttpSignatureMethods}}
1251+
null,
1252+
{{/hasHttpSignatureMethods}}
1253+
method,
1254+
target.getUri());
1255+
}
1256+
12361257
if (queryParams != null) {
12371258
for (Pair queryParam : queryParams) {
12381259
if (queryParam.getValue() != null) {
@@ -1263,27 +1284,6 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
12631284

12641285
Entity<?> entity = serialize(body, formParams, contentType, isBodyNullable);
12651286

1266-
// put all headers in one place
1267-
Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
1268-
allHeaderParams.putAll(headerParams);
1269-
1270-
if (authNames != null) {
1271-
// update different parameters (e.g. headers) for authentication
1272-
updateParamsForAuth(
1273-
authNames,
1274-
queryParams,
1275-
allHeaderParams,
1276-
cookieParams,
1277-
{{#hasHttpSignatureMethods}}
1278-
serializeToString(body, formParams, contentType, isBodyNullable),
1279-
{{/hasHttpSignatureMethods}}
1280-
{{^hasHttpSignatureMethods}}
1281-
null,
1282-
{{/hasHttpSignatureMethods}}
1283-
method,
1284-
target.getUri());
1285-
}
1286-
12871287
for (Entry<String, String> entry : allHeaderParams.entrySet()) {
12881288
String value = entry.getValue();
12891289
if (value != null) {

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,6 +1233,27 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
12331233
// to support (constant) query string in `path`, e.g. "/posts?draft=1"
12341234
WebTarget target = httpClient.target(targetURL);
12351235

1236+
// put all headers in one place
1237+
Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
1238+
allHeaderParams.putAll(headerParams);
1239+
1240+
if (authNames != null) {
1241+
// update different parameters (e.g. headers) for authentication
1242+
updateParamsForAuth(
1243+
authNames,
1244+
queryParams,
1245+
allHeaderParams,
1246+
cookieParams,
1247+
{{#hasHttpSignatureMethods}}
1248+
serializeToString(body, formParams, contentType, isBodyNullable),
1249+
{{/hasHttpSignatureMethods}}
1250+
{{^hasHttpSignatureMethods}}
1251+
null,
1252+
{{/hasHttpSignatureMethods}}
1253+
method,
1254+
target.getUri());
1255+
}
1256+
12361257
if (queryParams != null) {
12371258
for (Pair queryParam : queryParams) {
12381259
if (queryParam.getValue() != null) {
@@ -1263,27 +1284,6 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
12631284

12641285
Entity<?> entity = serialize(body, formParams, contentType, isBodyNullable);
12651286

1266-
// put all headers in one place
1267-
Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
1268-
allHeaderParams.putAll(headerParams);
1269-
1270-
if (authNames != null) {
1271-
// update different parameters (e.g. headers) for authentication
1272-
updateParamsForAuth(
1273-
authNames,
1274-
queryParams,
1275-
allHeaderParams,
1276-
cookieParams,
1277-
{{#hasHttpSignatureMethods}}
1278-
serializeToString(body, formParams, contentType, isBodyNullable),
1279-
{{/hasHttpSignatureMethods}}
1280-
{{^hasHttpSignatureMethods}}
1281-
null,
1282-
{{/hasHttpSignatureMethods}}
1283-
method,
1284-
target.getUri());
1285-
}
1286-
12871287
for (Entry<String, String> entry : allHeaderParams.entrySet()) {
12881288
String value = entry.getValue();
12891289
if (value != null) {

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,6 +1012,22 @@ public <T> ApiResponse<T> invokeAPI(
10121012
// to support (constant) query string in `path`, e.g. "/posts?draft=1"
10131013
WebTarget target = httpClient.target(targetURL);
10141014

1015+
// put all headers in one place
1016+
Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
1017+
allHeaderParams.putAll(headerParams);
1018+
1019+
if (authNames != null) {
1020+
// update different parameters (e.g. headers) for authentication
1021+
updateParamsForAuth(
1022+
authNames,
1023+
queryParams,
1024+
allHeaderParams,
1025+
cookieParams,
1026+
null,
1027+
method,
1028+
target.getUri());
1029+
}
1030+
10151031
if (queryParams != null) {
10161032
for (Pair queryParam : queryParams) {
10171033
if (queryParam.getValue() != null) {
@@ -1042,22 +1058,6 @@ public <T> ApiResponse<T> invokeAPI(
10421058

10431059
Entity<?> entity = serialize(body, formParams, contentType, isBodyNullable);
10441060

1045-
// put all headers in one place
1046-
Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
1047-
allHeaderParams.putAll(headerParams);
1048-
1049-
if (authNames != null) {
1050-
// update different parameters (e.g. headers) for authentication
1051-
updateParamsForAuth(
1052-
authNames,
1053-
queryParams,
1054-
allHeaderParams,
1055-
cookieParams,
1056-
null,
1057-
method,
1058-
target.getUri());
1059-
}
1060-
10611061
for (Entry<String, String> entry : allHeaderParams.entrySet()) {
10621062
String value = entry.getValue();
10631063
if (value != null) {

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,6 +1012,22 @@ public <T> ApiResponse<T> invokeAPI(
10121012
// to support (constant) query string in `path`, e.g. "/posts?draft=1"
10131013
WebTarget target = httpClient.target(targetURL);
10141014

1015+
// put all headers in one place
1016+
Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
1017+
allHeaderParams.putAll(headerParams);
1018+
1019+
if (authNames != null) {
1020+
// update different parameters (e.g. headers) for authentication
1021+
updateParamsForAuth(
1022+
authNames,
1023+
queryParams,
1024+
allHeaderParams,
1025+
cookieParams,
1026+
null,
1027+
method,
1028+
target.getUri());
1029+
}
1030+
10151031
if (queryParams != null) {
10161032
for (Pair queryParam : queryParams) {
10171033
if (queryParam.getValue() != null) {
@@ -1042,22 +1058,6 @@ public <T> ApiResponse<T> invokeAPI(
10421058

10431059
Entity<?> entity = serialize(body, formParams, contentType, isBodyNullable);
10441060

1045-
// put all headers in one place
1046-
Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
1047-
allHeaderParams.putAll(headerParams);
1048-
1049-
if (authNames != null) {
1050-
// update different parameters (e.g. headers) for authentication
1051-
updateParamsForAuth(
1052-
authNames,
1053-
queryParams,
1054-
allHeaderParams,
1055-
cookieParams,
1056-
null,
1057-
method,
1058-
target.getUri());
1059-
}
1060-
10611061
for (Entry<String, String> entry : allHeaderParams.entrySet()) {
10621062
String value = entry.getValue();
10631063
if (value != null) {

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,6 +1153,22 @@ public <T> ApiResponse<T> invokeAPI(
11531153
// to support (constant) query string in `path`, e.g. "/posts?draft=1"
11541154
WebTarget target = httpClient.target(targetURL);
11551155

1156+
// put all headers in one place
1157+
Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
1158+
allHeaderParams.putAll(headerParams);
1159+
1160+
if (authNames != null) {
1161+
// update different parameters (e.g. headers) for authentication
1162+
updateParamsForAuth(
1163+
authNames,
1164+
queryParams,
1165+
allHeaderParams,
1166+
cookieParams,
1167+
null,
1168+
method,
1169+
target.getUri());
1170+
}
1171+
11561172
if (queryParams != null) {
11571173
for (Pair queryParam : queryParams) {
11581174
if (queryParam.getValue() != null) {
@@ -1183,22 +1199,6 @@ public <T> ApiResponse<T> invokeAPI(
11831199

11841200
Entity<?> entity = serialize(body, formParams, contentType, isBodyNullable);
11851201

1186-
// put all headers in one place
1187-
Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
1188-
allHeaderParams.putAll(headerParams);
1189-
1190-
if (authNames != null) {
1191-
// update different parameters (e.g. headers) for authentication
1192-
updateParamsForAuth(
1193-
authNames,
1194-
queryParams,
1195-
allHeaderParams,
1196-
cookieParams,
1197-
null,
1198-
method,
1199-
target.getUri());
1200-
}
1201-
12021202
for (Entry<String, String> entry : allHeaderParams.entrySet()) {
12031203
String value = entry.getValue();
12041204
if (value != null) {

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,6 +1153,22 @@ public <T> ApiResponse<T> invokeAPI(
11531153
// to support (constant) query string in `path`, e.g. "/posts?draft=1"
11541154
WebTarget target = httpClient.target(targetURL);
11551155

1156+
// put all headers in one place
1157+
Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
1158+
allHeaderParams.putAll(headerParams);
1159+
1160+
if (authNames != null) {
1161+
// update different parameters (e.g. headers) for authentication
1162+
updateParamsForAuth(
1163+
authNames,
1164+
queryParams,
1165+
allHeaderParams,
1166+
cookieParams,
1167+
null,
1168+
method,
1169+
target.getUri());
1170+
}
1171+
11561172
if (queryParams != null) {
11571173
for (Pair queryParam : queryParams) {
11581174
if (queryParam.getValue() != null) {
@@ -1183,22 +1199,6 @@ public <T> ApiResponse<T> invokeAPI(
11831199

11841200
Entity<?> entity = serialize(body, formParams, contentType, isBodyNullable);
11851201

1186-
// put all headers in one place
1187-
Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
1188-
allHeaderParams.putAll(headerParams);
1189-
1190-
if (authNames != null) {
1191-
// update different parameters (e.g. headers) for authentication
1192-
updateParamsForAuth(
1193-
authNames,
1194-
queryParams,
1195-
allHeaderParams,
1196-
cookieParams,
1197-
null,
1198-
method,
1199-
target.getUri());
1200-
}
1201-
12021202
for (Entry<String, String> entry : allHeaderParams.entrySet()) {
12031203
String value = entry.getValue();
12041204
if (value != null) {

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,6 +1012,22 @@ public <T> ApiResponse<T> invokeAPI(
10121012
// to support (constant) query string in `path`, e.g. "/posts?draft=1"
10131013
WebTarget target = httpClient.target(targetURL);
10141014

1015+
// put all headers in one place
1016+
Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
1017+
allHeaderParams.putAll(headerParams);
1018+
1019+
if (authNames != null) {
1020+
// update different parameters (e.g. headers) for authentication
1021+
updateParamsForAuth(
1022+
authNames,
1023+
queryParams,
1024+
allHeaderParams,
1025+
cookieParams,
1026+
null,
1027+
method,
1028+
target.getUri());
1029+
}
1030+
10151031
if (queryParams != null) {
10161032
for (Pair queryParam : queryParams) {
10171033
if (queryParam.getValue() != null) {
@@ -1042,22 +1058,6 @@ public <T> ApiResponse<T> invokeAPI(
10421058

10431059
Entity<?> entity = serialize(body, formParams, contentType, isBodyNullable);
10441060

1045-
// put all headers in one place
1046-
Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
1047-
allHeaderParams.putAll(headerParams);
1048-
1049-
if (authNames != null) {
1050-
// update different parameters (e.g. headers) for authentication
1051-
updateParamsForAuth(
1052-
authNames,
1053-
queryParams,
1054-
allHeaderParams,
1055-
cookieParams,
1056-
null,
1057-
method,
1058-
target.getUri());
1059-
}
1060-
10611061
for (Entry<String, String> entry : allHeaderParams.entrySet()) {
10621062
String value = entry.getValue();
10631063
if (value != null) {

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,6 +1235,22 @@ public <T> ApiResponse<T> invokeAPI(
12351235
// to support (constant) query string in `path`, e.g. "/posts?draft=1"
12361236
WebTarget target = httpClient.target(targetURL);
12371237

1238+
// put all headers in one place
1239+
Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
1240+
allHeaderParams.putAll(headerParams);
1241+
1242+
if (authNames != null) {
1243+
// update different parameters (e.g. headers) for authentication
1244+
updateParamsForAuth(
1245+
authNames,
1246+
queryParams,
1247+
allHeaderParams,
1248+
cookieParams,
1249+
serializeToString(body, formParams, contentType, isBodyNullable),
1250+
method,
1251+
target.getUri());
1252+
}
1253+
12381254
if (queryParams != null) {
12391255
for (Pair queryParam : queryParams) {
12401256
if (queryParam.getValue() != null) {
@@ -1265,22 +1281,6 @@ public <T> ApiResponse<T> invokeAPI(
12651281

12661282
Entity<?> entity = serialize(body, formParams, contentType, isBodyNullable);
12671283

1268-
// put all headers in one place
1269-
Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
1270-
allHeaderParams.putAll(headerParams);
1271-
1272-
if (authNames != null) {
1273-
// update different parameters (e.g. headers) for authentication
1274-
updateParamsForAuth(
1275-
authNames,
1276-
queryParams,
1277-
allHeaderParams,
1278-
cookieParams,
1279-
serializeToString(body, formParams, contentType, isBodyNullable),
1280-
method,
1281-
target.getUri());
1282-
}
1283-
12841284
for (Entry<String, String> entry : allHeaderParams.entrySet()) {
12851285
String value = entry.getValue();
12861286
if (value != null) {

0 commit comments

Comments
 (0)