Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit38345ef

Browse files
committed
Fix AsyncHttpClientCall#responseCallback NPE
Plus minor nits
1 parented1aa39 commit38345ef

File tree

3 files changed

+19
-24
lines changed

3 files changed

+19
-24
lines changed

‎extras/retrofit2/src/main/java/org/asynchttpclient/extras/retrofit/AsyncHttpClientCall.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public Call clone() {
161161

162162
protected <T>ThandleException(Throwablethrowable,CallbackresponseCallback) {
163163
try {
164-
if (responseCallback==null) {
164+
if (responseCallback!=null) {
165165
responseCallback.onFailure(this,toIOException(throwable));
166166
}
167167
}catch (Exceptione) {

‎extras/retrofit2/src/test/java/org/asynchttpclient/extras/retrofit/AsyncHttpClientCallTest.java‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,11 @@
1212
*/
1313
packageorg.asynchttpclient.extras.retrofit;
1414

15+
importstaticorg.asynchttpclient.extras.retrofit.AsyncHttpClientCall.*;
16+
importstaticorg.mockito.Matchers.any;
17+
importstaticorg.mockito.Mockito.*;
18+
importstaticorg.testng.Assert.assertTrue;
1519
importio.netty.handler.codec.http.EmptyHttpHeaders;
16-
importlombok.extern.slf4j.Slf4j;
17-
importlombok.val;
18-
importokhttp3.Request;
19-
importorg.asynchttpclient.AsyncCompletionHandler;
20-
importorg.asynchttpclient.AsyncHttpClient;
21-
importorg.asynchttpclient.BoundRequestBuilder;
22-
importorg.asynchttpclient.Response;
23-
importorg.testng.Assert;
24-
importorg.testng.annotations.DataProvider;
25-
importorg.testng.annotations.Test;
2620

2721
importjava.io.IOException;
2822
importjava.util.Arrays;
@@ -32,14 +26,17 @@
3226
importjava.util.concurrent.atomic.AtomicInteger;
3327
importjava.util.function.Consumer;
3428

35-
importstaticorg.asynchttpclient.extras.retrofit.AsyncHttpClientCall.runConsumer;
36-
importstaticorg.asynchttpclient.extras.retrofit.AsyncHttpClientCall.runConsumers;
37-
importstaticorg.mockito.Matchers.any;
38-
importstaticorg.mockito.Mockito.mock;
39-
importstaticorg.mockito.Mockito.when;
40-
importstaticorg.testng.Assert.assertTrue;
29+
importlombok.val;
30+
importokhttp3.Request;
31+
32+
importorg.asynchttpclient.AsyncCompletionHandler;
33+
importorg.asynchttpclient.AsyncHttpClient;
34+
importorg.asynchttpclient.BoundRequestBuilder;
35+
importorg.asynchttpclient.Response;
36+
importorg.testng.Assert;
37+
importorg.testng.annotations.DataProvider;
38+
importorg.testng.annotations.Test;
4139

42-
@Slf4j
4340
publicclassAsyncHttpClientCallTest {
4441
staticfinalRequestREQUEST =newRequest.Builder().url("http://www.google.com/").build();
4542

@@ -60,7 +57,7 @@ Object[][] dataProviderFirst() {
6057
}
6158

6259
@Test(dataProvider ="second")
63-
voidshouldInvokeConsumersOnEachExecution(Consumer<AsyncCompletionHandler>handlerConsumer,
60+
voidshouldInvokeConsumersOnEachExecution(Consumer<AsyncCompletionHandler<?>>handlerConsumer,
6461
intexpectedStarted,
6562
intexpectedOk,
6663
intexpectedFailed) {
@@ -82,6 +79,7 @@ void shouldInvokeConsumersOnEachExecution(Consumer<AsyncCompletionHandler> handl
8279
when(httpClient.prepareRequest((org.asynchttpclient.RequestBuilder)any())).thenReturn(brb);
8380

8481
when(httpClient.executeRequest((org.asynchttpclient.Request)any(),any())).then(invocationOnMock -> {
82+
@SuppressWarnings("rawtypes")
8583
valhandler =invocationOnMock.getArgumentAt(1,AsyncCompletionHandler.class);
8684
handlerConsumer.accept(handler);
8785
returnnull;
@@ -140,15 +138,13 @@ Object[][] dataProviderSecond() {
140138
when(response.getStatusText()).thenReturn("OK");
141139
when(response.getHeaders()).thenReturn(EmptyHttpHeaders.INSTANCE);
142140

143-
AsyncCompletionHandlerx =null;
144-
145-
Consumer<AsyncCompletionHandler>okConsumer =handler -> {
141+
Consumer<AsyncCompletionHandler<?>>okConsumer =handler -> {
146142
try {
147143
handler.onCompleted(response);
148144
}catch (Exceptione) {
149145
}
150146
};
151-
Consumer<AsyncCompletionHandler>failedConsumer =handler ->handler.onThrowable(newTimeoutException("foo"));
147+
Consumer<AsyncCompletionHandler<?>>failedConsumer =handler ->handler.onThrowable(newTimeoutException("foo"));
152148

153149
returnnewObject[][]{
154150
{okConsumer,1,1,0},

‎extras/retrofit2/src/test/java/org/asynchttpclient/extras/retrofit/TestServices.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public static class Contributor implements Serializable {
3535
@NonNull
3636
Stringlogin;
3737

38-
@NonNull
3938
intcontributions;
4039
}
4140

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp