From c2b166becc6008a004aa2f02f18777f8bf1b902e Mon Sep 17 00:00:00 2001 From: Daniel Qian Date: Fri, 22 Aug 2014 16:08:30 +0800 Subject: [PATCH] polish code --- .../weixin/api/WxMessageInterceptor.java | 2 +- .../java/chanjarster/weixin/api/WxService.java | 2 +- .../chanjarster/weixin/api/WxServiceImpl.java | 18 +++++++++--------- .../chanjarster/weixin/bean/WxXmlMessage.java | 1 - .../chanjarster/weixin/api/WxServiceTest.java | 10 +++++----- .../weixin/bean/WxCustomMessageTest.java | 1 - .../chanjarster/weixin/bean/WxErrorTest.java | 2 -- .../weixin/bean/WxXmlMessageTest.java | 1 - 8 files changed, 16 insertions(+), 21 deletions(-) diff --git a/src/main/java/chanjarster/weixin/api/WxMessageInterceptor.java b/src/main/java/chanjarster/weixin/api/WxMessageInterceptor.java index 10967268..c8bd2b1e 100644 --- a/src/main/java/chanjarster/weixin/api/WxMessageInterceptor.java +++ b/src/main/java/chanjarster/weixin/api/WxMessageInterceptor.java @@ -6,7 +6,7 @@ import chanjarster.weixin.bean.WxXmlMessage; /** - * 微信消息拦截器,可以用来做一些验证 + * 微信消息拦截器,可以用来做验证 * @author qianjia * */ diff --git a/src/main/java/chanjarster/weixin/api/WxService.java b/src/main/java/chanjarster/weixin/api/WxService.java index 48588a72..00cb9f35 100644 --- a/src/main/java/chanjarster/weixin/api/WxService.java +++ b/src/main/java/chanjarster/weixin/api/WxService.java @@ -75,5 +75,5 @@ public interface WxService { */ public WxMenu getMenu() throws WxErrorException; - public void setWxConfigProvider(WxConfigStorage wxConfigProvider); + public void setWxConfigStorage(WxConfigStorage wxConfigProvider); } diff --git a/src/main/java/chanjarster/weixin/api/WxServiceImpl.java b/src/main/java/chanjarster/weixin/api/WxServiceImpl.java index 27debf4e..9ecc7729 100644 --- a/src/main/java/chanjarster/weixin/api/WxServiceImpl.java +++ b/src/main/java/chanjarster/weixin/api/WxServiceImpl.java @@ -35,11 +35,11 @@ public class WxServiceImpl implements WxService { protected static final CloseableHttpClient httpclient = HttpClients.createDefault(); - protected WxConfigStorage wxConfigProvider; + protected WxConfigStorage wxConfigStorage; public boolean checkSignature(String timestamp, String nonce, String signature) { try { - String token = wxConfigProvider.getToken(); + String token = wxConfigStorage.getToken(); MessageDigest sha1 = MessageDigest.getInstance("SHA1"); String[] arr = new String[] { token, timestamp, nonce }; Arrays.sort(arr); @@ -70,8 +70,8 @@ public class WxServiceImpl implements WxService { if (!GLOBAL_ACCESS_TOKEN_REFRESH_FLAG.getAndSet(true)) { try { String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential" - + "&appid=" + wxConfigProvider.getAppId() - + "&secret=" + wxConfigProvider.getSecret() + + "&appid=" + wxConfigStorage.getAppId() + + "&secret=" + wxConfigStorage.getSecret() ; try { HttpGet httpGet = new HttpGet(url); @@ -82,7 +82,7 @@ public class WxServiceImpl implements WxService { throw new WxErrorException(error); } WxAccessToken accessToken = WxAccessToken.fromJson(resultContent); - wxConfigProvider.updateAccessToken(accessToken.getAccess_token(), accessToken.getExpires_in()); + wxConfigStorage.updateAccessToken(accessToken.getAccess_token(), accessToken.getExpires_in()); } catch (ClientProtocolException e) { throw new RuntimeException(e); } catch (IOException e) { @@ -147,10 +147,10 @@ public class WxServiceImpl implements WxService { * @throws WxErrorException */ protected String execute(String method, String uri, String data) throws WxErrorException { - if (StringUtils.isBlank(wxConfigProvider.getAccessToken())) { + if (StringUtils.isBlank(wxConfigStorage.getAccessToken())) { refreshAccessToken(); } - String accessToken = wxConfigProvider.getAccessToken(); + String accessToken = wxConfigStorage.getAccessToken(); String uriWithAccessToken = uri; uriWithAccessToken += uri.indexOf('?') == -1 ? "?access_token=" + accessToken : "&access_token=" + accessToken; @@ -196,8 +196,8 @@ public class WxServiceImpl implements WxService { } } - public void setWxConfigProvider(WxConfigStorage wxConfigProvider) { - this.wxConfigProvider = wxConfigProvider; + public void setWxConfigStorage(WxConfigStorage wxConfigProvider) { + this.wxConfigStorage = wxConfigProvider; } } diff --git a/src/main/java/chanjarster/weixin/bean/WxXmlMessage.java b/src/main/java/chanjarster/weixin/bean/WxXmlMessage.java index 9b285b1c..e1459ab3 100644 --- a/src/main/java/chanjarster/weixin/bean/WxXmlMessage.java +++ b/src/main/java/chanjarster/weixin/bean/WxXmlMessage.java @@ -2,7 +2,6 @@ package chanjarster.weixin.bean; import java.io.InputStream; -import javax.management.RuntimeErrorException; import javax.xml.bind.JAXBException; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/test/java/chanjarster/weixin/api/WxServiceTest.java b/src/test/java/chanjarster/weixin/api/WxServiceTest.java index a9290c18..fc483200 100644 --- a/src/test/java/chanjarster/weixin/api/WxServiceTest.java +++ b/src/test/java/chanjarster/weixin/api/WxServiceTest.java @@ -28,16 +28,16 @@ public class WxServiceTest { InputStream is1 = ClassLoader.getSystemResourceAsStream("test-config.xml"); WxXmlConfigStorage config1 = XmlTransformer.fromXml(WxXmlConfigStorage.class, is1); this.wxService = new WxServiceImpl(); - this.wxService.setWxConfigProvider(config1); + this.wxService.setWxConfigStorage(config1); } @Test public void testRefreshAccessToken() throws WxErrorException { - WxConfigStorage configProvider = wxService.wxConfigProvider; - String before = configProvider.getAccessToken(); + WxConfigStorage configStorage = wxService.wxConfigStorage; + String before = configStorage.getAccessToken(); wxService.refreshAccessToken(); - String after = configProvider.getAccessToken(); + String after = configStorage.getAccessToken(); Assert.assertNotEquals(before, after); Assert.assertTrue(StringUtils.isNotBlank(after)); @@ -45,7 +45,7 @@ public class WxServiceTest { @Test(dependsOnMethods = "testRefreshAccessToken") public void sendCustomMessage() throws WxErrorException { - WxXmlConfigStorage configProvider = (WxXmlConfigStorage) wxService.wxConfigProvider; + WxXmlConfigStorage configProvider = (WxXmlConfigStorage) wxService.wxConfigStorage; WxCustomMessage message = new WxCustomMessage(); message.setMsgtype(WxConsts.MSG_TEXT); message.setTouser(configProvider.getOpenId()); diff --git a/src/test/java/chanjarster/weixin/bean/WxCustomMessageTest.java b/src/test/java/chanjarster/weixin/bean/WxCustomMessageTest.java index 27388645..42073096 100644 --- a/src/test/java/chanjarster/weixin/bean/WxCustomMessageTest.java +++ b/src/test/java/chanjarster/weixin/bean/WxCustomMessageTest.java @@ -4,7 +4,6 @@ import org.testng.Assert; import org.testng.annotations.Test; import chanjarster.weixin.api.WxConsts; -import chanjarster.weixin.bean.WxCustomMessage; import chanjarster.weixin.bean.WxCustomMessage.WxArticle; @Test diff --git a/src/test/java/chanjarster/weixin/bean/WxErrorTest.java b/src/test/java/chanjarster/weixin/bean/WxErrorTest.java index 9c938160..f2b9e956 100644 --- a/src/test/java/chanjarster/weixin/bean/WxErrorTest.java +++ b/src/test/java/chanjarster/weixin/bean/WxErrorTest.java @@ -3,8 +3,6 @@ package chanjarster.weixin.bean; import org.testng.Assert; import org.testng.annotations.Test; -import chanjarster.weixin.bean.WxError; - @Test public class WxErrorTest { diff --git a/src/test/java/chanjarster/weixin/bean/WxXmlMessageTest.java b/src/test/java/chanjarster/weixin/bean/WxXmlMessageTest.java index dd1a4fe0..96c96577 100644 --- a/src/test/java/chanjarster/weixin/bean/WxXmlMessageTest.java +++ b/src/test/java/chanjarster/weixin/bean/WxXmlMessageTest.java @@ -4,7 +4,6 @@ import org.testng.Assert; import org.testng.annotations.Test; import chanjarster.weixin.api.WxConsts; -import chanjarster.weixin.bean.WxXmlMessage; @Test public class WxXmlMessageTest {