This commit is contained in:
Looly
2022-03-27 23:08:45 +08:00
parent 7385fe937d
commit 8177848a47
4 changed files with 10 additions and 2 deletions

View File

@@ -64,6 +64,7 @@
* 【core 】 修复Win下文件名带*问题pr#584@Gitee
* 【core 】 FileUtil.getMimeType增加rar、7z支持issue#I4ZBN0@Gitee
* 【json 】 JSON修复transient设置无效问题issue#2212@Github
* 【core 】 修复IterUtil.getElementType获取结果为null的问题issue#2222@Github
-------------------------------------------------------------------------------------------------------------
# 5.7.22 (2022-03-01)

View File

@@ -643,7 +643,7 @@ public class IterUtil {
*/
public static Class<?> getElementType(Iterator<?> iterator) {
final Iterator<?> iter2 = new CopiedIter<>(iterator);
if (iter2.hasNext()) {
while (iter2.hasNext()) {
final Object t = iter2.next();
if (null != t) {
return t.getClass();

View File

@@ -90,6 +90,13 @@ public class IterUtilTest {
Assert.assertEquals(expectedMap, testMap);
}
@Test
public void getElementTypeTest(){
List<Integer> integers = Arrays.asList(null, 1);
Class<?> elementType = IterUtil.getElementType(integers);
Assert.assertEquals(Integer.class,elementType);
}
@Data
@AllArgsConstructor
public static class Car {

View File

@@ -14,7 +14,7 @@ public class CronPatternNextMatchTest {
CronPattern pattern = new CronPattern("23 12 * 12 * * *");
//noinspection ConstantConditions
final Calendar calendar = pattern.nextMatchAfter(
DateUtil.parse("2022-04-12 09:12:12").toCalendar());
DateUtil.parse("2022-04-12 09:12:24").toCalendar());
Console.log(DateUtil.date(calendar));
Assert.assertTrue(pattern.match(calendar, true));