implements Response, Cl
// StaticLog.warn(e, e.getMessage());
}
-
// 存储服务端设置的Cookie信息
GlobalCookieManager.store(httpConnection, this.headers);
- // 获取响应编码，如果非空，替换用户定义的编码
- final Charset charsetFromResponse = httpConnection.getCharset();
- if (null != charsetFromResponse) {
- this.charset = charsetFromResponse;
- }
-
// 获取响应内容流
- this.in = new HttpInputStream(this);
-
- // 同步情况下强制同步
- if (!this.isAsync) {
- forceSync();
+ if (false == isIgnoreBody) {
+ this.body = new ResponseBody(this, new HttpInputStream(this), isAsync, this.ignoreEOFError);
}
}
-
- /**
- * 强制同步，用于初始化
- * 强制同步后变化如下：
- *
- *
- * 1、读取body内容到内存
- * 2、异步状态设为false（变为同步状态）
- * 3、关闭Http流
- * 4、断开与服务器连接
- *
- *
- * @return this
- */
- private HttpResponse forceSync() {
- // 非同步状态转为同步状态
- try {
- this.readBody(this.in);
- } catch (final IORuntimeException e) {
- //noinspection StatementWithEmptyBody
- if (e.getCause() instanceof FileNotFoundException) {
- // 服务器无返回内容，忽略之
- } else {
- throw new HttpException(e);
- }
- } finally {
- if (this.isAsync) {
- this.isAsync = false;
- }
- this.close();
- }
- return this;
- }
-
- /**
- * 读取主体，忽略EOFException异常
- *
- * @param in 输入流
- * @throws IORuntimeException IO异常
- */
- private void readBody(final InputStream in) throws IORuntimeException {
- if (ignoreBody) {
- return;
- }
-
- final long contentLength = contentLength();
- final FastByteArrayOutputStream out = new FastByteArrayOutputStream((int) contentLength);
- body().writeClose(out);
- this.bodyBytes = out.toByteArray();
- }
// ---------------------------------------------------------------- Private method end
}
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/okhttp/OkHttpResponse.java b/hutool-http/src/main/java/cn/hutool/http/client/engine/okhttp/OkHttpResponse.java
index 228dcd7ab..5e1808f85 100755
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/okhttp/OkHttpResponse.java
+++ b/hutool-http/src/main/java/cn/hutool/http/client/engine/okhttp/OkHttpResponse.java
@@ -1,11 +1,8 @@
package cn.hutool.http.client.engine.okhttp;
import cn.hutool.core.io.stream.EmptyInputStream;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.http.HttpUtil;
+import cn.hutool.core.util.ObjUtil;
import cn.hutool.http.client.Response;
-import cn.hutool.http.meta.Header;
import okhttp3.ResponseBody;
import java.io.IOException;
@@ -46,12 +43,7 @@ public class OkHttpResponse implements Response {
@Override
public Charset charset() {
- final String contentType = rawRes.header(Header.CONTENT_TYPE.getValue());
- if(StrUtil.isNotEmpty(contentType)){
- final String charset = HttpUtil.getCharset(contentType);
- CharsetUtil.parse(charset, this.requestCharset);
- }
- return this.requestCharset;
+ return ObjUtil.defaultIfNull(Response.super.charset(), requestCharset);
}
@Override
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/HttpServerRequest.java b/hutool-http/src/main/java/cn/hutool/http/server/HttpServerRequest.java
index 4f17a9557..9cec2c3d9 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/HttpServerRequest.java
+++ b/hutool-http/src/main/java/cn/hutool/http/server/HttpServerRequest.java
@@ -11,6 +11,7 @@ import cn.hutool.core.net.multipart.UploadSetting;
import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.core.util.ObjUtil;
import cn.hutool.http.meta.Header;
import cn.hutool.http.HttpUtil;
import cn.hutool.http.meta.Method;
@@ -169,8 +170,7 @@ public class HttpServerRequest extends HttpServerBase {
public Charset getCharset() {
if(null == this.charsetCache){
final String contentType = getContentType();
- final String charsetStr = HttpUtil.getCharset(contentType);
- this.charsetCache = CharsetUtil.parse(charsetStr, DEFAULT_CHARSET);
+ this.charsetCache = ObjUtil.defaultIfNull(HttpUtil.getCharset(contentType), DEFAULT_CHARSET);
}
return this.charsetCache;
diff --git a/hutool-http/src/test/java/cn/hutool/http/MockServerTest.java b/hutool-http/src/test/java/cn/hutool/http/MockServerTest.java
new file mode 100755
index 000000000..a419b6567
--- /dev/null
+++ b/hutool-http/src/test/java/cn/hutool/http/MockServerTest.java
@@ -0,0 +1,16 @@
+package cn.hutool.http;
+
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+
+import java.io.IOException;
+
+public class MockServerTest {
+ public static void main(final String[] args) throws IOException {
+ //noinspection resource
+ final MockWebServer server = new MockWebServer();
+ final MockResponse mockResponse = new MockResponse().setBody("hello, world!");
+ server.enqueue(mockResponse);
+ server.start(8080);
+ }
+}
diff --git a/hutool-http/src/test/java/cn/hutool/http/client/JdkEngineTest.java b/hutool-http/src/test/java/cn/hutool/http/client/JdkEngineTest.java
new file mode 100755
index 000000000..0e69f5155
--- /dev/null
+++ b/hutool-http/src/test/java/cn/hutool/http/client/JdkEngineTest.java
@@ -0,0 +1,22 @@
+package cn.hutool.http.client;
+
+import cn.hutool.core.lang.Console;
+import cn.hutool.http.client.engine.jdk.JdkClientEngine;
+import cn.hutool.http.meta.Method;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class JdkEngineTest {
+
+ @Test
+ @Ignore
+ public void getTest(){
+ final ClientEngine engine = new JdkClientEngine();
+
+ final Request req = Request.of("https://www.hutool.cn/").method(Method.GET);
+ final Response res = engine.send(req);
+
+ Console.log(res.getStatus());
+ Console.log(res.bodyStr());
+ }
+}