Skip to content

Commit cae504b

Browse files
binarywangbinarywang
committed
修复小l字符问题
1 parent 0714cbe commit cae504b

File tree

21 files changed

+46
-44
lines changed

21 files changed

+46
-44
lines changed

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/session/StandardSessionManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public void run() {
192192
while (true) {
193193
try {
194194
// 每秒清理一次
195-
Thread.sleep(StandardSessionManager.this.backgroundProcessorDelay * 1000l);
195+
Thread.sleep(StandardSessionManager.this.backgroundProcessorDelay * 1000L);
196196
backgroundProcess();
197197
} catch (InterruptedException e) {
198198
StandardSessionManager.this.log.error("SessionManagerImpl.backgroundProcess error", e);

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/GsonHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public static Long getAsLong(JsonElement element) {
7777

7878
public static long getAsPrimitiveLong(JsonElement element) {
7979
Long r = getAsLong(element);
80-
return r == null ? 0l : r;
80+
return r == null ? 0L : r;
8181
}
8282

8383
public static Integer getAsInteger(JsonElement element) {

‎weixin-java-common/src/test/java/me/chanjar/weixin/common/api/WxMessageInMemoryDuplicateCheckerTest.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@
33
import org.testng.Assert;
44
import org.testng.annotations.Test;
55

6+
import java.util.concurrent.TimeUnit;
7+
68
import static org.testng.Assert.assertFalse;
79
import static org.testng.Assert.assertTrue;
810

911
@Test
1012
public class WxMessageInMemoryDuplicateCheckerTest {
11-
private WxMessageInMemoryDuplicateChecker checker = new WxMessageInMemoryDuplicateChecker(2000l, 1000l);
13+
private WxMessageInMemoryDuplicateChecker checker = new WxMessageInMemoryDuplicateChecker(2000L, 1000L);
1214

1315
public void test() throws InterruptedException {
14-
Long[] msgIds = new Long[]{1l, 2l, 3l, 4l, 5l, 6l, 7l, 8l};
16+
Long[] msgIds = new Long[]{1L, 2L, 3L, 4L, 5L, 6L, 7L, 8L};
1517

1618
// 第一次检查
1719
for (Long msgId : msgIds) {
@@ -20,14 +22,14 @@ public void test() throws InterruptedException {
2022
}
2123

2224
// 过1秒再检查
23-
Thread.sleep(1000l);
25+
TimeUnit.SECONDS.sleep(1);
2426
for (Long msgId : msgIds) {
2527
boolean result = checker.isDuplicate(String.valueOf(msgId));
2628
assertTrue(result);
2729
}
2830

2931
// 过1.5秒再检查
30-
Thread.sleep(1500l);
32+
TimeUnit.MILLISECONDS.sleep(1500L);
3133
for (Long msgId : msgIds) {
3234
boolean result = checker.isDuplicate(String.valueOf(msgId));
3335
assertFalse(result);

‎weixin-java-common/src/test/java/me/chanjar/weixin/common/session/SessionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public void testBackgroundProcess(WxSessionManager sessionManager) throws Interr
8080
InternalSession abc = ism.createSession("abc");
8181
abc.endAccess();
8282

83-
Thread.sleep(2000l);
83+
Thread.sleep(2000);
8484
Assert.assertEquals(ism.getActiveSessions(), 0);
8585

8686
}
@@ -99,7 +99,7 @@ public void testBackgroundProcess2(WxSessionManager sessionManager) throws Inter
9999
abc.setMaxInactiveInterval(1);
100100
abc.endAccess();
101101

102-
Thread.sleep(2000l);
102+
Thread.sleep(2000);
103103
Assert.assertEquals(ism.getActiveSessions(), 0);
104104

105105
}

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/BaseBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public BuilderType fromUser(String fromusername) {
2323
public void setCommon(WxCpXmlOutMessage m) {
2424
m.setToUserName(this.toUserName);
2525
m.setFromUserName(this.fromUserName);
26-
m.setCreateTime(System.currentTimeMillis() / 1000l);
26+
m.setCreateTime(System.currentTimeMillis() / 1000L);
2727
}
2828

2929
}

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpInMemoryConfigStorage.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public synchronized void updateAccessToken(WxAccessToken accessToken) {
6363
@Override
6464
public synchronized void updateAccessToken(String accessToken, int expiresInSeconds) {
6565
this.accessToken = accessToken;
66-
this.expiresTime = System.currentTimeMillis() + (expiresInSeconds - 200) * 1000l;
66+
this.expiresTime = System.currentTimeMillis() + (expiresInSeconds - 200) * 1000L;
6767
}
6868

6969
@Override
@@ -92,7 +92,7 @@ public boolean isJsapiTicketExpired() {
9292
public synchronized void updateJsapiTicket(String jsapiTicket, int expiresInSeconds) {
9393
this.jsapiTicket = jsapiTicket;
9494
// 预留200秒的时间
95-
this.jsapiTicketExpiresTime = System.currentTimeMillis() + (expiresInSeconds - 200) * 1000l;
95+
this.jsapiTicketExpiresTime = System.currentTimeMillis() + (expiresInSeconds - 200) * 1000L;
9696
}
9797

9898
@Override

‎weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMessageRouterTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void testAsync(WxCpXmlMessage message, String expected) throws Interrupte
6969
WxCpMessageRouter router = new WxCpMessageRouter(null);
7070
prepare(true, sb, router);
7171
router.route(message);
72-
Thread.sleep(500l);
72+
Thread.sleep(500);
7373
Assert.assertEquals(sb.toString(), expected);
7474
}
7575

@@ -89,7 +89,7 @@ public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> co
8989
public void run() {
9090
router.route(m);
9191
try {
92-
Thread.sleep(1000l);
92+
Thread.sleep(1000);
9393
} catch (InterruptedException e) {
9494
}
9595
}
@@ -98,7 +98,7 @@ public void run() {
9898
new Thread(r).start();
9999
}
100100

101-
Thread.sleep(1000l * 2);
101+
Thread.sleep(2000);
102102
}
103103

104104
@DataProvider(name = "messages-1")
@@ -184,7 +184,7 @@ public void testSessionClean1(StandardSessionManager ism) throws InterruptedExce
184184
msg.setFromUserName("abc");
185185
router.route(msg);
186186

187-
Thread.sleep(2000l);
187+
Thread.sleep(2000);
188188
Assert.assertEquals(ism.getActiveSessions(), 0);
189189

190190
}
@@ -204,7 +204,7 @@ public void testSessionClean2(StandardSessionManager ism) throws InterruptedExce
204204
msg.setFromUserName("abc");
205205
router.route(msg);
206206

207-
Thread.sleep(2000l);
207+
Thread.sleep(2000);
208208
Assert.assertEquals(ism.getActiveSessions(), 0);
209209
}
210210
{
@@ -218,7 +218,7 @@ public void testSessionClean2(StandardSessionManager ism) throws InterruptedExce
218218
msg.setFromUserName("abc");
219219
router.route(msg);
220220

221-
Thread.sleep(2000l);
221+
Thread.sleep(2000);
222222
Assert.assertEquals(ism.getActiveSessions(), 0);
223223
}
224224

@@ -238,7 +238,7 @@ public void testSessionClean3(StandardSessionManager ism) throws InterruptedExce
238238
msg.setFromUserName("abc");
239239
router.route(msg);
240240

241-
Thread.sleep(2000l);
241+
Thread.sleep(2000);
242242
Assert.assertEquals(ism.getActiveSessions(), 0);
243243

244244
}
@@ -257,7 +257,7 @@ public void testSessionClean4(StandardSessionManager ism) throws InterruptedExce
257257
msg.setFromUserName("abc");
258258
router.route(msg);
259259

260-
Thread.sleep(2000l);
260+
Thread.sleep(2000);
261261
Assert.assertEquals(ism.getActiveSessions(), 0);
262262
}
263263

@@ -271,7 +271,7 @@ public void testSessionClean4(StandardSessionManager ism) throws InterruptedExce
271271
msg.setFromUserName("abc");
272272
router.route(msg);
273273

274-
Thread.sleep(2000l);
274+
Thread.sleep(2000);
275275
Assert.assertEquals(ism.getActiveSessions(), 0);
276276
}
277277
}

‎weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlMessageTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ public void testFromXml() {
5757
WxCpXmlMessage wxMessage = WxCpXmlMessage.fromXml(xml);
5858
assertEquals(wxMessage.getToUserName(), "toUser");
5959
assertEquals(wxMessage.getFromUserName(), "fromUser");
60-
assertEquals(wxMessage.getCreateTime(), new Long(1348831860l));
60+
assertEquals(wxMessage.getCreateTime(), new Long(1348831860));
6161
assertEquals(wxMessage.getMsgType(), WxConsts.XmlMsgType.TEXT);
6262
assertEquals(wxMessage.getContent(), "this is a test");
63-
assertEquals(wxMessage.getMsgId(), new Long(1234567890123456l));
63+
assertEquals(wxMessage.getMsgId(), new Long(1234567890123456L));
6464
assertEquals(wxMessage.getPicUrl(), "this is a url");
6565
assertEquals(wxMessage.getMediaId(), "media_id");
6666
assertEquals(wxMessage.getFormat(), "Format");
@@ -80,7 +80,7 @@ public void testFromXml() {
8080
assertEquals(wxMessage.getPrecision(), 119.385040);
8181
assertEquals(wxMessage.getScanCodeInfo().getScanType(), "qrcode");
8282
assertEquals(wxMessage.getScanCodeInfo().getScanResult(), "1");
83-
assertEquals(wxMessage.getSendPicsInfo().getCount(), new Long(1l));
83+
assertEquals(wxMessage.getSendPicsInfo().getCount(), new Long(1));
8484
assertEquals(wxMessage.getSendPicsInfo().getPicList().get(0).getPicMd5Sum(), "1b5f7c23b5bf75682a53e7b6d163e185");
8585
assertEquals(wxMessage.getSendLocationInfo().getLocationX(), "23");
8686
assertEquals(wxMessage.getSendLocationInfo().getLocationY(), "113");

‎weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutImageMessageTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class WxCpXmlOutImageMessageTest {
99
public void test() {
1010
WxCpXmlOutImageMessage m = new WxCpXmlOutImageMessage();
1111
m.setMediaId("ddfefesfsdfef");
12-
m.setCreateTime(1122l);
12+
m.setCreateTime(1122L);
1313
m.setFromUserName("from");
1414
m.setToUserName("to");
1515

‎weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutNewsMessageTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class WxCpXmlOutNewsMessageTest {
88

99
public void test() {
1010
WxCpXmlOutNewsMessage m = new WxCpXmlOutNewsMessage();
11-
m.setCreateTime(1122l);
11+
m.setCreateTime(1122L);
1212
m.setFromUserName("fromUser");
1313
m.setToUserName("toUser");
1414

0 commit comments

Comments
 (0)