fix warnings

binarywang · binarywang · commit d42227c78e7d · 2016-09-08T15:35:51.000+08:00
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/ApiTestModule.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/ApiTestModule.java
@@ -38,23 +38,23 @@ public static class WxXmlCpInMemoryConfigStorage extends WxCpInMemoryConfigStora
     protected String tagId;
 
     public String getUserId() {
-      return userId;
+      return this.userId;
     }
 
     public void setUserId(String userId) {
       this.userId = userId;
     }
 
     public String getDepartmentId() {
-      return departmentId;
+      return this.departmentId;
     }
 
     public void setDepartmentId(String departmentId) {
       this.departmentId = departmentId;
     }
 
     public String getTagId() {
-      return tagId;
+      return this.tagId;
     }
 
     public void setTagId(String tagId) {
@@ -64,9 +64,9 @@ public void setTagId(String tagId) {
     @Override
     public String toString() {
       return super.toString() + " > WxXmlCpConfigStorage{" +
-              "userId='" + userId + '\'' +
-              ", departmentId='" + departmentId + '\'' +
-              ", tagId='" + tagId + '\'' +
+              "userId='" + this.userId + '\'' +
+              ", departmentId='" + this.departmentId + '\'' +
+              ", tagId='" + this.tagId + '\'' +
               '}';
     }
   }
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpBaseAPITest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpBaseAPITest.java
@@ -20,9 +20,9 @@ public class WxCpBaseAPITest {
   protected WxCpServiceImpl wxService;
 
   public void testRefreshAccessToken() throws WxErrorException {
-    WxCpConfigStorage configStorage = wxService.wxCpConfigStorage;
+    WxCpConfigStorage configStorage = this.wxService.wxCpConfigStorage;
     String before = configStorage.getAccessToken();
-    wxService.getAccessToken(false);
+    this.wxService.getAccessToken(false);
 
     String after = configStorage.getAccessToken();
 
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpDepartAPITest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpDepartAPITest.java
@@ -28,34 +28,34 @@ public void testDepartCreate() throws WxErrorException {
     depart.setName("子部门" + System.currentTimeMillis());
     depart.setParentId(1);
     depart.setOrder(1);
-    Integer departId = wxCpService.departCreate(depart);
+    Integer departId = this.wxCpService.departCreate(depart);
   }
 
   @Test(dependsOnMethods = "testDepartCreate")
   public void testDepartGet() throws WxErrorException {
     System.out.println("=================获取部门");
-    List<WxCpDepart> departList = wxCpService.departGet();
+    List<WxCpDepart> departList = this.wxCpService.departGet();
     Assert.assertNotNull(departList);
     Assert.assertTrue(departList.size() > 0);
     for (WxCpDepart g : departList) {
-      depart = g;
-      System.out.println(depart.getId() + ":" + depart.getName());
+      this.depart = g;
+      System.out.println(this.depart.getId() + ":" + this.depart.getName());
       Assert.assertNotNull(g.getName());
     }
   }
 
   @Test(dependsOnMethods = {"testDepartGet", "testDepartCreate"})
   public void testDepartUpdate() throws WxErrorException {
     System.out.println("=================更新部门");
-    depart.setName("子部门改名" + System.currentTimeMillis());
-    wxCpService.departUpdate(depart);
+    this.depart.setName("子部门改名" + System.currentTimeMillis());
+    this.wxCpService.departUpdate(this.depart);
   }
 
   @Test(dependsOnMethods = "testDepartUpdate")
   public void testDepartDelete() throws WxErrorException {
     System.out.println("=================删除部门");
-    System.out.println(depart.getId() + ":" + depart.getName());
-    wxCpService.departDelete(depart.getId());
+    System.out.println(this.depart.getId() + ":" + this.depart.getName());
+    this.wxCpService.departDelete(this.depart.getId());
   }
 
 }
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMediaAPITest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMediaAPITest.java
@@ -27,21 +27,21 @@ public class WxCpMediaAPITest {
   @Inject
   protected WxCpServiceImpl wxService;
 
-  private List<String> media_ids = new ArrayList<String>();
+  private List<String> media_ids = new ArrayList<>();
 
   @Test(dataProvider = "uploadMedia")
   public void testUploadMedia(String mediaType, String fileType, String fileName) throws WxErrorException, IOException {
     InputStream inputStream = ClassLoader.getSystemResourceAsStream(fileName);
-    WxMediaUploadResult res = wxService.mediaUpload(mediaType, fileType, inputStream);
+    WxMediaUploadResult res = this.wxService.mediaUpload(mediaType, fileType, inputStream);
     Assert.assertNotNull(res.getType());
     Assert.assertNotNull(res.getCreatedAt());
     Assert.assertTrue(res.getMediaId() != null || res.getThumbMediaId() != null);
 
     if (res.getMediaId() != null) {
-      media_ids.add(res.getMediaId());
+      this.media_ids.add(res.getMediaId());
     }
     if (res.getThumbMediaId() != null) {
-      media_ids.add(res.getThumbMediaId());
+      this.media_ids.add(res.getThumbMediaId());
     }
   }
 
@@ -57,7 +57,7 @@ public Object[][] uploadMedia() {
 
   @Test(dependsOnMethods = {"testUploadMedia"}, dataProvider = "downloadMedia")
   public void testDownloadMedia(String media_id) throws WxErrorException {
-    wxService.mediaDownload(media_id);
+    this.wxService.mediaDownload(media_id);
   }
 
   @DataProvider
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMessageAPITest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMessageAPITest.java
@@ -20,21 +20,21 @@ public class WxCpMessageAPITest {
   protected WxCpServiceImpl wxService;
 
   public void testSendCustomMessage() throws WxErrorException {
-    ApiTestModule.WxXmlCpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlCpInMemoryConfigStorage) wxService.wxCpConfigStorage;
+    ApiTestModule.WxXmlCpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlCpInMemoryConfigStorage) this.wxService.wxCpConfigStorage;
     WxCpMessage message1 = new WxCpMessage();
     message1.setAgentId(configStorage.getAgentId());
     message1.setMsgType(WxConsts.CUSTOM_MSG_TEXT);
     message1.setToUser(configStorage.getUserId());
     message1.setContent("欢迎欢迎，热烈欢迎\n换行测试\n超链接:<a href=\"http://www.baidu.com\">Hello World</a>");
-    wxService.messageSend(message1);
+    this.wxService.messageSend(message1);
 
     WxCpMessage message2 = WxCpMessage
             .TEXT()
             .agentId(configStorage.getAgentId())
             .toUser(configStorage.getUserId())
             .content("欢迎欢迎，热烈欢迎\n换行测试\n超链接:<a href=\"http://www.baidu.com\">Hello World</a>")
             .build();
-    wxService.messageSend(message2);
+    this.wxService.messageSend(message2);
 
   }
 
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
@@ -286,7 +286,7 @@ public WxEchoCpMessageHandler(StringBuffer sb, String echoStr) {
     @Override
     public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService wxCpService,
                                     WxSessionManager sessionManager) {
-      sb.append(this.echoStr).append(',');
+      this.sb.append(this.echoStr).append(',');
       return null;
     }
 
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpTagAPITest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpTagAPITest.java
@@ -23,44 +23,44 @@ public class WxCpTagAPITest {
   protected String tagId;
 
   public void testTagCreate() throws Exception {
-    tagId = wxService.tagCreate("测试标签4");
-    System.out.println(tagId);
+    this.tagId = this.wxService.tagCreate("测试标签4");
+    System.out.println(this.tagId);
   }
 
   @Test(dependsOnMethods = "testTagCreate")
   public void testTagUpdate() throws Exception {
-    wxService.tagUpdate(tagId, "测试标签-改名");
+    this.wxService.tagUpdate(this.tagId, "测试标签-改名");
   }
 
   @Test(dependsOnMethods = "testTagUpdate")
   public void testTagGet() throws Exception {
-    List<WxCpTag> tags = wxService.tagGet();
+    List<WxCpTag> tags = this.wxService.tagGet();
     Assert.assertNotEquals(tags.size(), 0);
   }
 
   @Test(dependsOnMethods = "testTagGet")
   public void testTagAddUsers() throws Exception {
-    List<String> userIds = new ArrayList<String>();
-    userIds.add(((ApiTestModule.WxXmlCpInMemoryConfigStorage) configStorage).getUserId());
-    wxService.tagAddUsers(tagId, userIds, null);
+    List<String> userIds = new ArrayList<>();
+    userIds.add(((ApiTestModule.WxXmlCpInMemoryConfigStorage) this.configStorage).getUserId());
+    this.wxService.tagAddUsers(this.tagId, userIds, null);
   }
 
   @Test(dependsOnMethods = "testTagAddUsers")
   public void testTagGetUsers() throws Exception {
-    List<WxCpUser> users = wxService.tagGetUsers(tagId);
+    List<WxCpUser> users = this.wxService.tagGetUsers(this.tagId);
     Assert.assertNotEquals(users.size(), 0);
   }
 
   @Test(dependsOnMethods = "testTagGetUsers")
   public void testTagRemoveUsers() throws Exception {
-    List<String> userIds = new ArrayList<String>();
-    userIds.add(((ApiTestModule.WxXmlCpInMemoryConfigStorage) configStorage).getUserId());
-    wxService.tagRemoveUsers(tagId, userIds);
+    List<String> userIds = new ArrayList<>();
+    userIds.add(((ApiTestModule.WxXmlCpInMemoryConfigStorage) this.configStorage).getUserId());
+    this.wxService.tagRemoveUsers(this.tagId, userIds);
   }
 
   @Test(dependsOnMethods = "testTagRemoveUsers")
   public void testTagDelete() throws Exception {
-    wxService.tagDelete(tagId);
+    this.wxService.tagDelete(this.tagId);
   }
 
 }
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpUserAPITest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpUserAPITest.java
@@ -35,7 +35,7 @@ public void testUserCreate() throws WxErrorException {
     user.setPosition("woman");
     user.setTel("3300393");
     user.addExtAttr("爱好", "table");
-    wxCpService.userCreate(user);
+    this.wxCpService.userCreate(user);
   }
 
   @Test(dependsOnMethods = "testUserCreate")
@@ -44,23 +44,23 @@ public void testUserUpdate() throws WxErrorException {
     user.setUserId("some.woman");
     user.setName("Some Woman");
     user.addExtAttr("爱好", "table2");
-    wxCpService.userUpdate(user);
+    this.wxCpService.userUpdate(user);
   }
 
   @Test(dependsOnMethods = "testUserUpdate")
   public void testUserGet() throws WxErrorException {
-    WxCpUser user = wxCpService.userGet("some.woman");
+    WxCpUser user = this.wxCpService.userGet("some.woman");
     Assert.assertNotNull(user);
   }
 
   @Test(dependsOnMethods = "testUserGet")
   public void testDepartGetUsers() throws WxErrorException {
-    List<WxCpUser> users = wxCpService.departGetUsers(1, true, 0);
+    List<WxCpUser> users = this.wxCpService.departGetUsers(1, true, 0);
     Assert.assertNotEquals(users.size(), 0);
   }
 
   @Test(dependsOnMethods = "testDepartGetUsers")
   public void testUserDelete() throws WxErrorException {
-    wxCpService.userDelete("some.woman");
+    this.wxCpService.userDelete("some.woman");
   }
 }
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxMenuAPITest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxMenuAPITest.java
@@ -24,17 +24,17 @@ public class WxMenuAPITest {
 
   @Test(dataProvider = "menu")
   public void testCreateMenu(WxMenu wxMenu) throws WxErrorException {
-    wxService.menuCreate(wxMenu);
+    this.wxService.menuCreate(wxMenu);
   }
 
   @Test(dependsOnMethods = {"testCreateMenu"})
   public void testGetMenu() throws WxErrorException {
-    Assert.assertNotNull(wxService.menuGet());
+    Assert.assertNotNull(this.wxService.menuGet());
   }
 
   @Test(dependsOnMethods = {"testGetMenu"})
   public void testDeleteMenu() throws WxErrorException {
-    wxService.menuDelete();
+    this.wxService.menuDelete();
   }
 
   @DataProvider(name = "menu")
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpDemoInMemoryConfigStorage.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpDemoInMemoryConfigStorage.java
@@ -21,8 +21,8 @@ public static WxCpDemoInMemoryConfigStorage fromXml(InputStream is) {
 
   @Override
   public String toString() {
-    return "SimpleWxConfigProvider [appidOrCorpid=" + corpId + ", corpSecret=" + corpSecret + ", accessToken=" + accessToken
-            + ", expiresTime=" + expiresTime + ", token=" + token + ", aesKey=" + aesKey + "]";
+    return "SimpleWxConfigProvider [appidOrCorpid=" + this.corpId + ", corpSecret=" + this.corpSecret + ", accessToken=" + this.accessToken
+            + ", expiresTime=" + this.expiresTime + ", token=" + this.token + ", aesKey=" + this.aesKey + "]";
   }
 
 }
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpEndpointServlet.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpEndpointServlet.java
@@ -43,23 +43,23 @@ protected void service(HttpServletRequest request, HttpServletResponse response)
     String echostr = request.getParameter("echostr");
 
     if (StringUtils.isNotBlank(echostr)) {
-      if (!wxCpService.checkSignature(msgSignature, timestamp, nonce, echostr)) {
+      if (!this.wxCpService.checkSignature(msgSignature, timestamp, nonce, echostr)) {
         // 消息签名不正确，说明不是公众平台发过来的消息
         response.getWriter().println("非法请求");
         return;
       }
-      WxCpCryptUtil cryptUtil = new WxCpCryptUtil(wxCpConfigStorage);
+      WxCpCryptUtil cryptUtil = new WxCpCryptUtil(this.wxCpConfigStorage);
       String plainText = cryptUtil.decrypt(echostr);
       // 说明是一个仅仅用来验证的请求，回显echostr
       response.getWriter().println(plainText);
       return;
     }
 
     WxCpXmlMessage inMessage = WxCpXmlMessage
-            .fromEncryptedXml(request.getInputStream(), wxCpConfigStorage, timestamp, nonce, msgSignature);
-    WxCpXmlOutMessage outMessage = wxCpMessageRouter.route(inMessage);
+            .fromEncryptedXml(request.getInputStream(), this.wxCpConfigStorage, timestamp, nonce, msgSignature);
+    WxCpXmlOutMessage outMessage = this.wxCpMessageRouter.route(inMessage);
     if (outMessage != null) {
-      response.getWriter().write(outMessage.toEncryptedXml(wxCpConfigStorage));
+      response.getWriter().write(outMessage.toEncryptedXml(this.wxCpConfigStorage));
     }
 
     return;
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpOAuth2Servlet.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpOAuth2Servlet.java
@@ -30,7 +30,7 @@ protected void service(HttpServletRequest request, HttpServletResponse response)
       response.getWriter().println("<h1>code</h1>");
       response.getWriter().println(code);
 
-      String[] res = wxCpService.oauth2getUserInfo(code);
+      String[] res = this.wxCpService.oauth2getUserInfo(code);
       response.getWriter().println("<h1>result</h1>");
       response.getWriter().println(Arrays.toString(res));
     } catch (WxErrorException e) {

Original file line number	Diff line number	Diff line change
`@@ -38,23 +38,23 @@ public static class WxXmlCpInMemoryConfigStorage extends WxCpInMemoryConfigStora`
`38`	`38`	`protected String tagId;`
`39`	`39`
`40`	`40`	`public String getUserId() {`
`41`		`- return userId;`
	`41`	`+ return this.userId;`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public void setUserId(String userId) {`
`45`	`45`	`this.userId = userId;`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public String getDepartmentId() {`
`49`		`- return departmentId;`
	`49`	`+ return this.departmentId;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public void setDepartmentId(String departmentId) {`
`53`	`53`	`this.departmentId = departmentId;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public String getTagId() {`
`57`		`- return tagId;`
	`57`	`+ return this.tagId;`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`public void setTagId(String tagId) {`
`@@ -64,9 +64,9 @@ public void setTagId(String tagId) {`
`64`	`64`	`@Override`
`65`	`65`	`public String toString() {`
`66`	`66`	`return super.toString() + " > WxXmlCpConfigStorage{" +`
`67`		`- "userId='" + userId + '\'' +`
`68`		`- ", departmentId='" + departmentId + '\'' +`
`69`		`- ", tagId='" + tagId + '\'' +`
	`67`	`+ "userId='" + this.userId + '\'' +`
	`68`	`+ ", departmentId='" + this.departmentId + '\'' +`
	`69`	`+ ", tagId='" + this.tagId + '\'' +`
`70`	`70`	`'}';`
`71`	`71`	`}`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ public WxEchoCpMessageHandler(StringBuffer sb, String echoStr) {`
`286`	`286`	`@Override`
`287`	`287`	`public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService wxCpService,`
`288`	`288`	`WxSessionManager sessionManager) {`
`289`		`- sb.append(this.echoStr).append(',');`
	`289`	`+ this.sb.append(this.echoStr).append(',');`
`290`	`290`	`return null;`
`291`	`291`	`}`
`292`	`292`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public void testUserCreate() throws WxErrorException {`
`35`	`35`	`user.setPosition("woman");`
`36`	`36`	`user.setTel("3300393");`
`37`	`37`	`user.addExtAttr("爱好", "table");`
`38`		`- wxCpService.userCreate(user);`
	`38`	`+ this.wxCpService.userCreate(user);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@Test(dependsOnMethods = "testUserCreate")`
`@@ -44,23 +44,23 @@ public void testUserUpdate() throws WxErrorException {`
`44`	`44`	`user.setUserId("some.woman");`
`45`	`45`	`user.setName("Some Woman");`
`46`	`46`	`user.addExtAttr("爱好", "table2");`
`47`		`- wxCpService.userUpdate(user);`
	`47`	`+ this.wxCpService.userUpdate(user);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`@Test(dependsOnMethods = "testUserUpdate")`
`51`	`51`	`public void testUserGet() throws WxErrorException {`
`52`		`- WxCpUser user = wxCpService.userGet("some.woman");`
	`52`	`+ WxCpUser user = this.wxCpService.userGet("some.woman");`
`53`	`53`	`Assert.assertNotNull(user);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@Test(dependsOnMethods = "testUserGet")`
`57`	`57`	`public void testDepartGetUsers() throws WxErrorException {`
`58`		`- List<WxCpUser> users = wxCpService.departGetUsers(1, true, 0);`
	`58`	`+ List<WxCpUser> users = this.wxCpService.departGetUsers(1, true, 0);`
`59`	`59`	`Assert.assertNotEquals(users.size(), 0);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`@Test(dependsOnMethods = "testDepartGetUsers")`
`63`	`63`	`public void testUserDelete() throws WxErrorException {`
`64`		`- wxCpService.userDelete("some.woman");`
	`64`	`+ this.wxCpService.userDelete("some.woman");`
`65`	`65`	`}`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,17 +24,17 @@ public class WxMenuAPITest {`
`24`	`24`
`25`	`25`	`@Test(dataProvider = "menu")`
`26`	`26`	`public void testCreateMenu(WxMenu wxMenu) throws WxErrorException {`
`27`		`- wxService.menuCreate(wxMenu);`
	`27`	`+ this.wxService.menuCreate(wxMenu);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@Test(dependsOnMethods = {"testCreateMenu"})`
`31`	`31`	`public void testGetMenu() throws WxErrorException {`
`32`		`- Assert.assertNotNull(wxService.menuGet());`
	`32`	`+ Assert.assertNotNull(this.wxService.menuGet());`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Test(dependsOnMethods = {"testGetMenu"})`
`36`	`36`	`public void testDeleteMenu() throws WxErrorException {`
`37`		`- wxService.menuDelete();`
	`37`	`+ this.wxService.menuDelete();`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@DataProvider(name = "menu")`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ public static WxCpDemoInMemoryConfigStorage fromXml(InputStream is) {`
`21`	`21`
`22`	`22`	`@Override`
`23`	`23`	`public String toString() {`
`24`		`- return "SimpleWxConfigProvider [appidOrCorpid=" + corpId + ", corpSecret=" + corpSecret + ", accessToken=" + accessToken`
`25`		`- + ", expiresTime=" + expiresTime + ", token=" + token + ", aesKey=" + aesKey + "]";`
	`24`	`+ return "SimpleWxConfigProvider [appidOrCorpid=" + this.corpId + ", corpSecret=" + this.corpSecret + ", accessToken=" + this.accessToken`
	`25`	`+ + ", expiresTime=" + this.expiresTime + ", token=" + this.token + ", aesKey=" + this.aesKey + "]";`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`}`