Skip to content

Commit 7a635da

Browse files
kullfarkullfar
committed
drop deprecated methods and constructors
1 parent 72723ba commit 7a635da

File tree

9 files changed

+0
-118
lines changed

9 files changed

+0
-118
lines changed

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.github.scribejava.core.httpclient.HttpClientConfig;
66
import com.github.scribejava.core.model.OAuthRequest;
77
import com.github.scribejava.core.oauth.OAuth20Service;
8-
import java.io.OutputStream;
98
import java.security.InvalidKeyException;
109
import java.security.NoSuchAlgorithmException;
1110
import java.util.Formatter;
@@ -14,18 +13,6 @@
1413

1514
public class FacebookService extends OAuth20Service {
1615

17-
/**
18-
* @deprecated use {@link #FacebookService(com.github.scribejava.core.builder.api.DefaultApi20, java.lang.String,
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)}
21-
*/
22-
@Deprecated
23-
public FacebookService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
24-
OutputStream debugStream, String state, String responseType, String userAgent,
25-
HttpClientConfig httpClientConfig, HttpClient httpClient) {
26-
this(api, apiKey, apiSecret, callback, scope, state, responseType, userAgent, httpClientConfig, httpClient);
27-
}
28-
2916
public FacebookService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
3017
String state, String responseType, String userAgent, HttpClientConfig httpClientConfig,
3118
HttpClient httpClient) {

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,9 @@
77
import com.github.scribejava.core.model.OAuthConstants;
88
import com.github.scribejava.core.model.OAuthRequest;
99
import com.github.scribejava.core.oauth.OAuth20Service;
10-
import java.io.OutputStream;
1110

1211
public class ImgurOAuthService extends OAuth20Service {
1312

14-
/**
15-
* @deprecated use {@link #ImgurOAuthService(com.github.scribejava.core.builder.api.DefaultApi20, java.lang.String,
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)}
18-
*/
19-
@Deprecated
20-
public ImgurOAuthService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
21-
OutputStream debugStream, String state, String responseType, String userAgent,
22-
HttpClientConfig httpClientConfig, HttpClient httpClient) {
23-
this(api, apiKey, apiSecret, callback, scope, state, responseType, userAgent, httpClientConfig, httpClient);
24-
}
25-
2613
public ImgurOAuthService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
2714
String state, String responseType, String userAgent, HttpClientConfig httpClientConfig,
2815
HttpClient httpClient) {

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.github.scribejava.core.httpclient.HttpClientConfig;
99
import com.github.scribejava.core.model.OAuthRequest;
1010
import com.github.scribejava.core.oauth.OAuth20Service;
11-
import java.io.OutputStream;
1211
import java.io.UnsupportedEncodingException;
1312
import java.nio.charset.Charset;
1413
import java.security.MessageDigest;
@@ -17,18 +16,6 @@
1716

1817
public class MailruOAuthService extends OAuth20Service {
1918

20-
/**
21-
* @deprecated use {@link #MailruOAuthService(com.github.scribejava.core.builder.api.DefaultApi20, java.lang.String,
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)}
24-
*/
25-
@Deprecated
26-
public MailruOAuthService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
27-
OutputStream debugStream, String state, String responseType, String userAgent,
28-
HttpClientConfig httpClientConfig, HttpClient httpClient) {
29-
this(api, apiKey, apiSecret, callback, scope, state, responseType, userAgent, httpClientConfig, httpClient);
30-
}
31-
3219
public MailruOAuthService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
3320
String state, String responseType, String userAgent, HttpClientConfig httpClientConfig,
3421
HttpClient httpClient) {

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,12 @@
55
import com.github.scribejava.core.httpclient.HttpClientConfig;
66
import com.github.scribejava.core.model.OAuthRequest;
77
import com.github.scribejava.core.oauth.OAuth20Service;
8-
import java.io.OutputStream;
98

109
public class MicrosoftAzureActiveDirectoryService extends OAuth20Service {
1110

1211
private static final String ACCEPTED_FORMAT
1312
= "application/json; odata=minimalmetadata; streaming=true; charset=utf-8";
1413

15-
/**
16-
* @deprecated use {@link #MicrosoftAzureActiveDirectoryService(com.github.scribejava.core.builder.api.DefaultApi20,
17-
* java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String,
18-
* java.lang.String, com.github.scribejava.core.httpclient.HttpClientConfig,
19-
* com.github.scribejava.core.httpclient.HttpClient)}
20-
*/
21-
@Deprecated
22-
public MicrosoftAzureActiveDirectoryService(DefaultApi20 api, String apiKey, String apiSecret, String callback,
23-
String scope, OutputStream debugStream, String state, String responseType, String userAgent,
24-
HttpClientConfig httpClientConfig, HttpClient httpClient) {
25-
this(api, apiKey, apiSecret, callback, scope, state, responseType, userAgent, httpClientConfig, httpClient);
26-
}
27-
2814
public MicrosoftAzureActiveDirectoryService(DefaultApi20 api, String apiKey, String apiSecret, String callback,
2915
String scope, String state, String responseType, String userAgent, HttpClientConfig httpClientConfig,
3016
HttpClient httpClient) {

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.github.scribejava.core.model.Parameter;
88
import com.github.scribejava.core.model.ParameterList;
99
import com.github.scribejava.core.oauth.OAuth20Service;
10-
import java.io.OutputStream;
1110
import java.io.UnsupportedEncodingException;
1211

1312
import java.net.URLDecoder;
@@ -20,19 +19,6 @@
2019

2120
public class OdnoklassnikiOAuthService extends OAuth20Service {
2221

23-
/**
24-
* @deprecated use {@link #OdnoklassnikiOAuthService(com.github.scribejava.core.builder.api.DefaultApi20,
25-
* java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String,
26-
* java.lang.String, com.github.scribejava.core.httpclient.HttpClientConfig,
27-
* com.github.scribejava.core.httpclient.HttpClient)}
28-
*/
29-
@Deprecated
30-
public OdnoklassnikiOAuthService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
31-
OutputStream debugStream, String state, String responseType, String userAgent,
32-
HttpClientConfig httpClientConfig, HttpClient httpClient) {
33-
this(api, apiKey, apiSecret, callback, scope, state, responseType, userAgent, httpClientConfig, httpClient);
34-
}
35-
3622
public OdnoklassnikiOAuthService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
3723
String state, String responseType, String userAgent, HttpClientConfig httpClientConfig,
3824
HttpClient httpClient) {

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,9 @@
66
import com.github.scribejava.core.model.OAuthConstants;
77
import com.github.scribejava.core.model.OAuthRequest;
88
import com.github.scribejava.core.oauth.OAuth20Service;
9-
import java.io.OutputStream;
109

1110
public class TutByOAuthService extends OAuth20Service {
1211

13-
/**
14-
* @deprecated use {@link #TutByOAuthService(com.github.scribejava.core.builder.api.DefaultApi20, java.lang.String,
15-
* java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String,
16-
* com.github.scribejava.core.httpclient.HttpClientConfig, com.github.scribejava.core.httpclient.HttpClient)}
17-
*/
18-
@Deprecated
19-
public TutByOAuthService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
20-
OutputStream debugStream, String state, String responseType, String userAgent,
21-
HttpClientConfig httpClientConfig, HttpClient httpClient) {
22-
this(api, apiKey, apiSecret, callback, scope, state, responseType, userAgent, httpClientConfig, httpClient);
23-
}
24-
2512
public TutByOAuthService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
2613
String state, String responseType, String userAgent, HttpClientConfig httpClientConfig,
2714
HttpClient httpClient) {

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,6 @@ public class OAuth10aService extends OAuthService {
2525
private final OutputStream debugStream;
2626
private final DefaultApi10a api;
2727

28-
/**
29-
* @deprecated use {@link #OAuth10aService(com.github.scribejava.core.builder.api.DefaultApi10a, java.lang.String,
30-
* java.lang.String, java.lang.String, java.lang.String, java.io.OutputStream, java.lang.String,
31-
* com.github.scribejava.core.httpclient.HttpClientConfig, com.github.scribejava.core.httpclient.HttpClient)}
32-
*/
33-
@Deprecated
34-
public OAuth10aService(DefaultApi10a api, String apiKey, String apiSecret, String callback, String scope,
35-
OutputStream debugStream, String state, String responseType, String userAgent,
36-
HttpClientConfig httpClientConfig, HttpClient httpClient) {
37-
this(api, apiKey, apiSecret, callback, scope, debugStream, userAgent, httpClientConfig, httpClient);
38-
}
39-
4028
public OAuth10aService(DefaultApi10a api, String apiKey, String apiSecret, String callback, String scope,
4129
OutputStream debugStream, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {
4230
super(apiKey, apiSecret, callback, scope, userAgent, httpClientConfig, httpClient);

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.Map;
2121
import java.util.concurrent.ExecutionException;
2222
import com.github.scribejava.core.revoke.TokenTypeHint;
23-
import java.io.OutputStream;
2423

2524
public class OAuth20Service extends OAuthService {
2625

@@ -30,18 +29,6 @@ public class OAuth20Service extends OAuthService {
3029
private final String responseType;
3130
private final String state;
3231

33-
/**
34-
* @deprecated use {@link #OAuth20Service(com.github.scribejava.core.builder.api.DefaultApi20, java.lang.String,
35-
* java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String,
36-
* com.github.scribejava.core.httpclient.HttpClientConfig, com.github.scribejava.core.httpclient.HttpClient)}
37-
*/
38-
@Deprecated
39-
public OAuth20Service(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
40-
OutputStream debugStream, String state, String responseType, String userAgent,
41-
HttpClientConfig httpClientConfig, HttpClient httpClient) {
42-
this(api, apiKey, apiSecret, callback, scope, state, responseType, userAgent, httpClientConfig, httpClient);
43-
}
44-
4532
public OAuth20Service(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
4633
String state, String responseType, String userAgent, HttpClientConfig httpClientConfig,
4734
HttpClient httpClient) {

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.io.File;
1313

1414
import java.io.IOException;
15-
import java.io.OutputStream;
1615
import java.util.ServiceLoader;
1716
import java.util.concurrent.ExecutionException;
1817
import java.util.concurrent.Future;
@@ -41,18 +40,6 @@ public OAuthService(String apiKey, String apiSecret, String callback, String sco
4140
}
4241
}
4342

44-
/**
45-
* @deprecated use {@link #OAuthService(java.lang.String, java.lang.String, java.lang.String, java.lang.String,
46-
* java.lang.String, com.github.scribejava.core.httpclient.HttpClientConfig,
47-
* com.github.scribejava.core.httpclient.HttpClient)}
48-
*/
49-
@Deprecated
50-
public OAuthService(String apiKey, String apiSecret, String callback, String scope, OutputStream debugStream,
51-
String state, String responseType, String userAgent, HttpClientConfig httpClientConfig,
52-
HttpClient httpClient) {
53-
this(apiKey, apiSecret, callback, scope, userAgent, httpClientConfig, httpClient);
54-
}
55-
5643
private static HttpClient getClient(HttpClientConfig config) {
5744
for (HttpClientProvider provider : ServiceLoader.load(HttpClientProvider.class)) {
5845
final HttpClient client = provider.createClient(config);

0 commit comments

Comments
 (0)