From 24718a3bc11850ddb1bca33b8333ee7d701aaa5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Rene=CC=81=20J=C3=B8rgensen?= <paulrene@comoyo.com> Date: Thu, 19 Jul 2018 07:54:28 +0200 Subject: [PATCH 1/2] [Java] Fix ignored resteasy default HTTP headers --- .../resources/Java/libraries/resteasy/ApiClient.mustache | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/ApiClient.mustache index f447d645807..cd60dfaae7a 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/ApiClient.mustache @@ -636,11 +636,11 @@ public class ApiClient { } } - for (Entry<String, String> defaultHeaderEnrty: defaultHeaderMap.entrySet()) { - if (!headerParams.containsKey(defaultHeaderEnrty.getKey())) { - String value = defaultHeaderEnrty.getKey(); + for (Entry<String, String> entry: defaultHeaderMap.entrySet()) { + if (!headerParams.containsKey(entry.getKey())) { + String value = entry.getValue(); if (value != null) { - invocationBuilder = invocationBuilder.header(defaultHeaderEnrty.getKey(), value); + invocationBuilder = invocationBuilder.header(entry.getKey(), value); } } } -- GitLab From c1180cd850e57ca12bc1d49831ea61dd964d167e Mon Sep 17 00:00:00 2001 From: Jeremie Bresson <dev@jmini.fr> Date: Thu, 19 Jul 2018 07:59:44 +0200 Subject: [PATCH 2/2] Update samples --- .../src/main/java/org/openapitools/client/ApiClient.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/ApiClient.java index 5e80ded364f..5294a2a8879 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/ApiClient.java @@ -631,11 +631,11 @@ public class ApiClient { } } - for (Entry<String, String> defaultHeaderEnrty: defaultHeaderMap.entrySet()) { - if (!headerParams.containsKey(defaultHeaderEnrty.getKey())) { - String value = defaultHeaderEnrty.getKey(); + for (Entry<String, String> entry: defaultHeaderMap.entrySet()) { + if (!headerParams.containsKey(entry.getKey())) { + String value = entry.getValue(); if (value != null) { - invocationBuilder = invocationBuilder.header(defaultHeaderEnrty.getKey(), value); + invocationBuilder = invocationBuilder.header(entry.getKey(), value); } } } -- GitLab