context,
+ WxCpService wxCpService,
+ WxSessionManager sessionManager) throws WxErrorException;
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageMatcher.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageMatcher.java
index 09fbdd21..c2c62b93 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageMatcher.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageMatcher.java
@@ -10,6 +10,6 @@ public interface WxCpMessageMatcher {
/**
* 消息是否匹配某种模式
*/
- public boolean match(WxCpXmlMessage message);
+ boolean match(WxCpXmlMessage message);
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageRouter.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageRouter.java
index 96b4e77d..f7e5286b 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageRouter.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageRouter.java
@@ -210,10 +210,7 @@ public class WxCpMessageRouter {
messageId = String.valueOf(wxMessage.getMsgId());
}
- if (messageDuplicateChecker.isDuplicate(messageId)) {
- return true;
- }
- return false;
+ return messageDuplicateChecker.isDuplicate(messageId);
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java
index 33de577d..7cf9332a 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java
@@ -70,7 +70,7 @@ public interface WxCpService {
* @see #getJsapiTicket(boolean)
* @throws WxErrorException
*/
- public String getJsapiTicket() throws WxErrorException;
+ String getJsapiTicket() throws WxErrorException;
/**
*
@@ -82,7 +82,7 @@ public interface WxCpService {
* @param forceRefresh 强制刷新
* @throws WxErrorException
*/
- public String getJsapiTicket(boolean forceRefresh) throws WxErrorException;
+ String getJsapiTicket(boolean forceRefresh) throws WxErrorException;
/**
*
@@ -92,7 +92,7 @@ public interface WxCpService {
*
* @param url url
*/
- public WxJsapiSignature createJsapiSignature(String url) throws WxErrorException;
+ WxJsapiSignature createJsapiSignature(String url) throws WxErrorException;
/**
*
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMessageRouterTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMessageRouterTest.java
index aac58a10..ccf981dd 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMessageRouterTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMessageRouterTest.java
@@ -49,7 +49,6 @@ public class WxCpMessageRouterTest {
}
}).handler(new WxEchoCpMessageHandler(sb, "matcher")).end()
.rule().async(async).handler(new WxEchoCpMessageHandler(sb, "ALL")).end();
- ;
}
@Test(dataProvider="messages-1")
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpConfigStorage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpConfigStorage.java
index d57b94a8..0cf9d2e1 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpConfigStorage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpConfigStorage.java
@@ -13,89 +13,89 @@ import java.io.File;
*/
public interface WxMpConfigStorage {
- public String getAccessToken();
+ String getAccessToken();
- public boolean isAccessTokenExpired();
+ boolean isAccessTokenExpired();
/**
* 强制将access token过期掉
*/
- public void expireAccessToken();
+ void expireAccessToken();
/**
* 应该是线程安全的
* @param accessToken
*/
- public void updateAccessToken(WxAccessToken accessToken);
+ void updateAccessToken(WxAccessToken accessToken);
/**
* 应该是线程安全的
* @param accessToken
* @param expiresIn
*/
- public void updateAccessToken(String accessToken, int expiresIn);
+ void updateAccessToken(String accessToken, int expiresIn);
- public String getJsapiTicket();
+ String getJsapiTicket();
- public boolean isJsapiTicketExpired();
+ boolean isJsapiTicketExpired();
/**
* 强制将jsapi ticket过期掉
*/
- public void expireJsapiTicket();
+ void expireJsapiTicket();
/**
* 应该是线程安全的
* @param jsapiTicket
*/
- public void updateJsapiTicket(String jsapiTicket, int expiresInSeconds);
+ void updateJsapiTicket(String jsapiTicket, int expiresInSeconds);
- public String getCardApiTicket();
+ String getCardApiTicket();
- public boolean isCardApiTicketExpired();
+ boolean isCardApiTicketExpired();
/**
* 强制将卡券api ticket过期掉
*/
- public void expireCardApiTicket();
+ void expireCardApiTicket();
/**
* 应该是线程安全的
* @param cardApiTicket
*/
- public void updateCardApiTicket(String cardApiTicket, int expiresInSeconds);
+ void updateCardApiTicket(String cardApiTicket, int expiresInSeconds);
- public String getAppId();
+ String getAppId();
- public String getSecret();
+ String getSecret();
- public String getPartnerId();
+ String getPartnerId();
- public String getPartnerKey();
+ String getPartnerKey();
- public String getToken();
+ String getToken();
- public String getAesKey();
+ String getAesKey();
- public long getExpiresTime();
+ long getExpiresTime();
- public String getOauth2redirectUri();
+ String getOauth2redirectUri();
- public String getHttp_proxy_host();
+ String getHttp_proxy_host();
- public int getHttp_proxy_port();
+ int getHttp_proxy_port();
- public String getHttp_proxy_username();
+ String getHttp_proxy_username();
- public String getHttp_proxy_password();
+ String getHttp_proxy_password();
- public File getTmpDirFile();
+ File getTmpDirFile();
- public SSLContext getSSLContext();
+ SSLContext getSSLContext();
/**
* http client builder
* @return ApacheHttpClientBuilder
*/
- public ApacheHttpClientBuilder getApacheHttpClientBuilder();
+ ApacheHttpClientBuilder getApacheHttpClientBuilder();
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpGroupService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpGroupService.java
index 80cadd55..80bcf524 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpGroupService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpGroupService.java
@@ -22,7 +22,7 @@ public interface WxMpGroupService {
*
* @param name 分组名字(30个字符以内)
*/
- public WxMpGroup groupCreate(String name) throws WxErrorException;
+ WxMpGroup groupCreate(String name) throws WxErrorException;
/**
*
@@ -30,7 +30,7 @@ public interface WxMpGroupService {
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=分组管理接口
*
*/
- public List groupGet() throws WxErrorException;
+ List groupGet() throws WxErrorException;
/**
*
@@ -40,7 +40,7 @@ public interface WxMpGroupService {
*
* @param openid 微信用户的openid
*/
- public long userGetGroup(String openid) throws WxErrorException;
+ long userGetGroup(String openid) throws WxErrorException;
/**
*
@@ -52,7 +52,7 @@ public interface WxMpGroupService {
*
* @param group 要更新的group,group的id,name必须设置
*/
- public void groupUpdate(WxMpGroup group) throws WxErrorException;
+ void groupUpdate(WxMpGroup group) throws WxErrorException;
/**
*
@@ -65,5 +65,5 @@ public interface WxMpGroupService {
* @param openid 用户openid
* @param to_groupid 移动到的分组id
*/
- public void userUpdateGroup(String openid, long to_groupid) throws WxErrorException;
+ void userUpdateGroup(String openid, long to_groupid) throws WxErrorException;
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMaterialService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMaterialService.java
index 7254a008..2325ccac 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMaterialService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMaterialService.java
@@ -25,7 +25,7 @@ public interface WxMpMaterialService {
* @throws WxErrorException
* @see #mediaUpload(String, String, InputStream)
*/
- public WxMediaUploadResult mediaUpload(String mediaType, File file) throws WxErrorException;
+ WxMediaUploadResult mediaUpload(String mediaType, File file) throws WxErrorException;
/**
*
@@ -39,7 +39,7 @@ public interface WxMpMaterialService {
* @return 保存到本地的临时文件
* @throws WxErrorException
*/
- public File mediaDownload(String media_id) throws WxErrorException;
+ File mediaDownload(String media_id) throws WxErrorException;
/**
*
@@ -51,7 +51,7 @@ public interface WxMpMaterialService {
* @return WxMediaImgUploadResult 返回图片url
* @throws WxErrorException
*/
- public WxMediaImgUploadResult mediaImgUpload(File file) throws WxErrorException;
+ WxMediaImgUploadResult mediaImgUpload(File file) throws WxErrorException;
/**
*
@@ -72,7 +72,7 @@ public interface WxMpMaterialService {
* @param inputStream 输入流
* @throws WxErrorException
*/
- public WxMediaUploadResult mediaUpload(String mediaType, String fileType, InputStream inputStream) throws WxErrorException, IOException;
+ WxMediaUploadResult mediaUpload(String mediaType, String fileType, InputStream inputStream) throws WxErrorException, IOException;
/**
*
@@ -90,7 +90,7 @@ public interface WxMpMaterialService {
* @param mediaType 媒体类型, 请看{@link me.chanjar.weixin.common.api.WxConsts}
* @param material 上传的素材, 请看{@link me.chanjar.weixin.mp.bean.WxMpMaterial}
*/
- public WxMpMaterialUploadResult materialFileUpload(String mediaType, WxMpMaterial material) throws WxErrorException;
+ WxMpMaterialUploadResult materialFileUpload(String mediaType, WxMpMaterial material) throws WxErrorException;
/**
*
@@ -101,7 +101,7 @@ public interface WxMpMaterialService {
*
* @param news 上传的图文消息, 请看{@link me.chanjar.weixin.mp.bean.WxMpMaterialNews}
*/
- public WxMpMaterialUploadResult materialNewsUpload(WxMpMaterialNews news) throws WxErrorException;
+ WxMpMaterialUploadResult materialNewsUpload(WxMpMaterialNews news) throws WxErrorException;
/**
*
@@ -112,7 +112,7 @@ public interface WxMpMaterialService {
*
* @param media_id 永久素材的id
*/
- public InputStream materialImageOrVoiceDownload(String media_id) throws WxErrorException;
+ InputStream materialImageOrVoiceDownload(String media_id) throws WxErrorException;
/**
*
@@ -123,7 +123,7 @@ public interface WxMpMaterialService {
*
* @param media_id 永久素材的id
*/
- public WxMpMaterialVideoInfoResult materialVideoInfo(String media_id) throws WxErrorException;
+ WxMpMaterialVideoInfoResult materialVideoInfo(String media_id) throws WxErrorException;
/**
*
@@ -134,7 +134,7 @@ public interface WxMpMaterialService {
*
* @param media_id 永久素材的id
*/
- public WxMpMaterialNews materialNewsInfo(String media_id) throws WxErrorException;
+ WxMpMaterialNews materialNewsInfo(String media_id) throws WxErrorException;
/**
*
@@ -145,7 +145,7 @@ public interface WxMpMaterialService {
*
* @param wxMpMaterialArticleUpdate 用来更新图文素材的bean, 请看{@link me.chanjar.weixin.mp.bean.WxMpMaterialArticleUpdate}
*/
- public boolean materialNewsUpdate(WxMpMaterialArticleUpdate wxMpMaterialArticleUpdate) throws WxErrorException;
+ boolean materialNewsUpdate(WxMpMaterialArticleUpdate wxMpMaterialArticleUpdate) throws WxErrorException;
/**
*
@@ -156,7 +156,7 @@ public interface WxMpMaterialService {
*
* @param media_id 永久素材的id
*/
- public boolean materialDelete(String media_id) throws WxErrorException;
+ boolean materialDelete(String media_id) throws WxErrorException;
/**
*
@@ -165,7 +165,7 @@ public interface WxMpMaterialService {
* 详情请见: http://mp.weixin.qq.com/wiki/16/8cc64f8c189674b421bee3ed403993b8.html
*
*/
- public WxMpMaterialCountResult materialCount() throws WxErrorException;
+ WxMpMaterialCountResult materialCount() throws WxErrorException;
/**
*
@@ -177,7 +177,7 @@ public interface WxMpMaterialService {
* @param offset 从全部素材的该偏移位置开始返回,0表示从第一个素材 返回
* @param count 返回素材的数量,取值在1到20之间
*/
- public WxMpMaterialNewsBatchGetResult materialNewsBatchGet(int offset, int count) throws WxErrorException;
+ WxMpMaterialNewsBatchGetResult materialNewsBatchGet(int offset, int count) throws WxErrorException;
/**
*
@@ -190,6 +190,6 @@ public interface WxMpMaterialService {
* @param offset 从全部素材的该偏移位置开始返回,0表示从第一个素材 返回
* @param count 返回素材的数量,取值在1到20之间
*/
- public WxMpMaterialFileBatchGetResult materialFileBatchGet(String type, int offset, int count) throws WxErrorException;
+ WxMpMaterialFileBatchGetResult materialFileBatchGet(String type, int offset, int count) throws WxErrorException;
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMenuService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMenuService.java
index 670921db..31ce48d3 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMenuService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMenuService.java
@@ -18,7 +18,7 @@ public interface WxMpMenuService {
* 详情请见:http://mp.weixin.qq.com/wiki/0/c48ccd12b69ae023159b4bfaa7c39c20.html
*
*/
- public void menuCreate(WxMenu menu) throws WxErrorException;
+ void menuCreate(WxMenu menu) throws WxErrorException;
/**
*
@@ -26,7 +26,7 @@ public interface WxMpMenuService {
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=自定义菜单删除接口
*
*/
- public void menuDelete() throws WxErrorException;
+ void menuDelete() throws WxErrorException;
/**
*
@@ -36,7 +36,7 @@ public interface WxMpMenuService {
*
* @param menuid
*/
- public void menuDelete(String menuid) throws WxErrorException;
+ void menuDelete(String menuid) throws WxErrorException;
/**
*
@@ -44,7 +44,7 @@ public interface WxMpMenuService {
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=自定义菜单查询接口
*
*/
- public WxMenu menuGet() throws WxErrorException;
+ WxMenu menuGet() throws WxErrorException;
/**
*
@@ -54,6 +54,6 @@ public interface WxMpMenuService {
*
* @param userid 可以是粉丝的OpenID,也可以是粉丝的微信号。
*/
- public WxMenu menuTryMatch(String userid) throws WxErrorException;
+ WxMenu menuTryMatch(String userid) throws WxErrorException;
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageHandler.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageHandler.java
index 0fbc589c..dae2a238 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageHandler.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageHandler.java
@@ -21,9 +21,9 @@ public interface WxMpMessageHandler {
* @param sessionManager
* @return xml格式的消息,如果在异步规则里处理的话,可以返回null
*/
- public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
- Map context,
- WxMpService wxMpService,
- WxSessionManager sessionManager) throws WxErrorException;
+ WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
+ Map context,
+ WxMpService wxMpService,
+ WxSessionManager sessionManager) throws WxErrorException;
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageInterceptor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageInterceptor.java
index 4b60c450..3fcd6d95 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageInterceptor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageInterceptor.java
@@ -22,9 +22,9 @@ public interface WxMpMessageInterceptor {
* @param sessionManager
* @return true代表OK,false代表不OK
*/
- public boolean intercept(WxMpXmlMessage wxMessage,
- Map context,
- WxMpService wxMpService,
- WxSessionManager sessionManager) throws WxErrorException;
+ boolean intercept(WxMpXmlMessage wxMessage,
+ Map context,
+ WxMpService wxMpService,
+ WxSessionManager sessionManager) throws WxErrorException;
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageMatcher.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageMatcher.java
index c4e3c456..68798ae2 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageMatcher.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageMatcher.java
@@ -11,6 +11,6 @@ public interface WxMpMessageMatcher {
* 消息是否匹配某种模式
* @param message
*/
- public boolean match(WxMpXmlMessage message);
+ boolean match(WxMpXmlMessage message);
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
index 73d0cabe..1de7ba90 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
@@ -209,10 +209,7 @@ public class WxMpMessageRouter {
messageId.append(wxMessage.getMsgId());
}
- if (messageDuplicateChecker.isDuplicate(messageId.toString())) {
- return true;
- }
- return false;
+ return messageDuplicateChecker.isDuplicate(messageId.toString());
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpQrcodeService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpQrcodeService.java
index 2015ae1b..7997a70d 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpQrcodeService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpQrcodeService.java
@@ -21,7 +21,7 @@ public interface WxMpQrcodeService {
* @param scene_id 参数。
* @param expire_seconds 过期秒数,默认60秒,最小60秒,最大1800秒
*/
- public WxMpQrCodeTicket qrCodeCreateTmpTicket(int scene_id, Integer expire_seconds) throws WxErrorException;
+ WxMpQrCodeTicket qrCodeCreateTmpTicket(int scene_id, Integer expire_seconds) throws WxErrorException;
/**
*
@@ -31,7 +31,7 @@ public interface WxMpQrcodeService {
*
* @param scene_id 参数。永久二维码时最大值为100000(目前参数只支持1--100000)
*/
- public WxMpQrCodeTicket qrCodeCreateLastTicket(int scene_id) throws WxErrorException;
+ WxMpQrCodeTicket qrCodeCreateLastTicket(int scene_id) throws WxErrorException;
/**
*
@@ -41,7 +41,7 @@ public interface WxMpQrcodeService {
*
* @param scene_str 参数。字符串类型长度现在为1到64
*/
- public WxMpQrCodeTicket qrCodeCreateLastTicket(String scene_str) throws WxErrorException;
+ WxMpQrCodeTicket qrCodeCreateLastTicket(String scene_str) throws WxErrorException;
/**
*
@@ -51,7 +51,7 @@ public interface WxMpQrcodeService {
*
* @param ticket 二维码ticket
*/
- public File qrCodePicture(WxMpQrCodeTicket ticket) throws WxErrorException;
+ File qrCodePicture(WxMpQrCodeTicket ticket) throws WxErrorException;
/**
*
@@ -62,7 +62,7 @@ public interface WxMpQrcodeService {
* @param ticket 二维码ticket
* @param needShortUrl 是否需要压缩的二维码地址
*/
- public String qrCodePictureUrl(String ticket, boolean needShortUrl) throws WxErrorException;
+ String qrCodePictureUrl(String ticket, boolean needShortUrl) throws WxErrorException;
/**
*
@@ -72,6 +72,6 @@ public interface WxMpQrcodeService {
*
* @param ticket 二维码ticket
*/
- public String qrCodePictureUrl(String ticket) throws WxErrorException;
+ String qrCodePictureUrl(String ticket) throws WxErrorException;
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserService.java
index 818087b4..0705e990 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserService.java
@@ -25,7 +25,7 @@ public interface WxMpUserService {
* @param openid 用户openid
* @param remark 备注名
*/
- public void userUpdateRemark(String openid, String remark) throws WxErrorException;
+ void userUpdateRemark(String openid, String remark) throws WxErrorException;
/**
*
@@ -36,7 +36,7 @@ public interface WxMpUserService {
* @param openid 用户openid
* @param lang 语言,zh_CN 简体(默认),zh_TW 繁体,en 英语
*/
- public WxMpUser userInfo(String openid, String lang) throws WxErrorException;
+ WxMpUser userInfo(String openid, String lang) throws WxErrorException;
/**
*
@@ -46,7 +46,7 @@ public interface WxMpUserService {
*
* @param next_openid 可选,第一个拉取的OPENID,null为从头开始拉取
*/
- public WxMpUserList userList(String next_openid) throws WxErrorException;
+ WxMpUserList userList(String next_openid) throws WxErrorException;
/**
*
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 751261bf..e0529bd3 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
@@ -24,7 +24,7 @@ public class MaterialDeleteRequestExecutor implements RequestExecutor {
@Override
- public WxMpMaterialUploadResult execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri, WxMpMaterial material) throws WxErrorException, ClientProtocolException, IOException {
+ public WxMpMaterialUploadResult execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri, WxMpMaterial material) throws WxErrorException, IOException {
HttpPost httpPost = new HttpPost(uri);
if (httpProxy != null) {
RequestConfig response = RequestConfig.custom().setProxy(httpProxy).build();
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 c9698b49..1434c8eb 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
@@ -24,7 +24,7 @@ public class MaterialVideoInfoRequestExecutor implements RequestExecutor {
@Override
- public WxMediaImgUploadResult execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri, File data) throws WxErrorException, ClientProtocolException, IOException {
+ public WxMediaImgUploadResult execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri, File data) throws WxErrorException, IOException {
HttpPost httpPost = new HttpPost(uri);
if (httpProxy != null) {
RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build();
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 a643c68d..96e444e7 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
@@ -31,7 +31,7 @@ public class QrCodeRequestExecutor implements RequestExecutor {
@Override
public void serialize(Long value, JsonGenerator gen,
SerializerProvider serializers)
- throws IOException, JsonProcessingException {
+ throws IOException {
gen.writeString(DF.format(value * 1000));
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserGsonAdapter.java
index 0b80e90a..060c362a 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserGsonAdapter.java
@@ -21,7 +21,7 @@ public class WxMpUserGsonAdapter implements JsonDeserializer {
WxMpUser wxMpUser = new WxMpUser();
Integer subscribe = GsonHelper.getInteger(o, "subscribe");
if (subscribe != null) {
- wxMpUser.setSubscribe(new Integer(0).equals(subscribe) ? false : true);
+ wxMpUser.setSubscribe(!new Integer(0).equals(subscribe));
}
wxMpUser.setCity(GsonHelper.getString(o, "city"));
wxMpUser.setCountry(GsonHelper.getString(o, "country"));
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMessageRouterTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMessageRouterTest.java
index bcc78edd..a6cb0a63 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMessageRouterTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMessageRouterTest.java
@@ -49,7 +49,6 @@ public class WxMpMessageRouterTest {
}
}).handler(new WxEchoMpMessageHandler(sb, "matcher")).end()
.rule().async(async).handler(new WxEchoMpMessageHandler(sb, "ALL")).end();
- ;
}
@Test(dataProvider="messages-1")