fix code

hutool-core/src/main/java/cn/hutool/core/map/Dict.java

@@ -92,7 +92,7 @@ public class Dict extends LinkedHashMap<String, Object> implements BasicTypeGett
 	 * @return Dict
 	 * @since 5.4.1
 	 */
-	public static Dict of(final Object... keysAndValues) {
+	public static Dict ofKvs(final Object... keysAndValues) {
 		final Dict dict = create();
 
 		String key = null;

hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java

@@ -37,7 +37,7 @@ public class DictTest {
 
 	@Test
 	public void ofTest(){
-		final Dict dict = Dict.of(
+		final Dict dict = Dict.ofKvs(
 				"RED", "#FF0000",
 				"GREEN", "#00FF00",
 				"BLUE", "#0000FF"
@@ -50,11 +50,11 @@ public class DictTest {
 
 	@Test
 	public void removeEqualTest(){
-		final Dict dict = Dict.of(
+		final Dict dict = Dict.ofKvs(
 			"key1", null
 		);
 
-		final Dict dict2 = Dict.of(
+		final Dict dict2 = Dict.ofKvs(
 			"key1", null
 		);
 

hutool-db/pom.xml

@@ -22,7 +22,7 @@
 		<dbcp2.version>2.9.0</dbcp2.version>
 		<tomcat-jdbc.version>10.0.20</tomcat-jdbc.version>
 		<druid.version>1.2.9</druid.version>
-		<hikariCP.version>2.4.13</hikariCP.version>
+		<hikariCP.version>4.0.3</hikariCP.version>
 		<sqlite.version>3.36.0.3</sqlite.version>
 		<!-- 此处固定2.5.x，支持到JDK8 -->
 		<hsqldb.version>2.5.2</hsqldb.version>
@@ -60,7 +60,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.zaxxer</groupId>
-			<artifactId>HikariCP-java7</artifactId>
+			<artifactId>HikariCP</artifactId>
 			<version>${hikariCP.version}</version>
 			<exclusions>
 				<exclusion>
@@ -79,7 +79,7 @@
 		<dependency>
 			<groupId>com.github.chris2018998</groupId>
 			<artifactId>beecp</artifactId>
-			<version>3.3.5</version>
+			<version>3.3.6</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>slf4j-api</artifactId>
@@ -92,12 +92,6 @@
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-dbcp2</artifactId>
 			<version>${dbcp2.version}</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>commons-pool2</artifactId>
-					<groupId>org.apache.commons</groupId>
-				</exclusion>
-			</exclusions>
 			<optional>true</optional>
 		</dependency>
 
@@ -135,7 +129,7 @@
 		<dependency>
 			<groupId>com.microsoft.sqlserver</groupId>
 			<artifactId>mssql-jdbc</artifactId>
-			<version>10.2.0.jre8</version>
+			<version>10.2.1.jre8</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

hutool-db/src/main/java/cn/hutool/db/AbstractDb.java

@@ -417,7 +417,7 @@ public abstract class AbstractDb<R extends AbstractDb<R>> extends DefaultConnect
 	 * @throws DbRuntimeException SQL执行异常
 	 */
 	public int del(final String tableName, final String field, final Object value) throws DbRuntimeException {
-		return del(Entity.create(tableName).set(field, value));
+		return del(Entity.of(tableName).set(field, value));
 	}
 
 	/**
@@ -470,7 +470,7 @@ public abstract class AbstractDb<R extends AbstractDb<R>> extends DefaultConnect
 	 * @throws DbRuntimeException SQL执行异常
 	 */
 	public <T> Entity get(final String tableName, final String field, final T value) throws DbRuntimeException {
-		return this.get(Entity.create(tableName).set(field, value));
+		return this.get(Entity.of(tableName).set(field, value));
 	}
 
 	/**
@@ -620,7 +620,7 @@ public abstract class AbstractDb<R extends AbstractDb<R>> extends DefaultConnect
 	 * @throws DbRuntimeException SQL执行异常
 	 */
 	public List<Entity> findAll(final String tableName) throws DbRuntimeException {
-		return findAll(Entity.create(tableName));
+		return findAll(Entity.of(tableName));
 	}
 
 	/**
@@ -633,7 +633,7 @@ public abstract class AbstractDb<R extends AbstractDb<R>> extends DefaultConnect
 	 * @throws DbRuntimeException SQL执行异常
 	 */
 	public List<Entity> findBy(final String tableName, final String field, final Object value) throws DbRuntimeException {
-		return findAll(Entity.create(tableName).set(field, value));
+		return findAll(Entity.of(tableName).set(field, value));
 	}
 
 	/**
@@ -661,7 +661,7 @@ public abstract class AbstractDb<R extends AbstractDb<R>> extends DefaultConnect
 	 * @throws DbRuntimeException SQL执行异常
 	 */
 	public List<Entity> findLike(final String tableName, final String field, final String value, final LikeType likeType) throws DbRuntimeException {
-		return findAll(Entity.create(tableName).set(field, SqlUtil.buildLikeValue(value, likeType, true)));
+		return findAll(Entity.of(tableName).set(field, SqlUtil.buildLikeValue(value, likeType, true)));
 	}
 
 	/**

hutool-db/src/main/java/cn/hutool/db/ActiveEntity.java

@@ -219,7 +219,7 @@ public class ActiveEntity extends Entity {
 	 * @return this
 	 */
 	public ActiveEntity update(final String primaryKey) {
-		db.update(this, Entity.create().set(primaryKey, this.get(primaryKey)));
+		db.update(this, Entity.of().set(primaryKey, this.get(primaryKey)));
 		return this;
 	}
 	// -------------------------------------------------------------------------- CRUD end

hutool-db/src/main/java/cn/hutool/db/DaoTemplate.java

@@ -139,7 +139,7 @@ public class DaoTemplate {
 		if (pk == null) {
 			return 0;
 		}
-		return this.del(Entity.create(tableName).set(primaryKeyField, pk));
+		return this.del(Entity.of(tableName).set(primaryKeyField, pk));
 	}
 
 	/**
@@ -156,7 +156,7 @@ public class DaoTemplate {
 			return 0;
 		}
 
-		return this.del(Entity.create(tableName).set(field, value));
+		return this.del(Entity.of(tableName).set(field, value));
 	}
 
 	/**
@@ -208,7 +208,7 @@ public class DaoTemplate {
 			throw new DbRuntimeException(StrUtil.format("Please determine `{}` for update", primaryKeyField));
 		}
 
-		final Entity where = Entity.create(tableName).set(primaryKeyField, pk);
+		final Entity where = Entity.of(tableName).set(primaryKeyField, pk);
 		final Entity record = entity.clone();
 		record.remove(primaryKeyField);
 
@@ -252,7 +252,7 @@ public class DaoTemplate {
 	 * @throws DbRuntimeException SQL执行异常
 	 */
 	public <T> Entity get(final String field, final T value) throws DbRuntimeException {
-		return this.get(Entity.create(tableName).set(field, value));
+		return this.get(Entity.of(tableName).set(field, value));
 	}
 
 	/**
@@ -279,7 +279,7 @@ public class DaoTemplate {
 	 * @throws DbRuntimeException SQL执行异常
 	 */
 	public <T> List<Entity> find(final String field, final T value) throws DbRuntimeException {
-		return this.find(Entity.create(tableName).set(field, value));
+		return this.find(Entity.of(tableName).set(field, value));
 	}
 
 	/**
@@ -289,7 +289,7 @@ public class DaoTemplate {
 	 * @throws DbRuntimeException SQL执行异常
 	 */
 	public List<Entity> findAll() throws DbRuntimeException {
-		return this.find(Entity.create(tableName));
+		return this.find(Entity.of(tableName));
 	}
 
 	/**
@@ -377,7 +377,7 @@ public class DaoTemplate {
 	 */
 	private Entity fixEntity(Entity entity) {
 		if (null == entity) {
-			entity = Entity.create(tableName);
+			entity = Entity.of(tableName);
 		} else if (StrUtil.isBlank(entity.getTableName())) {
 			entity.setTableName(tableName);
 		}

hutool-db/src/main/java/cn/hutool/db/Entity.java

@@ -39,7 +39,7 @@ public class Entity extends Dict {
 	 *
 	 * @return Entity
 	 */
-	public static Entity create() {
+	public static Entity of() {
 		return new Entity();
 	}
 
@@ -49,7 +49,7 @@ public class Entity extends Dict {
 	 * @param tableName 表名
 	 * @return Entity
 	 */
-	public static Entity create(final String tableName) {
+	public static Entity of(final String tableName) {
 		return new Entity(tableName);
 	}
 
@@ -61,7 +61,7 @@ public class Entity extends Dict {
 	 * @return Entity
 	 */
 	public static <T> Entity parse(final T bean) {
-		return create(null).parseBean(bean);
+		return of(null).parseBean(bean);
 	}
 
 	/**
@@ -74,7 +74,7 @@ public class Entity extends Dict {
 	 * @return Entity
 	 */
 	public static <T> Entity parse(final T bean, final boolean isToUnderlineCase, final boolean ignoreNullValue) {
-		return create(null).parseBean(bean, isToUnderlineCase, ignoreNullValue);
+		return of(null).parseBean(bean, isToUnderlineCase, ignoreNullValue);
 	}
 
 	/**
@@ -85,7 +85,7 @@ public class Entity extends Dict {
 	 * @return Entity
 	 */
 	public static <T> Entity parseWithUnderlineCase(final T bean) {
-		return create(null).parseBean(bean, true, true);
+		return of(null).parseBean(bean, true, true);
 	}
 	// --------------------------------------------------------------- Static method end
 

hutool-db/src/main/java/cn/hutool/db/dialect/Dialect.java

@@ -1,6 +1,5 @@
 package cn.hutool.db.dialect;
 
-import cn.hutool.core.collection.ListUtil;
 import cn.hutool.db.Entity;
 import cn.hutool.db.Page;
 import cn.hutool.db.sql.Order;
@@ -134,7 +133,7 @@ public interface Dialect extends Serializable {
 	 * @throws SQLException SQL执行异常
 	 */
 	default PreparedStatement psForCount(final Connection conn, final Query query) throws SQLException {
-		return psForFind(conn, query.clone().setFields(ListUtil.of("count(1)")));
+		return psForCount(conn, SqlBuilder.create().query(query));
 	}
 
 	/**

hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java

@@ -172,7 +172,7 @@ public class MetaUtil {
 	 */
 	public static Entity createLimitedEntity(final DataSource ds, final String tableName) {
 		final String[] columnNames = getColumnNames(ds, tableName);
-		return Entity.create(tableName).setFieldNames(columnNames);
+		return Entity.of(tableName).setFieldNames(columnNames);
 	}
 
 	/**

hutool-db/src/test/java/cn/hutool/db/CRUDTest.java

@@ -26,75 +26,75 @@ public class CRUDTest {
 
 	@Test
 	public void findIsNullTest() {
-		final List<Entity> results = db.findAll(Entity.create("user").set("age", "is null"));
+		final List<Entity> results = db.findAll(Entity.of("user").set("age", "is null"));
 		Assert.assertEquals(0, results.size());
 	}
 
 	@Test
 	public void findIsNullTest2() {
-		final List<Entity> results = db.findAll(Entity.create("user").set("age", "= null"));
+		final List<Entity> results = db.findAll(Entity.of("user").set("age", "= null"));
 		Assert.assertEquals(0, results.size());
 	}
 
 	@Test
 	public void findIsNullTest3() {
-		final List<Entity> results = db.findAll(Entity.create("user").set("age", null));
+		final List<Entity> results = db.findAll(Entity.of("user").set("age", null));
 		Assert.assertEquals(0, results.size());
 	}
 
 	@Test
 	public void findBetweenTest() {
-		final List<Entity> results = db.findAll(Entity.create("user").set("age", "between '18' and '40'"));
+		final List<Entity> results = db.findAll(Entity.of("user").set("age", "between '18' and '40'"));
 		Assert.assertEquals(1, results.size());
 	}
 
 	@Test
 	public void findByBigIntegerTest() {
-		final List<Entity> results = db.findAll(Entity.create("user").set("age", new BigInteger("12")));
+		final List<Entity> results = db.findAll(Entity.of("user").set("age", new BigInteger("12")));
 		Assert.assertEquals(2, results.size());
 	}
 
 	@Test
 	public void findByBigDecimalTest() {
-		final List<Entity> results = db.findAll(Entity.create("user").set("age", new BigDecimal("12")));
+		final List<Entity> results = db.findAll(Entity.of("user").set("age", new BigDecimal("12")));
 		Assert.assertEquals(2, results.size());
 	}
 
 	@Test
 	public void findLikeTest() {
-		final List<Entity> results = db.findAll(Entity.create("user").set("name", "like \"%三%\""));
+		final List<Entity> results = db.findAll(Entity.of("user").set("name", "like \"%三%\""));
 		Assert.assertEquals(2, results.size());
 	}
 
 	@Test
 	public void findLikeTest2() {
-		final List<Entity> results = db.findAll(Entity.create("user").set("name", new Condition("name", "三", LikeType.Contains)));
+		final List<Entity> results = db.findAll(Entity.of("user").set("name", new Condition("name", "三", LikeType.Contains)));
 		Assert.assertEquals(2, results.size());
 	}
 
 	@Test
 	public void findLikeTest3() {
-		final List<Entity> results = db.findAll(Entity.create("user").set("name", new Condition("name", null, LikeType.Contains)));
+		final List<Entity> results = db.findAll(Entity.of("user").set("name", new Condition("name", null, LikeType.Contains)));
 		Assert.assertEquals(0, results.size());
 	}
 
 	@Test
 	public void findInTest() {
-		final List<Entity> results = db.findAll(Entity.create("user").set("id", "in 1,2,3"));
+		final List<Entity> results = db.findAll(Entity.of("user").set("id", "in 1,2,3"));
 		Console.log(results);
 		Assert.assertEquals(2, results.size());
 	}
 
 	@Test
 	public void findInTest2() {
-		final List<Entity> results = db.findAll(Entity.create("user")
+		final List<Entity> results = db.findAll(Entity.of("user")
 				.set("id", new Condition("id", new long[]{1, 2, 3})));
 		Assert.assertEquals(2, results.size());
 	}
 
 	@Test
 	public void findInTest3() {
-		final List<Entity> results = db.findAll(Entity.create("user")
+		final List<Entity> results = db.findAll(Entity.of("user")
 				.set("id", new long[]{1, 2, 3}));
 		Assert.assertEquals(2, results.size());
 	}
@@ -107,7 +107,7 @@ public class CRUDTest {
 
 	@Test
 	public void findTest() {
-		final List<Entity> find = db.find(ListUtil.of("name AS name2"), Entity.create("user"), new EntityListHandler());
+		final List<Entity> find = db.find(ListUtil.of("name AS name2"), Entity.of("user"), new EntityListHandler());
 		Assert.assertFalse(find.isEmpty());
 	}
 
@@ -128,13 +128,13 @@ public class CRUDTest {
 	public void crudTest() {
 
 		// 增
-		final Long id = db.insertForGeneratedKey(Entity.create("user").set("name", "unitTestUser").set("age", 66));
+		final Long id = db.insertForGeneratedKey(Entity.of("user").set("name", "unitTestUser").set("age", 66));
 		Assert.assertTrue(id > 0);
 		final Entity result = db.get("user", "name", "unitTestUser");
 		Assert.assertSame(66, result.getInt("age"));
 
 		// 改
-		final int update = db.update(Entity.create().set("age", 88), Entity.create("user").set("name", "unitTestUser"));
+		final int update = db.update(Entity.of().set("age", 88), Entity.of("user").set("name", "unitTestUser"));
 		Assert.assertTrue(update > 0);
 		final Entity result2 = db.get("user", "name", "unitTestUser");
 		Assert.assertSame(88, result2.getInt("age"));

hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java

@@ -31,7 +31,7 @@ public class ConcurentTest {
 		for(int i = 0; i < 10000; i++) {
 			ThreadUtil.execute(() -> {
 				final List<Entity> find;
-				find = db.find(ListUtil.of("name AS name2"), Entity.create("user"), new EntityListHandler());
+				find = db.find(ListUtil.of("name AS name2"), Entity.of("user"), new EntityListHandler());
 				Console.log(find);
 			});
 		}

hutool-db/src/test/java/cn/hutool/db/DbTest.java

@@ -27,17 +27,17 @@ public class DbTest {
 
 	@Test
 	public void findTest() {
-		final List<Entity> find = Db.of().find(Entity.create("user").set("age", 18));
+		final List<Entity> find = Db.of().find(Entity.of("user").set("age", 18));
 		Assert.assertEquals("王五", find.get(0).get("name"));
 	}
 
 	@Test
 	public void pageTest() {
 		// 测试数据库中一共4条数据，第0页有3条，第1页有1条
-		final List<Entity> page0 = Db.of().page(Entity.create("user"), Page.of(0, 3));
+		final List<Entity> page0 = Db.of().page(Entity.of("user"), Page.of(0, 3));
 		Assert.assertEquals(3, page0.size());
 
-		final List<Entity> page1 = Db.of().page(Entity.create("user"), Page.of(1, 3));
+		final List<Entity> page1 = Db.of().page(Entity.of("user"), Page.of(1, 3));
 		Assert.assertEquals(1, page1.size());
 	}
 
@@ -71,6 +71,12 @@ public class DbTest {
 		Assert.assertEquals(4, count);
 	}
 
+	@Test
+	public void countByQueryTest() {
+		final long count = Db.of().count(Entity.of("user"));
+		Assert.assertEquals(4, count);
+	}
+
 	@Test
 	public void countTest2() {
 		final long count = Db.of().count("select * from user order by name DESC");
@@ -80,7 +86,7 @@ public class DbTest {
 	@Test
 	public void findLikeTest() {
 		// 方式1
-		List<Entity> find = Db.of().find(Entity.create("user").set("name", "like 王%"));
+		List<Entity> find = Db.of().find(Entity.of("user").set("name", "like 王%"));
 		Assert.assertEquals("王五", find.get(0).get("name"));
 
 		// 方式2
@@ -108,8 +114,8 @@ public class DbTest {
 	@Ignore
 	public void txTest() throws SQLException {
 		Db.of().tx(db -> {
-			db.insert(Entity.create("user").set("name", "unitTestuser2"));
+			db.insert(Entity.of("user").set("name", "unitTestuser2"));
-			db.update(Entity.create().set("age", 79), Entity.create("user").set("name", "unitTestuser2"));
+			db.update(Entity.of().set("age", 79), Entity.of("user").set("name", "unitTestuser2"));
 			db.del("user", "name", "unitTestuser2");
 		});
 	}

hutool-db/src/test/java/cn/hutool/db/DerbyTest.java

@@ -23,10 +23,10 @@ public class DerbyTest {
 		final Db db = Db.of(DS_GROUP_NAME);
 		db.execute("CREATE TABLE test(a INTEGER, b BIGINT)");
 
-		db.insert(Entity.create("test").set("a", 1).set("b", 11));
+		db.insert(Entity.of("test").set("a", 1).set("b", 11));
-		db.insert(Entity.create("test").set("a", 2).set("b", 21));
+		db.insert(Entity.of("test").set("a", 2).set("b", 21));
-		db.insert(Entity.create("test").set("a", 3).set("b", 31));
+		db.insert(Entity.of("test").set("a", 3).set("b", 31));
-		db.insert(Entity.create("test").set("a", 4).set("b", 41));
+		db.insert(Entity.of("test").set("a", 4).set("b", 41));
 	}
 
 	@Test
@@ -39,7 +39,7 @@ public class DerbyTest {
 	@Test
 	@Ignore
 	public void findTest() throws SQLException {
-		final List<Entity> query = Db.of(DS_GROUP_NAME).find(Entity.create("test"));
+		final List<Entity> query = Db.of(DS_GROUP_NAME).find(Entity.of("test"));
 		Assert.assertEquals(4, query.size());
 	}
 }

hutool-db/src/test/java/cn/hutool/db/EntityTest.java

@@ -18,7 +18,7 @@ public class EntityTest {
 		user.setId(1);
 		user.setName("test");
 
-		final Entity entity = Entity.create("testTable").parseBean(user);
+		final Entity entity = Entity.of("testTable").parseBean(user);
 		Assert.assertEquals(Integer.valueOf(1), entity.getInt("id"));
 		Assert.assertEquals("test", entity.getStr("name"));
 	}
@@ -29,7 +29,7 @@ public class EntityTest {
 		user.setId(1);
 		user.setName("test");
 
-		final Entity entity = Entity.create().parseBean(user);
+		final Entity entity = Entity.of().parseBean(user);
 		Assert.assertEquals(Integer.valueOf(1), entity.getInt("id"));
 		Assert.assertEquals("test", entity.getStr("name"));
 		Assert.assertEquals("user", entity.getTableName());
@@ -40,7 +40,7 @@ public class EntityTest {
 		final User user = new User();
 		user.setName("test");
 
-		final Entity entity = Entity.create().parseBean(user, false, true);
+		final Entity entity = Entity.of().parseBean(user, false, true);
 
 		Assert.assertFalse(entity.containsKey("id"));
 		Assert.assertEquals("test", entity.getStr("name"));
@@ -49,7 +49,7 @@ public class EntityTest {
 
 	@Test
 	public void entityToBeanIgnoreCaseTest() {
-		final Entity entity = Entity.create().set("ID", 2).set("NAME", "testName");
+		final Entity entity = Entity.of().set("ID", 2).set("NAME", "testName");
 		final User user = entity.toBeanIgnoreCase(User.class);
 
 		Assert.assertEquals(Integer.valueOf(2), user.getId());

hutool-db/src/test/java/cn/hutool/db/FindBeanTest.java

@@ -5,7 +5,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.sql.SQLException;
 import java.util.List;
 
 /**
@@ -25,7 +24,7 @@ public class FindBeanTest {
 
 	@Test
 	public void findAllBeanTest() {
-		final List<User> results = db.findAll(Entity.create("user"), User.class);
+		final List<User> results = db.findAll(Entity.of("user"), User.class);
 
 		Assert.assertEquals(4, results.size());
 		Assert.assertEquals(Integer.valueOf(1), results.get(0).getId());
@@ -35,7 +34,7 @@ public class FindBeanTest {
 	@Test
 	@SuppressWarnings("rawtypes")
 	public void findAllListTest() {
-		final List<List> results = db.findAll(Entity.create("user"), List.class);
+		final List<List> results = db.findAll(Entity.of("user"), List.class);
 
 		Assert.assertEquals(4, results.size());
 		Assert.assertEquals(1, results.get(0).get(0));
@@ -44,7 +43,7 @@ public class FindBeanTest {
 
 	@Test
 	public void findAllArrayTest() {
-		final List<Object[]> results = db.findAll(Entity.create("user"), Object[].class);
+		final List<Object[]> results = db.findAll(Entity.of("user"), Object[].class);
 
 		Assert.assertEquals(4, results.size());
 		Assert.assertEquals(1, results.get(0)[0]);
@@ -53,13 +52,13 @@ public class FindBeanTest {
 
 	@Test
 	public void findAllStringTest() {
-		final List<String> results = db.findAll(Entity.create("user"), String.class);
+		final List<String> results = db.findAll(Entity.of("user"), String.class);
 		Assert.assertEquals(4, results.size());
 	}
 
 	@Test
 	public void findAllStringArrayTest() {
-		final List<String[]> results = db.findAll(Entity.create("user"), String[].class);
+		final List<String[]> results = db.findAll(Entity.of("user"), String[].class);
 
 		Assert.assertEquals(4, results.size());
 		Assert.assertEquals("1", results.get(0)[0]);

hutool-db/src/test/java/cn/hutool/db/H2Test.java

@@ -21,10 +21,10 @@ public class H2Test {
 		final Db db = Db.of(DS_GROUP_NAME);
 		db.execute("CREATE TABLE test(a INTEGER, b BIGINT)");
 
-		db.insert(Entity.create("test").set("a", 1).set("b", 11));
+		db.insert(Entity.of("test").set("a", 1).set("b", 11));
-		db.insert(Entity.create("test").set("a", 2).set("b", 21));
+		db.insert(Entity.of("test").set("a", 2).set("b", 21));
-		db.insert(Entity.create("test").set("a", 3).set("b", 31));
+		db.insert(Entity.of("test").set("a", 3).set("b", 31));
-		db.insert(Entity.create("test").set("a", 4).set("b", 41));
+		db.insert(Entity.of("test").set("a", 4).set("b", 41));
 	}
 
 	@Test
@@ -35,14 +35,14 @@ public class H2Test {
 
 	@Test
 	public void findTest() {
-		final List<Entity> query = Db.of(DS_GROUP_NAME).find(Entity.create("test"));
+		final List<Entity> query = Db.of(DS_GROUP_NAME).find(Entity.of("test"));
 		Assert.assertEquals(4, query.size());
 	}
 
 	@Test
 	public void upsertTest() {
 		final Db db=Db.of(DS_GROUP_NAME);
-		db.upsert(Entity.create("test").set("a",1).set("b",111),"a");
+		db.upsert(Entity.of("test").set("a",1).set("b",111),"a");
 		final Entity a1=db.get("test","a",1);
 		Assert.assertEquals(Long.valueOf(111),a1.getLong("b"));
 	}

hutool-db/src/test/java/cn/hutool/db/HsqldbTest.java

@@ -20,10 +20,10 @@ public class HsqldbTest {
 	public static void init() {
 		final Db db = Db.of(DS_GROUP_NAME);
 		db.execute("CREATE TABLE test(a INTEGER, b BIGINT)");
-		db.insert(Entity.create("test").set("a", 1).set("b", 11));
+		db.insert(Entity.of("test").set("a", 1).set("b", 11));
-		db.insert(Entity.create("test").set("a", 2).set("b", 21));
+		db.insert(Entity.of("test").set("a", 2).set("b", 21));
-		db.insert(Entity.create("test").set("a", 3).set("b", 31));
+		db.insert(Entity.of("test").set("a", 3).set("b", 31));
-		db.insert(Entity.create("test").set("a", 4).set("b", 41));
+		db.insert(Entity.of("test").set("a", 4).set("b", 41));
 	}
 
 	@Test
@@ -34,7 +34,7 @@ public class HsqldbTest {
 
 	@Test
 	public void findTest() {
-		final List<Entity> query = Db.of(DS_GROUP_NAME).find(Entity.create("test"));
+		final List<Entity> query = Db.of(DS_GROUP_NAME).find(Entity.of("test"));
 		Assert.assertEquals(4, query.size());
 	}
 }

hutool-db/src/test/java/cn/hutool/db/MySQLTest.java

@@ -26,7 +26,7 @@ public class MySQLTest {
 	@Ignore
 	public void insertTest() {
 		for (int id = 100; id < 200; id++) {
-			Db.of("mysql").insert(Entity.create("user")//
+			Db.of("mysql").insert(Entity.of("user")//
 					.set("id", id)//
 					.set("name", "测试用户" + id)//
 					.set("text", "描述" + id)//
@@ -45,20 +45,20 @@ public class MySQLTest {
 	@Ignore
 	public void txTest() throws SQLException {
 		Db.of("mysql").tx(db -> {
-			final int update = db.update(Entity.create("user").set("text", "描述100"), Entity.create().set("id", 100));
+			final int update = db.update(Entity.of("user").set("text", "描述100"), Entity.of().set("id", 100));
-			db.update(Entity.create("user").set("text", "描述101"), Entity.create().set("id", 101));
+			db.update(Entity.of("user").set("text", "描述101"), Entity.of().set("id", 101));
 			if (1 == update) {
 				// 手动指定异常，然后测试回滚触发
 				throw new RuntimeException("Error");
 			}
-			db.update(Entity.create("user").set("text", "描述102"), Entity.create().set("id", 102));
+			db.update(Entity.of("user").set("text", "描述102"), Entity.of().set("id", 102));
 		});
 	}
 
 	@Test
 	@Ignore
 	public void pageTest() {
-		final PageResult<Entity> result = Db.of("mysql").page(Entity.create("user"), new Page(2, 10));
+		final PageResult<Entity> result = Db.of("mysql").page(Entity.of("user"), new Page(2, 10));
 		for (final Entity entity : result) {
 			Console.log(entity.get("id"));
 		}
@@ -75,9 +75,9 @@ public class MySQLTest {
 	@Ignore
 	public void upsertTest() {
 		final Db db = Db.of("mysql");
-		db.insert(Entity.create("testuser").set("id", 1).set("account", "ice").set("pass", "123456"));
+		db.insert(Entity.of("testuser").set("id", 1).set("account", "ice").set("pass", "123456"));
-		db.upsert(Entity.create("testuser").set("id", 1).set("account", "icefairy").set("pass", "a123456"));
+		db.upsert(Entity.of("testuser").set("id", 1).set("account", "icefairy").set("pass", "a123456"));
-		final Entity user = db.get(Entity.create("testuser").set("id", 1));
+		final Entity user = db.get(Entity.of("testuser").set("id", 1));
 		System.out.println("user======="+user.getStr("account")+"___"+user.getStr("pass"));
 		Assert.assertEquals(user.getStr("account"), "icefairy");
 	}

hutool-db/src/test/java/cn/hutool/db/OracleTest.java

@@ -19,7 +19,7 @@ public class OracleTest {
 	@Test
 	public void oraclePageSqlTest() {
 		final Page page = new Page(0, 10);
-		final Entity where = Entity.create("PMCPERFORMANCEINFO").set("yearPI", "2017");
+		final Entity where = Entity.of("PMCPERFORMANCEINFO").set("yearPI", "2017");
 		final Query query = new Query(SqlUtil.buildConditions(where), where.getTableName());
 		query.setPage(page);
 
@@ -41,7 +41,7 @@ public class OracleTest {
 	@Ignore
 	public void insertTest() {
 		for (int id = 100; id < 200; id++) {
-			Db.of("orcl").insert(Entity.create("T_USER")//
+			Db.of("orcl").insert(Entity.of("T_USER")//
 					.set("ID", id)//
 					.set("name", "测试用户" + id)//
 					.set("TEXT", "描述" + id)//
@@ -53,7 +53,7 @@ public class OracleTest {
 	@Test
 	@Ignore
 	public void pageTest() {
-		final PageResult<Entity> result = Db.of("orcl").page(Entity.create("T_USER"), new Page(2, 10));
+		final PageResult<Entity> result = Db.of("orcl").page(Entity.of("T_USER"), new Page(2, 10));
 		for (final Entity entity : result) {
 			Console.log(entity.get("ID"));
 		}

hutool-db/src/test/java/cn/hutool/db/PicTransferTest.java

@@ -16,7 +16,7 @@ public class PicTransferTest {
 	public void findTest() {
 		Db.of().find(
 				ListUtil.view("NAME", "TYPE", "GROUP", "PIC"),
-				Entity.create("PIC_INFO").set("TYPE", 1),
+				Entity.of("PIC_INFO").set("TYPE", 1),
 				rs -> {
 					while(rs.next()){
 						save(rs);

hutool-db/src/test/java/cn/hutool/db/PostgreTest.java

@@ -16,7 +16,7 @@ public class PostgreTest {
 	@Ignore
 	public void insertTest() {
 		for (int id = 100; id < 200; id++) {
-			Db.of("postgre").insert(Entity.create("user")//
+			Db.of("postgre").insert(Entity.of("user")//
 					.set("id", id)//
 					.set("name", "测试用户" + id)//
 			);
@@ -26,7 +26,7 @@ public class PostgreTest {
 	@Test
 	@Ignore
 	public void pageTest() {
-		final PageResult<Entity> result = Db.of("postgre").page(Entity.create("user"), new Page(2, 10));
+		final PageResult<Entity> result = Db.of("postgre").page(Entity.of("user"), new Page(2, 10));
 		for (final Entity entity : result) {
 			Console.log(entity.get("id"));
 		}
@@ -38,9 +38,9 @@ public class PostgreTest {
 		final Db db = Db.of("postgre");
 		db.executeBatch("drop table if exists ctest",
 				"create table if not exists \"ctest\" ( \"id\" serial4, \"t1\" varchar(255) COLLATE \"pg_catalog\".\"default\", \"t2\" varchar(255) COLLATE \"pg_catalog\".\"default\", \"t3\" varchar(255) COLLATE \"pg_catalog\".\"default\", CONSTRAINT \"ctest_pkey\" PRIMARY KEY (\"id\") )  ");
-		db.insert(Entity.create("ctest").set("id", 1).set("t1", "111").set("t2", "222").set("t3", "333"));
+		db.insert(Entity.of("ctest").set("id", 1).set("t1", "111").set("t2", "222").set("t3", "333"));
-		db.upsert(Entity.create("ctest").set("id", 1).set("t1", "new111").set("t2", "new222").set("t3", "bew333"),"id");
+		db.upsert(Entity.of("ctest").set("id", 1).set("t1", "new111").set("t2", "new222").set("t3", "bew333"),"id");
-		final Entity et=db.get(Entity.create("ctest").set("id", 1));
+		final Entity et=db.get(Entity.of("ctest").set("id", 1));
 		Assert.assertEquals("new111",et.getStr("t1"));
 	}
 }

hutool-db/src/test/java/cn/hutool/db/SessionTest.java

@@ -15,13 +15,13 @@ public class SessionTest {
 	public void transTest() {
 		final Session session = Session.of("test");
 		session.beginTransaction();
-		session.update(Entity.create().set("age", 76), Entity.create("user").set("name", "unitTestUser"));
+		session.update(Entity.of().set("age", 76), Entity.of("user").set("name", "unitTestUser"));
 		session.commit();
 	}
 
 	@Test
 	@Ignore
 	public void txTest() {
-		Session.of("test").tx(session -> session.update(Entity.create().set("age", 78), Entity.create("user").set("name", "unitTestUser")));
+		Session.of("test").tx(session -> session.update(Entity.of().set("age", 78), Entity.of("user").set("name", "unitTestUser")));
 	}
 }

hutool-db/src/test/java/cn/hutool/db/SqlServerTest.java

@@ -22,7 +22,7 @@ public class SqlServerTest {
 	@Ignore
 	public void insertTest() {
 		for (int id = 100; id < 200; id++) {
-			Db.of("sqlserver").insert(Entity.create("T_USER")//
+			Db.of("sqlserver").insert(Entity.of("T_USER")//
 					.set("ID", id)//
 					.set("name", "测试用户" + id)//
 			);
@@ -32,7 +32,7 @@ public class SqlServerTest {
 	@Test
 	@Ignore
 	public void pageTest() {
-		final PageResult<Entity> result = Db.of("sqlserver").page(Entity.create("T_USER"), new Page(2, 10));
+		final PageResult<Entity> result = Db.of("sqlserver").page(Entity.of("T_USER"), new Page(2, 10));
 		for (final Entity entity : result) {
 			Console.log(entity.get("ID"));
 		}

hutool-db/src/test/java/cn/hutool/db/UpdateTest.java

@@ -23,7 +23,7 @@ public class UpdateTest {
 	public void updateTest() {
 
 		// 改
-		final int update = db.update(Entity.create("user").set("age", 88), Entity.create().set("name", "unitTestUser"));
+		final int update = db.update(Entity.of("user").set("age", 88), Entity.of().set("name", "unitTestUser"));
 		Assert.assertTrue(update > 0);
 		final Entity result2 = db.get("user", "name", "unitTestUser");
 		Assert.assertSame(88, result2.getInt("age"));

hutool-db/src/test/java/cn/hutool/db/nosql/MongoDBTest.java

@@ -1,20 +0,0 @@
-package cn.hutool.db.nosql;
-
-import cn.hutool.db.nosql.mongo.MongoFactory;
-import com.mongodb.client.MongoDatabase;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * @author VampireAchao
- */
-public class MongoDBTest {
-
-	@Test
-	@Ignore
-	public void mongoDSTest() {
-		final MongoDatabase db = MongoFactory.getDS("master").getDb("test");
-		Assert.assertEquals("test", db.getName());
-	}
-}

hutool-db/src/test/java/cn/hutool/db/nosql/RedisDSTest.java

@@ -1,15 +0,0 @@
-package cn.hutool.db.nosql;
-
-import cn.hutool.db.nosql.redis.RedisDS;
-import org.junit.Ignore;
-import org.junit.Test;
-import redis.clients.jedis.Jedis;
-
-public class RedisDSTest {
-
-	@Test
-	@Ignore
-	public void redisDSTest(){
-		final Jedis jedis = RedisDS.create().getJedis();
-	}
-}