fix code

hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayWrapper.java

@@ -14,7 +14,7 @@ package org.dromara.hutool.core.array;
 
 import org.dromara.hutool.core.collection.iter.ArrayIter;
 import org.dromara.hutool.core.convert.Convert;
-import org.dromara.hutool.core.func.Wrapper;
+import org.dromara.hutool.core.lang.wrapper.Wrapper;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.lang.Validator;
 import org.dromara.hutool.core.reflect.ClassUtil;

hutool-core/src/main/java/org/dromara/hutool/core/io/ReaderWrapper.java

@@ -13,7 +13,7 @@
 package org.dromara.hutool.core.io;
 
 import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.func.Wrapper;
+import org.dromara.hutool.core.lang.wrapper.Wrapper;
 
 import java.io.IOException;
 import java.io.Reader;

hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileWrapper.java

@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.io.file;
 
-import org.dromara.hutool.core.func.Wrapper;
+import org.dromara.hutool.core.lang.wrapper.Wrapper;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.util.CharsetUtil;
 import org.dromara.hutool.core.util.ObjUtil;

hutool-core/src/main/java/org/dromara/hutool/core/lang/builder/package-info.java

@@ -12,7 +12,7 @@
 
 /**
  * 建造者工具<br>
- * 用于建造特定对象或结果
+ * 用于建造特定对象或结果，建造者模式的抽象。
  *
  * @author looly
  *

hutool-core/src/main/java/org/dromara/hutool/core/lang/wrapper/SimpleWrapper.java

@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package org.dromara.hutool.core.func;
+package org.dromara.hutool.core.lang.wrapper;
 
 /**
  * 简单包装对象

hutool-core/src/main/java/org/dromara/hutool/core/lang/wrapper/Wrapper.java

@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package org.dromara.hutool.core.func;
+package org.dromara.hutool.core.lang.wrapper;
 
 /**
  * 包装接口

hutool-core/src/main/java/org/dromara/hutool/core/lang/wrapper/package-info.java

@@ -0,0 +1,17 @@
+/*
+ * 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:
+ *          https://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.
+ */
+
+/**
+ * 提供包装对象的抽象<br>
+ * 通过包装接口，实现装饰模式或代理模式，以增强或目标对象功能。
+ */
+package org.dromara.hutool.core.lang.wrapper;

hutool-core/src/main/java/org/dromara/hutool/core/map/LinkedForestMap.java

@@ -15,7 +15,7 @@ package org.dromara.hutool.core.map;
 import org.dromara.hutool.core.collection.CollUtil;
 import org.dromara.hutool.core.collection.ListUtil;
 import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.func.Wrapper;
+import org.dromara.hutool.core.lang.wrapper.Wrapper;
 import org.dromara.hutool.core.reflect.ClassUtil;
 import org.dromara.hutool.core.text.StrUtil;
 import org.dromara.hutool.core.util.ObjUtil;

hutool-core/src/main/java/org/dromara/hutool/core/map/MapWrapper.java

@@ -13,7 +13,7 @@
 package org.dromara.hutool.core.map;
 
 import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.func.Wrapper;
+import org.dromara.hutool.core.lang.wrapper.Wrapper;
 import org.dromara.hutool.core.util.ObjUtil;
 
 import java.io.IOException;

hutool-crypto/src/main/java/org/dromara/hutool/crypto/CipherWrapper.java

@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.crypto;
 
-import org.dromara.hutool.core.func.Wrapper;
+import org.dromara.hutool.core.lang.wrapper.Wrapper;
 
 import javax.crypto.Cipher;
 import java.security.InvalidAlgorithmParameterException;

hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/Digester.java

@@ -14,7 +14,7 @@ package org.dromara.hutool.crypto.digest;
 
 import org.dromara.hutool.core.array.ArrayUtil;
 import org.dromara.hutool.core.codec.HexUtil;
-import org.dromara.hutool.core.func.SimpleWrapper;
+import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
 import org.dromara.hutool.core.io.IORuntimeException;
 import org.dromara.hutool.core.io.IoUtil;
 import org.dromara.hutool.core.io.file.FileUtil;

hutool-db/src/main/java/org/dromara/hutool/db/driver/DriverIdentifier.java

@@ -140,13 +140,10 @@ public class DriverIdentifier {
 			return null;
 		}
 
