Skip to content

Commit 6fb19d6

Browse files
yuyu1025yuyu1025
committed
style: Add the final modifier to the variable
1 parent b48794b commit 6fb19d6

File tree

2 files changed

+50
-50
lines changed

2 files changed

+50
-50
lines changed

‎src/main/java/org/apache/commons/lang3/time/DateUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1648,7 +1648,7 @@ public static LocalDateTime toLocalDateTime(final Date date) {
16481648
* @since 3.18
16491649
*/
16501650
public static LocalDateTime toLocalDateTime(final Date date, final TimeZone tz) {
1651-
LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(Objects.requireNonNull(date, "date").getTime()),
1651+
final LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(Objects.requireNonNull(date, "date").getTime()),
16521652
Objects.requireNonNull(tz, "tz").toZoneId());
16531653
if (date instanceof java.sql.Timestamp ) {
16541654
return localDateTime.withNano(((Timestamp) date).getNanos());

‎src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1291,133 +1291,133 @@ public void testToCalendarWithTimeZoneNull() {
12911291

12921292
@Test
12931293
void testToLocalDateTimeWithSqlDate() {
1294-
java.sql.Date sqlDate = java.sql.Date.valueOf("2000-01-01");
1294+
final java.sql.Date sqlDate = java.sql.Date.valueOf("2000-01-01");
12951295

1296-
LocalDateTime result = DateUtils.toLocalDateTime(sqlDate);
1296+
final LocalDateTime result = DateUtils.toLocalDateTime(sqlDate);
12971297

12981298
assertNotNull(result);
12991299

1300-
LocalDateTime expected = LocalDateTime.of(2000, 1, 1, 0, 0, 0);
1300+
final LocalDateTime expected = LocalDateTime.of(2000, 1, 1, 0, 0, 0);
13011301
assertEquals(expected, result);
13021302

1303-
Instant instant = Instant.ofEpochMilli(sqlDate.getTime());
1304-
LocalDateTime expectedWithZone = LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
1303+
final Instant instant = Instant.ofEpochMilli(sqlDate.getTime());
1304+
final LocalDateTime expectedWithZone = LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
13051305
assertEquals(expectedWithZone, result);
13061306
}
13071307

13081308
@Test
13091309
public void testToLocalDateTimeWithSqlTime() {
1310-
java.sql.Time sqlTime = java.sql.Time.valueOf("12:30:45");
1310+
final java.sql.Time sqlTime = java.sql.Time.valueOf("12:30:45");
13111311

1312-
LocalDateTime result = DateUtils.toLocalDateTime(sqlTime);
1312+
final LocalDateTime result = DateUtils.toLocalDateTime(sqlTime);
13131313

13141314
assertNotNull(result);
13151315

1316-
LocalDateTime expected = LocalDateTime.of(1970, 1, 1, 12, 30, 45);
1316+
final LocalDateTime expected = LocalDateTime.of(1970, 1, 1, 12, 30, 45);
13171317
assertEquals(expected, result);
13181318

1319-
Instant instant = Instant.ofEpochMilli(sqlTime.getTime());
1320-
LocalDateTime expectedWithZone = LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
1319+
final Instant instant = Instant.ofEpochMilli(sqlTime.getTime());
1320+
final LocalDateTime expectedWithZone = LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
13211321
assertEquals(expectedWithZone, result);
13221322
}
13231323

13241324
@Test
13251325
public void testToLocalDateTimeWithSqlTimestamp() {
1326-
java.sql.Timestamp sqlTimestamp = java.sql.Timestamp.valueOf("2000-01-01 12:30:45.123456789");
1326+
final java.sql.Timestamp sqlTimestamp = java.sql.Timestamp.valueOf("2000-01-01 12:30:45.123456789");
13271327

1328-
LocalDateTime result = DateUtils.toLocalDateTime(sqlTimestamp);
1328+
final LocalDateTime result = DateUtils.toLocalDateTime(sqlTimestamp);
13291329

13301330
assertNotNull(result);
13311331

1332-
LocalDateTime expected = LocalDateTime.of(
1332+
final LocalDateTime expected = LocalDateTime.of(
13331333
2000, 1, 1, 12, 30, 45, 123_456_789
13341334
);
13351335
assertEquals(expected, result);
13361336

1337-
Instant instant = sqlTimestamp.toInstant();
1338-
LocalDateTime expectedWithZone = LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
1337+
final Instant instant = sqlTimestamp.toInstant();
1338+
final LocalDateTime expectedWithZone = LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
13391339
assertEquals(expectedWithZone, result);
13401340
}
13411341

13421342
@Test
13431343
public void testToLocalDateTimeWithSqlTimestamp_NanoPrecision() {
1344-
java.sql.Timestamp sqlTimestamp = java.sql.Timestamp.valueOf("2000-01-01 12:30:45.987654321");
1344+
final java.sql.Timestamp sqlTimestamp = java.sql.Timestamp.valueOf("2000-01-01 12:30:45.987654321");
13451345

1346-
LocalDateTime result = DateUtils.toLocalDateTime(sqlTimestamp);
1346+
final LocalDateTime result = DateUtils.toLocalDateTime(sqlTimestamp);
13471347

1348-
LocalDateTime expected = LocalDateTime.of(
1348+
final LocalDateTime expected = LocalDateTime.of(
13491349
2000, 1, 1, 12, 30, 45, 987_654_321
13501350
);
13511351
assertEquals(expected, result);
13521352
}
13531353

13541354
@Test
13551355
public void testToLocalDateTimeWithSqlTimestamp_WithTimeZone() {
1356-
java.sql.Timestamp sqlTimestamp = java.sql.Timestamp.valueOf("2000-01-01 12:30:45");
1357-
TimeZone timeZone = TimeZone.getTimeZone("America/New_York");
1356+
final java.sql.Timestamp sqlTimestamp = java.sql.Timestamp.valueOf("2000-01-01 12:30:45");
1357+
final TimeZone timeZone = TimeZone.getTimeZone("America/New_York");
13581358

1359-
LocalDateTime result = DateUtils.toLocalDateTime(sqlTimestamp, timeZone);
1359+
final LocalDateTime result = DateUtils.toLocalDateTime(sqlTimestamp, timeZone);
13601360

1361-
Instant instant = sqlTimestamp.toInstant();
1362-
LocalDateTime expected = LocalDateTime.ofInstant(instant, timeZone.toZoneId());
1361+
final Instant instant = sqlTimestamp.toInstant();
1362+
final LocalDateTime expected = LocalDateTime.ofInstant(instant, timeZone.toZoneId());
13631363
assertEquals(expected, result);
13641364
}
13651365

13661366
@Test
13671367
public void testToLocalDateTimeWithSqlDate_Epoch() {
1368-
java.sql.Date sqlDate = java.sql.Date.valueOf("1970-01-01");
1368+
final java.sql.Date sqlDate = java.sql.Date.valueOf("1970-01-01");
13691369

1370-
LocalDateTime result = DateUtils.toLocalDateTime(sqlDate);
1370+
final LocalDateTime result = DateUtils.toLocalDateTime(sqlDate);
13711371

1372-
LocalDateTime expected = LocalDateTime.of(1970, 1, 1, 0, 0, 0);
1372+
final LocalDateTime expected = LocalDateTime.of(1970, 1, 1, 0, 0, 0);
13731373
assertEquals(expected, result);
13741374
}
13751375

13761376
@Test
13771377
public void testToLocalDateTimeWithSqlTime_MaxValue() {
1378-
java.sql.Time sqlTime = java.sql.Time.valueOf("23:59:59");
1378+
final java.sql.Time sqlTime = java.sql.Time.valueOf("23:59:59");
13791379

1380-
LocalDateTime result = DateUtils.toLocalDateTime(sqlTime);
1380+
final LocalDateTime result = DateUtils.toLocalDateTime(sqlTime);
13811381

1382-
LocalDateTime expected = LocalDateTime.of(1970, 1, 1, 23, 59, 59);
1382+
final LocalDateTime expected = LocalDateTime.of(1970, 1, 1, 23, 59, 59);
13831383
assertEquals(expected, result);
13841384
}
13851385

13861386
@Test
13871387
public void testToLocalDateTimeWithSqlTimestamp_DaylightSaving() {
1388-
java.sql.Timestamp sqlTimestamp = java.sql.Timestamp.valueOf("2023-03-12 02:30:00");
1389-
TimeZone newYork = TimeZone.getTimeZone("America/New_York");
1388+
final java.sql.Timestamp sqlTimestamp = java.sql.Timestamp.valueOf("2023-03-12 02:30:00");
1389+
final TimeZone newYork = TimeZone.getTimeZone("America/New_York");
13901390

1391-
LocalDateTime result = DateUtils.toLocalDateTime(sqlTimestamp, newYork);
1391+
final LocalDateTime result = DateUtils.toLocalDateTime(sqlTimestamp, newYork);
13921392

1393-
Instant instant = sqlTimestamp.toInstant();
1394-
LocalDateTime expected = LocalDateTime.ofInstant(instant, newYork.toZoneId());
1393+
final Instant instant = sqlTimestamp.toInstant();
1394+
final LocalDateTime expected = LocalDateTime.ofInstant(instant, newYork.toZoneId());
13951395
assertEquals(expected, result);
13961396
}
13971397

13981398
@Test
13991399
void shouldConvertDateToLocalDateTimeUsingDefaultTimeZone() {
14001400
TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"));
14011401

1402-
Instant instant = LocalDateTime.of(2023, 1, 1, 0, 0)
1402+
final Instant instant = LocalDateTime.of(2023, 1, 1, 0, 0)
14031403
.atOffset(ZoneOffset.UTC)
14041404
.toInstant();
1405-
Date date = Date.from(instant);
1405+
final Date date = Date.from(instant);
14061406

1407-
LocalDateTime expected = LocalDateTime.of(2023, 1, 1, 8, 0);
1407+
final LocalDateTime expected = LocalDateTime.of(2023, 1, 1, 8, 0);
14081408

14091409
assertEquals(expected, DateUtils.toLocalDateTime(date));
14101410
}
14111411

14121412
@Test
14131413
void shouldConvertDateToLocalDateTimeUsingSpecifiedTimeZone() {
1414-
Instant instant = LocalDateTime.of(2023, 1, 1, 0, 0)
1414+
final Instant instant = LocalDateTime.of(2023, 1, 1, 0, 0)
14151415
.atOffset(ZoneOffset.UTC)
14161416
.toInstant();
1417-
Date date = Date.from(instant);
1417+
final Date date = Date.from(instant);
14181418

1419-
TimeZone newYorkTimeZone = TimeZone.getTimeZone("America/New_York");
1420-
LocalDateTime expected = LocalDateTime.of(2022, 12, 31, 19, 0);
1419+
final TimeZone newYorkTimeZone = TimeZone.getTimeZone("America/New_York");
1420+
final LocalDateTime expected = LocalDateTime.of(2022, 12, 31, 19, 0);
14211421

14221422
assertEquals(expected, DateUtils.toLocalDateTime(date, newYorkTimeZone));
14231423
}
@@ -1430,26 +1430,26 @@ void shouldThrowNullPointerExceptionWhenDateIsNull() {
14301430

14311431
@Test
14321432
void shouldHandleDaylightSavingTimeCorrectly() {
1433-
Instant instant = LocalDateTime.of(2023, 3, 12, 7, 0)
1433+
final Instant instant = LocalDateTime.of(2023, 3, 12, 7, 0)
14341434
.atOffset(ZoneOffset.UTC)
14351435
.toInstant();
1436-
Date date = Date.from(instant);
1436+
final Date date = Date.from(instant);
14371437

1438-
TimeZone newYorkTimeZone = TimeZone.getTimeZone("America/New_York");
1439-
LocalDateTime expected = LocalDateTime.of(2023, 3, 12, 3, 0);
1438+
final TimeZone newYorkTimeZone = TimeZone.getTimeZone("America/New_York");
1439+
final LocalDateTime expected = LocalDateTime.of(2023, 3, 12, 3, 0);
14401440

14411441
assertEquals(expected, DateUtils.toLocalDateTime(date, newYorkTimeZone));
14421442
}
14431443

14441444
@Test
14451445
void shouldHandleExtremeTimeZoneCorrectly() {
1446-
Instant instant = LocalDateTime.of(2023, 1, 1, 0, 0)
1446+
final Instant instant = LocalDateTime.of(2023, 1, 1, 0, 0)
14471447
.atOffset(ZoneOffset.UTC)
14481448
.toInstant();
1449-
Date date = Date.from(instant);
1449+
final Date date = Date.from(instant);
14501450

1451-
TimeZone extremeTimeZone = TimeZone.getTimeZone("Pacific/Kiritimati");
1452-
LocalDateTime expected = LocalDateTime.of(2023, 1, 1, 14, 0);
1451+
final TimeZone extremeTimeZone = TimeZone.getTimeZone("Pacific/Kiritimati");
1452+
final LocalDateTime expected = LocalDateTime.of(2023, 1, 1, 14, 0);
14531453

14541454
assertEquals(expected, DateUtils.toLocalDateTime(date, extremeTimeZone));
14551455
}

0 commit comments

Comments
 (0)