Skip to content

Commit 96217e5

Browse files
s-gromovs-gromov
committed
FIX: ScribeJava shouldn't require all async http client provider to be on the classpath if using only one of them
1 parent 11b76c4 commit 96217e5

5 files changed

Lines changed: 14 additions & 11 deletions

File tree

‎changelog‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
[SNAPSHOT]
2+
* FIX: ScribeJava shouldn't require all async http client provider to be on the classpath if using only one of them
3+
14
[2.7.2]
25
* FIX: ScribeJava shouldn't require any async http client provider to be on the classpath (neither ning neither AHC)
36

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
3939
.apiSecret(clientSecret)
4040
.state(secretState)
4141
.callback("http://www.example.com/oauth_callback/")
42-
.asyncHttpClientConfig(clientConfig)
42+
.asyncNingHttpClientConfig(clientConfig)
4343
.build(FacebookApi.instance());
4444

4545
final Scanner in = new Scanner(System.in, "UTF-8");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
4242
.scope("profile") // replace with desired scope
4343
.state(secretState)
4444
.callback("http://example.com/callback")
45-
.asyncHttpClientConfig(clientConfig)
45+
.asyncAHCHttpClientConfig(clientConfig)
4646
.build(GoogleApi20.instance());
4747
final Scanner in = new Scanner(System.in, "UTF-8");
4848

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
3535
.apiKey(clientId)
3636
.apiSecret(clientSecret)
3737
.callback("http://www.example.com/oauth_callback/")
38-
.asyncHttpClientConfig(clientConfig)
38+
.asyncNingHttpClientConfig(clientConfig)
3939
.build(MailruApi.instance());
4040

4141
final Scanner in = new Scanner(System.in, "UTF-8");

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,27 +135,27 @@ public ServiceBuilder readTimeout(Integer readTimeout) {
135135
return this;
136136
}
137137

138-
public ServiceBuilder asyncHttpClientConfig(com.ning.http.client.AsyncHttpClientConfig asyncHttpClientConfig) {
138+
public ServiceBuilder asyncNingHttpClientConfig(com.ning.http.client.AsyncHttpClientConfig asyncHttpClientConfig) {
139139
Preconditions.checkNotNull(asyncHttpClientConfig, "asyncHttpClientConfig can't be null");
140140
ningAsyncHttpClientConfig = asyncHttpClientConfig;
141141
ahcAsyncHttpClientConfig = null;
142142
return this;
143143
}
144144

145-
public ServiceBuilder asyncHttpClientConfig(org.asynchttpclient.AsyncHttpClientConfig asyncHttpClientConfig) {
145+
public ServiceBuilder asyncNingHttpProviderClassName(String asyncHttpProviderClassName) {
146+
this.ningAsyncHttpProviderClassName = asyncHttpProviderClassName;
147+
ahcAsyncHttpClientConfig = null;
148+
return this;
149+
}
150+
151+
public ServiceBuilder asyncAHCHttpClientConfig(org.asynchttpclient.AsyncHttpClientConfig asyncHttpClientConfig) {
146152
Preconditions.checkNotNull(asyncHttpClientConfig, "asyncHttpClientConfig can't be null");
147153
ahcAsyncHttpClientConfig = asyncHttpClientConfig;
148154
ningAsyncHttpClientConfig = null;
149155
ningAsyncHttpProviderClassName = null;
150156
return this;
151157
}
152158

153-
public ServiceBuilder asyncHttpProviderClassName(String asyncHttpProviderClassName) {
154-
this.ningAsyncHttpProviderClassName = asyncHttpProviderClassName;
155-
ahcAsyncHttpClientConfig = null;
156-
return this;
157-
}
158-
159159
public ServiceBuilder userAgent(String userAgent) {
160160
this.userAgent = userAgent;
161161
return this;

0 commit comments

Comments
 (0)