fix comment

This commit is contained in:
Looly
2021-08-11 11:41:06 +08:00
parent b048cc7fd7
commit 6dc8524e69
3 changed files with 43 additions and 20 deletions

View File

@@ -32,6 +32,7 @@ import java.net.URLStreamHandler;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.function.Consumer;
/**
* http请求类<br>
@@ -486,8 +487,8 @@ public class HttpRequest extends HttpBase<HttpRequest> {
return this.form(name, (File) value);
}
if(value instanceof Resource){
return form(name, (Resource)value);
if (value instanceof Resource) {
return form(name, (Resource) value);
}
// 普通值
@@ -563,7 +564,7 @@ public class HttpRequest extends HttpBase<HttpRequest> {
* @return this
*/
public HttpRequest form(String name, File... files) {
if(ArrayUtil.isEmpty(files)){
if (ArrayUtil.isEmpty(files)) {
return this;
}
if (1 == files.length) {
@@ -656,9 +657,9 @@ public class HttpRequest extends HttpBase<HttpRequest> {
*/
public Map<String, Resource> fileForm() {
final Map<String, Resource> result = MapUtil.newHashMap();
this.form.forEach((key, value)->{
if(value instanceof Resource){
result.put(key, (Resource)value);
this.form.forEach((key, value) -> {
if (value instanceof Resource) {
result.put(key, (Resource) value);
}
});
return result;
@@ -968,6 +969,19 @@ public class HttpRequest extends HttpBase<HttpRequest> {
return httpResponse;
}
/**
* 执行Request请求后对响应内容后续处理<br>
* 处理结束后关闭连接
*
* @param consumer 响应内容处理函数
* @since 5.7.8
*/
public void then(Consumer<HttpResponse> consumer) {
try (HttpResponse response = execute(true)) {
consumer.accept(response);
}
}
/**
* 简单验证,生成的头信息类似于:
* <pre>
@@ -1168,9 +1182,9 @@ public class HttpRequest extends HttpBase<HttpRequest> {
// Write的时候会优先使用body中的内容write时自动关闭OutputStream
byte[] content;
if(ArrayUtil.isNotEmpty(this.bodyBytes)){
if (ArrayUtil.isNotEmpty(this.bodyBytes)) {
content = this.bodyBytes;
} else{
} else {
content = StrUtil.bytes(getFormUrlEncoded(), this.charset);
}
IoUtil.write(this.httpConnection.getOutputStream(), true, content);
@@ -1228,11 +1242,12 @@ public class HttpRequest extends HttpBase<HttpRequest> {
* 1. 存在资源对象fileForm非空
* 2. 用户自定义头为multipart/form-data开头
* </pre>
*
* @return 是否为multipart/form-data表单
* @since 5.3.5
*/
private boolean isMultipart(){
if(this.isMultiPart){
private boolean isMultipart() {
if (this.isMultiPart) {
return true;
}
@@ -1244,15 +1259,15 @@ public class HttpRequest extends HttpBase<HttpRequest> {
/**
* 将参数加入到form中如果form为空新建之。
*
* @param name 表单属性名
* @param name 表单属性名
* @param value 属性值
* @return this
*/
private HttpRequest putToForm(String name, Object value){
if(null == name || null == value){
private HttpRequest putToForm(String name, Object value) {
if (null == name || null == value) {
return this;
}
if(null == this.form){
if (null == this.form) {
this.form = new LinkedHashMap<>();
}
this.form.put(name, value);