Skip to content

Commit

Permalink
[Java][okhttp-gson] Add new ApiClient constructors for access token r…
Browse files Browse the repository at this point in the history 
…etry (#1319)

* Add new ApiClient constructors for access token retry

* Update samples

* Update security samples
  • Loading branch information
@Kiran-Sivakumar @wing328
Kiran-Sivakumar authored and wing328 committed Nov 3, 2018
1 parent 7eb9cda commit 078b04d
Show file tree
Hide file tree
Showing 6 changed files with 70 additions and 30 deletions.
24 changes: 17 additions & 7 deletions modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public class ApiClient {
private HttpLoggingInterceptor loggingInterceptor;
/*
* Constructor for ApiClient
* Basic constructor for ApiClient
*/
public ApiClient() {
init();
Expand All @@ -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<String, String> 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<String, String> 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<String, String> parameters) {
init();
RetryingOAuth retryingOAuth = new RetryingOAuth("{{tokenUrl}}", clientId, OAuthFlow.{{flow}}, clientSecret, parameters);
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore-security-test/java/okhttp-gson/.openapi-generator/VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.1-SNAPSHOT
3.3.2-SNAPSHOT
24 changes: 17 additions & 7 deletions ...store-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public class ApiClient {
private HttpLoggingInterceptor loggingInterceptor;

/*
* Constructor for ApiClient
* Basic constructor for ApiClient
*/
public ApiClient() {
init();
Expand All @@ -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<String, String> 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<String, String> 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<String, String> parameters) {
init();

RetryingOAuth retryingOAuth = new RetryingOAuth("", clientId, OAuthFlow.implicit, clientSecret, parameters);
Expand Down
2 changes: 1 addition & 1 deletion ...curity-test/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
24 changes: 17 additions & 7 deletions ...ore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public class ApiClient {
private HttpLoggingInterceptor loggingInterceptor;

/*
* Constructor for ApiClient
* Basic constructor for ApiClient
*/
public ApiClient() {
init();
Expand All @@ -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<String, String> 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<String, String> 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<String, String> parameters) {
init();

RetryingOAuth retryingOAuth = new RetryingOAuth("", clientId, OAuthFlow.implicit, clientSecret, parameters);
Expand Down
24 changes: 17 additions & 7 deletions ...les/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public class ApiClient {
private HttpLoggingInterceptor loggingInterceptor;

/*
* Constructor for ApiClient
* Basic constructor for ApiClient
*/
public ApiClient() {
init();
Expand All @@ -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<String, String> 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<String, String> 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<String, String> parameters) {
init();

RetryingOAuth retryingOAuth = new RetryingOAuth("", clientId, OAuthFlow.implicit, clientSecret, parameters);
Expand Down

0 comments on commit 078b04d

Please sign in to comment.