Skip to content

Commit ad79556

Browse files
kullfarkullfar
committed
simplify async examples to reflect use of new OAuthService unified methods
1 parent 9ee53d2 commit ad79556

8 files changed

Lines changed: 65 additions & 27 deletions

File tree

‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/FacebookAsyncNingExample.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
7373

7474
// Trade the Request Token and Verfier for the Access Token
7575
System.out.println("Trading the Request Token for an Access Token...");
76-
final OAuth2AccessToken accessToken = service.getAccessTokenAsync(code, null).get();
76+
final OAuth2AccessToken accessToken = service.getAccessTokenAsync(code).get();
7777
System.out.println("Got the Access Token!");
7878
System.out.println("(if your curious it looks like this: " + accessToken
7979
+ ", 'rawResponse'='" + accessToken.getRawResponse() + "')");
@@ -83,7 +83,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
8383
System.out.println("Now we're going to access a protected resource...");
8484
final OAuthRequest request = new OAuthRequest(Verb.GET, PROTECTED_RESOURCE_URL);
8585
service.signRequest(accessToken, request);
86-
final Response response = service.execute(request, null).get();
86+
final Response response = service.execute(request);
8787
System.out.println("Got it! Lets see what we found...");
8888
System.out.println();
8989
System.out.println(response.getCode());

‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/GitHubAsyncOkHttpExample.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public static void main(String... args) throws IOException, ExecutionException,
6565

6666
// Trade the Request Token and Verfier for the Access Token
6767
System.out.println("Trading the Request Token for an Access Token...");
68-
final OAuth2AccessToken accessToken = service.getAccessTokenAsync(code, null).get();
68+
final OAuth2AccessToken accessToken = service.getAccessToken(code);
6969
System.out.println("Got the Access Token!");
7070
System.out.println("(if your curious it looks like this: " + accessToken
7171
+ ", 'rawResponse'='" + accessToken.getRawResponse() + "')");
@@ -75,7 +75,7 @@ public static void main(String... args) throws IOException, ExecutionException,
7575
System.out.println("Now we're going to access a protected resource...");
7676
final OAuthRequest request = new OAuthRequest(Verb.GET, PROTECTED_RESOURCE_URL);
7777
service.signRequest(accessToken, request);
78-
final Response response = service.execute(request, null).get();
78+
final Response response = service.execute(request);
7979
System.out.println("Got it! Lets see what we found...");
8080
System.out.println();
8181
System.out.println(response.getCode());

‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Google20AsyncAHCExample.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
8282

8383
// Trade the Request Token and Verfier for the Access Token
8484
System.out.println("Trading the Request Token for an Access Token...");
85-
OAuth2AccessToken accessToken = service.getAccessTokenAsync(code, null).get();
85+
OAuth2AccessToken accessToken = service.getAccessToken(code);
8686
System.out.println("Got the Access Token!");
8787
System.out.println("(if your curious it looks like this: " + accessToken
8888
+ ", 'rawResponse'='" + accessToken.getRawResponse() + "')");
8989

9090
System.out.println("Refreshing the Access Token...");
91-
accessToken = service.refreshAccessTokenAsync(accessToken.getRefreshToken(), null).get();
91+
accessToken = service.refreshAccessToken(accessToken.getRefreshToken());
9292
System.out.println("Refreshed the Access Token!");
9393
System.out.println("(if your curious it looks like this: " + accessToken
9494
+ ", 'rawResponse'='" + accessToken.getRawResponse() + "')");
@@ -113,7 +113,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
113113

114114
final OAuthRequest request = new OAuthRequest(Verb.GET, requestUrl);
115115
service.signRequest(accessToken, request);
116-
final Response response = service.execute(request, null).get();
116+
final Response response = service.execute(request);
117117
System.out.println();
118118
System.out.println(response.getCode());
119119
System.out.println(response.getBody());

‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/MailruAsyncExample.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
5959

