fix some code

binarywang · binarywang · commit 007e736f741e · 2017-06-10T23:06:40.000+08:00
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/RequestHttp.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/RequestHttp.java
@@ -8,20 +8,15 @@ public interface RequestHttp<H, P> {
   /**
    * 返回httpClient
    *
-   * @return
    */
   H getRequestHttpClient();
 
   /**
    * 返回httpProxy
    *
-   * @return
    */
   P getRequestHttpProxy();
 
-  /**
-   * @return
-   */
   HttpType getRequestType();
 
 }
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
@@ -12,11 +12,10 @@
 public abstract class SimpleGetRequestExecutor<H, P> implements RequestExecutor<String, String> {
   protected RequestHttp<H, P> requestHttp;
 
-  public SimpleGetRequestExecutor(RequestHttp requestHttp) {
+  public SimpleGetRequestExecutor(RequestHttp<H, P> requestHttp) {
     this.requestHttp = requestHttp;
   }
 
-
   public static RequestExecutor<String, String> create(RequestHttp requestHttp) {
     switch (requestHttp.getRequestType()) {
       case APACHE_HTTP:
@@ -26,7 +25,7 @@ public static RequestExecutor<String, String> create(RequestHttp requestHttp) {
       case OK_HTTP:
         return new OkHttpSimpleGetRequestExecutor(requestHttp);
       default:
-        return null;
+        throw new IllegalArgumentException("非法请求参数");
     }
   }
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java
@@ -210,8 +210,7 @@ public boolean oauth2validateAccessToken(WxMpOAuth2AccessToken oAuth2AccessToken
     String url = String.format(WxMpService.OAUTH2_VALIDATE_TOKEN_URL, oAuth2AccessToken.getAccessToken(), oAuth2AccessToken.getOpenId());
 
     try {
-      RequestExecutor<String, String> executor = SimpleGetRequestExecutor.create(this);
-      executor.execute(url, null);
+      SimpleGetRequestExecutor.create(this).execute(url, null);
     } catch (IOException e) {
       throw new RuntimeException(e);
     } catch (WxErrorException e) {

Original file line number	Diff line number	Diff line change
`@@ -8,20 +8,15 @@ public interface RequestHttp<H, P> {`
`8`	`8`	`/**`
`9`	`9`	`* 返回httpClient`
`10`	`10`	`*`
`11`		`- * @return`
`12`	`11`	`*/`
`13`	`12`	`H getRequestHttpClient();`
`14`	`13`
`15`	`14`	`/**`
`16`	`15`	`* 返回httpProxy`
`17`	`16`	`*`
`18`		`- * @return`
`19`	`17`	`*/`
`20`	`18`	`P getRequestHttpProxy();`
`21`	`19`
`22`		`- /**`
`23`		`- * @return`
`24`		`- */`
`25`	`20`	`HttpType getRequestType();`
`26`	`21`
`27`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,10 @@`
`12`	`12`	`public abstract class SimpleGetRequestExecutor<H, P> implements RequestExecutor<String, String> {`
`13`	`13`	`protected RequestHttp<H, P> requestHttp;`
`14`	`14`
`15`		`- public SimpleGetRequestExecutor(RequestHttp requestHttp) {`
	`15`	`+ public SimpleGetRequestExecutor(RequestHttp<H, P> requestHttp) {`
`16`	`16`	`this.requestHttp = requestHttp;`
`17`	`17`	`}`
`18`	`18`
`19`		`-`
`20`	`19`	`public static RequestExecutor<String, String> create(RequestHttp requestHttp) {`
`21`	`20`	`switch (requestHttp.getRequestType()) {`
`22`	`21`	`case APACHE_HTTP:`
`@@ -26,7 +25,7 @@ public static RequestExecutor<String, String> create(RequestHttp requestHttp) {`
`26`	`25`	`case OK_HTTP:`
`27`	`26`	`return new OkHttpSimpleGetRequestExecutor(requestHttp);`
`28`	`27`	`default:`
`29`		`- return null;`
	`28`	`+ throw new IllegalArgumentException("非法请求参数");`
`30`	`29`	`}`
`31`	`30`	`}`
`32`	`31`