From 0bcba32ea40d2e8f60ff49d27b2747a0be86d8c3 Mon Sep 17 00:00:00 2001 From: Kyle Scully Date: Tue, 12 Oct 2021 23:06:39 -0700 Subject: [PATCH] refactor: Use diamond operator --- .../weixin/common/util/http/WxDnsResolver.java | 4 ++-- .../config/impl/AbstractWxMaRedisConfig.java | 2 +- .../api/impl/WxMaShopAuditServiceImplTest.java | 16 ++++++++-------- .../open/api/impl/WxOpenMessageRouter.java | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/WxDnsResolver.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/WxDnsResolver.java index 6c6137089..d0321af09 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/WxDnsResolver.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/WxDnsResolver.java @@ -19,7 +19,7 @@ import java.util.Map; public class WxDnsResolver implements DnsResolver { private final static String WECHAT_API_URL = "api.weixin.qq.com"; - private static Map MAPPINGS = new HashMap(); + private static Map MAPPINGS = new HashMap<>(); protected final Logger log = LoggerFactory.getLogger(WxDnsResolver.class); private String wxApiIp; @@ -38,7 +38,7 @@ public class WxDnsResolver implements DnsResolver { } catch (UnknownHostException e) { //如果初始化DNS配置失败则使用默认配置,不影响服务的启动 log.error("init WxDnsResolver error", e); - MAPPINGS = new HashMap(); + MAPPINGS = new HashMap<>(); } } diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/AbstractWxMaRedisConfig.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/AbstractWxMaRedisConfig.java index 9b94a04bb..19d3a00f6 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/AbstractWxMaRedisConfig.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/AbstractWxMaRedisConfig.java @@ -79,7 +79,7 @@ public abstract class AbstractWxMaRedisConfig extends WxMaDefaultConfigImpl { private void setValueToRedis(String key, long expiresTime, String value) { try (Jedis jedis = getConfiguredJedis()) { - Map hash = new HashMap(); + Map hash = new HashMap<>(); hash.put(HASH_VALUE_FIELD, value); hash.put(HASH_EXPIRE_FIELD, String.valueOf(expiresTime)); jedis.hmset(getRedisKey(key), hash); diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaShopAuditServiceImplTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaShopAuditServiceImplTest.java index c8ec9f081..117f052ac 100644 --- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaShopAuditServiceImplTest.java +++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaShopAuditServiceImplTest.java @@ -33,23 +33,23 @@ public class WxMaShopAuditServiceImplTest { WxMaShopAuditBrandRequest request = WxMaShopAuditBrandRequest.builder().build(); WxMaShopAuditBrandRequest.AuditReqBean auditReqBean = WxMaShopAuditBrandRequest.AuditReqBean.builder().build(); - auditReqBean.setLicense(new ArrayList(Arrays.asList("https://img.zhls.qq.com/3/609b98f7e0ff43d59ce6d9cca636c3e0.jpg"))); + auditReqBean.setLicense(new ArrayList<>(Arrays.asList("https://img.zhls.qq.com/3/609b98f7e0ff43d59ce6d9cca636c3e0.jpg"))); auditReqBean.setBrandInfo(WxMaShopAuditBrandRequest.AuditReqBean.BrandInfoBean.builder() .brandAuditType(1) .trademarkType("29") .brandManagementType(2) .commodityOriginType(2) .brandWording("346225226351203275") - .saleAuthorization(new ArrayList(Arrays.asList("https://img.zhls.qq.com/3/609b98f7e0ff43d59ce6d9cca636c3e0.jpg"))) - .trademarkRegistrationCertificate(new ArrayList(Arrays.asList("https://img.zhls.qq.com/3/609b98f7e0ff43d59ce6d9cca636c3e0.jpg"))) - .trademarkChangeCertificate(new ArrayList(Arrays.asList("https://img.zhls.qq.com/3/609b98f7e0ff43d59ce6d9cca636c3e0.jpg"))) + .saleAuthorization(new ArrayList<>(Arrays.asList("https://img.zhls.qq.com/3/609b98f7e0ff43d59ce6d9cca636c3e0.jpg"))) + .trademarkRegistrationCertificate(new ArrayList<>(Arrays.asList("https://img.zhls.qq.com/3/609b98f7e0ff43d59ce6d9cca636c3e0.jpg"))) + .trademarkChangeCertificate(new ArrayList<>(Arrays.asList("https://img.zhls.qq.com/3/609b98f7e0ff43d59ce6d9cca636c3e0.jpg"))) .trademarkRegistrant("https://img.zhls.qq.com/3/609b98f7e0ff43d59ce6d9cca636c3e0.jpg") .trademarkRegistrantNu("1249305") .trademarkAuthorizationPeriod("2020-03-25 12:05:25") - .trademarkRegistrationApplication(new ArrayList(Arrays.asList("https://img.zhls.qq.com/3/609b98f7e0ff43d59ce6d9cca636c3e0.jpg"))) + .trademarkRegistrationApplication(new ArrayList<>(Arrays.asList("https://img.zhls.qq.com/3/609b98f7e0ff43d59ce6d9cca636c3e0.jpg"))) .trademarkApplicant("张三") .trademarkApplicationTime("2020-03-25 12:05:25") - .importedGoodsForm(new ArrayList(Arrays.asList("https://img.zhls.qq.com/3/609b98f7e0ff43d59ce6d9cca636c3e0.jpg"))) + .importedGoodsForm(new ArrayList<>(Arrays.asList("https://img.zhls.qq.com/3/609b98f7e0ff43d59ce6d9cca636c3e0.jpg"))) .build()); request.setAuditReq(auditReqBean); @@ -61,12 +61,12 @@ public class WxMaShopAuditServiceImplTest { public void testAuditCategory() throws WxErrorException { WxMaShopAuditCategoryRequest request = WxMaShopAuditCategoryRequest.builder().build(); WxMaShopAuditCategoryRequest.AuditReqBean auditReqBean = WxMaShopAuditCategoryRequest.AuditReqBean.builder().build(); - auditReqBean.setLicense(new ArrayList(Arrays.asList("www.xxxxx.com"))); + auditReqBean.setLicense(new ArrayList<>(Arrays.asList("www.xxxxx.com"))); auditReqBean.setCategoryInfo(WxMaShopAuditCategoryRequest.AuditReqBean.CategoryInfoBean.builder() .level1(7419) .level2(7439) .level3(7448) - .certificate(new ArrayList(Arrays.asList("www.xxxxx.com"))) + .certificate(new ArrayList<>(Arrays.asList("www.xxxxx.com"))) .build()); request.setAuditReq(auditReqBean); WxMaShopAuditCategoryResponse response = wxService.getShopAuditService().auditCategory(request); diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMessageRouter.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMessageRouter.java index 2e483fc0a..7314bfd69 100644 --- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMessageRouter.java +++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMessageRouter.java @@ -17,7 +17,7 @@ public class WxOpenMessageRouter extends WxMpMessageRouter { } public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage, String appId) { - return route(wxMessage, new HashMap(), appId); + return route(wxMessage, new HashMap<>(), appId); } public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage, final Map context, String appId) {