Skip to content

Commit 0daaa01

Browse files
binarywangbinarywang
committed
重构规范RequestExecuter代码
1 parent b901f73 commit 0daaa01

30 files changed

+100
-141
lines changed

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
import me.chanjar.weixin.mp.api.WxMpMaterialService;
1313
import me.chanjar.weixin.mp.api.WxMpService;
1414
import me.chanjar.weixin.mp.bean.material.*;
15-
import me.chanjar.weixin.mp.util.http.*;
15+
import me.chanjar.weixin.mp.util.requestexecuter.material.*;
16+
import me.chanjar.weixin.mp.util.requestexecuter.media.MediaImgUploadRequestExecutor;
1617
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
1718

1819
import java.io.File;

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpQrcodeServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import me.chanjar.weixin.mp.api.WxMpQrcodeService;
77
import me.chanjar.weixin.mp.api.WxMpService;
88
import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket;
9-
import me.chanjar.weixin.mp.util.http.QrCodeRequestExecutor;
9+
import me.chanjar.weixin.mp.util.requestexecuter.qrcode.QrCodeRequestExecutor;
1010
import org.apache.commons.lang3.StringUtils;
1111

1212
import java.io.File;

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialDeleteRequestExecutor.java renamed to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialDeleteApacheHttpRequestExecutor.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
package me.chanjar.weixin.mp.util.http.apache;
1+
package me.chanjar.weixin.mp.util.requestexecuter.material;
22