6060
// Trade the Request Token and Verfier for the Access Token
6161
System.out.println("Trading the Request Token for an Access Token...");
62-
final OAuth2AccessToken accessToken = service.getAccessTokenAsync(code, null).get();
62+
final OAuth2AccessToken accessToken = service.getAccessToken(code);
6363
System.out.println("Got the Access Token!");
6464
System.out.println("(if your curious it looks like this: " + accessToken
6565
+ ", 'rawResponse'='" + accessToken.getRawResponse() + "')");
@@ -68,7 +68,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
6868
System.out.println("Now we're going to access a protected resource...");
6969
final OAuthRequest request = new OAuthRequest(Verb.GET, PROTECTED_RESOURCE_URL);
7070
service.signRequest(accessToken, request);
71-
final Response response = service.execute(request, null).get();
71+
final Response response = service.execute(request);
7272

7373
System.out.println("Got it! Lets see what we found...");
7474
System.out.println();

‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/SalesforceNingAsyncExample.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
6767
final String codeEncoded = URLDecoder.decode(code, "UTF-8");
6868
// Trade the Request Token and Verifier for the Access Token
6969
System.out.println("Trading the Request Token for an Access Token...");
70-
final SalesforceToken accessToken = (SalesforceToken) service.getAccessTokenAsync(codeEncoded, null).get();
70+
final SalesforceToken accessToken = (SalesforceToken) service.getAccessToken(codeEncoded);
7171
System.out.println("Got the Access Token!");
7272
System.out.println("(if your curious it looks like this: " + accessToken
7373
+ ", 'rawResponse'='" + accessToken.getRawResponse() + "')");
@@ -83,7 +83,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
8383
System.out.println();
8484
System.out.println("Full URL: " + url);
8585
final OAuthRequest request = new OAuthRequest(Verb.GET, url);
86-
final Response response = service.execute(request, null).get();
86+
final Response response = service.execute(request);
8787
System.out.println();
8888
System.out.println(response.getCode());
8989
System.out.println(response.getBody());

‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/VkontakteExternalHttpExample.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static void main(String... args) throws IOException, InterruptedException
6464

6565
// Trade the Request Token and Verfier for the Access Token
6666
System.out.println("Trading the Request Token for an Access Token...");
67-
final OAuth2AccessToken accessToken = service.getAccessTokenAsync(code, null).get();
67+
final OAuth2AccessToken accessToken = service.getAccessToken(code);
6868
System.out.println("Got the Access Token!");
6969
System.out.println("(if your curious it looks like this: " + accessToken
7070
+ ", 'rawResponse'='" + accessToken.getRawResponse() + "')");
@@ -74,7 +74,7 @@ public static void main(String... args) throws IOException, InterruptedException
7474
System.out.println("Now we're going to access a protected resource...");
7575
final OAuthRequest request = new OAuthRequest(Verb.GET, PROTECTED_RESOURCE_URL);
7676
service.signRequest(accessToken, request);
77-
final Response response = service.execute(request, null).get();
77+
final Response response = service.execute(request);
7878
System.out.println("Got it! Lets see what we found...");
7979
System.out.println();
8080
System.out.println(response.getCode());

‎scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth20Service.java‎

Lines changed: 44 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,35 @@ public OAuth2AccessToken convert(Response response) throws IOException {
5454
});
5555
}
5656

57+
public final Future<OAuth2AccessToken> getAccessTokenAsync(String code) {
58+
return getAccessToken(code, null);
59+
}
60+
61+
/**
62+
* Start the request to retrieve the access token. The optionally provided callback will be called with the Token
63+
* when it is available.
64+
*
65+
* @param code code
66+
* @param callback optional callback
67+
* @return Future
68+
* @deprecated user {@link #getAccessToken(java.lang.String,
69+
* com.github.scribejava.core.model.OAuthAsyncRequestCallback) }
70+
*/
71+
@Deprecated
72+
public final Future<OAuth2AccessToken> getAccessTokenAsync(String code,
73+
OAuthAsyncRequestCallback<OAuth2AccessToken> callback) {
74+
final OAuthRequest request = createAccessTokenRequest(code);
75+
76+
return sendAccessTokenRequestAsync(request, callback);
77+
}
78+
5779
public final OAuth2AccessToken getAccessToken(String code)
5880
throws IOException, InterruptedException, ExecutionException {
5981
final OAuthRequest request = createAccessTokenRequest(code);
6082

6183
return sendAccessTokenRequestSync(request);
6284
}
6385

