diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java index 9f46e9254..0fcfb39c8 100755 --- a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java @@ -1659,6 +1659,35 @@ public class CollUtil { return collection == null || collection.isEmpty(); } + /** + * 集合是否为空。 + * 如果集合中所有元素为null或空串,也认为此集合为空。 + * @param collection + * @return + */ + public static boolean isBlank(Collection collection) { + if(isEmpty(collection)){ + return true; + } + + for(Object o: collection){ + if(ObjectUtil.isNotEmpty(o)){ + return false; + } + } + return true; + } + + /** + * 集合是否为非空。 + * 集合长度大于0,且所有元素中至少有一个不为null或空串。 + * @param collection + * @return + */ + public static boolean isNotBlank(Collection collection) { + return false == isBlank(collection); + } + /** * 如果给定集合为空,返回默认集合 * diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java index b9b9d4775..5400cd5fe 100755 --- a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java @@ -1047,4 +1047,27 @@ public class CollUtilTest { final Object first = CollUtil.getFirst(nullList); Assert.assertNull(first); } + + @Test + public void blankTest() { + List strs = new ArrayList<>(); + strs.add(null); + strs.add(""); + strs.add(""); + + boolean c = CollUtil.isBlank(strs); + Assert.assertEquals(true, c ); + + + List arrs = new ArrayList<>(); + arrs.add(null); + arrs.add(""); + arrs.add(" "); + arrs.add(""); + arrs.add(" a "); + + boolean d = CollUtil.isNotBlank(arrs); + Assert.assertEquals(true, d ); + } + } diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel03SaxReader.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel03SaxReader.java index 0f1f3d184..84fc2a51f 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel03SaxReader.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel03SaxReader.java @@ -1,9 +1,12 @@ package cn.hutool.poi.excel.sax; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.log.StaticLog; import cn.hutool.poi.excel.sax.handler.RowHandler; import cn.hutool.poi.exceptions.POIException; import org.apache.poi.hssf.eventusermodel.EventWorkbookBuilder.SheetRecordCollectingListener; @@ -216,7 +219,10 @@ public class Excel03SaxReader implements HSSFListener, ExcelSaxReader rowCells) { + System.out.println(StrUtil.format("sheetIndex={};rowIndex={},rowCells={}",sheetIndex,rowIndex,rowCells)); + } + + @Override + public void doAfterAllAnalysed() { + doAfterAllAnalysedTime.addAndGet(1); + } + }); + }catch (Exception ex){ + ex.printStackTrace(); + } + //总共2个sheet页,读取所有sheet时,一共执行doAfterAllAnalysed2次。 + Assert.assertEquals(2, doAfterAllAnalysedTime.intValue()); + } + } diff --git a/hutool-poi/src/test/resources/readBySax.xls b/hutool-poi/src/test/resources/readBySax.xls new file mode 100644 index 000000000..131b8cfcf Binary files /dev/null and b/hutool-poi/src/test/resources/readBySax.xls differ diff --git a/hutool-poi/src/test/resources/test.xls b/hutool-poi/src/test/resources/test.xls new file mode 100644 index 000000000..07200c82a Binary files /dev/null and b/hutool-poi/src/test/resources/test.xls differ