Skip to content

Commit c270cef

Browse files
kullfarkullfar
committed
cleanup deprecated methods
1 parent 8b5dca9 commit c270cef

26 files changed

Lines changed: 17 additions & 792 deletions

File tree

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

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -70,34 +70,11 @@ public ClientAuthentication getClientAuthentication() {
7070
return RequestBodyAuthenticationScheme.instance();
7171
}
7272

73-
/**
74-
* @param apiKey apiKey
75-
* @param apiSecret apiSecret
76-
* @param callback callback
77-
* @param scope scope
78-
* @param debugStream debugStream
79-
* @param state state
80-
* @param responseType responseType
81-
* @param userAgent userAgent
82-
* @param httpClientConfig httpClientConfig
83-
* @param httpClient httpClient
84-
* @return return
85-
* @deprecated use one of getAuthorizationUrl method in {@link com.github.scribejava.core.oauth.OAuth20Service}
86-
*/
87-
@Deprecated
88-
@Override
89-
public FacebookService createService(String apiKey, String apiSecret, String callback, String scope,
90-
OutputStream debugStream, String state, String responseType, String userAgent,
91-
HttpClientConfig httpClientConfig, HttpClient httpClient) {
92-
return new FacebookService(this, apiKey, apiSecret, callback, scope, state, responseType, userAgent,
93-
httpClientConfig, httpClient);
94-
}
95-
9673
@Override
9774
public FacebookService createService(String apiKey, String apiSecret, String callback, String scope,
9875
OutputStream debugStream, String responseType, String userAgent, HttpClientConfig httpClientConfig,
9976
HttpClient httpClient) {
100-
return createService(apiKey, apiSecret, callback, scope, debugStream, null, responseType, userAgent,
101-
httpClientConfig, httpClient);
77+
return new FacebookService(this, apiKey, apiSecret, callback, scope, responseType, userAgent, httpClientConfig,
78+
httpClient);
10279
}
10380
}

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

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -54,34 +54,11 @@ protected String getAuthorizationBaseUrl() {
5454
throw new UnsupportedOperationException("use getAuthorizationUrl instead");
5555
}
5656

