fix warnings

binarywang · binarywang · commit b68ec3aeed10 · 2016-09-08T15:49:43.000+08:00
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
@@ -52,7 +52,7 @@ public class WxCpMessageRouter {
 
   private static final int DEFAULT_THREAD_POOL_SIZE = 100;
   protected final Logger log = LoggerFactory.getLogger(WxCpMessageRouter.class);
-  private final List<WxCpMessageRouterRule> rules = new ArrayList<WxCpMessageRouterRule>();
+  private final List<WxCpMessageRouterRule> rules = new ArrayList<>();
 
   private final WxCpService wxCpService;
 
@@ -142,7 +142,7 @@ public WxCpXmlOutMessage route(final WxCpXmlMessage wxMessage) {
       return null;
     }
 
-    final List<WxCpMessageRouterRule> matchRules = new ArrayList<WxCpMessageRouterRule>();
+    final List<WxCpMessageRouterRule> matchRules = new ArrayList<>();
     // 收集匹配的规则
     for (final WxCpMessageRouterRule rule : this.rules) {
       if (rule.test(wxMessage)) {
@@ -158,12 +158,13 @@ public WxCpXmlOutMessage route(final WxCpXmlMessage wxMessage) {
     }
 
     WxCpXmlOutMessage res = null;
-    final List<Future> futures = new ArrayList<Future>();
+    final List<Future> futures = new ArrayList<>();
     for (final WxCpMessageRouterRule rule : matchRules) {
       // 返回最后一个非异步的rule的执行结果
       if (rule.isAsync()) {
         futures.add(
                 this.executorService.submit(new Runnable() {
+                  @Override
                   public void run() {
                     rule.service(wxMessage, WxCpMessageRouter.this.wxCpService, WxCpMessageRouter.this.sessionManager, WxCpMessageRouter.this.exceptionHandler);
                   }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageRouterRule.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageRouterRule.java
@@ -36,9 +36,9 @@ public class WxCpMessageRouterRule {
 
   private Integer agentId;
 
-  private List<WxCpMessageHandler> handlers = new ArrayList<WxCpMessageHandler>();
+  private List<WxCpMessageHandler> handlers = new ArrayList<>();
 
-  private List<WxCpMessageInterceptor> interceptors = new ArrayList<WxCpMessageInterceptor>();
+  private List<WxCpMessageInterceptor> interceptors = new ArrayList<>();
 
   protected WxCpMessageRouterRule(WxCpMessageRouter routerBuilder) {
     this.routerBuilder = routerBuilder;
@@ -235,7 +235,7 @@ protected WxCpXmlOutMessage service(WxCpXmlMessage wxMessage,
 
     try {
 
-      Map<String, Object> context = new HashMap<String, Object>();
+      Map<String, Object> context = new HashMap<>();
       // 如果拦截器不通过
       for (WxCpMessageInterceptor interceptor : this.interceptors) {
         if (!interceptor.intercept(wxMessage, context, wxCpService, sessionManager)) {
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpDepart.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpDepart.java
@@ -11,6 +11,10 @@
  */
 public class WxCpDepart implements Serializable {
 
+  /**
+   * 
+   */
+  private static final long serialVersionUID = -5028321625140879571L;
   private Integer id;
   private String name;
   private Integer parentId;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMessage.java
@@ -14,6 +14,10 @@
  */
 public class WxCpMessage implements Serializable {
 
+  /**
+   * 
+   */
+  private static final long serialVersionUID = -2082278303476631708L;
   private String toUser;
   private String toParty;
   private String toTag;
@@ -27,7 +31,7 @@ public class WxCpMessage implements Serializable {
   private String musicUrl;
   private String hqMusicUrl;
   private String safe;
-  private List<WxArticle> articles = new ArrayList<WxArticle>();
+  private List<WxArticle> articles = new ArrayList<>();
 
   /**
    * 获得文本消息builder
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTag.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTag.java
@@ -9,6 +9,11 @@
  */
 public class WxCpTag implements Serializable {
 
+  /**
+   * 
+   */
+  private static final long serialVersionUID = -7243320279646928402L;
+
   private String id;
 
   private String name;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUser.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUser.java
@@ -13,7 +13,11 @@
  */
 public class WxCpUser implements Serializable {
 
-  private final List<Attr> extAttrs = new ArrayList<Attr>();
+  /**
+   * 
+   */
+  private static final long serialVersionUID = -5696099236344075582L;
+  private final List<Attr> extAttrs = new ArrayList<>();
   private String userId;
   private String name;
   private Integer[] departIds;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlMessage.java
@@ -32,6 +32,11 @@ public class WxCpXmlMessage implements Serializable {
   // 以下都是微信推送过来的消息的xml的element所对应的属性
   ///////////////////////
 
+  /**
+   * 
+   */
+  private static final long serialVersionUID = -1042994982179476410L;
+
   @XStreamAlias("AgentID")
   private Integer agentId;
 
@@ -566,7 +571,7 @@ public void setScanResult(String scanResult) {
   public static class SendPicsInfo {
 
     @XStreamAlias("PicList")
-    protected final List<Item> picList = new ArrayList<Item>();
+    protected final List<Item> picList = new ArrayList<>();
     @XStreamAlias("Count")
     private Long count;
 
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutNewsMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutNewsMessage.java
@@ -12,7 +12,7 @@
 public class WxCpXmlOutNewsMessage extends WxCpXmlOutMessage {
 
   @XStreamAlias("Articles")
-  protected final List<Item> articles = new ArrayList<Item>();
+  protected final List<Item> articles = new ArrayList<>();
   @XStreamAlias("ArticleCount")
   protected int articleCount;
 
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/FileBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/FileBuilder.java
@@ -23,6 +23,7 @@ public FileBuilder mediaId(String media_id) {
     return this;
   }
 
+  @Override
   public WxCpMessage build() {
     WxCpMessage m = super.build();
     m.setMediaId(this.mediaId);
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/ImageBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/ImageBuilder.java
@@ -23,6 +23,7 @@ public ImageBuilder mediaId(String media_id) {
     return this;
   }
 
+  @Override
   public WxCpMessage build() {
     WxCpMessage m = super.build();
     m.setMediaId(this.mediaId);
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/NewsBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/NewsBuilder.java
@@ -17,7 +17,7 @@
  */
 public final class NewsBuilder extends BaseBuilder<NewsBuilder> {
 
-  private List<WxCpMessage.WxArticle> articles = new ArrayList<WxCpMessage.WxArticle>();
+  private List<WxCpMessage.WxArticle> articles = new ArrayList<>();
 
   public NewsBuilder() {
     this.msgType = WxConsts.CUSTOM_MSG_NEWS;
@@ -28,6 +28,7 @@ public NewsBuilder addArticle(WxCpMessage.WxArticle article) {
     return this;
   }
 
+  @Override
   public WxCpMessage build() {
     WxCpMessage m = super.build();
     m.setArticles(this.articles);
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/TextBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/TextBuilder.java
@@ -23,6 +23,7 @@ public TextBuilder content(String content) {
     return this;
   }
 
+  @Override
   public WxCpMessage build() {
     WxCpMessage m = super.build();
     m.setContent(this.content);
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/VideoBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/VideoBuilder.java
@@ -47,6 +47,7 @@ public VideoBuilder thumbMediaId(String thumb_media_id) {
     return this;
   }
 
+  @Override
   public WxCpMessage build() {
     WxCpMessage m = super.build();
     m.setMediaId(this.mediaId);
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/VoiceBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/VoiceBuilder.java
@@ -23,6 +23,7 @@ public VoiceBuilder mediaId(String media_id) {
     return this;
   }
 
+  @Override
   public WxCpMessage build() {
     WxCpMessage m = super.build();
     m.setMediaId(this.mediaId);
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/ImageBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/ImageBuilder.java
@@ -16,6 +16,7 @@ public ImageBuilder mediaId(String media_id) {
     return this;
   }
 
+  @Override
   public WxCpXmlOutImageMessage build() {
     WxCpXmlOutImageMessage m = new WxCpXmlOutImageMessage();
     setCommon(m);
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/NewsBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/NewsBuilder.java
@@ -13,13 +13,14 @@
  */
 public final class NewsBuilder extends BaseBuilder<NewsBuilder, WxCpXmlOutNewsMessage> {
 
-  protected final List<Item> articles = new ArrayList<Item>();
+  protected final List<Item> articles = new ArrayList<>();
 
   public NewsBuilder addArticle(Item item) {
     this.articles.add(item);
     return this;
   }
 
+  @Override
   public WxCpXmlOutNewsMessage build() {
     WxCpXmlOutNewsMessage m = new WxCpXmlOutNewsMessage();
     for (Item item : this.articles) {
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/TextBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/TextBuilder.java
@@ -15,6 +15,7 @@ public TextBuilder content(String content) {
     return this;
   }
 
+  @Override
   public WxCpXmlOutTextMessage build() {
     WxCpXmlOutTextMessage m = new WxCpXmlOutTextMessage();
     setCommon(m);
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/VideoBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/VideoBuilder.java
@@ -28,6 +28,7 @@ public VideoBuilder mediaId(String mediaId) {
     return this;
   }
 
+  @Override
   public WxCpXmlOutVideoMessage build() {
     WxCpXmlOutVideoMessage m = new WxCpXmlOutVideoMessage();
     setCommon(m);
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/VoiceBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/VoiceBuilder.java
@@ -16,6 +16,7 @@ public VoiceBuilder mediaId(String mediaId) {
     return this;
   }
 
+  @Override
   public WxCpXmlOutVoiceMessage build() {
     WxCpXmlOutVoiceMessage m = new WxCpXmlOutVoiceMessage();
     setCommon(m);
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpDepartGsonAdapter.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpDepartGsonAdapter.java
@@ -19,6 +19,7 @@
  */
 public class WxCpDepartGsonAdapter implements JsonSerializer<WxCpDepart>, JsonDeserializer<WxCpDepart> {
 
+  @Override
   public JsonElement serialize(WxCpDepart group, Type typeOfSrc, JsonSerializationContext context) {
     JsonObject json = new JsonObject();
     if (group.getId() != null) {
@@ -36,6 +37,7 @@ public JsonElement serialize(WxCpDepart group, Type typeOfSrc, JsonSerialization
     return json;
   }
 
+  @Override
   public WxCpDepart deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
           throws JsonParseException {
     WxCpDepart depart = new WxCpDepart();
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpMessageGsonAdapter.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpMessageGsonAdapter.java
@@ -20,6 +20,7 @@
  */
 public class WxCpMessageGsonAdapter implements JsonSerializer<WxCpMessage> {
 
+  @Override
   public JsonElement serialize(WxCpMessage message, Type typeOfSrc, JsonSerializationContext context) {
     JsonObject messageJson = new JsonObject();
     messageJson.addProperty("agentid", message.getAgentId());
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpTagGsonAdapter.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpTagGsonAdapter.java
@@ -19,13 +19,15 @@
  */
 public class WxCpTagGsonAdapter implements JsonSerializer<WxCpTag>, JsonDeserializer<WxCpTag> {
 
+  @Override
   public JsonElement serialize(WxCpTag tag, Type typeOfSrc, JsonSerializationContext context) {
     JsonObject o = new JsonObject();
     o.addProperty("tagid", tag.getId());
     o.addProperty("tagname", tag.getName());
     return o;
   }
 
+  @Override
   public WxCpTag deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
           throws JsonParseException {
     JsonObject jsonObject = json.getAsJsonObject();
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapter.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapter.java
@@ -19,6 +19,7 @@
  */
 public class WxCpUserGsonAdapter implements JsonDeserializer<WxCpUser>, JsonSerializer<WxCpUser> {
 
+  @Override
   public WxCpUser deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
           throws JsonParseException {
     JsonObject o = json.getAsJsonObject();
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/xml/XStreamTransformer.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/xml/XStreamTransformer.java
@@ -45,7 +45,7 @@ public static <T> String toXml(Class<T> clazz, T object) {
   }
 
   private static Map<Class, XStream> configXStreamInstance() {
-    Map<Class, XStream> map = new HashMap<Class, XStream>();
+    Map<Class, XStream> map = new HashMap<>();
     map.put(WxCpXmlMessage.class, config_WxCpXmlMessage());
     map.put(WxCpXmlOutNewsMessage.class, config_WxCpXmlOutNewsMessage());
     map.put(WxCpXmlOutTextMessage.class, config_WxCpXmlOutTextMessage());
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxUserTag.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxUserTag.java
@@ -1,10 +1,12 @@
 package me.chanjar.weixin.mp.bean.tag;
 
-import com.google.gson.JsonParser;
-import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import com.google.gson.JsonParser;
+
+import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
+
 /**
  * 用户标签对象
  * @author binarywang(https://github.com/binarywang)
@@ -27,23 +29,23 @@ public class WxUserTag {
   private Integer count;
 
   public String getName() {
-    return name;
+    return this.name;
   }
 
   public void setName(String name) {
     this.name = name;
   }
 
   public Integer getCount() {
-    return count;
+    return this.count;
   }
 
   public void setCount(Integer count) {
     this.count = count;
   }
 
   public Integer getId() {
-    return id;
+    return this.id;
   }
 
   public void setId(Integer id) {

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ public FileBuilder mediaId(String media_id) {`
`23`	`23`	`return this;`
`24`	`24`	`}`
`25`	`25`
	`26`	`+ @Override`
`26`	`27`	`public WxCpMessage build() {`
`27`	`28`	`WxCpMessage m = super.build();`
`28`	`29`	`m.setMediaId(this.mediaId);`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ public ImageBuilder mediaId(String media_id) {`
`23`	`23`	`return this;`
`24`	`24`	`}`
`25`	`25`
	`26`	`+ @Override`
`26`	`27`	`public WxCpMessage build() {`
`27`	`28`	`WxCpMessage m = super.build();`
`28`	`29`	`m.setMediaId(this.mediaId);`