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

Commit47c0732

Browse files
committed
drop OAuthConfig, remove deprecate usaged
1 parent4b46ba4 commit47c0732

23 files changed

+100
-399
lines changed

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

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
importcom.github.scribejava.core.httpclient.HttpClient;
99
importcom.github.scribejava.core.httpclient.HttpClientConfig;
1010
importcom.github.scribejava.core.model.OAuth2AccessToken;
11-
importcom.github.scribejava.core.model.OAuthConfig;
1211
importcom.github.scribejava.core.model.Verb;
1312
importjava.io.OutputStream;
1413

@@ -74,20 +73,7 @@ public ClientAuthenticationType getClientAuthenticationType() {
7473
publicFacebookServicecreateService(StringapiKey,StringapiSecret,Stringcallback,Stringscope,
7574
OutputStreamdebugStream,Stringstate,StringresponseType,StringuserAgent,
7675
HttpClientConfighttpClientConfig,HttpClienthttpClient) {
77-
returnnewFacebookService(this,apiKey,apiSecret,callback,scope,debugStream,state,responseType,
78-
userAgent,httpClientConfig,httpClient);
79-
}
80-
81-
/**
82-
* @deprecated use {@link #createService(java.lang.String, java.lang.String, java.lang.String, java.lang.String,
83-
* java.io.OutputStream, java.lang.String, java.lang.String, java.lang.String,
84-
* com.github.scribejava.core.httpclient.HttpClientConfig, com.github.scribejava.core.httpclient.HttpClient)}
85-
*/
86-
@Deprecated
87-
@Override
88-
publicFacebookServicecreateService(OAuthConfigconfig) {
89-
returncreateService(config.getApiKey(),config.getApiSecret(),config.getCallback(),config.getScope(),
90-
config.getDebugStream(),config.getState(),config.getResponseType(),config.getUserAgent(),
91-
config.getHttpClientConfig(),config.getHttpClient());
76+
returnnewFacebookService(this,apiKey,apiSecret,callback,scope,state,responseType,userAgent,
77+
httpClientConfig,httpClient);
9278
}
9379
}

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

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
importcom.github.scribejava.core.builder.api.DefaultApi20;
55
importcom.github.scribejava.core.httpclient.HttpClient;
66
importcom.github.scribejava.core.httpclient.HttpClientConfig;
7-
importcom.github.scribejava.core.model.OAuthConfig;
87
importcom.github.scribejava.core.model.OAuthConstants;
98
importcom.github.scribejava.core.model.ParameterList;
109
importjava.io.OutputStream;
@@ -59,21 +58,8 @@ protected String getAuthorizationBaseUrl() {
5958
publicImgurOAuthServicecreateService(StringapiKey,StringapiSecret,Stringcallback,Stringscope,
6059
OutputStreamdebugStream,Stringstate,StringresponseType,StringuserAgent,
6160
HttpClientConfighttpClientConfig,HttpClienthttpClient) {
62-
returnnewImgurOAuthService(this,apiKey,apiSecret,callback,scope,debugStream,state,responseType,
63-
userAgent,httpClientConfig,httpClient);
64-
}
65-
66-
/**
67-
* @deprecated use {@link #createService(java.lang.String, java.lang.String, java.lang.String, java.lang.String,
68-
* java.io.OutputStream, java.lang.String, java.lang.String, java.lang.String,
69-
* com.github.scribejava.core.httpclient.HttpClientConfig, com.github.scribejava.core.httpclient.HttpClient)}
70-
*/
71-
@Deprecated
72-
@Override
73-
publicImgurOAuthServicecreateService(OAuthConfigconfig) {
74-
returncreateService(config.getApiKey(),config.getApiSecret(),config.getCallback(),config.getScope(),
75-
config.getDebugStream(),config.getState(),config.getResponseType(),config.getUserAgent(),
76-
config.getHttpClientConfig(),config.getHttpClient());
61+
returnnewImgurOAuthService(this,apiKey,apiSecret,callback,scope,state,responseType,userAgent,
62+
httpClientConfig,httpClient);
7763
}
7864

7965
publicstaticbooleanisOob(Stringcallback) {

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

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

33
importcom.github.scribejava.core.builder.api.DefaultApi20;
4-
importcom.github.scribejava.core.model.OAuthConfig;
54
importcom.github.scribejava.apis.service.MailruOAuthService;
65
importcom.github.scribejava.core.httpclient.HttpClient;
76
importcom.github.scribejava.core.httpclient.HttpClientConfig;
@@ -34,20 +33,7 @@ protected String getAuthorizationBaseUrl() {
3433
publicMailruOAuthServicecreateService(StringapiKey,StringapiSecret,Stringcallback,Stringscope,
3534
OutputStreamdebugStream,Stringstate,StringresponseType,StringuserAgent,
3635
HttpClientConfighttpClientConfig,HttpClienthttpClient) {
37-
returnnewMailruOAuthService(this,apiKey,apiSecret,callback,scope,debugStream,state,responseType,
38-
userAgent,httpClientConfig,httpClient);
39-
}
40-
41-
/**
42-
* @deprecated use {@link #createService(java.lang.String, java.lang.String, java.lang.String, java.lang.String,
43-
* java.io.OutputStream, java.lang.String, java.lang.String, java.lang.String,
44-
* com.github.scribejava.core.httpclient.HttpClientConfig, com.github.scribejava.core.httpclient.HttpClient)}
45-
*/
46-
@Deprecated
47-
@Override
48-
publicMailruOAuthServicecreateService(OAuthConfigconfig) {
49-
returncreateService(config.getApiKey(),config.getApiSecret(),config.getCallback(),config.getScope(),
50-
config.getDebugStream(),config.getState(),config.getResponseType(),config.getUserAgent(),
51-
config.getHttpClientConfig(),config.getHttpClient());
36+
returnnewMailruOAuthService(this,apiKey,apiSecret,callback,scope,state,responseType,userAgent,
37+
httpClientConfig,httpClient);
5238
}
5339
}

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

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
importcom.github.scribejava.core.builder.api.DefaultApi20;
66
importcom.github.scribejava.core.httpclient.HttpClient;
77
importcom.github.scribejava.core.httpclient.HttpClientConfig;
8-
importcom.github.scribejava.core.model.OAuthConfig;
98
importjava.io.OutputStream;
109

1110
/**
@@ -53,21 +52,8 @@ protected String getAuthorizationBaseUrl() {
5352
publicMicrosoftAzureActiveDirectoryServicecreateService(StringapiKey,StringapiSecret,Stringcallback,
5453
Stringscope,OutputStreamdebugStream,Stringstate,StringresponseType,StringuserAgent,
5554
HttpClientConfighttpClientConfig,HttpClienthttpClient) {
56-
returnnewMicrosoftAzureActiveDirectoryService(this,apiKey,apiSecret,callback,scope,debugStream,state,
57-
responseType,userAgent,httpClientConfig,httpClient);
58-
}
59-
60-
/**
61-
* @deprecated use {@link #createService(java.lang.String, java.lang.String, java.lang.String, java.lang.String,
62-
* java.io.OutputStream, java.lang.String, java.lang.String, java.lang.String,
63-
* com.github.scribejava.core.httpclient.HttpClientConfig, com.github.scribejava.core.httpclient.HttpClient)}
64-
*/
65-
@Deprecated
66-
@Override
67-
publicMicrosoftAzureActiveDirectoryServicecreateService(OAuthConfigconfig) {
68-
returncreateService(config.getApiKey(),config.getApiSecret(),config.getCallback(),config.getScope(),
69-
config.getDebugStream(),config.getState(),config.getResponseType(),config.getUserAgent(),
70-
config.getHttpClientConfig(),config.getHttpClient());
55+
returnnewMicrosoftAzureActiveDirectoryService(this,apiKey,apiSecret,callback,scope,state,responseType,
56+
userAgent,httpClientConfig,httpClient);
7157
}
7258

7359
@Override

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

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
importcom.github.scribejava.core.builder.api.OAuth2SignatureType;
77
importcom.github.scribejava.core.httpclient.HttpClient;
88
importcom.github.scribejava.core.httpclient.HttpClientConfig;
9-
importcom.github.scribejava.core.model.OAuthConfig;
109
importjava.io.OutputStream;
1110

1211
publicclassOdnoklassnikiApiextendsDefaultApi20 {
@@ -36,21 +35,8 @@ protected String getAuthorizationBaseUrl() {
3635
publicOdnoklassnikiOAuthServicecreateService(StringapiKey,StringapiSecret,Stringcallback,Stringscope,
3736
OutputStreamdebugStream,Stringstate,StringresponseType,StringuserAgent,
3837
HttpClientConfighttpClientConfig,HttpClienthttpClient) {
39-
returnnewOdnoklassnikiOAuthService(this,apiKey,apiSecret,callback,scope,debugStream,state,responseType,
40-
userAgent,httpClientConfig,httpClient);
41-
}
42-
43-
/**
44-
* @deprecated use {@link #createService(java.lang.String, java.lang.String, java.lang.String, java.lang.String,
45-
* java.io.OutputStream, java.lang.String, java.lang.String, java.lang.String,
46-
* com.github.scribejava.core.httpclient.HttpClientConfig, com.github.scribejava.core.httpclient.HttpClient)}
47-
*/
48-
@Deprecated
49-
@Override
50-
publicOdnoklassnikiOAuthServicecreateService(OAuthConfigconfig) {
51-
returncreateService(config.getApiKey(),config.getApiSecret(),config.getCallback(),config.getScope(),
52-
config.getDebugStream(),config.getState(),config.getResponseType(),config.getUserAgent(),
53-
config.getHttpClientConfig(),config.getHttpClient());
38+
returnnewOdnoklassnikiOAuthService(this,apiKey,apiSecret,callback,scope,state,responseType,userAgent,
39+
httpClientConfig,httpClient);
5440
}
5541

5642
@Override

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

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
importcom.github.scribejava.core.builder.api.DefaultApi20;
55
importcom.github.scribejava.core.httpclient.HttpClient;
66
importcom.github.scribejava.core.httpclient.HttpClientConfig;
7-
importcom.github.scribejava.core.model.OAuthConfig;
87
importjava.io.OutputStream;
98

109
publicclassTutByApiextendsDefaultApi20 {
@@ -34,20 +33,7 @@ protected String getAuthorizationBaseUrl() {
3433
publicTutByOAuthServicecreateService(StringapiKey,StringapiSecret,Stringcallback,Stringscope,
3534
OutputStreamdebugStream,Stringstate,StringresponseType,StringuserAgent,
3635
HttpClientConfighttpClientConfig,HttpClienthttpClient) {
37-
returnnewTutByOAuthService(this,apiKey,apiSecret,callback,scope,debugStream,state,responseType,
38-
userAgent,httpClientConfig,httpClient);
39-
}
40-
41-
/**
42-
* @deprecated use {@link #createService(java.lang.String, java.lang.String, java.lang.String, java.lang.String,
43-
* java.io.OutputStream, java.lang.String, java.lang.String, java.lang.String,
44-
* com.github.scribejava.core.httpclient.HttpClientConfig, com.github.scribejava.core.httpclient.HttpClient)}
45-
*/
46-
@Deprecated
47-
@Override
48-
publicTutByOAuthServicecreateService(OAuthConfigconfig) {
49-
returncreateService(config.getApiKey(),config.getApiSecret(),config.getCallback(),config.getScope(),
50-
config.getDebugStream(),config.getState(),config.getResponseType(),config.getUserAgent(),
51-
config.getHttpClientConfig(),config.getHttpClient());
36+
returnnewTutByOAuthService(this,apiKey,apiSecret,callback,scope,state,responseType,userAgent,
37+
httpClientConfig,httpClient);
5238
}
5339
}

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
importcom.github.scribejava.core.builder.api.DefaultApi20;
44
importcom.github.scribejava.core.httpclient.HttpClient;
55
importcom.github.scribejava.core.httpclient.HttpClientConfig;
6-
importcom.github.scribejava.core.model.OAuthConfig;
76
importcom.github.scribejava.core.model.OAuthRequest;
87
importcom.github.scribejava.core.oauth.OAuth20Service;
98
importjava.io.OutputStream;
@@ -17,22 +16,20 @@ public class FacebookService extends OAuth20Service {
1716

1817
/**
1918
* @deprecated use {@link #FacebookService(com.github.scribejava.core.builder.api.DefaultApi20, java.lang.String,
20-
* java.lang.String, java.lang.String, java.lang.String, java.io.OutputStream, java.lang.String, java.lang.String,
21-
* java.lang.String, com.github.scribejava.core.httpclient.HttpClientConfig,
22-
* com.github.scribejava.core.httpclient.HttpClient)}
19+
* java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String,
20+
* com.github.scribejava.core.httpclient.HttpClientConfig, com.github.scribejava.core.httpclient.HttpClient)}
2321
*/
2422
@Deprecated
25-
publicFacebookService(DefaultApi20api,OAuthConfigconfig) {
26-
this(api,config.getApiKey(),config.getApiSecret(),config.getCallback(),config.getScope(),
27-
config.getDebugStream(),config.getState(),config.getResponseType(),config.getUserAgent(),
28-
config.getHttpClientConfig(),config.getHttpClient());
29-
}
30-
3123
publicFacebookService(DefaultApi20api,StringapiKey,StringapiSecret,Stringcallback,Stringscope,
3224
OutputStreamdebugStream,Stringstate,StringresponseType,StringuserAgent,
3325
HttpClientConfighttpClientConfig,HttpClienthttpClient) {
34-
super(api,apiKey,apiSecret,callback,scope,debugStream,state,responseType,userAgent,httpClientConfig,
35-
httpClient);
26+
this(api,apiKey,apiSecret,callback,scope,state,responseType,userAgent,httpClientConfig,httpClient);
27+
}
28+
29+
publicFacebookService(DefaultApi20api,StringapiKey,StringapiSecret,Stringcallback,Stringscope,
30+
Stringstate,StringresponseType,StringuserAgent,HttpClientConfighttpClientConfig,
31+
HttpClienthttpClient) {
32+
super(api,apiKey,apiSecret,callback,scope,state,responseType,userAgent,httpClientConfig,httpClient);
3633
}
3734

3835
@Override

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
importcom.github.scribejava.core.builder.api.DefaultApi20;
55
importcom.github.scribejava.core.httpclient.HttpClient;
66
importcom.github.scribejava.core.httpclient.HttpClientConfig;
7-
importcom.github.scribejava.core.model.OAuthConfig;
87
importcom.github.scribejava.core.model.OAuthConstants;
98
importcom.github.scribejava.core.model.OAuthRequest;
109
importcom.github.scribejava.core.oauth.OAuth20Service;
@@ -14,22 +13,20 @@ public class ImgurOAuthService extends OAuth20Service {
1413

1514
/**
1615
* @deprecated use {@link #ImgurOAuthService(com.github.scribejava.core.builder.api.DefaultApi20, java.lang.String,
17-
* java.lang.String, java.lang.String, java.lang.String, java.io.OutputStream, java.lang.String, java.lang.String,
18-
* java.lang.String, com.github.scribejava.core.httpclient.HttpClientConfig,
19-
* com.github.scribejava.core.httpclient.HttpClient)}
16+
* java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String,
17+
* com.github.scribejava.core.httpclient.HttpClientConfig, com.github.scribejava.core.httpclient.HttpClient)}
2018
*/
2119
@Deprecated
22-
publicImgurOAuthService(DefaultApi20api,OAuthConfigconfig) {
23-
this(api,config.getApiKey(),config.getApiSecret(),config.getCallback(),config.getScope(),
24-
config.getDebugStream(),config.getState(),config.getResponseType(),config.getUserAgent(),
25-
config.getHttpClientConfig(),config.getHttpClient());
26-
}
27-
2820
publicImgurOAuthService(DefaultApi20api,StringapiKey,StringapiSecret,Stringcallback,Stringscope,
2921
OutputStreamdebugStream,Stringstate,StringresponseType,StringuserAgent,
3022
HttpClientConfighttpClientConfig,HttpClienthttpClient) {
31-
super(api,apiKey,apiSecret,callback,scope,debugStream,state,responseType,userAgent,httpClientConfig,
32-
httpClient);
23+
this(api,apiKey,apiSecret,callback,scope,state,responseType,userAgent,httpClientConfig,httpClient);
24+
}
25+
26+
publicImgurOAuthService(DefaultApi20api,StringapiKey,StringapiSecret,Stringcallback,Stringscope,
27+
Stringstate,StringresponseType,StringuserAgent,HttpClientConfighttpClientConfig,
28+
HttpClienthttpClient) {
29+
super(api,apiKey,apiSecret,callback,scope,state,responseType,userAgent,httpClientConfig,httpClient);
3330
}
3431

3532
@Override

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
importcom.github.scribejava.core.builder.api.DefaultApi20;
77
importcom.github.scribejava.core.httpclient.HttpClient;
88
importcom.github.scribejava.core.httpclient.HttpClientConfig;
9-
importcom.github.scribejava.core.model.OAuthConfig;
109
importcom.github.scribejava.core.model.OAuthRequest;
1110
importcom.github.scribejava.core.oauth.OAuth20Service;
1211
importjava.io.OutputStream;
@@ -20,22 +19,20 @@ public class MailruOAuthService extends OAuth20Service {
2019

2120
/**
2221
* @deprecated use {@link #MailruOAuthService(com.github.scribejava.core.builder.api.DefaultApi20, java.lang.String,
23-
* java.lang.String, java.lang.String, java.lang.String, java.io.OutputStream, java.lang.String, java.lang.String,
24-
* java.lang.String, com.github.scribejava.core.httpclient.HttpClientConfig,
25-
* com.github.scribejava.core.httpclient.HttpClient)}
22+
* java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String,
23+
* com.github.scribejava.core.httpclient.HttpClientConfig, com.github.scribejava.core.httpclient.HttpClient)}
2624
*/
2725
@Deprecated
28-
publicMailruOAuthService(DefaultApi20api,OAuthConfigconfig) {
29-
this(api,config.getApiKey(),config.getApiSecret(),config.getCallback(),config.getScope(),
30-
config.getDebugStream(),config.getState(),config.getResponseType(),config.getUserAgent(),
31-
config.getHttpClientConfig(),config.getHttpClient());
32-
}
33-
3426
publicMailruOAuthService(DefaultApi20api,StringapiKey,StringapiSecret,Stringcallback,Stringscope,
3527
OutputStreamdebugStream,Stringstate,StringresponseType,StringuserAgent,
3628
HttpClientConfighttpClientConfig,HttpClienthttpClient) {
37-
super(api,apiKey,apiSecret,callback,scope,debugStream,state,responseType,userAgent,httpClientConfig,
38-
httpClient);
29+
this(api,apiKey,apiSecret,callback,scope,state,responseType,userAgent,httpClientConfig,httpClient);
30+
}
31+
32+
publicMailruOAuthService(DefaultApi20api,StringapiKey,StringapiSecret,Stringcallback,Stringscope,
33+
Stringstate,StringresponseType,StringuserAgent,HttpClientConfighttpClientConfig,
34+
HttpClienthttpClient) {
35+
super(api,apiKey,apiSecret,callback,scope,state,responseType,userAgent,httpClientConfig,httpClient);
3936
}
4037

4138

0 commit comments

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