fix warnings

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

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);
}

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