From d83444d3364b1ba47c83ab764a749fc59dd13306 Mon Sep 17 00:00:00 2001 From: Looly Date: Tue, 30 Jul 2024 15:17:22 +0800 Subject: [PATCH] fix code --- .../java/org/dromara/hutool/core/comparator/CompareUtil.java | 2 +- .../main/java/org/dromara/hutool/poi/excel/ExcelWriter.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/CompareUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/CompareUtil.java index 2dbf2e38a..f23dec093 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/CompareUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/CompareUtil.java @@ -335,7 +335,7 @@ public class CompareUtil { @SuppressWarnings("unchecked") public static Comparator comparingIndexed(final Function keyExtractor, final boolean atEndIfMiss, final U... objs) { Objects.requireNonNull(keyExtractor); - final ArrayIndexedComparator indexedComparator = new ArrayIndexedComparator<>(atEndIfMiss, objs); + final IndexedComparator indexedComparator = new IndexedComparator<>(atEndIfMiss, objs); return (o1, o2) -> indexedComparator.compare(keyExtractor.apply(o1), keyExtractor.apply(o2)); } diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelWriter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelWriter.java index 536e94a79..c126d1a07 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelWriter.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelWriter.java @@ -22,7 +22,7 @@ import org.apache.poi.xssf.usermodel.XSSFDataValidation; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.dromara.hutool.core.bean.BeanUtil; import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.comparator.ArrayIndexedComparator; +import org.dromara.hutool.core.comparator.IndexedComparator; import org.dromara.hutool.core.io.IORuntimeException; import org.dromara.hutool.core.io.IoUtil; import org.dromara.hutool.core.io.file.FileUtil; @@ -1440,7 +1440,7 @@ public class ExcelWriter extends ExcelBase { Comparator aliasComparator = this.aliasComparator; if (null == aliasComparator) { final Set keySet = this.headerAlias.keySet(); - aliasComparator = new ArrayIndexedComparator<>(keySet.toArray(new String[0])); + aliasComparator = new IndexedComparator<>(keySet.toArray(new String[0])); this.aliasComparator = aliasComparator; } return aliasComparator;