From 26272bb7e5b06c999d4c9444c70a38d23ba1453f Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sat, 10 Jun 2017 17:02:14 +0800 Subject: [PATCH] refactor some packages and class files name --- .../weixin/common/util/http/HttpType.java | 2 +- .../http/MediaDownloadRequestExecutor.java | 14 ++++++------- .../util/http/MediaUploadRequestExecutor.java | 14 ++++++------- .../common/util/http/RequestExecutor.java | 2 +- .../util/http/SimpleGetRequestExecutor.java | 18 ++++++++--------- .../util/http/SimplePostRequestExecutor.java | 14 ++++++------- ...heHttpClientSimpleGetRequestExecutor.java} | 4 ++-- ...JoddHttpMediaDownloadRequestExecutor.java} | 4 ++-- ...> JoddHttpMediaUploadRequestExecutor.java} | 4 ++-- ... => JoddHttpSimpleGetRequestExecutor.java} | 4 ++-- ...=> JoddHttpSimplePostRequestExecutor.java} | 4 ++-- ...> OkHttpMediaDownloadRequestExecutor.java} | 4 ++-- ... => OkHttpMediaUploadRequestExecutor.java} | 4 ++-- ...ttpProxyInfo.java => OkHttpProxyInfo.java} | 20 +++++++++---------- ...va => OkHttpSimpleGetRequestExecutor.java} | 4 ++-- ...a => OkHttpSimplePostRequestExecutor.java} | 6 +++--- ...a => WxCpServiceApacheHttpClientImpl.java} | 6 +++--- .../weixin/cp/api/impl/WxCpServiceImpl.java | 2 +- ...Impl.java => WxCpServiceJoddHttpImpl.java} | 6 +++--- ...ceImpl.java => WxCpServiceOkHttpImpl.java} | 14 ++++++------- ...a => WxMpServiceApacheHttpClientImpl.java} | 7 +++---- .../weixin/mp/api/impl/WxMpServiceImpl.java | 2 +- ...Impl.java => WxMpServiceJoddHttpImpl.java} | 7 +++---- ...ceImpl.java => WxMpServiceOkHttpImpl.java} | 15 +++++++------- .../http/MaterialDeleteRequestExecutor.java | 6 +++--- .../http/MaterialNewsInfoRequestExecutor.java | 6 +++--- .../http/MaterialUploadRequestExecutor.java | 6 +++--- .../MaterialVideoInfoRequestExecutor.java | 6 +++--- ...lVoiceAndImageDownloadRequestExecutor.java | 6 +++--- .../http/MediaImgUploadRequestExecutor.java | 6 +++--- .../mp/util/http/QrCodeRequestExecutor.java | 6 +++--- .../OkhttpMaterialDeleteRequestExecutor.java | 4 ++-- ...OkhttpMaterialNewsInfoRequestExecutor.java | 4 ++-- .../OkhttpMaterialUploadRequestExecutor.java | 4 ++-- ...khttpMaterialVideoInfoRequestExecutor.java | 4 ++-- ...lVoiceAndImageDownloadRequestExecutor.java | 4 ++-- .../OkhttpMediaImgUploadRequestExecutor.java | 4 ++-- .../okhttp/OkhttpQrCodeRequestExecutor.java | 4 ++-- .../weixin/mp/api/WxMpBusyRetryTest.java | 4 ++-- .../weixin/mp/api/test/ApiTestModule.java | 4 ++-- .../weixin/mp/demo/WxMpDemoServer.java | 4 ++-- 41 files changed, 130 insertions(+), 133 deletions(-) rename weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/{ApacheSimpleGetRequestExecutor.java => ApacheHttpClientSimpleGetRequestExecutor.java} (88%) rename weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/{JoddMediaDownloadRequestExecutor.java => JoddHttpMediaDownloadRequestExecutor.java} (92%) rename weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/{JoddMediaUploadRequestExecutor.java => JoddHttpMediaUploadRequestExecutor.java} (87%) rename weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/{JoddSimpleGetRequestExecutor.java => JoddHttpSimpleGetRequestExecutor.java} (87%) rename weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/{JoddSimplePostRequestExecutor.java => JoddHttpSimplePostRequestExecutor.java} (89%) rename weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/{OkMediaDownloadRequestExecutor.java => OkHttpMediaDownloadRequestExecutor.java} (93%) rename weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/{OkMediaUploadRequestExecutor.java => OkHttpMediaUploadRequestExecutor.java} (91%) rename weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/{OkhttpProxyInfo.java => OkHttpProxyInfo.java} (81%) rename weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/{OkSimpleGetRequestExecutor.java => OkHttpSimpleGetRequestExecutor.java} (91%) rename weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/{OkSimplePostRequestExecutor.java => OkHttpSimplePostRequestExecutor.java} (87%) rename weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/{apache/WxCpServiceImpl.java => WxCpServiceApacheHttpClientImpl.java} (95%) rename weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/{jodd/WxCpServiceImpl.java => WxCpServiceJoddHttpImpl.java} (93%) rename weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/{okhttp/WxCpServiceImpl.java => WxCpServiceOkHttpImpl.java} (89%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/{apache/WxMpServiceImpl.java => WxMpServiceApacheHttpClientImpl.java} (94%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/{jodd/WxMpServiceImpl.java => WxMpServiceJoddHttpImpl.java} (92%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/{okhttp/WxMpServiceImpl.java => WxMpServiceOkHttpImpl.java} (87%) diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/HttpType.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/HttpType.java index 5e78a6f1d..c692eb910 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/HttpType.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/HttpType.java @@ -4,5 +4,5 @@ package me.chanjar.weixin.common.util.http; * Created by ecoolper on 2017/4/28. */ public enum HttpType { - joddHttp, apacheHttp, okHttp; + JODD_HTTP, APACHE_HTTP, OK_HTTP; } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java index 72ceeb14b..dbfb5f8f2 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java @@ -1,8 +1,8 @@ package me.chanjar.weixin.common.util.http; import me.chanjar.weixin.common.util.http.apache.ApacheMediaDownloadRequestExecutor; -import me.chanjar.weixin.common.util.http.jodd.JoddMediaDownloadRequestExecutor; -import me.chanjar.weixin.common.util.http.okhttp.OkMediaDownloadRequestExecutor; +import me.chanjar.weixin.common.util.http.jodd.JoddHttpMediaDownloadRequestExecutor; +import me.chanjar.weixin.common.util.http.okhttp.OkHttpMediaDownloadRequestExecutor; import java.io.File; @@ -22,12 +22,12 @@ public abstract class MediaDownloadRequestExecutor implements RequestExecu public static RequestExecutor create(RequestHttp requestHttp, File tmpDirFile) { switch (requestHttp.getRequestType()) { - case apacheHttp: + case APACHE_HTTP: return new ApacheMediaDownloadRequestExecutor(requestHttp, tmpDirFile); - case joddHttp: - return new JoddMediaDownloadRequestExecutor(requestHttp, tmpDirFile); - case okHttp: - return new OkMediaDownloadRequestExecutor(requestHttp, tmpDirFile); + case JODD_HTTP: + return new JoddHttpMediaDownloadRequestExecutor(requestHttp, tmpDirFile); + case OK_HTTP: + return new OkHttpMediaDownloadRequestExecutor(requestHttp, tmpDirFile); default: return null; } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaUploadRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaUploadRequestExecutor.java index 1352954c2..6b883ce7c 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaUploadRequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaUploadRequestExecutor.java @@ -2,8 +2,8 @@ package me.chanjar.weixin.common.util.http; import me.chanjar.weixin.common.bean.result.WxMediaUploadResult; import me.chanjar.weixin.common.util.http.apache.ApacheMediaUploadRequestExecutor; -import me.chanjar.weixin.common.util.http.jodd.JoddMediaUploadRequestExecutor; -import me.chanjar.weixin.common.util.http.okhttp.OkMediaUploadRequestExecutor; +import me.chanjar.weixin.common.util.http.jodd.JoddHttpMediaUploadRequestExecutor; +import me.chanjar.weixin.common.util.http.okhttp.OkHttpMediaUploadRequestExecutor; import java.io.File; @@ -21,12 +21,12 @@ public abstract class MediaUploadRequestExecutor implements RequestExecuto public static RequestExecutor create(RequestHttp requestHttp) { switch (requestHttp.getRequestType()) { - case apacheHttp: + case APACHE_HTTP: return new ApacheMediaUploadRequestExecutor(requestHttp); - case joddHttp: - return new JoddMediaUploadRequestExecutor(requestHttp); - case okHttp: - return new OkMediaUploadRequestExecutor(requestHttp); + case JODD_HTTP: + return new JoddHttpMediaUploadRequestExecutor(requestHttp); + case OK_HTTP: + return new OkHttpMediaUploadRequestExecutor(requestHttp); default: return null; } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/RequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/RequestExecutor.java index a31796e66..583db4f5a 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/RequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/RequestExecutor.java @@ -54,6 +54,6 @@ public interface RequestExecutor { * @throws WxErrorException * @throws IOException *//* - T executeOkhttp(ConnectionPool pool, final OkhttpProxyInfo proxyInfo, String uri, E data) throws WxErrorException, IOException; + T executeOkhttp(ConnectionPool pool, final OkHttpProxyInfo proxyInfo, String uri, E data) throws WxErrorException, IOException; */ } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimpleGetRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimpleGetRequestExecutor.java index c7d782f50..a7871934a 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimpleGetRequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimpleGetRequestExecutor.java @@ -1,8 +1,8 @@ package me.chanjar.weixin.common.util.http; -import me.chanjar.weixin.common.util.http.apache.ApacheSimpleGetRequestExecutor; -import me.chanjar.weixin.common.util.http.jodd.JoddSimpleGetRequestExecutor; -import me.chanjar.weixin.common.util.http.okhttp.OkSimpleGetRequestExecutor; +import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientSimpleGetRequestExecutor; +import me.chanjar.weixin.common.util.http.jodd.JoddHttpSimpleGetRequestExecutor; +import me.chanjar.weixin.common.util.http.okhttp.OkHttpSimpleGetRequestExecutor; /** * 简单的GET请求执行器，请求的参数是String, 返回的结果也是String @@ -19,12 +19,12 @@ public abstract class SimpleGetRequestExecutor implements RequestExecutor< public static RequestExecutor create(RequestHttp requestHttp) { switch (requestHttp.getRequestType()) { - case apacheHttp: - return new ApacheSimpleGetRequestExecutor(requestHttp); - case joddHttp: - return new JoddSimpleGetRequestExecutor(requestHttp); - case okHttp: - return new OkSimpleGetRequestExecutor(requestHttp); + case APACHE_HTTP: + return new ApacheHttpClientSimpleGetRequestExecutor(requestHttp); + case JODD_HTTP: + return new JoddHttpSimpleGetRequestExecutor(requestHttp); + case OK_HTTP: + return new OkHttpSimpleGetRequestExecutor(requestHttp); default: return null; } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java index a8d4d7839..2932f2472 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java @@ -1,8 +1,8 @@ package me.chanjar.weixin.common.util.http; import me.chanjar.weixin.common.util.http.apache.ApacheSimplePostRequestExecutor; -import me.chanjar.weixin.common.util.http.jodd.JoddSimplePostRequestExecutor; -import me.chanjar.weixin.common.util.http.okhttp.OkSimplePostRequestExecutor; +import me.chanjar.weixin.common.util.http.jodd.JoddHttpSimplePostRequestExecutor; +import me.chanjar.weixin.common.util.http.okhttp.OkHttpSimplePostRequestExecutor; /** * 用装饰模式实现 @@ -19,12 +19,12 @@ public abstract class SimplePostRequestExecutor implements RequestExecutor public static RequestExecutor create(RequestHttp requestHttp) { switch (requestHttp.getRequestType()) { - case apacheHttp: + case APACHE_HTTP: return new ApacheSimplePostRequestExecutor(requestHttp); - case joddHttp: - return new JoddSimplePostRequestExecutor(requestHttp); - case okHttp: - return new OkSimplePostRequestExecutor(requestHttp); + case JODD_HTTP: + return new JoddHttpSimplePostRequestExecutor(requestHttp); + case OK_HTTP: + return new OkHttpSimplePostRequestExecutor(requestHttp); default: return null; } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheSimpleGetRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpClientSimpleGetRequestExecutor.java similarity index 88% rename from weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheSimpleGetRequestExecutor.java rename to weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpClientSimpleGetRequestExecutor.java index ebc7050e3..e47216e6c 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheSimpleGetRequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpClientSimpleGetRequestExecutor.java @@ -15,9 +15,9 @@ import java.io.IOException; /** * Created by ecoolper on 2017/5/4. */ -public class ApacheSimpleGetRequestExecutor extends SimpleGetRequestExecutor { +public class ApacheHttpClientSimpleGetRequestExecutor extends SimpleGetRequestExecutor { - public ApacheSimpleGetRequestExecutor(RequestHttp requestHttp) { + public ApacheHttpClientSimpleGetRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddMediaDownloadRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpMediaDownloadRequestExecutor.java similarity index 92% rename from weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddMediaDownloadRequestExecutor.java rename to weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpMediaDownloadRequestExecutor.java index a15272bc0..edbee7667 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddMediaDownloadRequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpMediaDownloadRequestExecutor.java @@ -23,10 +23,10 @@ import java.util.regex.Pattern; /** * Created by ecoolper on 2017/5/5. */ -public class JoddMediaDownloadRequestExecutor extends MediaDownloadRequestExecutor { +public class JoddHttpMediaDownloadRequestExecutor extends MediaDownloadRequestExecutor { - public JoddMediaDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) { + public JoddHttpMediaDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) { super(requestHttp, tmpDirFile); } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddMediaUploadRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpMediaUploadRequestExecutor.java similarity index 87% rename from weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddMediaUploadRequestExecutor.java rename to weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpMediaUploadRequestExecutor.java index 8466eead6..b4eef26a7 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddMediaUploadRequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpMediaUploadRequestExecutor.java @@ -18,8 +18,8 @@ import java.io.IOException; /** * Created by ecoolper on 2017/5/5. */ -public class JoddMediaUploadRequestExecutor extends MediaUploadRequestExecutor { - public JoddMediaUploadRequestExecutor(RequestHttp requestHttp) { +public class JoddHttpMediaUploadRequestExecutor extends MediaUploadRequestExecutor { + public JoddHttpMediaUploadRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddSimpleGetRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimpleGetRequestExecutor.java similarity index 87% rename from weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddSimpleGetRequestExecutor.java rename to weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimpleGetRequestExecutor.java index 02f6aa379..63386e77a 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddSimpleGetRequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimpleGetRequestExecutor.java @@ -13,9 +13,9 @@ import java.io.IOException; /** * Created by ecoolper on 2017/5/4. */ -public class JoddSimpleGetRequestExecutor extends SimpleGetRequestExecutor { +public class JoddHttpSimpleGetRequestExecutor extends SimpleGetRequestExecutor { - public JoddSimpleGetRequestExecutor(RequestHttp requestHttp) { + public JoddHttpSimpleGetRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddSimplePostRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimplePostRequestExecutor.java similarity index 89% rename from weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddSimplePostRequestExecutor.java rename to weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimplePostRequestExecutor.java index cca45350a..8fa349c67 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddSimplePostRequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimplePostRequestExecutor.java @@ -16,9 +16,9 @@ import java.io.IOException; /** * Created by ecoolper on 2017/5/4. */ -public class JoddSimplePostRequestExecutor extends SimplePostRequestExecutor { +public class JoddHttpSimplePostRequestExecutor extends SimplePostRequestExecutor { - public JoddSimplePostRequestExecutor(RequestHttp requestHttp) { + public JoddHttpSimplePostRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkMediaDownloadRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java similarity index 93% rename from weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkMediaDownloadRequestExecutor.java rename to weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java index ea9a95a9d..97f8cb02c 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkMediaDownloadRequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java @@ -18,10 +18,10 @@ import java.util.regex.Pattern; /** * Created by ecoolper on 2017/5/5. */ -public class OkMediaDownloadRequestExecutor extends MediaDownloadRequestExecutor { +public class OkHttpMediaDownloadRequestExecutor extends MediaDownloadRequestExecutor { - public OkMediaDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) { + public OkHttpMediaDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) { super(requestHttp, tmpDirFile); } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkMediaUploadRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaUploadRequestExecutor.java similarity index 91% rename from weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkMediaUploadRequestExecutor.java rename to weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaUploadRequestExecutor.java index 6dd1596d3..c01b37380 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkMediaUploadRequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaUploadRequestExecutor.java @@ -13,9 +13,9 @@ import java.io.IOException; /** * Created by ecoolper on 2017/5/5. */ -public class OkMediaUploadRequestExecutor extends MediaUploadRequestExecutor { +public class OkHttpMediaUploadRequestExecutor extends MediaUploadRequestExecutor { - public OkMediaUploadRequestExecutor(RequestHttp requestHttp) { + public OkHttpMediaUploadRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkhttpProxyInfo.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpProxyInfo.java similarity index 81% rename from weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkhttpProxyInfo.java rename to weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpProxyInfo.java index daaa92f2f..5515b0f71 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkhttpProxyInfo.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpProxyInfo.java @@ -7,13 +7,13 @@ import java.net.Proxy; * Created by ecoolper on 2017/4/26. * Proxy information. */ -public class OkhttpProxyInfo { +public class OkHttpProxyInfo { private final String proxyAddress; private final int proxyPort; private final String proxyUsername; private final String proxyPassword; private final ProxyType proxyType; - public OkhttpProxyInfo(ProxyType proxyType, String proxyHost, int proxyPort, String proxyUser, String proxyPassword) { + public OkHttpProxyInfo(ProxyType proxyType, String proxyHost, int proxyPort, String proxyUser, String proxyPassword) { this.proxyType = proxyType; this.proxyAddress = proxyHost; this.proxyPort = proxyPort; @@ -24,8 +24,8 @@ public class OkhttpProxyInfo { /** * Creates directProxy. */ - public static OkhttpProxyInfo directProxy() { - return new OkhttpProxyInfo(ProxyType.NONE, null, 0, null, null); + public static OkHttpProxyInfo directProxy() { + return new OkHttpProxyInfo(ProxyType.NONE, null, 0, null, null); } // ---------------------------------------------------------------- factory @@ -33,22 +33,22 @@ public class OkhttpProxyInfo { /** * Creates SOCKS4 proxy. */ - public static OkhttpProxyInfo socks4Proxy(String proxyAddress, int proxyPort, String proxyUser) { - return new OkhttpProxyInfo(ProxyType.SOCKS4, proxyAddress, proxyPort, proxyUser, null); + public static OkHttpProxyInfo socks4Proxy(String proxyAddress, int proxyPort, String proxyUser) { + return new OkHttpProxyInfo(ProxyType.SOCKS4, proxyAddress, proxyPort, proxyUser, null); } /** * Creates SOCKS5 proxy. */ - public static OkhttpProxyInfo socks5Proxy(String proxyAddress, int proxyPort, String proxyUser, String proxyPassword) { - return new OkhttpProxyInfo(ProxyType.SOCKS5, proxyAddress, proxyPort, proxyUser, proxyPassword); + public static OkHttpProxyInfo socks5Proxy(String proxyAddress, int proxyPort, String proxyUser, String proxyPassword) { + return new OkHttpProxyInfo(ProxyType.SOCKS5, proxyAddress, proxyPort, proxyUser, proxyPassword); } /** * Creates HTTP proxy. */ - public static OkhttpProxyInfo httpProxy(String proxyAddress, int proxyPort, String proxyUser, String proxyPassword) { - return new OkhttpProxyInfo(ProxyType.HTTP, proxyAddress, proxyPort, proxyUser, proxyPassword); + public static OkHttpProxyInfo httpProxy(String proxyAddress, int proxyPort, String proxyUser, String proxyPassword) { + return new OkHttpProxyInfo(ProxyType.HTTP, proxyAddress, proxyPort, proxyUser, proxyPassword); } /** diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkSimpleGetRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpSimpleGetRequestExecutor.java similarity index 91% rename from weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkSimpleGetRequestExecutor.java rename to weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpSimpleGetRequestExecutor.java index ba1ba999f..bbb5d4375 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkSimpleGetRequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpSimpleGetRequestExecutor.java @@ -11,9 +11,9 @@ import java.io.IOException; /** * Created by ecoolper on 2017/5/4. */ -public class OkSimpleGetRequestExecutor extends SimpleGetRequestExecutor { +public class OkHttpSimpleGetRequestExecutor extends SimpleGetRequestExecutor { - public OkSimpleGetRequestExecutor(RequestHttp requestHttp) { + public OkHttpSimpleGetRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkSimplePostRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpSimplePostRequestExecutor.java similarity index 87% rename from weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkSimplePostRequestExecutor.java rename to weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpSimplePostRequestExecutor.java index eed685017..9d153117c 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkSimplePostRequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpSimplePostRequestExecutor.java @@ -11,16 +11,16 @@ import java.io.IOException; /** * Created by ecoolper on 2017/5/4. */ -public class OkSimplePostRequestExecutor extends SimplePostRequestExecutor { +public class OkHttpSimplePostRequestExecutor extends SimplePostRequestExecutor { - public OkSimplePostRequestExecutor(RequestHttp requestHttp) { + public OkHttpSimplePostRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } @Override public String execute(String uri, String postEntity) throws WxErrorException, IOException { ConnectionPool pool = requestHttp.getRequestHttpClient(); - final OkhttpProxyInfo proxyInfo = requestHttp.getRequestHttpProxy(); + final OkHttpProxyInfo proxyInfo = requestHttp.getRequestHttpProxy(); OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(pool); //设置代理 diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/apache/WxCpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceApacheHttpClientImpl.java similarity index 95% rename from weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/apache/WxCpServiceImpl.java rename to weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceApacheHttpClientImpl.java index 006bb52ee..fecb26464 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/apache/WxCpServiceImpl.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceApacheHttpClientImpl.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.cp.api.impl.apache; +package me.chanjar.weixin.cp.api.impl; import me.chanjar.weixin.common.bean.WxAccessToken; @@ -18,7 +18,7 @@ import org.apache.http.impl.client.CloseableHttpClient; import java.io.IOException; -public class WxCpServiceImpl extends AbstractWxCpServiceImpl { +public class WxCpServiceApacheHttpClientImpl extends AbstractWxCpServiceImpl { protected CloseableHttpClient httpClient; protected HttpHost httpProxy; @@ -34,7 +34,7 @@ public class WxCpServiceImpl extends AbstractWxCpServiceImplbinarywang(Binary Wang) * */ -public class WxCpServiceImpl extends me.chanjar.weixin.cp.api.impl.apache.WxCpServiceImpl{ +public class WxCpServiceImpl extends WxCpServiceApacheHttpClientImpl { } diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/jodd/WxCpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceJoddHttpImpl.java similarity index 93% rename from weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/jodd/WxCpServiceImpl.java rename to weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceJoddHttpImpl.java index 1dc2dd0ef..5ceabd0c6 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/jodd/WxCpServiceImpl.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceJoddHttpImpl.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.cp.api.impl.jodd; +package me.chanjar.weixin.cp.api.impl; import jodd.http.*; import me.chanjar.weixin.common.bean.WxAccessToken; @@ -8,7 +8,7 @@ import me.chanjar.weixin.common.util.http.HttpType; import me.chanjar.weixin.cp.api.WxCpConfigStorage; import me.chanjar.weixin.cp.api.impl.AbstractWxCpServiceImpl; -public class WxCpServiceImpl extends AbstractWxCpServiceImpl { +public class WxCpServiceJoddHttpImpl extends AbstractWxCpServiceImpl { protected HttpConnectionProvider httpClient; protected ProxyInfo httpProxy; @@ -25,7 +25,7 @@ public class WxCpServiceImpl extends AbstractWxCpServiceImpl { +public class WxCpServiceOkHttpImpl extends AbstractWxCpServiceImpl { protected ConnectionPool httpClient; - protected OkhttpProxyInfo httpProxy; + protected OkHttpProxyInfo httpProxy; @Override @@ -22,13 +22,13 @@ public class WxCpServiceImpl extends AbstractWxCpServiceImpl 0) { - httpProxy = new OkhttpProxyInfo(OkhttpProxyInfo.ProxyType.SOCKS5, configStorage.getHttpProxyHost(), configStorage.getHttpProxyPort(), configStorage.getHttpProxyUsername(), configStorage.getHttpProxyPassword()); + httpProxy = new OkHttpProxyInfo(OkHttpProxyInfo.ProxyType.SOCKS5, configStorage.getHttpProxyHost(), configStorage.getHttpProxyPort(), configStorage.getHttpProxyUsername(), configStorage.getHttpProxyPassword()); } httpClient = new ConnectionPool(); diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/apache/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceApacheHttpClientImpl.java similarity index 94% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/apache/WxMpServiceImpl.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceApacheHttpClientImpl.java index fdce402ed..8e7d6da77 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/apache/WxMpServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceApacheHttpClientImpl.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.api.impl.apache; +package me.chanjar.weixin.mp.api.impl; import me.chanjar.weixin.common.bean.WxAccessToken; import me.chanjar.weixin.common.bean.result.WxError; @@ -9,7 +9,6 @@ import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder; import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder; import me.chanjar.weixin.mp.api.WxMpConfigStorage; import me.chanjar.weixin.mp.api.WxMpService; -import me.chanjar.weixin.mp.api.impl.AbstractWxMpServiceImpl; import org.apache.http.HttpHost; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; @@ -23,7 +22,7 @@ import java.util.concurrent.locks.Lock; /** * apache-http方式实现 */ -public class WxMpServiceImpl extends AbstractWxMpServiceImpl { +public class WxMpServiceApacheHttpClientImpl extends AbstractWxMpServiceImpl { private CloseableHttpClient httpClient; private HttpHost httpProxy; @@ -39,7 +38,7 @@ public class WxMpServiceImpl extends AbstractWxMpServiceImplbinarywang(Binary Wang) * */ -public class WxMpServiceImpl extends me.chanjar.weixin.mp.api.impl.apache.WxMpServiceImpl{ +public class WxMpServiceImpl extends WxMpServiceApacheHttpClientImpl { } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/jodd/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceJoddHttpImpl.java similarity index 92% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/jodd/WxMpServiceImpl.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceJoddHttpImpl.java index 6f02ff80c..bd4a525b6 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/jodd/WxMpServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceJoddHttpImpl.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.api.impl.jodd; +package me.chanjar.weixin.mp.api.impl; import jodd.http.*; import jodd.http.net.SocketHttpConnectionProvider; @@ -9,14 +9,13 @@ import me.chanjar.weixin.common.util.http.HttpType; import me.chanjar.weixin.common.util.http.RequestHttp; import me.chanjar.weixin.mp.api.WxMpConfigStorage; import me.chanjar.weixin.mp.api.WxMpService; -import me.chanjar.weixin.mp.api.impl.AbstractWxMpServiceImpl; import java.util.concurrent.locks.Lock; /** * jodd-http方式实现 */ -public class WxMpServiceImpl extends AbstractWxMpServiceImpl { +public class WxMpServiceJoddHttpImpl extends AbstractWxMpServiceImpl { private HttpConnectionProvider httpClient; private ProxyInfo httpProxy; @@ -32,7 +31,7 @@ public class WxMpServiceImpl extends AbstractWxMpServiceImpl { +public class WxMpServiceOkHttpImpl extends AbstractWxMpServiceImpl { private ConnectionPool httpClient; - private OkhttpProxyInfo httpProxy; + private OkHttpProxyInfo httpProxy; @Override public ConnectionPool getRequestHttpClient() { @@ -24,13 +23,13 @@ public class WxMpServiceImpl extends AbstractWxMpServiceImpl 0) { - httpProxy = new OkhttpProxyInfo(OkhttpProxyInfo.ProxyType.SOCKS5, configStorage.getHttpProxyHost(), configStorage.getHttpProxyPort(), configStorage.getHttpProxyUsername(), configStorage.getHttpProxyPassword()); + httpProxy = new OkHttpProxyInfo(OkHttpProxyInfo.ProxyType.SOCKS5, configStorage.getHttpProxyHost(), configStorage.getHttpProxyPort(), configStorage.getHttpProxyUsername(), configStorage.getHttpProxyPassword()); } httpClient = new ConnectionPool(); diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialDeleteRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialDeleteRequestExecutor.java index 307f55ff3..51b7a6776 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialDeleteRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialDeleteRequestExecutor.java @@ -15,11 +15,11 @@ public abstract class MaterialDeleteRequestExecutor implements RequestExec public static RequestExecutor create(RequestHttp requestHttp) { switch (requestHttp.getRequestType()) { - case apacheHttp: + case APACHE_HTTP: return new ApacheMaterialDeleteRequestExecutor(requestHttp); - case joddHttp: + case JODD_HTTP: return new JoddMaterialDeleteRequestExecutor(requestHttp); - case okHttp: + case OK_HTTP: return new OkhttpMaterialDeleteRequestExecutor(requestHttp); default: return null; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialNewsInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialNewsInfoRequestExecutor.java index 0544fbe91..24c00fe75 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialNewsInfoRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialNewsInfoRequestExecutor.java @@ -16,11 +16,11 @@ public abstract class MaterialNewsInfoRequestExecutor implements RequestEx public static RequestExecutor create(RequestHttp requestHttp) { switch (requestHttp.getRequestType()) { - case apacheHttp: + case APACHE_HTTP: return new ApacheMaterialNewsInfoRequestExecutor(requestHttp); - case joddHttp: + case JODD_HTTP: return new JoddMaterialNewsInfoRequestExecutor(requestHttp); - case okHttp: + case OK_HTTP: return new OkhttpMaterialNewsInfoRequestExecutor(requestHttp); default: //TODO 需要优化抛出异常 diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java index c44b5f160..c850d28cf 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java @@ -17,11 +17,11 @@ public abstract class MaterialUploadRequestExecutor implements RequestExec public static RequestExecutor create(RequestHttp requestHttp) { switch (requestHttp.getRequestType()) { - case apacheHttp: + case APACHE_HTTP: return new ApacheMaterialUploadRequestExecutor(requestHttp); - case joddHttp: + case JODD_HTTP: return new JoddMaterialUploadRequestExecutor(requestHttp); - case okHttp: + case OK_HTTP: return new OkhttpMaterialUploadRequestExecutor(requestHttp); default: return null; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVideoInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVideoInfoRequestExecutor.java index 49c984ddb..73948052f 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVideoInfoRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVideoInfoRequestExecutor.java @@ -19,11 +19,11 @@ public abstract class MaterialVideoInfoRequestExecutor implements RequestE public static RequestExecutor create(RequestHttp requestHttp) { switch (requestHttp.getRequestType()) { - case apacheHttp: + case APACHE_HTTP: return new ApacheMaterialVideoInfoRequestExecutor(requestHttp); - case joddHttp: + case JODD_HTTP: return new JoddMaterialVideoInfoRequestExecutor(requestHttp); - case okHttp: + case OK_HTTP: return new OkhttpMaterialVideoInfoRequestExecutor(requestHttp); default: return null; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVoiceAndImageDownloadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVoiceAndImageDownloadRequestExecutor.java index 7c47532a2..8bf55d03e 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVoiceAndImageDownloadRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVoiceAndImageDownloadRequestExecutor.java @@ -22,11 +22,11 @@ public abstract class MaterialVoiceAndImageDownloadRequestExecutor impleme public static RequestExecutor create(RequestHttp requestHttp, File tmpDirFile) { switch (requestHttp.getRequestType()) { - case apacheHttp: + case APACHE_HTTP: return new ApacheMaterialVoiceAndImageDownloadRequestExecutor(requestHttp, tmpDirFile); - case joddHttp: + case JODD_HTTP: return new JoddMaterialVoiceAndImageDownloadRequestExecutor(requestHttp, tmpDirFile); - case okHttp: + case OK_HTTP: return new OkhttpMaterialVoiceAndImageDownloadRequestExecutor(requestHttp, tmpDirFile); default: return null; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java index dc5e037b4..e187561fc 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java @@ -21,11 +21,11 @@ public abstract class MediaImgUploadRequestExecutor implements RequestExec public static RequestExecutor create(RequestHttp requestHttp) { switch (requestHttp.getRequestType()) { - case apacheHttp: + case APACHE_HTTP: return new ApacheMediaImgUploadRequestExecutor(requestHttp); - case joddHttp: + case JODD_HTTP: return new JoddMediaImgUploadRequestExecutor(requestHttp); - case okHttp: + case OK_HTTP: return new OkhttpMediaImgUploadRequestExecutor(requestHttp); default: return null; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java index 3fc34d87c..87c1920cd 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java @@ -23,11 +23,11 @@ public abstract class QrCodeRequestExecutor implements RequestExecutor create(RequestHttp requestHttp) { switch (requestHttp.getRequestType()) { - case apacheHttp: + case APACHE_HTTP: return new ApacheQrCodeRequestExecutor(requestHttp); - case joddHttp: + case JODD_HTTP: return new JoddQrCodeRequestExecutor(requestHttp); - case okHttp: + case OK_HTTP: return new OkhttpQrCodeRequestExecutor(requestHttp); default: //TODO 需要优化，最好抛出异常 diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialDeleteRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialDeleteRequestExecutor.java index 17e3ae554..61d4d18b3 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialDeleteRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialDeleteRequestExecutor.java @@ -3,7 +3,7 @@ package me.chanjar.weixin.mp.util.http.okhttp; import me.chanjar.weixin.common.bean.result.WxError; import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.common.util.http.RequestHttp; -import me.chanjar.weixin.common.util.http.okhttp.OkhttpProxyInfo; +import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; import me.chanjar.weixin.mp.util.http.MaterialDeleteRequestExecutor; import okhttp3.*; @@ -12,7 +12,7 @@ import java.io.IOException; /** * Created by ecoolper on 2017/5/5. */ -public class OkhttpMaterialDeleteRequestExecutor extends MaterialDeleteRequestExecutor { +public class OkhttpMaterialDeleteRequestExecutor extends MaterialDeleteRequestExecutor { public OkhttpMaterialDeleteRequestExecutor(RequestHttp requestHttp) { diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialNewsInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialNewsInfoRequestExecutor.java index 921915fff..d51fbbe48 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialNewsInfoRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialNewsInfoRequestExecutor.java @@ -3,7 +3,7 @@ package me.chanjar.weixin.mp.util.http.okhttp; import me.chanjar.weixin.common.bean.result.WxError; import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.common.util.http.RequestHttp; -import me.chanjar.weixin.common.util.http.okhttp.OkhttpProxyInfo; +import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews; import me.chanjar.weixin.mp.util.http.MaterialNewsInfoRequestExecutor; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; @@ -14,7 +14,7 @@ import java.io.IOException; /** * Created by ecoolper on 2017/5/5. */ -public class OkhttpMaterialNewsInfoRequestExecutor extends MaterialNewsInfoRequestExecutor { +public class OkhttpMaterialNewsInfoRequestExecutor extends MaterialNewsInfoRequestExecutor { public OkhttpMaterialNewsInfoRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialUploadRequestExecutor.java index a1e3f6189..27a9b5bfc 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialUploadRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialUploadRequestExecutor.java @@ -3,7 +3,7 @@ package me.chanjar.weixin.mp.util.http.okhttp; import me.chanjar.weixin.common.bean.result.WxError; import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.common.util.http.RequestHttp; -import me.chanjar.weixin.common.util.http.okhttp.OkhttpProxyInfo; +import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; import me.chanjar.weixin.common.util.json.WxGsonBuilder; import me.chanjar.weixin.mp.bean.material.WxMpMaterial; import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult; @@ -18,7 +18,7 @@ import java.util.Map; /** * Created by ecoolper on 2017/5/5. */ -public class OkhttpMaterialUploadRequestExecutor extends MaterialUploadRequestExecutor { +public class OkhttpMaterialUploadRequestExecutor extends MaterialUploadRequestExecutor { public OkhttpMaterialUploadRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVideoInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVideoInfoRequestExecutor.java index e296a8496..90c775bac 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVideoInfoRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVideoInfoRequestExecutor.java @@ -3,7 +3,7 @@ package me.chanjar.weixin.mp.util.http.okhttp; import me.chanjar.weixin.common.bean.result.WxError; import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.common.util.http.RequestHttp; -import me.chanjar.weixin.common.util.http.okhttp.OkhttpProxyInfo; +import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; import me.chanjar.weixin.mp.bean.material.WxMpMaterialVideoInfoResult; import me.chanjar.weixin.mp.util.http.MaterialVideoInfoRequestExecutor; import okhttp3.*; @@ -13,7 +13,7 @@ import java.io.IOException; /** * Created by ecoolper on 2017/5/5. */ -public class OkhttpMaterialVideoInfoRequestExecutor extends MaterialVideoInfoRequestExecutor { +public class OkhttpMaterialVideoInfoRequestExecutor extends MaterialVideoInfoRequestExecutor { public OkhttpMaterialVideoInfoRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVoiceAndImageDownloadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVoiceAndImageDownloadRequestExecutor.java index e6393b826..336b3a989 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVoiceAndImageDownloadRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVoiceAndImageDownloadRequestExecutor.java @@ -3,7 +3,7 @@ package me.chanjar.weixin.mp.util.http.okhttp; import me.chanjar.weixin.common.bean.result.WxError; import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.common.util.http.RequestHttp; -import me.chanjar.weixin.common.util.http.okhttp.OkhttpProxyInfo; +import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; import me.chanjar.weixin.common.util.json.WxGsonBuilder; import me.chanjar.weixin.mp.util.http.MaterialVoiceAndImageDownloadRequestExecutor; import okhttp3.*; @@ -17,7 +17,7 @@ import java.io.InputStream; /** * Created by ecoolper on 2017/5/5. */ -public class OkhttpMaterialVoiceAndImageDownloadRequestExecutor extends MaterialVoiceAndImageDownloadRequestExecutor { +public class OkhttpMaterialVoiceAndImageDownloadRequestExecutor extends MaterialVoiceAndImageDownloadRequestExecutor { public OkhttpMaterialVoiceAndImageDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) { super(requestHttp, tmpDirFile); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMediaImgUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMediaImgUploadRequestExecutor.java index af29e532d..3d8abd394 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMediaImgUploadRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMediaImgUploadRequestExecutor.java @@ -3,7 +3,7 @@ package me.chanjar.weixin.mp.util.http.okhttp; import me.chanjar.weixin.common.bean.result.WxError; import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.common.util.http.RequestHttp; -import me.chanjar.weixin.common.util.http.okhttp.OkhttpProxyInfo; +import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; import me.chanjar.weixin.mp.bean.material.WxMediaImgUploadResult; import me.chanjar.weixin.mp.util.http.MediaImgUploadRequestExecutor; import okhttp3.*; @@ -14,7 +14,7 @@ import java.io.IOException; /** * Created by ecoolper on 2017/5/5. */ -public class OkhttpMediaImgUploadRequestExecutor extends MediaImgUploadRequestExecutor { +public class OkhttpMediaImgUploadRequestExecutor extends MediaImgUploadRequestExecutor { public OkhttpMediaImgUploadRequestExecutor(RequestHttp requestHttp) { super(requestHttp); diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpQrCodeRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpQrCodeRequestExecutor.java index 5d75c74d4..f401b021c 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpQrCodeRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpQrCodeRequestExecutor.java @@ -4,7 +4,7 @@ import me.chanjar.weixin.common.bean.result.WxError; import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.common.util.fs.FileUtils; import me.chanjar.weixin.common.util.http.RequestHttp; -import me.chanjar.weixin.common.util.http.okhttp.OkhttpProxyInfo; +import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; import me.chanjar.weixin.mp.util.http.QrCodeRequestExecutor; @@ -19,7 +19,7 @@ import java.util.UUID; /** * Created by ecoolper on 2017/5/5. */ -public class OkhttpQrCodeRequestExecutor extends QrCodeRequestExecutor { +public class OkhttpQrCodeRequestExecutor extends QrCodeRequestExecutor { public OkhttpQrCodeRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBusyRetryTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBusyRetryTest.java index cc4dcf961..fc0f70b77 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBusyRetryTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBusyRetryTest.java @@ -3,7 +3,7 @@ package me.chanjar.weixin.mp.api; import me.chanjar.weixin.common.bean.result.WxError; import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.common.util.http.RequestExecutor; -import me.chanjar.weixin.mp.api.impl.apache.WxMpServiceImpl; +import me.chanjar.weixin.mp.api.impl.WxMpServiceApacheHttpClientImpl; import org.testng.annotations.*; import java.util.concurrent.ExecutionException; @@ -16,7 +16,7 @@ public class WxMpBusyRetryTest { @DataProvider(name = "getService") public Object[][] getService() { - WxMpService service = new WxMpServiceImpl() { + WxMpService service = new WxMpServiceApacheHttpClientImpl() { @Override public synchronized T executeInternal( diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/test/ApiTestModule.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/test/ApiTestModule.java index 2cfaec543..036c534ad 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/test/ApiTestModule.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/test/ApiTestModule.java @@ -6,7 +6,7 @@ import com.thoughtworks.xstream.XStream; import me.chanjar.weixin.common.util.xml.XStreamInitializer; import me.chanjar.weixin.mp.api.WxMpConfigStorage; import me.chanjar.weixin.mp.api.WxMpService; -import me.chanjar.weixin.mp.api.impl.apache.WxMpServiceImpl; +import me.chanjar.weixin.mp.api.impl.WxMpServiceApacheHttpClientImpl; import java.io.IOException; import java.io.InputStream; @@ -19,7 +19,7 @@ public class ApiTestModule implements Module { try (InputStream is1 = ClassLoader.getSystemResourceAsStream("test-config.xml")) { TestConfigStorage config = this.fromXml(TestConfigStorage.class, is1); config.setAccessTokenLock(new ReentrantLock()); - WxMpService wxService = new WxMpServiceImpl(); + WxMpService wxService = new WxMpServiceApacheHttpClientImpl(); wxService.setWxMpConfigStorage(config); binder.bind(WxMpService.class).toInstance(wxService); diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpDemoServer.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpDemoServer.java index e2c75f83d..3e16042d7 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpDemoServer.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpDemoServer.java @@ -5,7 +5,7 @@ import me.chanjar.weixin.mp.api.WxMpConfigStorage; import me.chanjar.weixin.mp.api.WxMpMessageHandler; import me.chanjar.weixin.mp.api.WxMpMessageRouter; import me.chanjar.weixin.mp.api.WxMpService; -import me.chanjar.weixin.mp.api.impl.apache.WxMpServiceImpl; +import me.chanjar.weixin.mp.api.impl.WxMpServiceApacheHttpClientImpl; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletHandler; import org.eclipse.jetty.servlet.ServletHolder; @@ -47,7 +47,7 @@ public class WxMpDemoServer { .fromXml(is1); wxMpConfigStorage = config; - wxMpService = new WxMpServiceImpl(); + wxMpService = new WxMpServiceApacheHttpClientImpl(); wxMpService.setWxMpConfigStorage(config); WxMpMessageHandler logHandler = new DemoLogHandler();