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 ece62e58..6d4a8a97 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 @@ -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 rules = new ArrayList(); + private final List rules = new ArrayList<>(); private final WxCpService wxCpService; @@ -142,7 +142,7 @@ public class WxCpMessageRouter { return null; } - final List matchRules = new ArrayList(); + final List matchRules = new ArrayList<>(); // 收集匹配的规则 for (final WxCpMessageRouterRule rule : this.rules) { if (rule.test(wxMessage)) { @@ -158,12 +158,13 @@ public class WxCpMessageRouter { } WxCpXmlOutMessage res = null; - final List futures = new ArrayList(); + final List 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 index 9014bde9..c81f045f 100644 --- 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 handlers = new ArrayList(); + private List handlers = new ArrayList<>(); - private List interceptors = new ArrayList(); + private List interceptors = new ArrayList<>(); protected WxCpMessageRouterRule(WxCpMessageRouter routerBuilder) { this.routerBuilder = routerBuilder; @@ -235,7 +235,7 @@ public class WxCpMessageRouterRule { try { - Map context = new HashMap(); + Map 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 index 540501d7..c8735086 100644 --- 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 @@ import java.io.Serializable; */ 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 index 0b5f926e..6dba9091 100644 --- 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 @@ import java.util.List; */ 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 articles = new ArrayList(); + private List 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 index 07c934b3..ca11cb1f 100644 --- 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 @@ import java.io.Serializable; */ 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 index 1c0cd7f1..d1737d5d 100644 --- 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 @@ import java.util.List; */ public class WxCpUser implements Serializable { - private final List extAttrs = new ArrayList(); + /** + * + */ + private static final long serialVersionUID = -5696099236344075582L; + private final List 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 index 80cf7d47..352fa2e6 100644 --- 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 class WxCpXmlMessage implements Serializable { public static class SendPicsInfo { @XStreamAlias("PicList") - protected final List picList = new ArrayList(); + protected final List 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 index b689ce6f..5906a324 100644 --- 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 @@ import java.util.List; public class WxCpXmlOutNewsMessage extends WxCpXmlOutMessage { @XStreamAlias("Articles") - protected final List articles = new ArrayList(); + protected final List 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 index d8295454..1da78169 100644 --- 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 final class FileBuilder extends BaseBuilder { 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 index 99195c26..a74f5016 100644 --- 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 final class ImageBuilder extends BaseBuilder { 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 index e2d2086a..8ea90872 100644 --- 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 @@ import java.util.List; */ public final class NewsBuilder extends BaseBuilder { - private List articles = new ArrayList(); + private List articles = new ArrayList<>(); public NewsBuilder() { this.msgType = WxConsts.CUSTOM_MSG_NEWS; @@ -28,6 +28,7 @@ public final class NewsBuilder extends BaseBuilder { 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 index 076db2f1..8c1ee1d0 100644 --- 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 final class TextBuilder extends BaseBuilder { 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 index da1cf500..52cba287 100644 --- 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 final class VideoBuilder extends BaseBuilder { 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 index 10b2b0fe..0960fe8f 100644 --- 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 final class VoiceBuilder extends BaseBuilder { 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 index ae774e40..f8cd25f4 100644 --- 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 final class ImageBuilder extends BaseBuilder { - protected final List articles = new ArrayList(); + protected final List 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 index 909a0ec9..dcdb58ca 100644 --- 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 final class TextBuilder extends BaseBuilder, JsonDeserializer { + @Override public JsonElement serialize(WxCpDepart group, Type typeOfSrc, JsonSerializationContext context) { JsonObject json = new JsonObject(); if (group.getId() != null) { @@ -36,6 +37,7 @@ public class WxCpDepartGsonAdapter implements JsonSerializer, JsonDe 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 index 45df80b3..322658c2 100644 --- 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 @@ import java.lang.reflect.Type; */ public class WxCpMessageGsonAdapter implements JsonSerializer { + @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 index b8599a1c..43e84a00 100644 --- 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,6 +19,7 @@ import java.lang.reflect.Type; */ public class WxCpTagGsonAdapter implements JsonSerializer, JsonDeserializer { + @Override public JsonElement serialize(WxCpTag tag, Type typeOfSrc, JsonSerializationContext context) { JsonObject o = new JsonObject(); o.addProperty("tagid", tag.getId()); @@ -26,6 +27,7 @@ public class WxCpTagGsonAdapter implements JsonSerializer, JsonDeserial 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 index 7a88f47e..bbabf054 100644 --- 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 @@ import java.lang.reflect.Type; */ public class WxCpUserGsonAdapter implements JsonDeserializer, JsonSerializer { + @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 index ae46d8f2..6b580630 100644 --- 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 class XStreamTransformer { } private static Map configXStreamInstance() { - Map map = new HashMap(); + Map 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 index 79d28f20..1f03019e 100644 --- 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,7 +29,7 @@ public class WxUserTag { private Integer count; public String getName() { - return name; + return this.name; } public void setName(String name) { @@ -35,7 +37,7 @@ public class WxUserTag { } public Integer getCount() { - return count; + return this.count; } public void setCount(Integer count) { @@ -43,7 +45,7 @@ public class WxUserTag { } public Integer getId() { - return id; + return this.id; } public void setId(Integer id) {