refactor some packages and class files name

Author: binarywang

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/HttpType.java

@@ -4,5 +4,5 @@
  * Created by ecoolper on 2017/4/28.
  */
 public enum HttpType {
-  joddHttp, apacheHttp, okHttp;
+  JODD_HTTP, APACHE_HTTP, OK_HTTP;
 }

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 MediaDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) {
 
   public static RequestExecutor<File, String> 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;
     }

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaUploadRequestExecutor.java

@@ -2,8 +2,8 @@
 
 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 MediaUploadRequestExecutor(RequestHttp requestHttp) {
 
   public static RequestExecutor<WxMediaUploadResult, File> 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;
     }

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/RequestExecutor.java

@@ -54,6 +54,6 @@ public interface RequestExecutor<T, E> {
    * @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;
 */
 }

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 SimpleGetRequestExecutor(RequestHttp requestHttp) {
 
   public static RequestExecutor<String, String> 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;
     }

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 SimplePostRequestExecutor(RequestHttp requestHttp) {
 
   public static RequestExecutor<String, String> 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;
     }

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheSimpleGetRequestExecutor.java renamed to weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpClientSimpleGetRequestExecutor.java

@@ -15,9 +15,9 @@
 /**
  * Created by ecoolper on 2017/5/4.
  */
-public class ApacheSimpleGetRequestExecutor extends SimpleGetRequestExecutor<CloseableHttpClient, HttpHost> {
+public class ApacheHttpClientSimpleGetRequestExecutor extends SimpleGetRequestExecutor<CloseableHttpClient, HttpHost> {
 
-  public ApacheSimpleGetRequestExecutor(RequestHttp requestHttp) {
+  public ApacheHttpClientSimpleGetRequestExecutor(RequestHttp requestHttp) {
     super(requestHttp);
   }
 

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddMediaDownloadRequestExecutor.java renamed to weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpMediaDownloadRequestExecutor.java

@@ -23,10 +23,10 @@
 /**
  * Created by ecoolper on 2017/5/5.
  */
-public class JoddMediaDownloadRequestExecutor extends MediaDownloadRequestExecutor<HttpConnectionProvider, ProxyInfo> {
+public class JoddHttpMediaDownloadRequestExecutor extends MediaDownloadRequestExecutor<HttpConnectionProvider, ProxyInfo> {
 
 
-  public JoddMediaDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) {
+  public JoddHttpMediaDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) {
     super(requestHttp, tmpDirFile);
   }
 

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddMediaUploadRequestExecutor.java renamed to weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpMediaUploadRequestExecutor.java

@@ -18,8 +18,8 @@
 /**
  * Created by ecoolper on 2017/5/5.
  */
-public class JoddMediaUploadRequestExecutor extends MediaUploadRequestExecutor<HttpConnectionProvider, ProxyInfo> {
-  public JoddMediaUploadRequestExecutor(RequestHttp requestHttp) {
+public class JoddHttpMediaUploadRequestExecutor extends MediaUploadRequestExecutor<HttpConnectionProvider, ProxyInfo> {
+  public JoddHttpMediaUploadRequestExecutor(RequestHttp requestHttp) {
     super(requestHttp);
   }
 

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddSimpleGetRequestExecutor.java renamed to weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimpleGetRequestExecutor.java

@@ -13,9 +13,9 @@
 /**
  * Created by ecoolper on 2017/5/4.
  */
-public class JoddSimpleGetRequestExecutor extends SimpleGetRequestExecutor<HttpConnectionProvider, ProxyInfo> {
+public class JoddHttpSimpleGetRequestExecutor extends SimpleGetRequestExecutor<HttpConnectionProvider, ProxyInfo> {
 
-  public JoddSimpleGetRequestExecutor(RequestHttp requestHttp) {
+  public JoddHttpSimpleGetRequestExecutor(RequestHttp requestHttp) {
     super(requestHttp);
   }