Skip to content

Commit 2522fe4

Browse files
committed
modify BaseResult
1 parent a0a0e0a commit 2522fe4

File tree

3 files changed

+39
-33
lines changed

3 files changed

+39
-33
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<groupId>cn.jpush.api</groupId>
55
<artifactId>jpush-client</artifactId>
6-
<version>3.2.6-SNAPSHOT</version>
6+
<version>3.2.7-SNAPSHOT</version>
77
<packaging>jar</packaging>
88
<url>https://github.com/jpush/jpush-api-java-client</url>
99
<name>JPush API Java Client</name>

src/main/java/cn/jpush/api/common/connection/NativeHttpClient.java

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,20 @@
11
package cn.jpush.api.common.connection;
22

3+
import cn.jpush.api.common.resp.APIConnectionException;
4+
import cn.jpush.api.common.resp.APIRequestException;
5+
import cn.jpush.api.common.resp.ResponseWrapper;
6+
import org.slf4j.Logger;
7+
import org.slf4j.LoggerFactory;
8+
9+
import javax.net.ssl.*;
310
import java.io.IOException;
411
import java.io.InputStream;
512
import java.io.InputStreamReader;
613
import java.io.OutputStream;
7-
import java.net.Authenticator;
8-
import java.net.HttpURLConnection;
9-
import java.net.PasswordAuthentication;
10-
import java.net.SocketTimeoutException;
11-
import java.net.URL;
14+
import java.net.*;
1215
import java.security.cert.CertificateException;
1316
import java.security.cert.X509Certificate;
1417

15-
import javax.net.ssl.HostnameVerifier;
16-
import javax.net.ssl.HttpsURLConnection;
17-
import javax.net.ssl.SSLContext;
18-
import javax.net.ssl.SSLSession;
19-
import javax.net.ssl.TrustManager;
20-
import javax.net.ssl.X509TrustManager;
21-
22-
import org.slf4j.Logger;
23-
import org.slf4j.LoggerFactory;
24-
25-
import cn.jpush.api.common.resp.APIConnectionException;
26-
import cn.jpush.api.common.resp.APIRequestException;
27-
import cn.jpush.api.common.resp.ResponseWrapper;
28-
2918
/**
3019
* The implementation has no connection pool mechanism, used origin java connection.
3120
*
@@ -68,13 +57,23 @@ public NativeHttpClient(String authCode, int maxRetryTimes, HttpProxy proxy) {
6857

6958
public ResponseWrapper sendGet(String url)
7059
throws APIConnectionException, APIRequestException {
71-
return doRequest(url, null, RequestMethod.GET);
60+
return sendGet(url, null);
61+
}
62+
63+
public ResponseWrapper sendGet(String url, String content)
64+
throws APIConnectionException, APIRequestException {
65+
return doRequest(url, content, RequestMethod.GET);
7266
}
7367

7468
public ResponseWrapper sendDelete(String url)
7569
throws APIConnectionException, APIRequestException {
76-
return doRequest(url, null, RequestMethod.DELETE);
70+
return sendDelete(url, null);
7771
}
72+
73+
public ResponseWrapper sendDelete(String url, String content)
74+
throws APIConnectionException, APIRequestException {
75+
return doRequest(url, content, RequestMethod.DELETE);
76+
}
7877

7978
public ResponseWrapper sendPost(String url, String content)
8079
throws APIConnectionException, APIRequestException {
@@ -117,7 +116,6 @@ private ResponseWrapper _doRequest(String url, String content,
117116
if (null != content) {
118117
LOG.debug("Request Content - " + content);
119118
}
120-
121119
HttpURLConnection conn = null;
122120
OutputStream out = null;
123121
StringBuffer sb = new StringBuffer();
@@ -146,17 +144,15 @@ private ResponseWrapper _doRequest(String url, String content,
146144
conn.setRequestProperty("Authorization", _authCode);
147145
conn.setRequestProperty("Content-Type", CONTENT_TYPE_JSON);
148146

149-
if (RequestMethod.GET == method) {
150-
conn.setDoOutput(false);
151-
} else if (RequestMethod.DELETE == method) {
152-
conn.setDoOutput(false);
153-
} else if (RequestMethod.POST == method || RequestMethod.PUT == method) {
154-
conn.setDoOutput(true);
155-
byte[] data = content.getBytes(CHARSET);
147+
if(null == content) {
148+
conn.setDoOutput(false);
149+
} else {
150+
conn.setDoOutput(true);
151+
byte[] data = content.getBytes(CHARSET);
156152
conn.setRequestProperty("Content-Length", String.valueOf(data.length));
157-
out = conn.getOutputStream();
153+
out = conn.getOutputStream();
158154
out.write(data);
159-
out.flush();
155+
out.flush();
160156
}
161157

162158
int status = conn.getResponseCode();

src/main/java/cn/jpush/api/common/resp/BaseResult.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,19 @@ public String getOriginalContent() {
2323
}
2424
return null;
2525
}
26+
27+
public int getResponseCode() {
28+
if(null != responseWrapper) {
29+
return responseWrapper.responseCode;
30+
}
31+
return -1;
32+
}
2633

2734
public boolean isResultOK() {
28-
return RESPONSE_OK == responseWrapper.responseCode;
35+
if(null != responseWrapper) {
36+
return ( responseWrapper.responseCode / 200 ) == 1;
37+
}
38+
return false;
2939
}
3040

3141
public static <T extends BaseResult> T fromResponse(

0 commit comments

Comments
 (0)