lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-08-23 13:06:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix warnings

Browse Source
This commit is contained in:
BinaryWang 2016-09-08 15:49:43 +08:00
parent 775f058b22
commit b68ec3aeed
25 changed files with 60 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageRouter.java
View File

@ -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 class WxCpMessageRouter {
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 class WxCpMessageRouter {
}
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);
}

6
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageRouterRule.java
View File

@ -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 @@ public class WxCpMessageRouterRule {
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)) {

4
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpDepart.java
View File

@ -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;

6
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMessage.java
View File

@ -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<WxArticle> articles = new ArrayList<WxArticle>();
private List<WxArticle> articles = new ArrayList<>();
/**
* 获得文本消息builder

5
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTag.java
View File

@ -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;

6
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUser.java
View File

@ -13,7 +13,11 @@ import java.util.List;
*/
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;

7
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlMessage.java
View File

@ -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<Item> picList = new ArrayList<Item>();
protected final List<Item> picList = new ArrayList<>();
@XStreamAlias("Count")
private Long count;

2
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutNewsMessage.java
View File

@ -12,7 +12,7 @@ import java.util.List;
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;

1
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/FileBuilder.java
View File

@ -23,6 +23,7 @@ public final class FileBuilder extends BaseBuilder<FileBuilder> {
return this;
}
@Override
public WxCpMessage build() {
WxCpMessage m = super.build();
m.setMediaId(this.mediaId);

1
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/ImageBuilder.java
View File

@ -23,6 +23,7 @@ public final class ImageBuilder extends BaseBuilder<ImageBuilder> {
return this;
}
@Override
public WxCpMessage build() {
WxCpMessage m = super.build();
m.setMediaId(this.mediaId);

3
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/NewsBuilder.java
View File

@ -17,7 +17,7 @@ import java.util.List;
*/
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 final class NewsBuilder extends BaseBuilder<NewsBuilder> {
return this;
}
@Override
public WxCpMessage build() {
WxCpMessage m = super.build();
m.setArticles(this.articles);

1
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/TextBuilder.java
View File

@ -23,6 +23,7 @@ public final class TextBuilder extends BaseBuilder<TextBuilder> {
return this;
}
@Override
public WxCpMessage build() {
WxCpMessage m = super.build();
m.setContent(this.content);

1
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/VideoBuilder.java
View File

@ -47,6 +47,7 @@ public final class VideoBuilder extends BaseBuilder<VideoBuilder> {
return this;
}
@Override
public WxCpMessage build() {
WxCpMessage m = super.build();
m.setMediaId(this.mediaId);

1
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/VoiceBuilder.java
View File

@ -23,6 +23,7 @@ public final class VoiceBuilder extends BaseBuilder<VoiceBuilder> {
return this;
}
@Override
public WxCpMessage build() {
WxCpMessage m = super.build();
m.setMediaId(this.mediaId);

1
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/ImageBuilder.java
View File

@ -16,6 +16,7 @@ public final class ImageBuilder extends BaseBuilder<ImageBuilder, WxCpXmlOutImag
return this;
}
@Override
public WxCpXmlOutImageMessage build() {
WxCpXmlOutImageMessage m = new WxCpXmlOutImageMessage();
setCommon(m);

3
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/NewsBuilder.java
View File

@ -13,13 +13,14 @@ import java.util.List;
*/
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) {

1
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/TextBuilder.java
View File

@ -15,6 +15,7 @@ public final class TextBuilder extends BaseBuilder<TextBuilder, WxCpXmlOutTextMe
return this;
}
@Override
public WxCpXmlOutTextMessage build() {
WxCpXmlOutTextMessage m = new WxCpXmlOutTextMessage();
setCommon(m);

1
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/VideoBuilder.java
View File

@ -28,6 +28,7 @@ public final class VideoBuilder extends BaseBuilder<VideoBuilder, WxCpXmlOutVide
return this;
}
@Override
public WxCpXmlOutVideoMessage build() {
WxCpXmlOutVideoMessage m = new WxCpXmlOutVideoMessage();
setCommon(m);

1
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/VoiceBuilder.java
View File

@ -16,6 +16,7 @@ public final class VoiceBuilder extends BaseBuilder<VoiceBuilder, WxCpXmlOutVoic
return this;
}
@Override
public WxCpXmlOutVoiceMessage build() {
WxCpXmlOutVoiceMessage m = new WxCpXmlOutVoiceMessage();
setCommon(m);

2
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpDepartGsonAdapter.java
View File

@ -19,6 +19,7 @@ import java.lang.reflect.Type;
*/
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 class WxCpDepartGsonAdapter implements JsonSerializer<WxCpDepart>, JsonDe
return json;
}
@Override
public WxCpDepart deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
throws JsonParseException {
WxCpDepart depart = new WxCpDepart();

1
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpMessageGsonAdapter.java
View File

@ -20,6 +20,7 @@ import java.lang.reflect.Type;
*/
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());

2
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpTagGsonAdapter.java
View File

@ -19,6 +19,7 @@ import java.lang.reflect.Type;
*/
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());
@ -26,6 +27,7 @@ public class WxCpTagGsonAdapter implements JsonSerializer<WxCpTag>, JsonDeserial
return o;
}
@Override
public WxCpTag deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
throws JsonParseException {
JsonObject jsonObject = json.getAsJsonObject();

1
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapter.java
View File

@ -19,6 +19,7 @@ import java.lang.reflect.Type;
*/
public class WxCpUserGsonAdapter implements JsonDeserializer<WxCpUser>, JsonSerializer<WxCpUser> {
@Override
public WxCpUser deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
throws JsonParseException {
JsonObject o = json.getAsJsonObject();

2
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/xml/XStreamTransformer.java
View File

@ -45,7 +45,7 @@ public class XStreamTransformer {
}
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());

12
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxUserTag.java
View File

@ -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) {