ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2023-04-14 22:48:06 +08:00
parent 55ee4298e9
commit b4a5d830a3
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hutool-core/src/main/java/org/dromara/hutool/core/collection/ListUtil.java
View File

@ -12,6 +12,7 @@
package org.dromara.hutool.core.collection; package org.dromara.hutool.core.collection;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.collection.iter.EnumerationIter; import org.dromara.hutool.core.collection.iter.EnumerationIter;
import org.dromara.hutool.core.collection.partition.AvgPartition; import org.dromara.hutool.core.collection.partition.AvgPartition;
import org.dromara.hutool.core.collection.partition.Partition; import org.dromara.hutool.core.collection.partition.Partition;
@ -21,7 +22,6 @@ import org.dromara.hutool.core.comparator.PinyinComparator;
import org.dromara.hutool.core.comparator.PropertyComparator; import org.dromara.hutool.core.comparator.PropertyComparator;
import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.lang.page.PageInfo; import org.dromara.hutool.core.lang.page.PageInfo;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.util.ObjUtil; import org.dromara.hutool.core.util.ObjUtil;
import java.util.*; import java.util.*;
@ -268,7 +268,7 @@ public class ListUtil {
return new ArrayList<>(0); return new ArrayList<>(0);
} }
return page(list, PageInfo.of(list.size(), pageSize) return page(list, PageInfo.of(list.size(), pageSize)
.setFirstPageNo(0).setPageNo(pageNo)); .setFirstPageNo(0).setPageNo(pageNo));
} }
/** /**
@ -322,7 +322,7 @@ public class ListUtil {
final int total = list.size(); final int total = list.size();
final PageInfo pageInfo = PageInfo.of(total, pageSize); final PageInfo pageInfo = PageInfo.of(total, pageSize);
while(pageInfo.isValidPage()){ while (pageInfo.isValidPage()) {
// 返回数据 // 返回数据
pageListConsumer.accept(sub(list, pageInfo.getBeginIndex(), pageInfo.getEndIndexExclude())); pageListConsumer.accept(sub(list, pageInfo.getBeginIndex(), pageInfo.getEndIndexExclude()));
pageInfo.nextPage(); pageInfo.nextPage();
@ -387,11 +387,13 @@ public class ListUtil {
} }
/** /**
* 反序给定List，会在原List基础上直接修改 * 反序给定List，会在原List基础上直接修改<br>
* 注意此方法不支持不可编辑的列表
* *
* @param <T> 元素类型 * @param <T> 元素类型
* @param list 被反转的List * @param list 被反转的List
* @return 反转后的List * @return 反转后的List
* @see Collections#reverse(List)
* @since 4.0.6 * @since 4.0.6
*/ */
public static <T> List<T> reverse(final List<T> list) { public static <T> List<T> reverse(final List<T> list) {
@ -416,7 +418,12 @@ public class ListUtil {
// 不支持clone // 不支持clone
list2 = new ArrayList<>(list); list2 = new ArrayList<>(list);
} }
return reverse(list2); try {
return reverse(list2);
} catch (final UnsupportedOperationException e) {
// 提供的列表不可编辑,新建列表
return reverse(of(list));
}
} }
/** /**
@ -589,8 +596,8 @@ public class ListUtil {
} }
return (list instanceof RandomAccess) return (list instanceof RandomAccess)
? new RandomAccessPartition<>(list, size) ? new RandomAccessPartition<>(list, size)
: new Partition<>(list, size); : new Partition<>(list, size);
} }
/** /**
@ -616,8 +623,8 @@ public class ListUtil {
} }
return (list instanceof RandomAccess) return (list instanceof RandomAccess)
? new RandomAccessAvgPartition<>(list, limit) ? new RandomAccessAvgPartition<>(list, limit)
: new AvgPartition<>(list, limit); : new AvgPartition<>(list, limit);
} }
/** /**

7
hutool-core/src/test/java/org/dromara/hutool/core/collection/ListUtilTest.java
View File

@ -255,4 +255,11 @@ public class ListUtilTest {
final CopyOnWriteArrayList<String> strings = ListUtil.ofCopyOnWrite("a", "b"); final CopyOnWriteArrayList<String> strings = ListUtil.ofCopyOnWrite("a", "b");
Assertions.assertEquals(2, strings.size()); Assertions.assertEquals(2, strings.size());
} }
@Test
void reverseNewTest() {
final List<Integer> view = ListUtil.view(1, 2, 3);
final List<Integer> reverse = ListUtil.reverseNew(view);
Assertions.assertEquals("[3, 2, 1]", reverse.toString());
}
} }