From 078b04deace0eba8a08681785fbb41e521d30b3f Mon Sep 17 00:00:00 2001 From: Kiran-Sivakumar <43218409+Kiran-Sivakumar@users.noreply.github.com> Date: Sat, 3 Nov 2018 07:10:16 -0700 Subject: [PATCH] [Java][okhttp-gson] Add new ApiClient constructors for access token retry (#1319) * Add new ApiClient constructors for access token retry * Update samples * Update security samples --- .../libraries/okhttp-gson/ApiClient.mustache | 24 +++++++++++++------ .../okhttp-gson/.openapi-generator/VERSION | 2 +- .../org/openapitools/client/ApiClient.java | 24 +++++++++++++------ .../client/model/ModelReturn.java | 2 +- .../org/openapitools/client/ApiClient.java | 24 +++++++++++++------ .../org/openapitools/client/ApiClient.java | 24 +++++++++++++------ 6 files changed, 70 insertions(+), 30 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache index 9775e5b323df..f3639393cc2d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache @@ -80,7 +80,7 @@ public class ApiClient { private HttpLoggingInterceptor loggingInterceptor; /* - * Constructor for ApiClient + * Basic constructor for ApiClient */ public ApiClient() { init(); @@ -94,13 +94,23 @@ public class ApiClient { } {{#authMethods}}{{#isOAuth}} /* - * Constructor for ApiClient to support access token retry on 401/403 + * Constructor for ApiClient to support access token retry on 401/403 configured with client ID */ - public ApiClient( - String clientId, - String clientSecret, - Map parameters - ) { + public ApiClient(String clientId) { + this(clientId, null, null); + } + + /* + * Constructor for ApiClient to support access token retry on 401/403 configured with client ID and additional parameters + */ + public ApiClient(String clientId, Map parameters) { + this(clientId, null, parameters); + } + + /* + * Constructor for ApiClient to support access token retry on 401/403 configured with client ID, secret, and additional parameters + */ + public ApiClient(String clientId, String clientSecret, Map parameters) { init(); RetryingOAuth retryingOAuth = new RetryingOAuth("{{tokenUrl}}", clientId, OAuthFlow.{{flow}}, clientSecret, parameters); diff --git a/samples/client/petstore-security-test/java/okhttp-gson/.openapi-generator/VERSION b/samples/client/petstore-security-test/java/okhttp-gson/.openapi-generator/VERSION index f4cb97d56ce2..a65271290834 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/.openapi-generator/VERSION +++ b/samples/client/petstore-security-test/java/okhttp-gson/.openapi-generator/VERSION @@ -1 +1 @@ -3.3.1-SNAPSHOT \ No newline at end of file +3.3.2-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java index de2793cbeef9..79c970410761 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java @@ -79,7 +79,7 @@ public class ApiClient { private HttpLoggingInterceptor loggingInterceptor; /* - * Constructor for ApiClient + * Basic constructor for ApiClient */ public ApiClient() { init(); @@ -92,13 +92,23 @@ public ApiClient() { } /* - * Constructor for ApiClient to support access token retry on 401/403 + * Constructor for ApiClient to support access token retry on 401/403 configured with client ID */ - public ApiClient( - String clientId, - String clientSecret, - Map parameters - ) { + public ApiClient(String clientId) { + this(clientId, null, null); + } + + /* + * Constructor for ApiClient to support access token retry on 401/403 configured with client ID and additional parameters + */ + public ApiClient(String clientId, Map parameters) { + this(clientId, null, parameters); + } + + /* + * Constructor for ApiClient to support access token retry on 401/403 configured with client ID, secret, and additional parameters + */ + public ApiClient(String clientId, String clientSecret, Map parameters) { init(); RetryingOAuth retryingOAuth = new RetryingOAuth("", clientId, OAuthFlow.implicit, clientSecret, parameters); diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java index cb658432bb18..6d5ddd7c0b0e 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -32,7 +32,7 @@ public class ModelReturn { public static final String SERIALIZED_NAME_RETURN = "return"; @SerializedName(SERIALIZED_NAME_RETURN) - private Integer _return = null; + private Integer _return; public ModelReturn _return(Integer _return) { this._return = _return; diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiClient.java index f8ad6cf3902b..12630634b3fc 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiClient.java @@ -79,7 +79,7 @@ public class ApiClient { private HttpLoggingInterceptor loggingInterceptor; /* - * Constructor for ApiClient + * Basic constructor for ApiClient */ public ApiClient() { init(); @@ -94,13 +94,23 @@ public ApiClient() { } /* - * Constructor for ApiClient to support access token retry on 401/403 + * Constructor for ApiClient to support access token retry on 401/403 configured with client ID */ - public ApiClient( - String clientId, - String clientSecret, - Map parameters - ) { + public ApiClient(String clientId) { + this(clientId, null, null); + } + + /* + * Constructor for ApiClient to support access token retry on 401/403 configured with client ID and additional parameters + */ + public ApiClient(String clientId, Map parameters) { + this(clientId, null, parameters); + } + + /* + * Constructor for ApiClient to support access token retry on 401/403 configured with client ID, secret, and additional parameters + */ + public ApiClient(String clientId, String clientSecret, Map parameters) { init(); RetryingOAuth retryingOAuth = new RetryingOAuth("", clientId, OAuthFlow.implicit, clientSecret, parameters); diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java index f8ad6cf3902b..12630634b3fc 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java @@ -79,7 +79,7 @@ public class ApiClient { private HttpLoggingInterceptor loggingInterceptor; /* - * Constructor for ApiClient + * Basic constructor for ApiClient */ public ApiClient() { init(); @@ -94,13 +94,23 @@ public ApiClient() { } /* - * Constructor for ApiClient to support access token retry on 401/403 + * Constructor for ApiClient to support access token retry on 401/403 configured with client ID */ - public ApiClient( - String clientId, - String clientSecret, - Map parameters - ) { + public ApiClient(String clientId) { + this(clientId, null, null); + } + + /* + * Constructor for ApiClient to support access token retry on 401/403 configured with client ID and additional parameters + */ + public ApiClient(String clientId, Map parameters) { + this(clientId, null, parameters); + } + + /* + * Constructor for ApiClient to support access token retry on 401/403 configured with client ID, secret, and additional parameters + */ + public ApiClient(String clientId, String clientSecret, Map parameters) { init(); RetryingOAuth retryingOAuth = new RetryingOAuth("", clientId, OAuthFlow.implicit, clientSecret, parameters);