Skip to content

Commit 2b0dce2

Browse files
kullfarkullfar
committed
remove deprecated code
1 parent c090469 commit 2b0dce2

File tree

8 files changed

+5
-170
lines changed

8 files changed

+5
-170
lines changed

‎changelog‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[SNAPSHOT]
2+
13
[4.1.0]
24
* make client_secret optional in OAuth2 while requesting AccessToken (if set to null, it's not required by OAuth2 specs)
35
* move OAuth1 SignatureType from ServiceBuilder to API

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

Lines changed: 2 additions & 27 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.OAuthConfig;
77
import com.github.scribejava.core.model.OAuthConstants;
8-
import com.github.scribejava.core.builder.api.OAuth1SignatureType;
98
import com.github.scribejava.core.oauth.OAuthService;
109
import com.github.scribejava.core.utils.Preconditions;
1110

@@ -21,12 +20,6 @@ public class ServiceBuilder {
2120
private String apiSecret;
2221
private String scope;
2322
private String state;
24-
/**
25-
* @deprecated override or change in Pull Request
26-
* {@link com.github.scribejava.core.builder.api.DefaultApi10a#getSignatureType()}
27-
*/
28-
@Deprecated
29-
private OAuth1SignatureType signatureType;
3023
private OutputStream debugStream;
3124
private String responseType = "code";
3225
private String userAgent;
@@ -98,23 +91,6 @@ public ServiceBuilder state(String state) {
9891
return this;
9992
}
10093

101-
/**
102-
* Configures the signature type, choose between header, querystring, etc. Defaults to null.<br>
103-
* 'null' means to use default for API
104-
* {@link com.github.scribejava.core.builder.api.DefaultApi10a#getSignatureType()}
105-
*
106-
* @param signatureType OAuth1SignatureType
107-
* @return the {@link ServiceBuilder} instance for method chaining
108-
*
109-
* @deprecated override or change in Pull Request
110-
* {@link com.github.scribejava.core.builder.api.DefaultApi10a#getSignatureType()}
111-
*/
112-
@Deprecated
113-
public ServiceBuilder signatureType(OAuth1SignatureType signatureType) {
114-
this.signatureType = signatureType;
115-
return this;
116-
}
117-
11894
public ServiceBuilder debugStream(OutputStream debugStream) {
11995
Preconditions.checkNotNull(debugStream, "debug stream can't be null");
12096
this.debugStream = debugStream;
@@ -158,11 +134,10 @@ public void checkPreconditions() {
158134
Preconditions.checkEmptyString(apiKey, "You must provide an api key");
159135
}
160136

161-
@SuppressWarnings("deprecation")
162137
private OAuthConfig createConfig() {
163138
checkPreconditions();
164-
return new OAuthConfig(apiKey, apiSecret, callback, signatureType, scope, debugStream, state, responseType,
165-
userAgent, httpClientConfig, httpClient);
139+
return new OAuthConfig(apiKey, apiSecret, callback, scope, debugStream, state, responseType, userAgent,
140+
httpClientConfig, httpClient);
166141
}
167142

168143
/**

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

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthConfig.java‎

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.github.scribejava.core.model;
22

3-
import com.github.scribejava.core.builder.api.OAuth1SignatureType;
43
import com.github.scribejava.core.httpclient.HttpClient;
54
import com.github.scribejava.core.httpclient.HttpClientConfig;
65
import java.io.IOException;
@@ -14,12 +13,6 @@ public class OAuthConfig {
1413
private final String apiKey;
1514
private final String apiSecret;
1615
private final String callback;
17-
/**
18-
* @deprecated override or change in Pull Request
19-
* {@link com.github.scribejava.core.builder.api.DefaultApi10a#getSignatureType()}
20-
*/
21-
@Deprecated
22-
private OAuth1SignatureType signatureType;
2316
private final String scope;
2417
private final OutputStream debugStream;
2518
private final String state;
@@ -33,35 +26,6 @@ public OAuthConfig(String key, String secret) {
3326
this(key, secret, null, null, null, null, null, null, null, null);
3427
}
3528

36-
/**
37-
* @param apiKey apiKey
38-
* @param apiSecret apiSecret
39-
* @param callback callback
40-
* @param signatureType signatureType
41-
* @param scope scope
42-
* @param debugStream debugStream
43-
* @param state state
44-
* @param responseType responseType
45-
* @param userAgent userAgent
46-
* @param httpClientConfig httpClientConfig
47-
* @param httpClient httpClient
48-
*
49-
* @deprecated use {@link #OAuthConfig(java.lang.String, java.lang.String, java.lang.String, java.lang.String,
50-
* java.io.OutputStream, java.lang.String, java.lang.String, java.lang.String,
51-
* com.github.scribejava.core.httpclient.HttpClientConfig, com.github.scribejava.core.httpclient.HttpClient)}
52-
* <br>
53-
* without OAuth1SignatureType param. to change OAuth1SignatureType override or change in Pull Request
54-
* <br>{@link com.github.scribejava.core.builder.api.DefaultApi10a#getSignatureType()}
55-
*/
56-
@Deprecated
57-
public OAuthConfig(String apiKey, String apiSecret, String callback, OAuth1SignatureType signatureType,
58-
String scope, OutputStream debugStream, String state, String responseType, String userAgent,
59-
HttpClientConfig httpClientConfig, HttpClient httpClient) {
60-
this(apiKey, apiSecret, callback, scope, debugStream, state, responseType, userAgent, httpClientConfig,
61-
httpClient);
62-
this.signatureType = signatureType;
63-
}
64-
6529
public OAuthConfig(String apiKey, String apiSecret, String callback, String scope, OutputStream debugStream,
6630
String state, String responseType, String userAgent, HttpClientConfig httpClientConfig,
6731
HttpClient httpClient) {
@@ -89,17 +53,6 @@ public String getCallback() {
8953
return callback;
9054
}
9155

92-
/**
93-
* @return configured OAuth1SignatureType to override from API
94-
*
95-
* @deprecated override or change in Pull Request
96-
* {@link com.github.scribejava.core.builder.api.DefaultApi10a#getSignatureType()}
97-
*/
98-
@Deprecated
99-
public OAuth1SignatureType getSignatureType() {
100-
return signatureType;
101-
}
102-
10356
public String getScope() {
10457
return scope;
10558
}

‎scribejava-core/src/main/java/com/github/scribejava/core/model/SignatureType.java‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,7 @@ private String getSignature(OAuthRequest request, String tokenSecret) {
180180

181181
protected void appendSignature(OAuthRequest request) {
182182
final OAuthConfig config = getConfig();
183-
@SuppressWarnings("deprecation")
184-
final OAuth1SignatureType signatureType
185-
= config.getSignatureType() == null ? api.getSignatureType() : config.getSignatureType();
183+
final OAuth1SignatureType signatureType = api.getSignatureType();
186184
switch (signatureType) {
187185
case Header:
188186
config.log("using Http Header signature");

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

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -58,24 +58,6 @@ public final Future<OAuth2AccessToken> getAccessTokenAsync(String code) {
5858
return getAccessToken(code, null);
5959
}
6060

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-
7961
public final OAuth2AccessToken getAccessToken(String code)
8062
throws IOException, InterruptedException, ExecutionException {
8163
final OAuthRequest request = createAccessTokenRequest(code);
@@ -120,22 +102,6 @@ public final Future<OAuth2AccessToken> refreshAccessTokenAsync(String refreshTok
120102
return refreshAccessToken(refreshToken, null);
121103
}
122104

123-
/**
124-
*
125-
* @param refreshToken refreshToken
126-
* @param callback callback
127-
* @return future
128-
* @deprecated use {@link #refreshAccessToken(java.lang.String,
129-
* com.github.scribejava.core.model.OAuthAsyncRequestCallback)}
130-
*/
131-
@Deprecated
132-
public final Future<OAuth2AccessToken> refreshAccessTokenAsync(String refreshToken,
133-
OAuthAsyncRequestCallback<OAuth2AccessToken> callback) {
134-
final OAuthRequest request = createRefreshTokenRequest(refreshToken);
135-
136-
return sendAccessTokenRequestAsync(request, callback);
137-
}
138-
139105
public final OAuth2AccessToken refreshAccessToken(String refreshToken)
140106
throws IOException, InterruptedException, ExecutionException {
141107
final OAuthRequest request = createRefreshTokenRequest(refreshToken);

‎scribejava-core/src/test/java/com/github/scribejava/core/builder/ServiceBuilderTest.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.github.scribejava.core.builder.api.DefaultApi20;
77
import com.github.scribejava.core.model.OAuthConfig;
88
import com.github.scribejava.core.model.OAuthConstants;
9-
import com.github.scribejava.core.builder.api.OAuth1SignatureType;
109
import com.github.scribejava.core.oauth.OAuth20Service;
1110

1211
public class ServiceBuilderTest {
@@ -21,15 +20,13 @@ public void setUp() {
2120
}
2221

2322
@Test
24-
@SuppressWarnings("deprecation")
2523
public void shouldReturnConfigDefaultValues() {
2624
builder.apiKey("key").apiSecret("secret").build(api);
2725

2826
final OAuthConfig config = api.getConfig();
2927
assertEquals(config.getApiKey(), "key");
3028
assertEquals(config.getApiSecret(), "secret");
3129
assertEquals(config.getCallback(), OAuthConstants.OUT_OF_BAND);
32-
assertEquals(config.getSignatureType(), null);
3330
}
3431

3532
@Test
@@ -42,17 +39,6 @@ public void shouldAcceptValidCallbackUrl() {
4239
assertEquals(config.getCallback(), "http://example.com");
4340
}
4441

45-
@Test
46-
@SuppressWarnings("deprecation")
47-
public void shouldAcceptASignatureType() {
48-
builder.apiKey("key").apiSecret("secret").signatureType(OAuth1SignatureType.QueryString).build(api);
49-
50-
final OAuthConfig config = api.getConfig();
51-
assertEquals(config.getApiKey(), "key");
52-
assertEquals(config.getApiSecret(), "secret");
53-
assertEquals(config.getSignatureType(), OAuth1SignatureType.QueryString);
54-
}
55-
5642
@Test(expected = IllegalArgumentException.class)
5743
public void shouldNotAcceptNullAsCallback() {
5844
builder.apiKey("key").apiSecret("secret").callback(null).build(api);

0 commit comments

Comments
 (0)