X Tutup
Skip to content

Commit 8c2f85b

Browse files
s-gromovs-gromov
committed
improve some small issues in prev. commit
1 parent c9464fa commit 8c2f85b

File tree

9 files changed

+20
-19
lines changed

9 files changed

+20
-19
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ That **single line** (added newlines for readability) is the only thing you need
1919

2020
Hit ScribeJava as hard and with many threads as you like.
2121

22-
### Async
22+
### Async and other HTTP clients
2323

24-
You can use ning async http client out-of-box, just use ServiceBuilderAsync
24+
You can use ning async http client 1.9.x or asynchttpclient 2.x out-of-box, just add maven modules scribejava-httpclient-ning or scribejava-httpclient-ahc to your pom
2525

2626
### Supports all major 1.0a and 2.0 OAuth APIs out-of-the-box
2727

‎changelog‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
[SNAPSHOT]
2+
* create abstract HTTP Client layer to support different HTTP clients as plugins (AHC and Ning support becames maven submodules)
3+
14
[2.8.1]
25
* add Salesforce sandbox API support
36

‎scribejava-apis/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
</dependency>
2323
<dependency>
2424
<groupId>com.github.scribejava</groupId>
25-
<artifactId>scribejava-ahc</artifactId>
25+
<artifactId>scribejava-httpclient-ahc</artifactId>
2626
<version>${project.version}</version>
2727
<scope>test</scope>
2828
</dependency>
2929
<dependency>
3030
<groupId>com.github.scribejava</groupId>
31-
<artifactId>scribejava-ning</artifactId>
31+
<artifactId>scribejava-httpclient-ning</artifactId>
3232
<version>${project.version}</version>
3333
<scope>test</scope>
3434
</dependency>

‎scribejava-httpclient-ahc/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</parent>
1111

1212
<groupId>com.github.scribejava</groupId>
13-
<artifactId>scribejava-ahc</artifactId>
14-
<name>ScribeJava Async Http Client support</name>
13+
<artifactId>scribejava-httpclient-ahc</artifactId>
14+
<name>ScribeJava Async Http Http Client support</name>
1515
<packaging>jar</packaging>
1616

1717
<dependencies>

‎scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/AhcHttpClient.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import java.util.concurrent.Future;
1515

1616
import static com.github.scribejava.core.model.AbstractRequest.DEFAULT_CONTENT_TYPE;
17+
import org.asynchttpclient.BoundRequestBuilder;
1718

1819
public class AhcHttpClient implements HttpClient {
1920

@@ -32,14 +33,13 @@ public void close() throws IOException {
3233
public <T> Future<T> executeAsync(String userAgent, Map<String, String> headers, Verb httpVerb, String completeUrl,
3334
String bodyContents, OAuthAsyncRequestCallback<T> callback,
3435
OAuthRequestAsync.ResponseConverter<T> converter) {
35-
final org.asynchttpclient.BoundRequestBuilder boundRequestBuilder;
36+
final BoundRequestBuilder boundRequestBuilder;
3637
switch (httpVerb) {
3738
case GET:
3839
boundRequestBuilder = client.prepareGet(completeUrl);
3940
break;
4041
case POST:
41-
org.asynchttpclient.BoundRequestBuilder requestBuilder
42-
= client.preparePost(completeUrl);
42+
BoundRequestBuilder requestBuilder = client.preparePost(completeUrl);
4343
if (!headers.containsKey(AbstractRequest.CONTENT_TYPE)) {
4444
requestBuilder = requestBuilder.addHeader(AbstractRequest.CONTENT_TYPE, DEFAULT_CONTENT_TYPE);
4545
}

‎scribejava-httpclient-ahc/src/main/resources/META-INF/services/com.github.scribejava.core.httpclient.HttpClientProvider‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
com.github.scribejava.httpclient.ahc.AhcProvider
1+
com.github.scribejava.httpclient.ahc.AhcProvider

‎scribejava-httpclient-ning/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</parent>
1111

1212
<groupId>com.github.scribejava</groupId>
13-
<artifactId>scribejava-ning</artifactId>
14-
<name>ScribeJava Ning Async client support</name>
13+
<artifactId>scribejava-httpclient-ning</artifactId>
14+
<name>ScribeJava Ning Async Http Client support</name>
1515
<packaging>jar</packaging>
1616

1717
<dependencies>

‎scribejava-httpclient-ning/src/main/java/com/github/scribejava/httpclient/ning/NingHttpClient.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ public class NingHttpClient implements HttpClient {
1919

2020
public NingHttpClient(NingHttpClientConfig ningConfig) {
2121
final String ningAsyncHttpProviderClassName = ningConfig.getNingAsyncHttpProviderClassName();
22-
client = ningAsyncHttpProviderClassName == null
23-
? new com.ning.http.client.AsyncHttpClient(ningConfig.getConfig())
24-
: new com.ning.http.client.AsyncHttpClient(ningAsyncHttpProviderClassName, ningConfig.getConfig());
22+
client = ningAsyncHttpProviderClassName == null ? new AsyncHttpClient(ningConfig.getConfig())
23+
: new AsyncHttpClient(ningAsyncHttpProviderClassName, ningConfig.getConfig());
2524
}
2625

2726
@Override
@@ -33,14 +32,13 @@ public void close() {
3332
public <T> Future<T> executeAsync(String userAgent, Map<String, String> headers, Verb httpVerb, String completeUrl,
3433
String bodyContents, OAuthAsyncRequestCallback<T> callback,
3534
OAuthRequestAsync.ResponseConverter<T> converter) {
36-
final com.ning.http.client.AsyncHttpClient.BoundRequestBuilder boundRequestBuilder;
35+
final AsyncHttpClient.BoundRequestBuilder boundRequestBuilder;
3736
switch (httpVerb) {
3837
case GET:
3938
boundRequestBuilder = client.prepareGet(completeUrl);
4039
break;
4140
case POST:
42-
com.ning.http.client.AsyncHttpClient.BoundRequestBuilder requestBuilder
43-
= client.preparePost(completeUrl);
41+
AsyncHttpClient.BoundRequestBuilder requestBuilder = client.preparePost(completeUrl);
4442
if (!headers.containsKey(AbstractRequest.CONTENT_TYPE)) {
4543
requestBuilder = requestBuilder.addHeader(AbstractRequest.CONTENT_TYPE, DEFAULT_CONTENT_TYPE);
4644
}

‎scribejava-httpclient-ning/src/main/resources/META-INF/services/com.github.scribejava.core.httpclient.HttpClientProvider‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
com.github.scribejava.httpclient.ning.NingProvider
1+
com.github.scribejava.httpclient.ning.NingProvider

0 commit comments

Comments
 (0)
X Tutup