Skip to content

Commit e06d9ae

Browse files
author
YangSen-qn
committed
change IRequestClient
1 parent ce526fb commit e06d9ae

File tree

6 files changed

+21
-22
lines changed

6 files changed

+21
-22
lines changed

‎doc/Android_Changes_from_7.x_to_8.0.0.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@
156156
### 8.1 change class
157157
**add:**
158158
- com.qiniu.android.http.request.IRequestClient
159-
- com.qiniu.android.http.request.IRequestClient.RequestClientCompleteHandler
160-
- com.qiniu.android.http.request.IRequestClient.RequestClientProgress
159+
- com.qiniu.android.http.request.IRequestClient.CompleteHandler
160+
- com.qiniu.android.http.request.IRequestClient.Progress
161161
- com.qiniu.android.http.request.IUploadServer
162162
- com.qiniu.android.http.request.RequestTransaction.RequestCompleteHandler
163163
- com.qiniu.android.http.request.IUploadRegion

‎library/src/androidTest/java/com/qiniu/android/SystemHttpClientTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void testGet() {
1919
null, null, null, 15);
2020

2121
SystemHttpClient client = new SystemHttpClient();
22-
client.request(request, true, null, null, new IRequestClient.RequestClientCompleteHandler() {
22+
client.request(request, true, null, null, new IRequestClient.CompleteHandler() {
2323
@Override
2424
public void complete(ResponseInfo responseInfo, UploadSingleRequestMetrics metrics, JSONObject response) {
2525
assertTrue("pass", responseInfo.isOK());
@@ -38,7 +38,7 @@ public void testSyncGet() {
3838
null, null, null, 15);
3939

4040
SystemHttpClient client = new SystemHttpClient();
41-
client.request(request, false, null, null, new IRequestClient.RequestClientCompleteHandler() {
41+
client.request(request, false, null, null, new IRequestClient.CompleteHandler() {
4242
@Override
4343
public void complete(ResponseInfo responseInfo, UploadSingleRequestMetrics metrics, JSONObject response) {
4444
assertTrue("pass", responseInfo.isOK());
@@ -57,7 +57,7 @@ public void testPostRequest() {
5757
Request.HttpMethodPOST, null, "hello".getBytes(), 15);
5858

5959
SystemHttpClient client = new SystemHttpClient();
60-
client.request(request, true, null, null, new IRequestClient.RequestClientCompleteHandler() {
60+
client.request(request, true, null, null, new IRequestClient.CompleteHandler() {
6161
@Override
6262
public void complete(ResponseInfo responseInfo, UploadSingleRequestMetrics metrics, JSONObject response) {
6363

@@ -77,7 +77,7 @@ public void testSyncPostRequest() {
7777
Request.HttpMethodPOST, null, "hello".getBytes(), 15);
7878

7979
SystemHttpClient client = new SystemHttpClient();
80-
client.request(request, false, null, null, new IRequestClient.RequestClientCompleteHandler() {
80+
client.request(request, false, null, null, new IRequestClient.CompleteHandler() {
8181
@Override
8282
public void complete(ResponseInfo responseInfo, UploadSingleRequestMetrics metrics, JSONObject response) {
8383

@@ -97,7 +97,7 @@ public void testPostRequestError() {
9797
Request.HttpMethodPOST, null, "hello".getBytes(), 15);
9898

9999
SystemHttpClient client = new SystemHttpClient();
100-
client.request(null, true, null, null, new IRequestClient.RequestClientCompleteHandler() {
100+
client.request(null, true, null, null, new IRequestClient.CompleteHandler() {
101101
@Override
102102
public void complete(ResponseInfo responseInfo, UploadSingleRequestMetrics metrics, JSONObject response) {
103103

‎library/src/main/java/com/qiniu/android/http/connectCheck/ConnectChecker.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public Object call() throws Exception {
133133
SystemHttpClient client = new SystemHttpClient();
134134

135135
LogUtil.i("== checkHost:" + host);
136-
client.request(request, true, null, null, new IRequestClient.RequestClientCompleteHandler() {
136+
client.request(request, true, null, null, new IRequestClient.CompleteHandler() {
137137
@Override
138138
public void complete(ResponseInfo responseInfo, UploadSingleRequestMetrics metrics, JSONObject response) {
139139
synchronized (this) {

‎library/src/main/java/com/qiniu/android/http/request/HttpSingleRequest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public boolean checkCancel() {
9292
" url:" + StringUtils.toNonnullString(request.urlString) +
9393
" ip:" + StringUtils.toNonnullString(request.ip));
9494

95-
client.request(request, isAsync, config.proxy, new IRequestClient.RequestClientProgress() {
95+
client.request(request, isAsync, config.proxy, new IRequestClient.Progress() {
9696
@Override
9797
public void progress(long totalBytesWritten, long totalBytesExpectedToWrite) {
9898
if (checkCancelHandler.checkCancel()) {
@@ -104,7 +104,7 @@ public void progress(long totalBytesWritten, long totalBytesExpectedToWrite) {
104104
progressHandler.progress(totalBytesWritten, totalBytesExpectedToWrite);
105105
}
106106
}
107-
}, new IRequestClient.RequestClientCompleteHandler() {
107+
}, new IRequestClient.CompleteHandler() {
108108
@Override
109109
public void complete(ResponseInfo responseInfo, UploadSingleRequestMetrics metrics, JSONObject response) {
110110
if (metrics != null) {

‎library/src/main/java/com/qiniu/android/http/request/IRequestClient.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99

1010
public abstract class IRequestClient {
1111

12-
public interface RequestClientProgress {
12+
public interface Progress {
1313
void progress(long totalBytesWritten, long totalBytesExpectedToWrite);
1414
}
1515

16-
public interface RequestClientCompleteHandler {
16+
public interface CompleteHandler {
1717
void complete(ResponseInfo responseInfo, UploadSingleRequestMetrics metrics, JSONObject response);
1818
}
1919

2020
public abstract void request(Request request,
2121
boolean isAsync,
2222
ProxyConfiguration connectionProxy,
23-
RequestClientProgress progress,
24-
RequestClientCompleteHandler complete);
23+
Progress progress,
24+
CompleteHandler complete);
2525

2626
public abstract void cancel();
2727
}

‎library/src/main/java/com/qiniu/android/http/request/httpclient/SystemHttpClient.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import okhttp3.EventListener;
4242
import okhttp3.Handshake;
4343
import okhttp3.Headers;
44-
import okhttp3.Interceptor;
4544
import okhttp3.MediaType;
4645
import okhttp3.OkHttpClient;
4746
import okhttp3.Protocol;
@@ -64,15 +63,15 @@ public class SystemHttpClient extends IRequestClient {
6463
private OkHttpClient httpClient;
6564
private Call call;
6665
private UploadSingleRequestMetrics metrics;
67-
private RequestClientProgress requestProgress;
68-
private RequestClientCompleteHandler completeHandler;
66+
private Progress requestProgress;
67+
private CompleteHandler completeHandler;
6968

7069
@Override
7170
public void request(Request request,
7271
boolean isAsync,
7372
ProxyConfiguration connectionProxy,
74-
RequestClientProgress progress,
75-
RequestClientCompleteHandler complete) {
73+
Progress progress,
74+
CompleteHandler complete) {
7675

7776
metrics = new UploadSingleRequestMetrics();
7877
metrics.start();
@@ -193,7 +192,7 @@ private synchronized static ConnectionPool getConnectPool() {
193192
return pool;
194193
}
195194

196-
private okhttp3.Request.Builder createRequestBuilder(final RequestClientProgress progress) {
195+
private okhttp3.Request.Builder createRequestBuilder(final Progress progress) {
197196
if (currentRequest == null) {
198197
return null;
199198
}
@@ -375,7 +374,7 @@ public void callFailed(Call call, IOException ioe) {
375374
private void handleError(Request request,
376375
int responseCode,
377376
String errorMsg,
378-
RequestClientCompleteHandler complete) {
377+
CompleteHandler complete) {
379378
synchronized (this) {
380379
if (hasHandleComplete) {
381380
return;
@@ -393,7 +392,7 @@ private void handleError(Request request,
393392

394393
private void handleResponse(Request request,
395394
okhttp3.Response response,
396-
RequestClientCompleteHandler complete) {
395+
CompleteHandler complete) {
397396
synchronized (this) {
398397
if (hasHandleComplete) {
399398
return;

0 commit comments

Comments
 (0)