Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9e4d14b

Browse files
committed
Merge branch 'debug-oauth2' ofhttps://github.com/rbarbey/scribejava into rbarbey-debug-oauth2
2 parents6e85a3b +f04ffc7 commit9e4d14b

File tree

18 files changed

+141
-59
lines changed

18 files changed

+141
-59
lines changed

‎scribejava-apis/src/main/java/com/github/scribejava/apis/FacebookApi.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
packagecom.github.scribejava.apis;
22

3+
importjava.io.OutputStream;
4+
35
importcom.github.scribejava.apis.facebook.FacebookAccessTokenJsonExtractor;
46
importcom.github.scribejava.apis.facebook.FacebookService;
57
importcom.github.scribejava.core.builder.api.DefaultApi20;
@@ -71,8 +73,9 @@ public ClientAuthentication getClientAuthentication() {
7173

7274
@Override
7375
publicFacebookServicecreateService(StringapiKey,StringapiSecret,Stringcallback,StringdefaultScope,
74-
StringresponseType,StringuserAgent,HttpClientConfighttpClientConfig,HttpClienthttpClient) {
75-
returnnewFacebookService(this,apiKey,apiSecret,callback,defaultScope,responseType,userAgent,
76-
httpClientConfig,httpClient);
76+
StringresponseType,OutputStreamdebugStream,StringuserAgent,HttpClientConfighttpClientConfig,
77+
HttpClienthttpClient) {
78+
returnnewFacebookService(this,apiKey,apiSecret,callback,defaultScope,responseType,debugStream,
79+
userAgent,httpClientConfig,httpClient);
7780
}
7881
}

‎scribejava-apis/src/main/java/com/github/scribejava/apis/ImgurApi.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
importcom.github.scribejava.core.httpclient.HttpClientConfig;
77
importcom.github.scribejava.core.model.OAuthConstants;
88
importcom.github.scribejava.core.model.ParameterList;
9+
10+
importjava.io.OutputStream;
911
importjava.util.Map;
1012

