Skip to content

Commit 840dbeb

Browse files
kullfarkullfar
committed
deprecate ScribeJavaConfig and ForceTypeOfHttpRequest
1 parent 548da8f commit 840dbeb

9 files changed

Lines changed: 10 additions & 93 deletions

File tree

‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/FacebookAsyncNingExample.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77
import java.util.concurrent.ExecutionException;
88
import com.github.scribejava.apis.FacebookApi;
99
import com.github.scribejava.core.builder.ServiceBuilder;
10-
import com.github.scribejava.core.model.ForceTypeOfHttpRequest;
1110
import com.github.scribejava.core.model.OAuth2AccessToken;
1211
import com.github.scribejava.core.model.OAuthRequestAsync;
1312
import com.github.scribejava.core.model.Response;
14-
import com.github.scribejava.core.model.ScribeJavaConfig;
1513
import com.github.scribejava.core.model.Verb;
1614
import com.github.scribejava.core.oauth.OAuth20Service;
1715
import java.io.IOException;
@@ -29,7 +27,6 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
2927
final String clientId = "your client id";
3028
final String clientSecret = "your client secret";
3129
final String secretState = "secret" + new Random().nextInt(999_999);
32-
ScribeJavaConfig.setForceTypeOfHttpRequests(ForceTypeOfHttpRequest.FORCE_ASYNC_ONLY_HTTP_REQUESTS);
3330
final NingHttpClientConfig clientConfig = new NingHttpClientConfig(new AsyncHttpClientConfig.Builder()
3431
.setMaxConnections(5)
3532
.setRequestTimeout(10_000)

‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Google20AsyncAHCExample.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@
55
import com.github.scribejava.apis.GoogleApi20;
66
import com.github.scribejava.httpclient.ahc.AhcHttpClientConfig;
77
import com.github.scribejava.core.builder.ServiceBuilder;
8-
import com.github.scribejava.core.model.ForceTypeOfHttpRequest;
98
import com.github.scribejava.core.httpclient.HttpClientConfig;
109
import com.github.scribejava.core.model.OAuth2AccessToken;
1110
import com.github.scribejava.core.model.OAuthRequestAsync;
1211
import com.github.scribejava.core.model.Response;
13-
import com.github.scribejava.core.model.ScribeJavaConfig;
1412
import com.github.scribejava.core.model.Verb;
1513
import com.github.scribejava.core.oauth.OAuth20Service;
1614
import java.io.IOException;
@@ -32,7 +30,6 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
3230
final String clientId = "your client id";
3331
final String clientSecret = "your client secret";
3432
final String secretState = "secret" + new Random().nextInt(999_999);
35-
ScribeJavaConfig.setForceTypeOfHttpRequests(ForceTypeOfHttpRequest.FORCE_ASYNC_ONLY_HTTP_REQUESTS);
3633
final HttpClientConfig clientConfig = new AhcHttpClientConfig(new DefaultAsyncHttpClientConfig.Builder()
3734
.setMaxConnections(5)
3835
.setRequestTimeout(10_000)

‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/SalesforceNingAsyncExample.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111
import com.github.scribejava.apis.salesforce.SalesforceToken;
1212
import com.github.scribejava.httpclient.ning.NingHttpClientConfig;
1313
import com.github.scribejava.core.builder.ServiceBuilder;
14-
import com.github.scribejava.core.model.ForceTypeOfHttpRequest;
1514
import com.github.scribejava.core.model.OAuthRequestAsync;
1615
import com.github.scribejava.core.model.Response;
17-
import com.github.scribejava.core.model.ScribeJavaConfig;
1816
import com.github.scribejava.core.model.Verb;
1917
import com.github.scribejava.core.oauth.OAuth20Service;
2018
import com.ning.http.client.AsyncHttpClientConfig;
@@ -35,7 +33,6 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
3533
final String clientId = "your client id";
3634
final String clientSecret = "your client secret";
3735

38-
ScribeJavaConfig.setForceTypeOfHttpRequests(ForceTypeOfHttpRequest.FORCE_ASYNC_ONLY_HTTP_REQUESTS);
3936
final NingHttpClientConfig clientConfig = new NingHttpClientConfig(new AsyncHttpClientConfig.Builder()
4037
.setMaxConnections(5)
4138
.setRequestTimeout(10_000)

‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/VkontakteExternalHttpExample.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
import java.util.Scanner;
44
import com.github.scribejava.core.builder.ServiceBuilder;
55
import com.github.scribejava.apis.VkontakteApi;
6-
import com.github.scribejava.core.model.ForceTypeOfHttpRequest;
76
import com.github.scribejava.core.model.OAuth2AccessToken;
87
import com.github.scribejava.core.model.OAuthRequestAsync;
98
import com.github.scribejava.core.model.Response;
10-
import com.github.scribejava.core.model.ScribeJavaConfig;
119
import com.github.scribejava.core.model.Verb;
1210
import com.github.scribejava.core.oauth.OAuth20Service;
1311
import com.github.scribejava.httpclient.ahc.AhcHttpClient;
@@ -28,7 +26,6 @@ public static void main(String... args) throws IOException, InterruptedException
2826
// Replace these with your client id and secret
2927
final String clientId = "your client id";
3028
final String clientSecret = "your client secret";
31-
ScribeJavaConfig.setForceTypeOfHttpRequests(ForceTypeOfHttpRequest.FORCE_ASYNC_ONLY_HTTP_REQUESTS);
3229

3330
//create any http client externally
3431
final DefaultAsyncHttpClientConfig httpClientConfig = new DefaultAsyncHttpClientConfig.Builder()

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

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

3+
/**
4+
*
5+
* @deprecated unused anymore. Have no sense and impaction
6+
*/
7+
@Deprecated
38
public enum ForceTypeOfHttpRequest {
49

510
NONE,

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import java.net.URL;
66
import java.util.Map;
77
import com.github.scribejava.core.exceptions.OAuthConnectionException;
8-
import com.github.scribejava.core.exceptions.OAuthException;
98
import com.github.scribejava.core.oauth.OAuthService;
109
import java.io.File;
1110

@@ -30,14 +29,6 @@ public OAuthRequest(Verb verb, String url, OAuthConfig config) {
3029
* @throws RuntimeException if the connection cannot be created.
3130
*/
3231
public Response send() {
33-
final ForceTypeOfHttpRequest forceTypeOfHttpRequest = ScribeJavaConfig.getForceTypeOfHttpRequests();
34-
35-
if (ForceTypeOfHttpRequest.FORCE_ASYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {
36-
throw new OAuthException("Cannot use sync operations, only async");
37-
}
38-
if (ForceTypeOfHttpRequest.PREFER_ASYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {
39-
config.log("Cannot use sync operations, only async");
40-
}
4132
try {
4233
createConnection();
4334
return doSend();

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

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

3+
/**
4+
*
5+
* @deprecated unused anymore. Have no sense and impaction
6+
*/
7+
@Deprecated
38
public abstract class ScribeJavaConfig {
49

510
private static ForceTypeOfHttpRequest forceTypeOfHttpRequests = ForceTypeOfHttpRequest.NONE;

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

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
package com.github.scribejava.core.oauth;
22

3-
import com.github.scribejava.core.exceptions.OAuthException;
43
import com.github.scribejava.core.httpclient.HttpClientProvider;
54
import com.github.scribejava.core.model.AbstractRequest;
6-
import com.github.scribejava.core.model.ForceTypeOfHttpRequest;
75
import com.github.scribejava.core.httpclient.HttpClient;
86
import com.github.scribejava.core.httpclient.HttpClientConfig;
97
import com.github.scribejava.core.model.OAuthAsyncRequestCallback;
108
import com.github.scribejava.core.model.OAuthConfig;
119
import com.github.scribejava.core.model.OAuthRequest;
1210
import com.github.scribejava.core.model.OAuthRequestAsync;
1311
import com.github.scribejava.core.model.Response;
14-
import com.github.scribejava.core.model.ScribeJavaConfig;
1512
import com.github.scribejava.core.model.Token;
1613
import java.io.File;
1714

@@ -32,26 +29,12 @@ public abstract class OAuthService<T extends Token> {
3229

3330
public OAuthService(OAuthConfig config) {
3431
this.config = config;
35-
final ForceTypeOfHttpRequest forceTypeOfHttpRequest = ScribeJavaConfig.getForceTypeOfHttpRequests();
3632
final HttpClientConfig httpClientConfig = config.getHttpClientConfig();
3733
final HttpClient externalHttpClient = config.getHttpClient();
3834

3935
if (httpClientConfig == null && externalHttpClient == null) {
40-
if (ForceTypeOfHttpRequest.FORCE_ASYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {
41-
throw new OAuthException("Cannot use sync operations, only async");
42-
}
43-
if (ForceTypeOfHttpRequest.PREFER_ASYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {
44-
config.log("Cannot use sync operations, only async");
45-
}
4636
httpClient = null;
4737
} else {
48-
if (ForceTypeOfHttpRequest.FORCE_SYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {
49-
throw new OAuthException("Cannot use async operations, only sync");
50-
}
51-
if (ForceTypeOfHttpRequest.PREFER_SYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {
52-
config.log("Cannot use async operations, only sync");
53-
}
54-
5538
httpClient = externalHttpClient == null ? getClient(httpClientConfig) : externalHttpClient;
5639
}
5740
}
@@ -86,14 +69,6 @@ public OAuthConfig getConfig() {
8669
public <T> Future<T> execute(OAuthRequestAsync request, OAuthAsyncRequestCallback<T> callback,
8770
OAuthRequestAsync.ResponseConverter<T> converter) {
8871

89-
final ForceTypeOfHttpRequest forceTypeOfHttpRequest = ScribeJavaConfig.getForceTypeOfHttpRequests();
90-
if (ForceTypeOfHttpRequest.FORCE_SYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {
91-
throw new OAuthException("Cannot use async operations, only sync");
92-
}
93-
if (ForceTypeOfHttpRequest.PREFER_SYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {
94-
config.log("Cannot use async operations, only sync");
95-
}
96-
9772
final File filePayload = request.getFilePayload();
9873
if (filePayload != null) {
9974
return httpClient.executeAsync(config.getUserAgent(), request.getHeaders(), request.getVerb(),

‎scribejava-core/src/test/java/com/github/scribejava/core/model/ForceTypeOfHttpRequestTest.java‎

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

0 commit comments

Comments
 (0)