From fefd88b358853e0a28671ee27e85410c3930f800 Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Sun, 12 Sep 2021 01:43:12 +0800
Subject: [PATCH] fix test

---
 .../src/main/java/cn/hutool/core/net/URLEncoder.java   |  9 +++------
 .../src/main/java/cn/hutool/core/text/StrJoiner.java   | 10 ++++++----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/net/URLEncoder.java b/hutool-core/src/main/java/cn/hutool/core/net/URLEncoder.java
index 660ae4bf5..f90609e0d 100644
--- a/hutool-core/src/main/java/cn/hutool/core/net/URLEncoder.java
+++ b/hutool-core/src/main/java/cn/hutool/core/net/URLEncoder.java
@@ -1,7 +1,6 @@
 package cn.hutool.core.net;
 
 import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.HexUtil;
 import cn.hutool.core.util.StrUtil;
 
@@ -318,16 +317,14 @@ public class URLEncoder implements Serializable {
 	 * 将URL中的字符串编码为%形式
 	 *
 	 * @param path    需要编码的字符串
-	 * @param charset 编码
+	 * @param charset 编码, {@code null}返回原字符串，表示不编码
 	 * @return 编码后的字符串
 	 */
 	public String encode(String path, Charset charset) {
-		if (StrUtil.isEmpty(path)) {
+		if (null == charset || StrUtil.isEmpty(path)) {
 			return path;
 		}
-		if(null == charset){
-			charset = CharsetUtil.CHARSET_UTF_8;
-		}
+
 		final StringBuilder rewrittenPath = new StringBuilder(path.length());
 		ByteArrayOutputStream buf = new ByteArrayOutputStream();
 		OutputStreamWriter writer = new OutputStreamWriter(buf, charset);
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrJoiner.java b/hutool-core/src/main/java/cn/hutool/core/text/StrJoiner.java
index ab6a1c60e..862b6ff8f 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/StrJoiner.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/StrJoiner.java
@@ -19,7 +19,7 @@ import java.util.function.Function;
  */
 public class StrJoiner implements Appendable, Serializable {
 	private static final long serialVersionUID = 1L;
-	
+
 	private Appendable appendable;
 	private CharSequence delimiter;
 	private CharSequence prefix;
@@ -232,10 +232,12 @@ public class StrJoiner implements Appendable, Serializable {
 	 * @return this
 	 */
 	public <T> StrJoiner append(Iterator<T> iterator) {
-		if (null == iterator) {
-			return this;
+		if (null != iterator) {
+			while (iterator.hasNext()) {
+				append(iterator.next());
+			}
 		}
-		return append(iterator, (t) -> StrJoiner.of(this).append(t).toString());
+		return this;
 	}
 
 	/**