1113
publicclassImgurApiextendsDefaultApi20 {
@@ -55,9 +57,10 @@ protected String getAuthorizationBaseUrl() {
5557

5658
@Override
5759
publicImgurOAuthServicecreateService(StringapiKey,StringapiSecret,Stringcallback,StringdefaultScope,
58-
StringresponseType,StringuserAgent,HttpClientConfighttpClientConfig,HttpClienthttpClient) {
59-
returnnewImgurOAuthService(this,apiKey,apiSecret,callback,defaultScope,responseType,userAgent,
60-
httpClientConfig,httpClient);
60+
StringresponseType,OutputStreamdebugStream,StringuserAgent,HttpClientConfighttpClientConfig,
61+
HttpClienthttpClient) {
62+
returnnewImgurOAuthService(this,apiKey,apiSecret,callback,defaultScope,responseType,debugStream,
63+
userAgent,httpClientConfig,httpClient);
6164
}
6265

6366
publicstaticbooleanisOob(Stringcallback) {

‎scribejava-apis/src/main/java/com/github/scribejava/apis/MailruApi.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
packagecom.github.scribejava.apis;
22

3+
importjava.io.OutputStream;
4+
35
importcom.github.scribejava.apis.mailru.MailruOAuthService;
46
importcom.github.scribejava.core.builder.api.DefaultApi20;
57
importcom.github.scribejava.core.httpclient.HttpClient;
@@ -30,8 +32,9 @@ protected String getAuthorizationBaseUrl() {
3032

3133
@Override
3234
publicMailruOAuthServicecreateService(StringapiKey,StringapiSecret,Stringcallback,StringdefaultScope,
33-
StringresponseType,StringuserAgent,HttpClientConfighttpClientConfig,HttpClienthttpClient) {
34-
returnnewMailruOAuthService(this,apiKey,apiSecret,callback,defaultScope,responseType,userAgent,
35-
httpClientConfig,httpClient);
35+
StringresponseType,OutputStreamdebugStream,StringuserAgent,HttpClientConfighttpClientConfig,
36+
HttpClienthttpClient) {
37+
returnnewMailruOAuthService(this,apiKey,apiSecret,callback,defaultScope,responseType,debugStream,
38+
userAgent,httpClientConfig,httpClient);
3639
}
3740
}

‎scribejava-apis/src/main/java/com/github/scribejava/apis/OdnoklassnikiApi.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
packagecom.github.scribejava.apis;
22

3+
importjava.io.OutputStream;
4+
35
importcom.github.scribejava.apis.odnoklassniki.OdnoklassnikiOAuthService;
46
importcom.github.scribejava.core.builder.api.DefaultApi20;
57
importcom.github.scribejava.core.httpclient.HttpClient;
@@ -34,10 +36,10 @@ protected String getAuthorizationBaseUrl() {
3436

3537
@Override
3638
publicOdnoklassnikiOAuthServicecreateService(StringapiKey,StringapiSecret,Stringcallback,
37-
StringdefaultScope,StringresponseType,StringuserAgent,HttpClientConfighttpClientConfig,
38-
HttpClienthttpClient) {
39-
returnnewOdnoklassnikiOAuthService(this,apiKey,apiSecret,callback,defaultScope,responseType,userAgent,
40-
httpClientConfig,httpClient);
39+
StringdefaultScope,StringresponseType,OutputStreamdebugStream,StringuserAgent,
40+
HttpClientConfighttpClientConfig,HttpClienthttpClient) {
41+
returnnewOdnoklassnikiOAuthService(this,apiKey,apiSecret,callback,defaultScope,responseType,debugStream,
42+
userAgent,httpClientConfig,httpClient);
4143
}
4244

4345
@Override

‎scribejava-apis/src/main/java/com/github/scribejava/apis/WunderlistAPI.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
packagecom.github.scribejava.apis;
22

3+
importjava.io.OutputStream;
4+
35
importcom.github.scribejava.apis.wunderlist.WunderlistOAuthService;
46
importcom.github.scribejava.core.builder.api.DefaultApi20;
57
importcom.github.scribejava.core.httpclient.HttpClient;
@@ -49,8 +51,9 @@ public ClientAuthentication getClientAuthentication() {
4951

5052
@Override
5153
publicOAuth20ServicecreateService(StringapiKey,StringapiSecret,Stringcallback,StringdefaultScope,
52-
StringresponseType,StringuserAgent,HttpClientConfighttpClientConfig,HttpClienthttpClient) {
53-
returnnewWunderlistOAuthService(this,apiKey,apiSecret,callback,defaultScope,responseType,userAgent,
54-
httpClientConfig,httpClient);
54+
StringresponseType,OutputStreamdebugStream,StringuserAgent,HttpClientConfighttpClientConfig,
55+
HttpClienthttpClient) {
56+
returnnewWunderlistOAuthService(this,apiKey,apiSecret,callback,defaultScope,responseType,debugStream,
57+
userAgent,httpClientConfig,httpClient);
5558
}
5659
}

‎scribejava-apis/src/main/java/com/github/scribejava/apis/facebook/FacebookService.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
importcom.github.scribejava.core.httpclient.HttpClientConfig;
66
importcom.github.scribejava.core.model.OAuthRequest;
77
importcom.github.scribejava.core.oauth.OAuth20Service;
8+
9+
importjava.io.OutputStream;
810
importjava.security.InvalidKeyException;
911
importjava.security.NoSuchAlgorithmException;
1012
importjava.util.Formatter;
@@ -14,8 +16,10 @@
1416
publicclassFacebookServiceextendsOAuth20Service {
1517

1618
publicFacebookService(DefaultApi20api,StringapiKey,StringapiSecret,Stringcallback,StringdefaultScope,
17-
StringresponseType,StringuserAgent,HttpClientConfighttpClientConfig,HttpClienthttpClient) {
18-
super(api,apiKey,apiSecret,callback,defaultScope,responseType,userAgent,httpClientConfig,httpClient);
19+
StringresponseType,OutputStreamdebugStream,StringuserAgent,HttpClientConfighttpClientConfig,
20+
HttpClienthttpClient) {
21+
super(api,apiKey,apiSecret,callback,defaultScope,responseType,debugStream,userAgent,httpClientConfig,
22+
httpClient);
1923
}
2024

2125
@Override

‎scribejava-apis/src/main/java/com/github/scribejava/apis/imgur/ImgurOAuthService.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
packagecom.github.scribejava.apis.imgur;
22

3+
importjava.io.OutputStream;
4+
35
importcom.github.scribejava.apis.ImgurApi;
46
importcom.github.scribejava.core.builder.api.DefaultApi20;
57
importcom.github.scribejava.core.httpclient.HttpClient;
@@ -13,8 +15,10 @@
1315
publicclassImgurOAuthServiceextendsOAuth20Service {
1416

1517
publicImgurOAuthService(DefaultApi20api,StringapiKey,StringapiSecret,Stringcallback,StringdefaultScope,
16-
StringresponseType,StringuserAgent,HttpClientConfighttpClientConfig,HttpClienthttpClient) {
17-
super(api,apiKey,apiSecret,callback,defaultScope,responseType,userAgent,httpClientConfig,httpClient);
18+
StringresponseType,OutputStreamdebugStream,StringuserAgent,HttpClientConfighttpClientConfig,
19+
HttpClienthttpClient) {
20+
super(api,apiKey,apiSecret,callback,defaultScope,responseType,debugStream,userAgent,httpClientConfig,
21+
httpClient);
1822
}
1923

2024
@Override

‎scribejava-apis/src/main/java/com/github/scribejava/apis/mailru/MailruOAuthService.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
importcom.github.scribejava.core.httpclient.HttpClientConfig;
99
importcom.github.scribejava.core.model.OAuthRequest;
1010
importcom.github.scribejava.core.oauth.OAuth20Service;
11+
12+
importjava.io.OutputStream;
1113
importjava.io.UnsupportedEncodingException;
1214
importjava.nio.charset.Charset;
1315
importjava.security.MessageDigest;
@@ -17,8 +19,10 @@
1719
publicclassMailruOAuthServiceextendsOAuth20Service {
1820

1921
publicMailruOAuthService(DefaultApi20api,StringapiKey,StringapiSecret,Stringcallback,StringdefaultScope,
20-
StringresponseType,StringuserAgent,HttpClientConfighttpClientConfig,HttpClienthttpClient) {
21-
super(api,apiKey,apiSecret,callback,defaultScope,responseType,userAgent,httpClientConfig,httpClient);
22+
StringresponseType,OutputStreamdebugStream,StringuserAgent,HttpClientConfighttpClientConfig,
23+
HttpClienthttpClient) {
24+
super(api,apiKey,apiSecret,callback,defaultScope,responseType,debugStream,userAgent,httpClientConfig,
25+
httpClient);
2226
}
2327

2428
@Override

‎scribejava-apis/src/main/java/com/github/scribejava/apis/odnoklassniki/OdnoklassnikiOAuthService.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
importcom.github.scribejava.core.model.Parameter;
88
importcom.github.scribejava.core.model.ParameterList;
99
importcom.github.scribejava.core.oauth.OAuth20Service;
10+
11+
importjava.io.OutputStream;
1012
importjava.io.UnsupportedEncodingException;
1113

1214
importjava.net.URLDecoder;
@@ -20,9 +22,10 @@
2022
publicclassOdnoklassnikiOAuthServiceextendsOAuth20Service {
2123

2224
publicOdnoklassnikiOAuthService(DefaultApi20api,StringapiKey,StringapiSecret,Stringcallback,
23-
StringdefaultScope,StringresponseType,StringuserAgent,HttpClientConfighttpClientConfig,
24-
HttpClienthttpClient) {
25-
super(api,apiKey,apiSecret,callback,defaultScope,responseType,userAgent,httpClientConfig,httpClient);
25+
StringdefaultScope,StringresponseType,OutputStreamdebugStream,StringuserAgent,
26+
HttpClientConfighttpClientConfig,HttpClienthttpClient) {
27+
super(api,apiKey,apiSecret,callback,defaultScope,responseType,debugStream,userAgent,httpClientConfig,
28+
httpClient);
2629
}
2730

2831
@Override

‎scribejava-apis/src/main/java/com/github/scribejava/apis/wunderlist/WunderlistOAuthService.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
packagecom.github.scribejava.apis.wunderlist;
22

3+
importjava.io.OutputStream;
4+
35
importcom.github.scribejava.apis.WunderlistAPI;
46
importcom.github.scribejava.core.httpclient.HttpClient;
57
importcom.github.scribejava.core.httpclient.HttpClientConfig;
@@ -9,9 +11,10 @@
911
publicclassWunderlistOAuthServiceextendsOAuth20Service {
1012

1113
publicWunderlistOAuthService(WunderlistAPIapi,StringapiKey,StringapiSecret,Stringcallback,
12-
StringdefaultScope,StringresponseType,StringuserAgent,HttpClientConfighttpClientConfig,
13-
HttpClienthttpClient) {
14-
super(api,apiKey,apiSecret,callback,defaultScope,responseType,userAgent,httpClientConfig,httpClient);
14+
StringdefaultScope,StringresponseType,OutputStreamdebugStream,StringuserAgent,
15+
HttpClientConfighttpClientConfig,HttpClienthttpClient) {
16+
super(api,apiKey,apiSecret,callback,defaultScope,responseType,debugStream,userAgent,httpClientConfig,
17+
httpClient);
1518
}
1619

1720
@Override

‎scribejava-core/src/main/java/com/github/scribejava/core/builder/ServiceBuilder.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public ServiceBuilderOAuth10a withScope(String scope) {
6868
}
6969

7070
@Override
71-
publicServiceBuilderOAuth10adebugStream(OutputStreamdebugStream) {
71+
publicServiceBuilderdebugStream(OutputStreamdebugStream) {
7272
Preconditions.checkNotNull(debugStream,"debug stream can't be null");
7373
this.debugStream =debugStream;
7474
returnthis;
@@ -101,7 +101,7 @@ public ServiceBuilder userAgent(String userAgent) {
101101
}
102102

103103
@Override
104-
publicServiceBuilderOAuth10adebug() {
104+
publicServiceBuilderdebug() {
105105
returndebugStream(System.out);
106106
}
107107

@@ -113,7 +113,7 @@ public OAuth10aService build(DefaultApi10a api) {
113113

114114
@Override
115115
publicOAuth20Servicebuild(DefaultApi20api) {
116-
returnapi.createService(apiKey,apiSecret,callback,scope,responseType,userAgent,httpClientConfig,
117-
httpClient);
116+
returnapi.createService(apiKey,apiSecret,callback,scope,responseType,debugStream,userAgent,
117+
httpClientConfig,httpClient);
118118
}
119119
}

‎scribejava-core/src/main/java/com/github/scribejava/core/builder/api/DefaultApi20.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
importcom.github.scribejava.core.oauth2.bearersignature.BearerSignatureAuthorizationRequestHeaderField;
1414
importcom.github.scribejava.core.oauth2.clientauthentication.ClientAuthentication;
1515
importcom.github.scribejava.core.oauth2.clientauthentication.HttpBasicAuthenticationScheme;
16+
17+
importjava.io.OutputStream;
1618
importjava.util.Map;
1719

1820
/**
@@ -106,8 +108,9 @@ public String getAuthorizationUrl(String responseType, String apiKey, String cal
106108
}
107109

108110
publicOAuth20ServicecreateService(StringapiKey,StringapiSecret,Stringcallback,StringdefaultScope,
109-
StringresponseType,StringuserAgent,HttpClientConfighttpClientConfig,HttpClienthttpClient) {
110-
returnnewOAuth20Service(this,apiKey,apiSecret,callback,defaultScope,responseType,userAgent,
111+
StringresponseType,OutputStreamdebugStream,StringuserAgent,HttpClientConfighttpClientConfig,
112+
HttpClienthttpClient) {
113+
returnnewOAuth20Service(this,apiKey,apiSecret,callback,defaultScope,responseType,debugStream,userAgent,
111114
httpClientConfig,httpClient);
112115
}
113116

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,12 @@
2222
publicclassOAuth10aServiceextendsOAuthService {
2323

2424
privatestaticfinalStringVERSION ="1.0";
25-
privatefinalOutputStreamdebugStream;
2625
privatefinalDefaultApi10aapi;
2726
privatefinalStringscope;
2827

2928
publicOAuth10aService(DefaultApi10aapi,StringapiKey,StringapiSecret,Stringcallback,Stringscope,
3029
OutputStreamdebugStream,StringuserAgent,HttpClientConfighttpClientConfig,HttpClienthttpClient) {
31-
super(apiKey,apiSecret,callback,userAgent,httpClientConfig,httpClient);
32-
this.debugStream =debugStream;
30+
super(apiKey,apiSecret,callback,debugStream,userAgent,httpClientConfig,httpClient);
3331
this.api =api;
3432
this.scope =scope;
3533
}
@@ -192,15 +190,4 @@ protected void appendSignature(OAuthRequest request) {
192190
publicDefaultApi10agetApi() {
193191
returnapi;
194192
}
195-
196-
publicvoidlog(StringmessagePattern,Object...params) {
197-
if (debugStream !=null) {
198-
finalStringmessage =String.format(messagePattern,params) +'\n';
199-
try {
200-
debugStream.write(message.getBytes("UTF8"));
201-
}catch (IOException |RuntimeExceptione) {
202-
thrownewRuntimeException("there were problems while writting to the debug stream",e);
203-
}
204-
}
205-
}
206193
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp