From 66883b42aea049b9cf280b6840ea6051edab8dab Mon Sep 17 00:00:00 2001 From: Looly Date: Tue, 15 Aug 2023 10:31:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DDb.findAll=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E5=BF=BD=E7=95=A5=E5=A4=A7=E5=B0=8F=E5=86=99=E6=97=A0=E6=95=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/hutool/db/AbstractDb.java | 2 +- .../hutool/db/handler/EntityListHandler.java | 15 +++++++++------ .../test/java/org/dromara/hutool/db/CRUDTest.java | 2 +- .../java/org/dromara/hutool/db/ConcurentTest.java | 2 +- .../test/java/org/dromara/hutool/db/DbTest.java | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/AbstractDb.java b/hutool-db/src/main/java/org/dromara/hutool/db/AbstractDb.java index 99c00235c..cc989b555 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/AbstractDb.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/AbstractDb.java @@ -606,7 +606,7 @@ public abstract class AbstractDb> extends DefaultConnect * @throws DbRuntimeException SQL执行异常 */ public List findAll(final Entity where) throws DbRuntimeException { - return find(where, EntityListHandler.of()); + return find(where, new EntityListHandler(this.caseInsensitive)); } /** diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/EntityListHandler.java b/hutool-db/src/main/java/org/dromara/hutool/db/handler/EntityListHandler.java index ce3caf708..82cd867a9 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/EntityListHandler.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/handler/EntityListHandler.java @@ -23,17 +23,20 @@ import java.util.List; /** * 结果集处理类 ,处理出的结果为Entity列表 - * @author loolly * + * @author loolly */ -public class EntityListHandler implements RsHandler>{ +public class EntityListHandler implements RsHandler> { private static final long serialVersionUID = -2846240126316979895L; - /** 是否大小写不敏感 */ + /** + * 是否大小写不敏感 + */ private final boolean caseInsensitive; /** - * 创建一个 EntityListHandler对象 + * 创建一个 EntityListHandler对象,默认大小写敏感 + * * @return EntityListHandler对象 */ public static EntityListHandler of() { @@ -41,7 +44,7 @@ public class EntityListHandler implements RsHandler>{ } /** - * 构造 + * 构造,默认大小写敏感 */ public EntityListHandler() { this(false); @@ -62,7 +65,7 @@ public class EntityListHandler implements RsHandler>{ final EntityRowHandler rowHandler = new EntityRowHandler(meta, caseInsensitive, true); final List result = ListUtil.of(); - while (rs.next()){ + while (rs.next()) { result.add(rowHandler.handle(rs)); } diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/CRUDTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/CRUDTest.java index fcccadf21..b652c314e 100644 --- a/hutool-db/src/test/java/org/dromara/hutool/db/CRUDTest.java +++ b/hutool-db/src/test/java/org/dromara/hutool/db/CRUDTest.java @@ -114,7 +114,7 @@ public class CRUDTest { @Test public void findTest() { - final List find = db.find(ListUtil.of("name AS name2"), Entity.of("user"), new EntityListHandler()); + final List find = db.find(ListUtil.of("name AS name2"), Entity.of("user"), EntityListHandler.of()); Assertions.assertFalse(find.isEmpty()); } diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/ConcurentTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/ConcurentTest.java index 7f01ddb9e..1819a4271 100644 --- a/hutool-db/src/test/java/org/dromara/hutool/db/ConcurentTest.java +++ b/hutool-db/src/test/java/org/dromara/hutool/db/ConcurentTest.java @@ -31,7 +31,7 @@ public class ConcurentTest { for(int i = 0; i < 10000; i++) { ThreadUtil.execute(() -> { final List find; - find = db.find(ListUtil.of("name AS name2"), Entity.of("user"), new EntityListHandler()); + find = db.find(ListUtil.of("name AS name2"), Entity.of("user"), EntityListHandler.of()); Console.log(find); }); } diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/DbTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/DbTest.java index 7aa66ad01..276ff846b 100644 --- a/hutool-db/src/test/java/org/dromara/hutool/db/DbTest.java +++ b/hutool-db/src/test/java/org/dromara/hutool/db/DbTest.java @@ -190,7 +190,7 @@ public class DbTest { ps.setFetchSize(Integer.MIN_VALUE); ps.setFetchDirection(ResultSet.FETCH_FORWARD); return ps; - }), new EntityListHandler()); + }), EntityListHandler.of()); } @Test