From b5ccd7b1e6cc75604d0d7a404975ea002f16701c Mon Sep 17 00:00:00 2001 From: Christine Jacob Date: Thu, 16 Nov 2017 14:18:24 +0100 Subject: [PATCH 1/4] - fix duplicate problem --- .../resources/Java/libraries/resttemplate/ApiClient.mustache | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache index 567fc6d25db..f1117b9601f 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache @@ -268,6 +268,8 @@ public class ApiClient { * @return ApiClient this client */ public ApiClient addDefaultHeader(String name, String value) { + if(defaultHeaders.containsKey(name)) + defaultHeaders.remove(name); defaultHeaders.add(name, value); return this; } From de3ec5c34fecfa70d2823cf474482be639ae13be Mon Sep 17 00:00:00 2001 From: Christine Jacob Date: Mon, 20 Nov 2017 08:36:50 +0100 Subject: [PATCH 2/4] style guide adjustment --- .../resources/Java/libraries/resttemplate/ApiClient.mustache | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache index f1117b9601f..16b8943b460 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache @@ -268,8 +268,9 @@ public class ApiClient { * @return ApiClient this client */ public ApiClient addDefaultHeader(String name, String value) { - if(defaultHeaders.containsKey(name)) + if (defaultHeaders.containsKey(name)) { defaultHeaders.remove(name); + } defaultHeaders.add(name, value); return this; } From d103e1f4e57407f8a74c1b13874314eabbad64cc Mon Sep 17 00:00:00 2001 From: Christine Jacob Date: Mon, 20 Nov 2017 08:52:13 +0100 Subject: [PATCH 3/4] replace tab with 4-space --- .../resources/Java/libraries/resttemplate/ApiClient.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache index 16b8943b460..e93dbf21c99 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache @@ -270,7 +270,7 @@ public class ApiClient { public ApiClient addDefaultHeader(String name, String value) { if (defaultHeaders.containsKey(name)) { defaultHeaders.remove(name); - } + } defaultHeaders.add(name, value); return this; } From 5123973c01b7dc699353336c32fa4ffcbf47055b Mon Sep 17 00:00:00 2001 From: Christine Jacob Date: Mon, 20 Nov 2017 08:56:33 +0100 Subject: [PATCH 4/4] replace tab with 4 -space --- .../resources/Java/libraries/resttemplate/ApiClient.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache index e93dbf21c99..54f2b14573b 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache @@ -270,7 +270,7 @@ public class ApiClient { public ApiClient addDefaultHeader(String name, String value) { if (defaultHeaders.containsKey(name)) { defaultHeaders.remove(name); - } + } defaultHeaders.add(name, value); return this; }