diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/ApiClient.mustache index b121f4e3cf6..6d43061d347 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/ApiClient.mustache @@ -57,11 +57,15 @@ public class ApiClient { {{#hasAuthMethods}} RequestInterceptor auth; {{#authMethods}}if ("{{name}}".equals(authName)) { - {{#isBasic}}{{#isBasicBasic}} + {{#isBasic}} + {{#isBasicBasic}} auth = new HttpBasicAuth(); - {{/isBasicBasic}}{{^isBasicBasic}} + {{/isBasicBasic}} + {{^isBasicBasic}} auth = new HttpBearerAuth("{{scheme}}"); - {{/isBasicBasic}}{{/isBasic}}{{#isApiKey}} + {{/isBasicBasic}} + {{/isBasic}} + {{#isApiKey}} auth = new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}"); {{/isApiKey}} {{#isOAuth}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache index e3efc5851e8..5ef1fc2bf9b 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache @@ -289,14 +289,14 @@ ${java.version} 1.8.3 1.5.21 - 3.13.1 + 3.14.0 2.8.5 3.8.1 {{#joda}} 2.9.9 {{/joda}} {{#threetenbp}} - 1.3.5 + 1.3.8 {{/threetenbp}} 1.0.0 4.12 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/ApiClient.mustache index 356ffb95a11..45327813288 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/ApiClient.mustache @@ -58,13 +58,17 @@ public class ApiClient { {{#hasAuthMethods}} Interceptor auth; {{#authMethods}}if ("{{name}}".equals(authName)) { - {{#isBasic}}{{#isBasicBasic}} - auth = new HttpBasicAuth(); - {{/isBasicBasic}}{{^isBasicBasic}} - auth = new HttpBearerAuth("{{scheme}}"); - {{/isBasicBasic}}{{/isBasic}} + {{#isBasic}} + {{#isBasicBasic}} + auth = new HttpBasicAuth(); + {{/isBasicBasic}} + {{^isBasicBasic}} + auth = new HttpBearerAuth("{{scheme}}"); + {{/isBasicBasic}} + {{/isBasic}} {{#isApiKey}} - auth = new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}");{{/isApiKey}} + auth = new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}"); + {{/isApiKey}} {{#isOAuth}} auth = new OAuth(OAuthFlow.{{flow}}, "{{authorizationUrl}}", "{{tokenUrl}}", "{{#scopes}}{{scope}}{{#hasMore}}, {{/hasMore}}{{/scopes}}"); {{/isOAuth}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache index 26ae8a95780..5c208861690 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache @@ -351,7 +351,7 @@ {{#supportJava6}}1.6{{/supportJava6}}{{^supportJava6}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/supportJava6}} ${java.version} ${java.version} - 1.8.0 + 1.8.3 1.5.21 {{#usePlayWS}} 2.8.11.3 @@ -379,7 +379,7 @@ 2.9.9 {{/joda}} {{#threetenbp}} - 1.3.5 + 1.3.8 {{/threetenbp}} 1.0.1 4.12 diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java index d5d7407dbe9..95f82ac14c7 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java @@ -44,16 +44,13 @@ public class ApiClient { for(String authName : authNames) { RequestInterceptor auth; if ("api_key".equals(authName)) { - auth = new ApiKeyAuth("header", "api_key"); } else if ("api_key_query".equals(authName)) { - auth = new ApiKeyAuth("query", "api_key_query"); } else if ("http_basic_test".equals(authName)) { - auth = new HttpBasicAuth(); - } else if ("petstore_auth".equals(authName)) { - auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets"); + } else if ("petstore_auth".equals(authName)) { + auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets"); } else { throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names"); } diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/ApiClient.java index d5d7407dbe9..95f82ac14c7 100644 --- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/ApiClient.java @@ -44,16 +44,13 @@ public class ApiClient { for(String authName : authNames) { RequestInterceptor auth; if ("api_key".equals(authName)) { - auth = new ApiKeyAuth("header", "api_key"); } else if ("api_key_query".equals(authName)) { - auth = new ApiKeyAuth("query", "api_key_query"); } else if ("http_basic_test".equals(authName)) { - auth = new HttpBasicAuth(); - } else if ("petstore_auth".equals(authName)) { - auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets"); + } else if ("petstore_auth".equals(authName)) { + auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets"); } else { throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names"); } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml index 0f21955558d..34f8ef7bf48 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml @@ -247,10 +247,10 @@ ${java.version} 1.8.3 1.5.21 - 3.13.1 + 3.14.0 2.8.5 3.8.1 - 1.3.5 + 1.3.8 1.0.0 4.12 UTF-8 diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml index f74731aed13..f07572a9204 100644 --- a/samples/client/petstore/java/okhttp-gson/pom.xml +++ b/samples/client/petstore/java/okhttp-gson/pom.xml @@ -240,10 +240,10 @@ ${java.version} 1.8.3 1.5.21 - 3.13.1 + 3.14.0 2.8.5 3.8.1 - 1.3.5 + 1.3.8 1.0.0 4.12 UTF-8 diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/ApiClient.java index 759bd9ae75f..d9f86ceab75 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/ApiClient.java @@ -55,19 +55,12 @@ public class ApiClient { for(String authName : authNames) { Interceptor auth; if ("api_key".equals(authName)) { - auth = new ApiKeyAuth("header", "api_key"); } else if ("api_key_query".equals(authName)) { - auth = new ApiKeyAuth("query", "api_key_query"); } else if ("http_basic_test".equals(authName)) { - - auth = new HttpBasicAuth(); - - + auth = new HttpBasicAuth(); } else if ("petstore_auth".equals(authName)) { - - auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets"); } else { throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names"); diff --git a/samples/client/petstore/java/retrofit2-play24/pom.xml b/samples/client/petstore/java/retrofit2-play24/pom.xml index 4fda2bb68f1..8ed00f4b63b 100644 --- a/samples/client/petstore/java/retrofit2-play24/pom.xml +++ b/samples/client/petstore/java/retrofit2-play24/pom.xml @@ -266,7 +266,7 @@ 1.8 ${java.version} ${java.version} - 1.8.0 + 1.8.3 1.5.21 2.8.11.3 2.6.6 diff --git a/samples/client/petstore/java/retrofit2-play25/pom.xml b/samples/client/petstore/java/retrofit2-play25/pom.xml index 86c11782bd5..e00541e2700 100644 --- a/samples/client/petstore/java/retrofit2-play25/pom.xml +++ b/samples/client/petstore/java/retrofit2-play25/pom.xml @@ -271,13 +271,13 @@ 1.8 ${java.version} ${java.version} - 1.8.0 + 1.8.3 1.5.21 2.8.11.3 2.7.8 2.5.15 2.5.0 - 1.3.5 + 1.3.8 1.0.1 4.12 diff --git a/samples/client/petstore/java/retrofit2-play26/pom.xml b/samples/client/petstore/java/retrofit2-play26/pom.xml index 2405985e924..2ca39726b18 100644 --- a/samples/client/petstore/java/retrofit2-play26/pom.xml +++ b/samples/client/petstore/java/retrofit2-play26/pom.xml @@ -276,13 +276,13 @@ 1.8 ${java.version} ${java.version} - 1.8.0 + 1.8.3 1.5.21 2.8.11.3 2.8.11 2.6.7 2.5.0 - 1.3.5 + 1.3.8 1.0.1 4.12 diff --git a/samples/client/petstore/java/retrofit2/pom.xml b/samples/client/petstore/java/retrofit2/pom.xml index 08cfbb4c5c9..a1a1ae29f00 100644 --- a/samples/client/petstore/java/retrofit2/pom.xml +++ b/samples/client/petstore/java/retrofit2/pom.xml @@ -240,10 +240,10 @@ 1.7 ${java.version} ${java.version} - 1.8.0 + 1.8.3 1.5.21 2.5.0 - 1.3.5 + 1.3.8 1.0.1 4.12 diff --git a/samples/client/petstore/java/retrofit2rx/pom.xml b/samples/client/petstore/java/retrofit2rx/pom.xml index 04990355aee..ca57d73d8e9 100644 --- a/samples/client/petstore/java/retrofit2rx/pom.xml +++ b/samples/client/petstore/java/retrofit2rx/pom.xml @@ -250,11 +250,11 @@ 1.7 ${java.version} ${java.version} - 1.8.0 + 1.8.3 1.5.21 2.5.0 1.3.0 - 1.3.5 + 1.3.8 1.0.1 4.12 diff --git a/samples/client/petstore/java/retrofit2rx2/pom.xml b/samples/client/petstore/java/retrofit2rx2/pom.xml index efbd091a66b..90ddc5d127c 100644 --- a/samples/client/petstore/java/retrofit2rx2/pom.xml +++ b/samples/client/petstore/java/retrofit2rx2/pom.xml @@ -250,11 +250,11 @@ 1.7 ${java.version} ${java.version} - 1.8.0 + 1.8.3 1.5.21 2.5.0 2.1.1 - 1.3.5 + 1.3.8 1.0.1 4.12