fix code

hutool-core/src/main/java/org/dromara/hutool/core/reflect/ConstructorUtil.java

@@ -12,20 +12,15 @@
 
 package org.dromara.hutool.core.reflect;
 
+import org.dromara.hutool.core.array.ArrayUtil;
 import org.dromara.hutool.core.classloader.ClassLoaderUtil;
 import org.dromara.hutool.core.exceptions.UtilException;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.map.WeakConcurrentMap;
-import org.dromara.hutool.core.array.ArrayUtil;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
-import java.util.AbstractMap;
+import java.util.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 
 /**
  * 反射中{@link Constructor}构造工具类，包括获取构造类和通过构造实例化对象相关工具
@@ -135,7 +130,7 @@ public class ConstructorUtil {
 		final Class<?>[] paramTypes = ClassUtil.getClasses(params);
 		final Constructor<T> constructor = getConstructor(clazz, paramTypes);
 		if (null == constructor) {
-			throw new UtilException("No Constructor matched for parameter types: [{}]", new Object[]{paramTypes});
+			throw new UtilException("No Constructor matched for parameter types: {}", new Object[]{paramTypes});
 		}
 		try {
 			return constructor.newInstance(params);

hutool-db/src/main/java/org/dromara/hutool/db/ds/DSUtil.java

@@ -12,14 +12,10 @@
 
 package org.dromara.hutool.db.ds;
 
+import org.dromara.hutool.core.reflect.ConstructorUtil;
+import org.dromara.hutool.core.spi.ListServiceLoader;
 import org.dromara.hutool.db.DbRuntimeException;
-import org.dromara.hutool.db.ds.bee.BeeDSFactory;
+import org.dromara.hutool.db.GlobalDbConfig;
-import org.dromara.hutool.db.ds.c3p0.C3p0DSFactory;
-import org.dromara.hutool.db.ds.dbcp.DbcpDSFactory;
-import org.dromara.hutool.db.ds.druid.DruidDSFactory;
-import org.dromara.hutool.db.ds.hikari.HikariDSFactory;
-import org.dromara.hutool.db.ds.pooled.PooledDSFactory;
-import org.dromara.hutool.db.ds.tomcat.TomcatDSFactory;
 import org.dromara.hutool.log.StaticLog;
 import org.dromara.hutool.setting.Setting;
 
@@ -112,52 +108,34 @@ public class DSUtil {
 	 */
 	public static DSFactory createFactory(final Setting setting) {
 		final DSFactory dsFactory = _createFactory(setting);
-		StaticLog.debug("Use [{}] DataSource As Default", dsFactory.getDataSourceName());
+		StaticLog.debug("Use [{}] DataSource As Default.", dsFactory.getDataSourceName());
 		return dsFactory;
 	}
 
 	/**
 	 * 创建数据源实现工厂<br>
 	 * 此方法通过“试错”方式查找引入项目的连接池库，按照优先级寻找，一旦寻找到则创建对应的数据源工厂<br>
-	 * 连接池优先级：Hikari &gt; Druid &gt; Tomcat &gt; BeeCP &gt; Dbcp &gt; C3p0 &gt; Hutool Pooled
+	 * 连接池优先级：Hikari &gt; Druid &gt; Tomcat &gt; BeeCP &gt; Dbcp &gt; C3p0 &gt; Hutool Pooled<br>
+	 * 见：META-INF/services/org.dromara.hutool.db.ds.DSFactory
 	 *
 	 * @param setting 数据库配置项
 	 * @return 日志实现类
 	 * @since 4.1.3
 	 */
-	private static DSFactory _createFactory(final Setting setting) {
+	private static DSFactory _createFactory(Setting setting) {
-		try {
+		if (null == setting) {
-			return new HikariDSFactory(setting);
+			setting = GlobalDbConfig.createDbSetting();
-		} catch (final NoClassDefFoundError | NoSuchMethodError e) {
-			// ignore
 		}
-		try {
+		final ListServiceLoader<DSFactory> loader = ListServiceLoader.of(DSFactory.class);
-			return new DruidDSFactory(setting);
+		final int size = loader.size();
-		} catch (final NoClassDefFoundError | NoSuchMethodError e) {
+		for (int i = 0; i < size; i++) {
-			// ignore
+			try {
+				return ConstructorUtil.newInstance(loader.getServiceClass(i), setting);
+			} catch (final NoClassDefFoundError | NoSuchMethodError e) {
+				// ignore
+			}
 		}
-		try {
+
-			return new TomcatDSFactory(setting);
+		throw new DbRuntimeException("No DSFactory implement available!");
-		} catch (final NoClassDefFoundError | NoSuchMethodError e) {
-			//如果未引入包，此处会报org.apache.tomcat.jdbc.pool.PoolConfiguration未找到错误
-			//因为org.apache.tomcat.jdbc.pool.DataSource实现了此接口，会首先检查接口的存在与否
-			// ignore
-		}
-		try {
-			return new BeeDSFactory(setting);
-		} catch (final NoClassDefFoundError | NoSuchMethodError e) {
-			// ignore
-		}
-		try {
-			return new DbcpDSFactory(setting);
-		} catch (final NoClassDefFoundError | NoSuchMethodError e) {
-			// ignore
-		}
-		try {
-			return new C3p0DSFactory(setting);
-		} catch (final NoClassDefFoundError | NoSuchMethodError e) {
-			// ignore
-		}
-		return new PooledDSFactory(setting);
 	}
 }

hutool-db/src/main/resources/META-INF/services/org.dromara.hutool.db.ds.DSFactory

@@ -0,0 +1,19 @@
+#
+# Copyright (c) 2023 looly(loolly@aliyun.com)
+# Hutool is licensed under Mulan PSL v2.
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
+# You may obtain a copy of Mulan PSL v2 at:
+#          http://license.coscl.org.cn/MulanPSL2
+# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+# EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+# See the Mulan PSL v2 for more details.
+#
+
+org.dromara.hutool.db.ds.hikari.HikariDSFactory
+org.dromara.hutool.db.ds.druid.DruidDSFactory
+org.dromara.hutool.db.ds.tomcat.TomcatDSFactory
+org.dromara.hutool.db.ds.bee.BeeDSFactory
+org.dromara.hutool.db.ds.dbcp.DbcpDSFactory
+org.dromara.hutool.db.ds.c3p0.C3p0DSFactory
+org.dromara.hutool.db.ds.pooled.PooledDSFactory