57-
/**
58-
* @param apiKey apiKey
59-
* @param apiSecret apiSecret
60-
* @param callback callback
61-
* @param scope scope
62-
* @param debugStream debugStream
63-
* @param state state
64-
* @param responseType responseType
65-
* @param userAgent userAgent
66-
* @param httpClientConfig httpClientConfig
67-
* @param httpClient httpClient
68-
* @return return
69-
* @deprecated use one of getAuthorizationUrl method in {@link com.github.scribejava.core.oauth.OAuth20Service}
70-
*/
71-
@Deprecated
72-
@Override
73-
public ImgurOAuthService createService(String apiKey, String apiSecret, String callback, String scope,
74-
OutputStream debugStream, String state, String responseType, String userAgent,
75-
HttpClientConfig httpClientConfig, HttpClient httpClient) {
76-
return new ImgurOAuthService(this, apiKey, apiSecret, callback, scope, state, responseType, userAgent,
77-
httpClientConfig, httpClient);
78-
}
79-
8057
@Override
8158
public ImgurOAuthService createService(String apiKey, String apiSecret, String callback, String scope,
8259
OutputStream debugStream, String responseType, String userAgent, HttpClientConfig httpClientConfig,
8360
HttpClient httpClient) {
84-
return createService(apiKey, apiSecret, callback, scope, debugStream, null, responseType, userAgent,
61+
return new ImgurOAuthService(this, apiKey, apiSecret, callback, scope, responseType, userAgent,
8562
httpClientConfig, httpClient);
8663
}
8764

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

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,11 @@ protected String getAuthorizationBaseUrl() {
2929
return "https://connect.mail.ru/oauth/authorize";
3030
}
3131

32-
/**
33-
* @param apiKey apiKey
34-
* @param apiSecret apiSecret
35-
* @param callback callback
36-
* @param scope scope
37-
* @param debugStream debugStream
38-
* @param state state
39-
* @param responseType responseType
40-
* @param userAgent userAgent
41-
* @param httpClientConfig httpClientConfig
42-
* @param httpClient httpClient
43-
* @return return
44-
* @deprecated use one of getAuthorizationUrl method in {@link com.github.scribejava.core.oauth.OAuth20Service}
45-
*/
46-
@Deprecated
47-
@Override
48-
public MailruOAuthService createService(String apiKey, String apiSecret, String callback, String scope,
49-
OutputStream debugStream, String state, String responseType, String userAgent,
50-
HttpClientConfig httpClientConfig, HttpClient httpClient) {
51-
return new MailruOAuthService(this, apiKey, apiSecret, callback, scope, state, responseType, userAgent,
52-
httpClientConfig, httpClient);
53-
}
54-
5532
@Override
5633
public MailruOAuthService createService(String apiKey, String apiSecret, String callback, String scope,
5734
OutputStream debugStream, String responseType, String userAgent, HttpClientConfig httpClientConfig,
5835
HttpClient httpClient) {
59-
return createService(apiKey, apiSecret, callback, scope, debugStream, null, responseType, userAgent,
36+
return new MailruOAuthService(this, apiKey, apiSecret, callback, scope, responseType, userAgent,
6037
httpClientConfig, httpClient);
6138
}
6239
}

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

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,34 +33,11 @@ protected String getAuthorizationBaseUrl() {
3333
return "https://connect.ok.ru/oauth/authorize";
3434
}
3535

36-
/**
37-
* @param apiKey apiKey
38-
* @param apiSecret apiSecret
39-
* @param callback callback
40-
* @param scope scope
41-
* @param debugStream debugStream
42-
* @param state state
43-
* @param responseType responseType
44-
* @param userAgent userAgent
45-
* @param httpClientConfig httpClientConfig
46-
* @param httpClient httpClient
47-
* @return return
48-
* @deprecated use one of getAuthorizationUrl method in {@link com.github.scribejava.core.oauth.OAuth20Service}
49-
*/
50-
@Deprecated
51-
@Override
52-
public OdnoklassnikiOAuthService createService(String apiKey, String apiSecret, String callback, String scope,
53-
OutputStream debugStream, String state, String responseType, String userAgent,
54-
HttpClientConfig httpClientConfig, HttpClient httpClient) {
55-
return new OdnoklassnikiOAuthService(this, apiKey, apiSecret, callback, scope, state, responseType, userAgent,
56-
httpClientConfig, httpClient);
57-
}
58-
5936
@Override
6037
public OdnoklassnikiOAuthService createService(String apiKey, String apiSecret, String callback, String scope,
6138
OutputStream debugStream, String responseType, String userAgent, HttpClientConfig httpClientConfig,
6239
HttpClient httpClient) {
63-
return createService(apiKey, apiSecret, callback, scope, debugStream, null, responseType, userAgent,
40+
return new OdnoklassnikiOAuthService(this, apiKey, apiSecret, callback, scope, responseType, userAgent,
6441
httpClientConfig, httpClient);
6542
}
6643

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

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -52,30 +52,7 @@ public ClientAuthentication getClientAuthentication() {
5252
public OAuth20Service createService(String apiKey, String apiSecret, String callback, String scope,
5353
OutputStream debugStream, String responseType, String userAgent, HttpClientConfig httpClientConfig,
5454
HttpClient httpClient) {
55-
return createService(apiKey, apiSecret, callback, scope, debugStream, null, responseType, userAgent,
56-
httpClientConfig, httpClient);
57-
}
58-
59-
/**
60-
* @param apiKey apiKey
61-
* @param apiSecret apiSecret
62-
* @param callback callback
63-
* @param scope scope
64-
* @param debugStream debugStream
65-
* @param state state
66-
* @param responseType responseType
67-
* @param userAgent userAgent
68-
* @param httpClientConfig httpClientConfig
69-
* @param httpClient httpClient
70-
* @return return
71-
* @deprecated use one of getAuthorizationUrl method in {@link com.github.scribejava.core.oauth.OAuth20Service}
72-
*/
73-
@Deprecated
74-
@Override
75-
public OAuth20Service createService(String apiKey, String apiSecret, String callback, String scope,
76-
OutputStream debugStream, String state, String responseType, String userAgent,
77-
HttpClientConfig httpClientConfig, HttpClient httpClient) {
78-
return new WunderlistOAuthService(this, apiKey, apiSecret, callback, scope, state, responseType, userAgent,
55+
return new WunderlistOAuthService(this, apiKey, apiSecret, callback, scope, responseType, userAgent,
7956
httpClientConfig, httpClient);
8057
}
8158
}

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,6 @@
1313

1414
public class FacebookService extends OAuth20Service {
1515

16-
/**
17-
* @param api api
18-
* @param apiKey apiKey
19-
* @param apiSecret apiSecret
20-
* @param callback callback
21-
* @param scope scope
22-
* @param state state
23-
* @param responseType responseType
24-
* @param userAgent userAgent
25-
* @param httpClientConfig httpClientConfig
26-
* @param httpClient httpClient
27-
* @deprecated use one of getAuthorizationUrl method in {@link com.github.scribejava.core.oauth.OAuth20Service}
28-
*/
29-
@Deprecated
30-
public FacebookService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
31-
String state, String responseType, String userAgent, HttpClientConfig httpClientConfig,
32-
HttpClient httpClient) {
33-
super(api, apiKey, apiSecret, callback, scope, state, responseType, userAgent, httpClientConfig, httpClient);
34-
}
35-
3616
public FacebookService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
3717
String responseType, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {
3818
super(api, apiKey, apiSecret, callback, scope, responseType, userAgent, httpClientConfig, httpClient);

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,6 @@
1010

1111
public class ImgurOAuthService extends OAuth20Service {
1212

13-
/**
14-
* @param api api
15-
* @param apiKey apiKey
16-
* @param apiSecret apiSecret
17-
* @param callback callback
18-
* @param scope scope
19-
* @param state state
20-
* @param responseType responseType
21-
* @param userAgent userAgent
22-
* @param httpClientConfig httpClientConfig
23-
* @param httpClient httpClient
24-
* @deprecated use one of getAuthorizationUrl method in {@link com.github.scribejava.core.oauth.OAuth20Service}
25-
*/
26-
@Deprecated
27-
public ImgurOAuthService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
28-
String state, String responseType, String userAgent, HttpClientConfig httpClientConfig,
29-
HttpClient httpClient) {
30-
super(api, apiKey, apiSecret, callback, scope, state, responseType, userAgent, httpClientConfig, httpClient);
31-
}
32-
3313
public ImgurOAuthService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
3414
String responseType, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {
3515
super(api, apiKey, apiSecret, callback, scope, responseType, userAgent, httpClientConfig, httpClient);

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,11 @@
1616

1717
public class MailruOAuthService extends OAuth20Service {
1818

19-
/**
20-
* @param api api
21-
* @param apiKey apiKey
22-
* @param apiSecret apiSecret
23-
* @param callback callback
24-
* @param scope scope
25-
* @param state state
26-
* @param responseType responseType
27-
* @param userAgent userAgent
28-
* @param httpClientConfig httpClientConfig
29-
* @param httpClient httpClient
30-
* @deprecated use one of getAuthorizationUrl method in {@link com.github.scribejava.core.oauth.OAuth20Service}
31-
*/
32-
@Deprecated
33-
public MailruOAuthService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
34-
String state, String responseType, String userAgent, HttpClientConfig httpClientConfig,
35-
HttpClient httpClient) {
36-
super(api, apiKey, apiSecret, callback, scope, state, responseType, userAgent, httpClientConfig, httpClient);
37-
}
38-
3919
public MailruOAuthService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
4020
String responseType, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {
4121
super(api, apiKey, apiSecret, callback, scope, responseType, userAgent, httpClientConfig, httpClient);
4222
}
4323

44-
4524
@Override
4625
public void signRequest(String accessToken, OAuthRequest request) {
4726
// sig = md5(params + secret_key)

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,6 @@
1919

2020
public class OdnoklassnikiOAuthService extends OAuth20Service {
2121

22-
/**
23-
* @param api api
24-
* @param apiKey apiKey
25-
* @param apiSecret apiSecret
26-
* @param callback callback
27-
* @param scope scope
28-
* @param state state
29-
* @param responseType responseType
30-
* @param userAgent userAgent
31-
* @param httpClientConfig httpClientConfig
32-
* @param httpClient httpClient
33-
* @deprecated use one of getAuthorizationUrl method in {@link com.github.scribejava.core.oauth.OAuth20Service}
34-
*/
35-
@Deprecated
36-
public OdnoklassnikiOAuthService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
37-
String state, String responseType, String userAgent, HttpClientConfig httpClientConfig,
38-
HttpClient httpClient) {
39-
super(api, apiKey, apiSecret, callback, scope, state, responseType, userAgent, httpClientConfig, httpClient);
40-
}
41-
4222
public OdnoklassnikiOAuthService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
4323
String responseType, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {
4424
super(api, apiKey, apiSecret, callback, scope, responseType, userAgent, httpClientConfig, httpClient);

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,6 @@
88

99
public class WunderlistOAuthService extends OAuth20Service {
1010

11-
/**
12-
* @param api api
13-
* @param apiKey apiKey
14-
* @param apiSecret apiSecret
15-
* @param callback callback
16-
* @param scope scope
17-
* @param state state
18-
* @param responseType responseType
19-
* @param userAgent userAgent
20-
* @param httpClientConfig httpClientConfig
21-
* @param httpClient httpClient
22-
* @deprecated use one of getAuthorizationUrl method in {@link com.github.scribejava.core.oauth.OAuth20Service}
23-
*/
24-
@Deprecated
25-
public WunderlistOAuthService(WunderlistAPI api, String apiKey, String apiSecret, String callback, String scope,
26-
String state, String responseType, String userAgent, HttpClientConfig httpClientConfig,
27-
HttpClient httpClient) {
28-
super(api, apiKey, apiSecret, callback, scope, state, responseType, userAgent, httpClientConfig, httpClient);
29-
}
30-
3111
public WunderlistOAuthService(WunderlistAPI api, String apiKey, String apiSecret, String callback, String scope,
3212
String responseType, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {
3313
super(api, apiKey, apiSecret, callback, scope, responseType, userAgent, httpClientConfig, httpClient);

0 commit comments

Comments
 (0)