64-
public final Future<OAuth2AccessToken> getAccessTokenAsync(String code) {
65-
return getAccessTokenAsync(code, null);
66-
}
67-
6886
/**
6987
* Start the request to retrieve the access token. The optionally provided callback will be called with the Token
7088
* when it is available.
@@ -73,7 +91,7 @@ public final Future<OAuth2AccessToken> getAccessTokenAsync(String code) {
7391
* @param callback optional callback
7492
* @return Future
7593
*/
76-
public final Future<OAuth2AccessToken> getAccessTokenAsync(String code,
94+
public final Future<OAuth2AccessToken> getAccessToken(String code,
7795
OAuthAsyncRequestCallback<OAuth2AccessToken> callback) {
7896
final OAuthRequest request = createAccessTokenRequest(code);
7997

@@ -95,18 +113,34 @@ protected OAuthRequest createAccessTokenRequest(String code) {
95113
return request;
96114
}
97115

116+
public final Future<OAuth2AccessToken> refreshAccessTokenAsync(String refreshToken) {
117+
return refreshAccessToken(refreshToken, null);
118+
}
119+
120+
/**
121+
*
122+
* @param refreshToken refreshToken
123+
* @param callback callback
124+
* @return future
125+
* @deprecated use {@link #refreshAccessToken(java.lang.String,
126+
* com.github.scribejava.core.model.OAuthAsyncRequestCallback)}
127+
*/
128+
@Deprecated
129+
public final Future<OAuth2AccessToken> refreshAccessTokenAsync(String refreshToken,
130+
OAuthAsyncRequestCallback<OAuth2AccessToken> callback) {
131+
final OAuthRequest request = createRefreshTokenRequest(refreshToken);
132+
133+
return sendAccessTokenRequestAsync(request, callback);
134+
}
135+
98136
public final OAuth2AccessToken refreshAccessToken(String refreshToken)
99137
throws IOException, InterruptedException, ExecutionException {
100138
final OAuthRequest request = createRefreshTokenRequest(refreshToken);
101139

102140
return sendAccessTokenRequestSync(request);
103141
}
104142

105-
public final Future<OAuth2AccessToken> refreshAccessTokenAsync(String refreshToken) {
106-
return refreshAccessTokenAsync(refreshToken, null);
107-
}
108-
109-
public final Future<OAuth2AccessToken> refreshAccessTokenAsync(String refreshToken,
143+
public final Future<OAuth2AccessToken> refreshAccessToken(String refreshToken,
110144
OAuthAsyncRequestCallback<OAuth2AccessToken> callback) {
111145
final OAuthRequest request = createRefreshTokenRequest(refreshToken);
112146

‎scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuthService.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,14 @@ public OAuthConfig getConfig() {
6868

6969
public abstract void signRequest(T token, OAuthRequest request);
7070

71+
public Future<Response> executeAsync(OAuthRequest request) {
72+
return execute(request, null);
73+
}
74+
75+
public Future<Response> execute(OAuthRequest request, OAuthAsyncRequestCallback<Response> callback) {
76+
return execute(request, callback, null);
77+
}
78+
7179
public <R> Future<R> execute(OAuthRequest request, OAuthAsyncRequestCallback<R> callback,
7280
OAuthRequest.ResponseConverter<R> converter) {
7381

@@ -84,10 +92,6 @@ public <R> Future<R> execute(OAuthRequest request, OAuthAsyncRequestCallback<R>
8492
}
8593
}
8694

87-
public Future<Response> execute(OAuthRequest request, OAuthAsyncRequestCallback<Response> callback) {
88-
return execute(request, callback, null);
89-
}
90-
9195
public Response execute(OAuthRequest request) throws InterruptedException, ExecutionException, IOException {
9296
final File filePayload = request.getFilePayload();
9397
if (filePayload != null) {

0 commit comments

Comments
 (0)