-		for (final DriverMatcher driverMatcher : this.matcherList) {
+		return this.matcherList.stream()
-			if (driverMatcher.isMatch(jdbcUrl)) {
+			.filter(driverMatcher -> driverMatcher.test(jdbcUrl))
-				return driverMatcher.getClassName();
+			.findFirst()
-			}
+			.map(DriverMatcher::getClassName).orElse(null);
-		}
-
-		return null;
 	}
 
 	/**

hutool-db/src/main/java/org/dromara/hutool/db/driver/matcher/Db2DriverMatcher.java

@@ -28,7 +28,7 @@ public class Db2DriverMatcher implements DriverMatcher {
 	private String jdbcUrl;
 
 	@Override
-	public boolean isMatch(final String jdbcUrl) {
+	public boolean test(final String jdbcUrl) {
 		this.jdbcUrl = jdbcUrl;
 		return jdbcUrl.startsWith("jdbc:db2:");
 	}

hutool-db/src/main/java/org/dromara/hutool/db/driver/matcher/DriverMatcher.java

@@ -12,22 +12,16 @@
 
 package org.dromara.hutool.db.driver.matcher;
 
+import java.util.function.Predicate;
+
 /**
  * 驱动匹配接口，通过实现此接口，可以：<br>
- * 通过{@link #isMatch(String)} 判断JDBC URL 是否匹配驱动的要求<br>
+ * 通过{@link #test(Object)} 判断JDBC URL 是否匹配驱动的要求<br>
  * 通过{@link #getClassName()} 获取对应的驱动类名称
  *
  * @author looly
  */
-public interface DriverMatcher {
+public interface DriverMatcher extends Predicate<String> {
-
-	/**
-	 * 自定义规则是否匹配 JDBC URL
-	 *
-	 * @param jdbcUrl JDBC URL
-	 * @return 是否匹配
-	 */
-	boolean isMatch(final String jdbcUrl);
 
 	/**
 	 * 获取对应的驱动类名称

hutool-db/src/main/java/org/dromara/hutool/db/driver/matcher/MysqlDriverMatcher.java

@@ -34,7 +34,7 @@ public class MysqlDriverMatcher implements DriverMatcher {
 	}
 
 	@Override
-	public boolean isMatch(final String jdbcUrl) {
+	public boolean test(final String jdbcUrl) {
 		return jdbcUrl.startsWith("jdbc:mysql:")
 			// 阿里的Mysql分布式集群
 			|| jdbcUrl.startsWith("jdbc:cobar:")

hutool-db/src/main/java/org/dromara/hutool/db/driver/matcher/StartsWithDriverMatcher.java

@@ -35,7 +35,7 @@ public class StartsWithDriverMatcher implements DriverMatcher {
 	}
 
 	@Override
-	public boolean isMatch(final String jdbcUrl) {
+	public boolean test(final String jdbcUrl) {
 		for (final String startsWithStr : startsWithStrs) {
 			if (jdbcUrl.startsWith(startsWithStr)) {
 				return true;

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

@@ -14,7 +14,7 @@ package org.dromara.hutool.db.ds;
 
 import org.dromara.hutool.core.exception.CloneException;
 import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.func.Wrapper;
+import org.dromara.hutool.core.lang.wrapper.Wrapper;
 
 import javax.sql.DataSource;
 import java.io.Closeable;

hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/ConnectionWrapper.java

@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.db.ds.pooled;
 
-import org.dromara.hutool.core.func.Wrapper;
+import org.dromara.hutool.core.lang.wrapper.Wrapper;
 
 import java.sql.Array;
 import java.sql.Blob;

hutool-db/src/main/java/org/dromara/hutool/db/sql/StatementWrapper.java

@@ -14,7 +14,7 @@ package org.dromara.hutool.db.sql;
 
 import org.dromara.hutool.core.array.ArrayUtil;
 import org.dromara.hutool.core.collection.iter.ArrayIter;
-import org.dromara.hutool.core.func.SimpleWrapper;
+import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
 import org.dromara.hutool.core.lang.Assert;
 
 import java.io.InputStream;

hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/Session.java

@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.extra.ssh;
 
-import org.dromara.hutool.core.func.Wrapper;
+import org.dromara.hutool.core.lang.wrapper.Wrapper;
 import org.dromara.hutool.core.io.IORuntimeException;
 
 import java.io.Closeable;

hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateEngine.java

@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.extra.template.engine;
 
-import org.dromara.hutool.core.func.Wrapper;
+import org.dromara.hutool.core.lang.wrapper.Wrapper;
 import org.dromara.hutool.extra.template.Template;
 import org.dromara.hutool.extra.template.TemplateConfig;
 

hutool-http/src/main/java/org/dromara/hutool/http/server/HttpExchangeWrapper.java

@@ -16,7 +16,7 @@ import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpContext;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpPrincipal;
-import org.dromara.hutool.core.func.Wrapper;
+import org.dromara.hutool.core.lang.wrapper.Wrapper;
 
 import java.io.IOException;
 import java.io.InputStream;

hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONStringer.java

@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.json.serialize;
 
-import org.dromara.hutool.core.func.Wrapper;
+import org.dromara.hutool.core.lang.wrapper.Wrapper;
 
 /**
  * {@code JSONString}接口定义了一个{@code toJSONString()}<br>