zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

add SetUtil

Browse Source
This commit is contained in:
Looly
2022-05-07 12:18:29 +08:00
parent ab0448e0fd
commit 029a603d5f
56 changed files with 434 additions and 625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hutool-db/src/main/java/cn/hutool/db/AbstractDb.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.db;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.lang.func.Func1;
import cn.hutool.db.dialect.Dialect;
import cn.hutool.db.handler.BeanListHandler;
@@ -554,7 +554,7 @@ public abstract class AbstractDb<R extends AbstractDb<R>> extends DefaultConnect
* @throws DbRuntimeException SQL执行异常
*/
public <T> T find(final Entity where, final RsHandler<T> rsh, final String... fields) throws DbRuntimeException {
return find(CollUtil.newArrayList(fields), where, rsh);
return find(ListUtil.toList(fields), where, rsh);
}
/**

5
hutool-db/src/main/java/cn/hutool/db/Entity.java
View File

@@ -1,6 +1,7 @@
package cn.hutool.db;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.SetUtil;
import cn.hutool.core.lang.func.Func0;
import cn.hutool.core.map.Dict;
import cn.hutool.core.reflect.MethodUtil;
@@ -155,7 +156,7 @@ public class Entity extends Dict {
*/
public Entity setFieldNames(final Collection<String> fieldNames) {
if (CollUtil.isNotEmpty(fieldNames)) {
this.fieldNames = CollUtil.newHashSet(true, fieldNames);
this.fieldNames = SetUtil.newHashSet(true, fieldNames);
}
return this;
}
@@ -168,7 +169,7 @@ public class Entity extends Dict {
*/
public Entity setFieldNames(final String... fieldNames) {
if (ArrayUtil.isNotEmpty(fieldNames)) {
this.fieldNames = CollUtil.newLinkedHashSet(fieldNames);
this.fieldNames = SetUtil.newLinkedHashSet(fieldNames);
}
return this;
}

4
hutool-db/src/main/java/cn/hutool/db/sql/Query.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.db.sql;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.db.DbRuntimeException;
import cn.hutool.db.Entity;
@@ -113,7 +113,7 @@ public class Query implements Cloneable {
* @return this
*/
public Query setFields(final String... fields) {
this.fields = CollUtil.newArrayList(fields);
this.fields = ListUtil.toList(fields);
return this;
}

8
hutool-db/src/test/java/cn/hutool/db/CRUDTest.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.db;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.lang.Console;
import cn.hutool.core.map.MapUtil;
import cn.hutool.db.handler.EntityListHandler;
@@ -107,7 +107,7 @@ public class CRUDTest {
@Test
public void findTest() {
final List<Entity> find = db.find(CollUtil.newArrayList("name AS name2"), Entity.create("user"), new EntityListHandler());
final List<Entity> find = db.find(ListUtil.toList("name AS name2"), Entity.create("user"), new EntityListHandler());
Assert.assertFalse(find.isEmpty());
}
@@ -168,7 +168,7 @@ public class CRUDTest {
Console.log(data1);
Console.log(data2);
final int[] result = db.insert(CollUtil.newArrayList(data1, data2));
final int[] result = db.insert(ListUtil.toList(data1, data2));
Console.log(result);
}
@@ -185,7 +185,7 @@ public class CRUDTest {
Console.log(data1);
final int[] result = db.insert(CollUtil.newArrayList(data1));
final int[] result = db.insert(ListUtil.toList(data1));
Console.log(result);
}

4
hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.db;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.lang.Console;
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.db.handler.EntityListHandler;
@@ -31,7 +31,7 @@ public class ConcurentTest {
for(int i = 0; i < 10000; i++) {
ThreadUtil.execute(() -> {
final List<Entity> find;
find = db.find(CollUtil.newArrayList("name AS name2"), Entity.create("user"), new EntityListHandler());
find = db.find(ListUtil.toList("name AS name2"), Entity.create("user"), new EntityListHandler());
Console.log(find);
});
}

4
hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.db.meta;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.SetUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.ds.DSFactory;
import org.junit.Assert;
@@ -27,7 +27,7 @@ public class MetaUtilTest {
@Test
public void getTableMetaTest() {
final Table table = MetaUtil.getTableMeta(ds, "user");
Assert.assertEquals(CollUtil.newHashSet("id"), table.getPkNames());
Assert.assertEquals(SetUtil.newHashSet("id"), table.getPkNames());
}
@Test