lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2026-02-09 09:16:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2025-11-19 23:08:35 +08:00
parent 12c86e5bab
commit fceeafebce
135 changed files with 592 additions and 958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-json/src/main/java/cn/hutool/v7/json/JSONObject.java
View File

@@ -167,7 +167,7 @@ public class JSONObject extends MapWrapper<String, JSON> implements JSON, JSONGe
return putValue(key, 1);
}
if (json instanceof JSONPrimitive jsonPrimitive) {
if (json instanceof final JSONPrimitive jsonPrimitive) {
if (jsonPrimitive.isNumber()) {
jsonPrimitive.increment();
return this;

6
hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TemporalTypeAdapter.java
View File

@@ -134,11 +134,11 @@ public class TemporalTypeAdapter implements MatcherJSONSerializer<TemporalAccess
* @param json JSONObject
*/
private static void toJSONObject(final TemporalAccessor bean, final JSONObject json) {
if (bean instanceof LocalDate localDate) {
if (bean instanceof final LocalDate localDate) {
json.putValue(YEAR_KEY, localDate.getYear());
json.putValue(MONTH_KEY, localDate.getMonthValue());
json.putValue(DAY_KEY, localDate.getDayOfMonth());
} else if (bean instanceof LocalDateTime localDateTime) {
} else if (bean instanceof final LocalDateTime localDateTime) {
json.putValue(YEAR_KEY, localDateTime.getYear());
json.putValue(MONTH_KEY, localDateTime.getMonthValue());
json.putValue(DAY_KEY, localDateTime.getDayOfMonth());
@@ -146,7 +146,7 @@ public class TemporalTypeAdapter implements MatcherJSONSerializer<TemporalAccess
json.putValue(MINUTE_KEY, localDateTime.getMinute());
json.putValue(SECOND_KEY, localDateTime.getSecond());
json.putValue(NANO_KEY, localDateTime.getNano());
} else if (bean instanceof LocalTime localTime) {
} else if (bean instanceof final LocalTime localTime) {
json.putValue(HOUR_KEY, localTime.getHour());
json.putValue(MINUTE_KEY, localTime.getMinute());
json.putValue(SECOND_KEY, localTime.getSecond());

2
hutool-json/src/main/java/cn/hutool/v7/json/support/JSONNodeBeanFactory.java
View File

@@ -48,7 +48,7 @@ public class JSONNodeBeanFactory implements NodeBeanFactory<JSON> {
final BeanPath<JSON> next = beanPath.next();
if (null != next) {
final Node node = next.getNode();
if (node instanceof NameNode nameNode) {
if (node instanceof final NameNode nameNode) {
if (nameNode.isNumber()) {
return JSONUtil.ofArray(config);
}

2
hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3289Test.java
View File

@@ -25,7 +25,7 @@ public class Issue3289Test {
@Test
void parseTest() {
Assertions.assertThrows(JSONException.class, () -> {
String s = "{\"G\":00,[6E962756779]}";
final String s = "{\"G\":00,[6E962756779]}";
JSONUtil.parse(s);
});
}

2
hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueID61QRTest.java
View File

@@ -29,7 +29,7 @@ public class IssueID61QRTest {
@SuppressWarnings("unchecked")
@Test
public void testName() {
JSONObject map1 = JSONUtil.ofObj(new JSONConfig().setDateFormat("yyyy"));
final JSONObject map1 = JSONUtil.ofObj(new JSONConfig().setDateFormat("yyyy"));
map1.putValue("a", 3);
map1.putValue("b", 5);
map1.putValue("c", 5432);

18
hutool-json/src/test/java/cn/hutool/v7/json/jwt/Issue4105Test.java
View File

@@ -28,9 +28,9 @@ public class Issue4105Test {
void verifyNoneTest() {
// {"alg": "none"}.{"exp": 1642196407}
// 当定义alg为none时，校验总是成功
String head = Base64.encode("{\"alg\": \"none\"}");
String payload = Base64.encode("{\"exp\": 1642196407}");
String token = StrUtil.format("{}.{}.", head, payload);
final String head = Base64.encode("{\"alg\": \"none\"}");
final String payload = Base64.encode("{\"exp\": 1642196407}");
final String token = StrUtil.format("{}.{}.", head, payload);
final JWT jwt = JWTUtil.parseToken(token);
Assertions.assertNull(jwt.getSigner());
@@ -46,9 +46,9 @@ public class Issue4105Test {
void verifyEmptyTest() {
// {"alg": "none"}.{"exp": 1642196407}
// 当定义alg为none时，校验总是成功
String head = Base64.encode("{\"alg\": \"\"}");
String payload = Base64.encode("{\"exp\": 1642196407}");
String token = StrUtil.format("{}.{}.", head, payload);
final String head = Base64.encode("{\"alg\": \"\"}");
final String payload = Base64.encode("{\"exp\": 1642196407}");
final String token = StrUtil.format("{}.{}.", head, payload);
final JWT jwt = JWTUtil.parseToken(token);
Assertions.assertNull(jwt.getSigner());
@@ -64,9 +64,9 @@ public class Issue4105Test {
void verifyHs256Test() {
// {"alg": "none"}.{"exp": 1642196407}
// 当定义alg为none时，校验总是成功
String head = Base64.encode("{\"alg\": \"HS256\"}");
String payload = Base64.encode("{\"exp\": 1642196407}");
String token = StrUtil.format("{}.{}.", head, payload);
final String head = Base64.encode("{\"alg\": \"HS256\"}");
final String payload = Base64.encode("{\"exp\": 1642196407}");
final String token = StrUtil.format("{}.{}.", head, payload);
final JWT jwt = JWTUtil.parseToken(token);
Assertions.assertNull(jwt.getSigner());

2
hutool-json/src/test/java/cn/hutool/v7/json/xml/IssueID0HP2Test.java
View File

@@ -17,7 +17,7 @@ public class IssueID0HP2Test {
final JSONObject json = JSONUtil.ofObj(JSONConfig.of().setDateFormat("yyyy/MM/dd"))
.putValue("date", DateUtil.parse("2025-10-03"));
String xml = JSONUtil.toXmlStr(json);
final String xml = JSONUtil.toXmlStr(json);
Assertions.assertEquals("<date>2025/10/03</date>", xml);
}
}