33
import me.chanjar.weixin.common.WxType;
44
import me.chanjar.weixin.common.error.WxError;
55
import me.chanjar.weixin.common.error.WxErrorException;
66
import me.chanjar.weixin.common.util.http.RequestHttp;
77
import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler;
88
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
9-
import me.chanjar.weixin.mp.util.http.MaterialDeleteRequestExecutor;
109
import org.apache.http.HttpHost;
1110
import org.apache.http.client.config.RequestConfig;
1211
import org.apache.http.client.methods.CloseableHttpResponse;
@@ -21,8 +20,8 @@
2120
/**
2221
* Created by ecoolper on 2017/5/5.
2322
*/
24-
public class ApacheMaterialDeleteRequestExecutor extends MaterialDeleteRequestExecutor<CloseableHttpClient, HttpHost> {
25-
public ApacheMaterialDeleteRequestExecutor(RequestHttp requestHttp) {
23+
public class MaterialDeleteApacheHttpRequestExecutor extends MaterialDeleteRequestExecutor<CloseableHttpClient, HttpHost> {
24+
public MaterialDeleteApacheHttpRequestExecutor(RequestHttp requestHttp) {
2625
super(requestHttp);
2726
}
2827

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialDeleteRequestExecutor.java renamed to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialDeleteJoddHttpRequestExecutor.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.chanjar.weixin.mp.util.http.jodd;
1+
package me.chanjar.weixin.mp.util.requestexecuter.material;
22

33
import jodd.http.HttpConnectionProvider;
44
import jodd.http.HttpRequest;
@@ -10,15 +10,14 @@
1010
import me.chanjar.weixin.common.error.WxError;
1111
import me.chanjar.weixin.common.error.WxErrorException;
1212
import me.chanjar.weixin.common.util.http.RequestHttp;
13-
import me.chanjar.weixin.mp.util.http.MaterialDeleteRequestExecutor;
1413

1514
import java.io.IOException;
1615

1716
/**
1817
* Created by ecoolper on 2017/5/5.
1918
*/
20-
public class JoddMaterialDeleteRequestExecutor extends MaterialDeleteRequestExecutor<HttpConnectionProvider, ProxyInfo> {
21-
public JoddMaterialDeleteRequestExecutor(RequestHttp requestHttp) {
19+
public class MaterialDeleteJoddHttpRequestExecutor extends MaterialDeleteRequestExecutor<HttpConnectionProvider, ProxyInfo> {
20+
public MaterialDeleteJoddHttpRequestExecutor(RequestHttp requestHttp) {
2221
super(requestHttp);
2322
}
2423

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialDeleteRequestExecutor.java renamed to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialDeleteOkhttpRequestExecutor.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
package me.chanjar.weixin.mp.util.http.okhttp;
1+
package me.chanjar.weixin.mp.util.requestexecuter.material;
22

33
import me.chanjar.weixin.common.WxType;
44
import me.chanjar.weixin.common.error.WxError;
55
import me.chanjar.weixin.common.error.WxErrorException;
66
import me.chanjar.weixin.common.util.http.RequestHttp;
77
import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo;
8-
import me.chanjar.weixin.mp.util.http.MaterialDeleteRequestExecutor;
98
import okhttp3.*;
109
import org.slf4j.Logger;
1110
import org.slf4j.LoggerFactory;
@@ -15,17 +14,17 @@
1514
/**
1615
* Created by ecoolper on 2017/5/5.
1716
*/
18-
public class OkhttpMaterialDeleteRequestExecutor extends MaterialDeleteRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
17+
public class MaterialDeleteOkhttpRequestExecutor extends MaterialDeleteRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
1918
private final Logger logger = LoggerFactory.getLogger(this.getClass());
2019

2120

22-
public OkhttpMaterialDeleteRequestExecutor(RequestHttp requestHttp) {
21+
public MaterialDeleteOkhttpRequestExecutor(RequestHttp requestHttp) {
2322
super(requestHttp);
2423
}
2524

2625
@Override
2726
public Boolean execute(String uri, String materialId) throws WxErrorException, IOException {
28-
logger.debug("OkhttpMaterialDeleteRequestExecutor is running");
27+
logger.debug("MaterialDeleteOkhttpRequestExecutor is running");
2928
//得到httpClient
3029
OkHttpClient client = requestHttp.getRequestHttpClient();
3130

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialDeleteRequestExecutor.java renamed to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialDeleteRequestExecutor.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
package me.chanjar.weixin.mp.util.http;
1+
package me.chanjar.weixin.mp.util.requestexecuter.material;
22

33
import me.chanjar.weixin.common.util.http.RequestExecutor;
44
import me.chanjar.weixin.common.util.http.RequestHttp;
5-
import me.chanjar.weixin.mp.util.http.apache.ApacheMaterialDeleteRequestExecutor;
6-
import me.chanjar.weixin.mp.util.http.jodd.JoddMaterialDeleteRequestExecutor;
7-
import me.chanjar.weixin.mp.util.http.okhttp.OkhttpMaterialDeleteRequestExecutor;
85

96
public abstract class MaterialDeleteRequestExecutor<H, P> implements RequestExecutor<Boolean, String> {
107
protected RequestHttp<H, P> requestHttp;
@@ -16,11 +13,11 @@ public MaterialDeleteRequestExecutor(RequestHttp requestHttp) {
1613
public static RequestExecutor<Boolean, String> create(RequestHttp requestHttp) {
1714
switch (requestHttp.getRequestType()) {
1815
case APACHE_HTTP:
19-
return new ApacheMaterialDeleteRequestExecutor(requestHttp);
16+
return new MaterialDeleteApacheHttpRequestExecutor(requestHttp);
2017
case JODD_HTTP:
21-
return new JoddMaterialDeleteRequestExecutor(requestHttp);
18+
return new MaterialDeleteJoddHttpRequestExecutor(requestHttp);
2219
case OK_HTTP:
23-
return new OkhttpMaterialDeleteRequestExecutor(requestHttp);
20+
return new MaterialDeleteOkhttpRequestExecutor(requestHttp);
2421
default:
2522
return null;
2623
}

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialNewsInfoRequestExecutor.java renamed to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialNewsInfoApacheHttpRequestExecutor.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.chanjar.weixin.mp.util.http.apache;
1+
package me.chanjar.weixin.mp.util.requestexecuter.material;
22

33
import com.google.common.collect.ImmutableMap;
44
import me.chanjar.weixin.common.WxType;
@@ -8,7 +8,6 @@
88
import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler;
99
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
1010
import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews;
11-
import me.chanjar.weixin.mp.util.http.MaterialNewsInfoRequestExecutor;
1211
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
1312
import org.apache.http.HttpHost;
1413
import org.apache.http.client.config.RequestConfig;
@@ -27,11 +26,11 @@
2726
* @author ecoolper
2827
* @date 2017/5/5
2928
*/
30-
public class ApacheMaterialNewsInfoRequestExecutor
29+
public class MaterialNewsInfoApacheHttpRequestExecutor
3130
extends MaterialNewsInfoRequestExecutor<CloseableHttpClient, HttpHost> {
3231
private final Logger logger = LoggerFactory.getLogger(this.getClass());
3332

34-
public ApacheMaterialNewsInfoRequestExecutor(RequestHttp requestHttp) {
33+
public MaterialNewsInfoApacheHttpRequestExecutor(RequestHttp requestHttp) {
3534
super(requestHttp);
3635
}
3736

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialNewsInfoRequestExecutor.java renamed to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialNewsInfoJoddHttpRequestExecutor.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.chanjar.weixin.mp.util.http.jodd;
1+
package me.chanjar.weixin.mp.util.requestexecuter.material;
22

33
import com.google.common.collect.ImmutableMap;
44
import jodd.http.HttpConnectionProvider;
@@ -13,7 +13,6 @@
1313
import me.chanjar.weixin.common.util.http.RequestHttp;
1414
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
1515
import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews;
16-
import me.chanjar.weixin.mp.util.http.MaterialNewsInfoRequestExecutor;
1716
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
1817
import org.slf4j.Logger;
1918
import org.slf4j.LoggerFactory;
@@ -23,9 +22,9 @@
2322
/**
2423
* Created by ecoolper on 2017/5/5.
2524
*/
26-
public class JoddMaterialNewsInfoRequestExecutor extends MaterialNewsInfoRequestExecutor<HttpConnectionProvider, ProxyInfo> {
25+
public class MaterialNewsInfoJoddHttpRequestExecutor extends MaterialNewsInfoRequestExecutor<HttpConnectionProvider, ProxyInfo> {
2726
private final Logger logger = LoggerFactory.getLogger(this.getClass());
28-
public JoddMaterialNewsInfoRequestExecutor(RequestHttp requestHttp) {
27+
public MaterialNewsInfoJoddHttpRequestExecutor(RequestHttp requestHttp) {
2928
super(requestHttp);
3029
}
3130

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialNewsInfoRequestExecutor.java renamed to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialNewsInfoOkhttpRequestExecutor.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.chanjar.weixin.mp.util.http.okhttp;
1+
package me.chanjar.weixin.mp.util.requestexecuter.material;
22

33
import com.google.common.collect.ImmutableMap;
44
import me.chanjar.weixin.common.WxType;
@@ -8,7 +8,6 @@
88
import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo;
99
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
1010
import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews;
11-
import me.chanjar.weixin.mp.util.http.MaterialNewsInfoRequestExecutor;
1211
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
1312
import okhttp3.*;
1413
import org.slf4j.Logger;
@@ -19,9 +18,9 @@
1918
/**
2019
* Created by ecoolper on 2017/5/5.
2120
*/
22-
public class OkhttpMaterialNewsInfoRequestExecutor extends MaterialNewsInfoRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
21+
public class MaterialNewsInfoOkhttpRequestExecutor extends MaterialNewsInfoRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
2322
private final Logger logger = LoggerFactory.getLogger(this.getClass());
24-
public OkhttpMaterialNewsInfoRequestExecutor(RequestHttp requestHttp) {
23+
public MaterialNewsInfoOkhttpRequestExecutor(RequestHttp requestHttp) {
2524
super(requestHttp);
2625
}
2726

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialNewsInfoRequestExecutor.java renamed to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialNewsInfoRequestExecutor.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
package me.chanjar.weixin.mp.util.http;
1+
package me.chanjar.weixin.mp.util.requestexecuter.material;
22

33
import me.chanjar.weixin.common.util.http.RequestExecutor;
44
import me.chanjar.weixin.common.util.http.RequestHttp;
55
import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews;
6-
import me.chanjar.weixin.mp.util.http.apache.ApacheMaterialNewsInfoRequestExecutor;
7-
import me.chanjar.weixin.mp.util.http.jodd.JoddMaterialNewsInfoRequestExecutor;
8-
import me.chanjar.weixin.mp.util.http.okhttp.OkhttpMaterialNewsInfoRequestExecutor;
96

107
public abstract class MaterialNewsInfoRequestExecutor<H, P> implements RequestExecutor<WxMpMaterialNews, String> {
118
protected RequestHttp<H, P> requestHttp;
@@ -17,11 +14,11 @@ public MaterialNewsInfoRequestExecutor(RequestHttp requestHttp) {
1714
public static RequestExecutor<WxMpMaterialNews, String> create(RequestHttp requestHttp) {
1815
switch (requestHttp.getRequestType()) {
1916
case APACHE_HTTP:
20-
return new ApacheMaterialNewsInfoRequestExecutor(requestHttp);
17+
return new MaterialNewsInfoApacheHttpRequestExecutor(requestHttp);
2118
case JODD_HTTP:
22-
return new JoddMaterialNewsInfoRequestExecutor(requestHttp);
19+
return new MaterialNewsInfoJoddHttpRequestExecutor(requestHttp);
2320
case OK_HTTP:
24-
return new OkhttpMaterialNewsInfoRequestExecutor(requestHttp);
21+
return new MaterialNewsInfoOkhttpRequestExecutor(requestHttp);
2522
default:
2623
//TODO 需要优化抛出异常
2724
return null;

0 commit comments

Comments
 (0)