fix code

2025-07-21 15:09:48 +08:00 · 2022-11-30 23:51:36 +08:00
parent 185cd09ab0
commit 75d536839c
34 changed files with 877 additions and 2145 deletions
--- a/hutool-core/src/test/java/cn/hutool/core/net/url/UrlQueryUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/net/url/UrlQueryUtilTest.java
@@ -0,0 +1,153 @@
+package cn.hutool.core.net.url;
+
+import cn.hutool.core.util.CharsetUtil;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Map;
+
+public class UrlQueryUtilTest {
+	@Test
+	public void decodeQueryTest() {
+		final String paramsStr = "uuuu=0&a=b&c=%3F%23%40!%24%25%5E%26%3Ddsssss555555";
+		final Map<String, List<String>> map = UrlQueryUtil.decodeQuery(paramsStr, CharsetUtil.NAME_UTF_8);
+		Assert.assertEquals("0", map.get("uuuu").get(0));
+		Assert.assertEquals("b", map.get("a").get(0));
+		Assert.assertEquals("?#@!$%^&=dsssss555555", map.get("c").get(0));
+	}
+
+	@Test
+	public void decodeQueryTest2() {
+		// 参数值存在分界标记等号时
+		final Map<String, String> paramMap = UrlQueryUtil.decodeQuery("https://www.xxx.com/api.action?aa=123&f_token=NzBkMjQxNDM1MDVlMDliZTk1OTU3ZDI1OTI0NTBiOWQ=", CharsetUtil.UTF_8);
+		Assert.assertEquals("123",paramMap.get("aa"));
+		Assert.assertEquals("NzBkMjQxNDM1MDVlMDliZTk1OTU3ZDI1OTI0NTBiOWQ=",paramMap.get("f_token"));
+	}
+
+	@Test
+	public void toQueryTest() {
+		final String paramsStr = "uuuu=0&a=b&c=3Ddsssss555555";
+		final Map<String, List<String>> map = UrlQueryUtil.decodeQuery(paramsStr, CharsetUtil.NAME_UTF_8);
+
+		final String encodedParams = UrlQueryUtil.toQuery(map);
+		Assert.assertEquals(paramsStr, encodedParams);
+	}
+
+	@Test
+	public void encodeParamTest() {
+		// ?单独存在去除之，&单位位于末尾去除之
+		String paramsStr = "?a=b&c=d&";
+		String encode = UrlQueryUtil.encodeQuery(paramsStr, CharsetUtil.UTF_8);
+		Assert.assertEquals("a=b&c=d", encode);
+
+		// url不参与转码
+		paramsStr = "http://www.abc.dd?a=b&c=d&";
+		encode = UrlQueryUtil.encodeQuery(paramsStr, CharsetUtil.UTF_8);
+		Assert.assertEquals("http://www.abc.dd?a=b&c=d", encode);
+
+		// b=b中的=被当作值的一部分，不做encode
+		paramsStr = "a=b=b&c=d&";
+		encode = UrlQueryUtil.encodeQuery(paramsStr, CharsetUtil.UTF_8);
+		Assert.assertEquals("a=b=b&c=d", encode);
+
+		// =d的情况被处理为key为空
+		paramsStr = "a=bbb&c=d&=d";
+		encode = UrlQueryUtil.encodeQuery(paramsStr, CharsetUtil.UTF_8);
+		Assert.assertEquals("a=bbb&c=d&=d", encode);
+
+		// d=的情况被处理为value为空
+		paramsStr = "a=bbb&c=d&d=";
+		encode = UrlQueryUtil.encodeQuery(paramsStr, CharsetUtil.UTF_8);
+		Assert.assertEquals("a=bbb&c=d&d=", encode);
+
+		// 多个&&被处理为单个，相当于空条件
+		paramsStr = "a=bbb&c=d&&&d=";
+		encode = UrlQueryUtil.encodeQuery(paramsStr, CharsetUtil.UTF_8);
+		Assert.assertEquals("a=bbb&c=d&d=", encode);
+
+		// &d&相当于只有键，无值得情况
+		paramsStr = "a=bbb&c=d&d&";
+		encode = UrlQueryUtil.encodeQuery(paramsStr, CharsetUtil.UTF_8);
+		Assert.assertEquals("a=bbb&c=d&d=", encode);
+
+		// 中文的键和值被编码
+		paramsStr = "a=bbb&c=你好&哈喽&";
+		encode = UrlQueryUtil.encodeQuery(paramsStr, CharsetUtil.UTF_8);
+		Assert.assertEquals("a=bbb&c=%E4%BD%A0%E5%A5%BD&%E5%93%88%E5%96%BD=", encode);
+
+		// URL原样输出
+		paramsStr = "https://www.hutool.cn/";
+		encode = UrlQueryUtil.encodeQuery(paramsStr, CharsetUtil.UTF_8);
+		Assert.assertEquals(paramsStr, encode);
+
+		// URL原样输出
+		paramsStr = "https://www.hutool.cn/?";
+		encode = UrlQueryUtil.encodeQuery(paramsStr, CharsetUtil.UTF_8);
+		Assert.assertEquals("https://www.hutool.cn/", encode);
+	}
+
+	@Test
+	public void decodeParamTest() {
+		// 开头的？被去除
+		String a = "?a=b&c=d&";
+		Map<String, List<String>> map = UrlQueryUtil.decodeQuery(a, CharsetUtil.NAME_UTF_8);
+		Assert.assertEquals("b", map.get("a").get(0));
+		Assert.assertEquals("d", map.get("c").get(0));
+
+		// =e被当作空为key，e为value
+		a = "?a=b&c=d&=e";
+		map = UrlQueryUtil.decodeQuery(a, CharsetUtil.NAME_UTF_8);
+		Assert.assertEquals("b", map.get("a").get(0));
+		Assert.assertEquals("d", map.get("c").get(0));
+		Assert.assertEquals("e", map.get("").get(0));
+
+		// 多余的&去除
+		a = "?a=b&c=d&=e&&&&";
+		map = UrlQueryUtil.decodeQuery(a, CharsetUtil.NAME_UTF_8);
+		Assert.assertEquals("b", map.get("a").get(0));
+		Assert.assertEquals("d", map.get("c").get(0));
+		Assert.assertEquals("e", map.get("").get(0));
+
+		// 值为空
+		a = "?a=b&c=d&e=";
+		map = UrlQueryUtil.decodeQuery(a, CharsetUtil.NAME_UTF_8);
+		Assert.assertEquals("b", map.get("a").get(0));
+		Assert.assertEquals("d", map.get("c").get(0));
+		Assert.assertEquals("", map.get("e").get(0));
+
+		// &=被作为键和值都为空
+		a = "a=b&c=d&=";
+		map = UrlQueryUtil.decodeQuery(a, CharsetUtil.NAME_UTF_8);
+		Assert.assertEquals("b", map.get("a").get(0));
+		Assert.assertEquals("d", map.get("c").get(0));
+		Assert.assertEquals("", map.get("").get(0));
+
+		// &e&这类单独的字符串被当作key
+		a = "a=b&c=d&e&";
+		map = UrlQueryUtil.decodeQuery(a, CharsetUtil.NAME_UTF_8);
+		Assert.assertEquals("b", map.get("a").get(0));
+		Assert.assertEquals("d", map.get("c").get(0));
+		Assert.assertNull(map.get("e").get(0));
+		Assert.assertNull(map.get("").get(0));
+
+		// 被编码的键和值被还原
+		a = "a=bbb&c=%E4%BD%A0%E5%A5%BD&%E5%93%88%E5%96%BD=";
+		map = UrlQueryUtil.decodeQuery(a, CharsetUtil.NAME_UTF_8);
+		Assert.assertEquals("bbb", map.get("a").get(0));
+		Assert.assertEquals("你好", map.get("c").get(0));
+		Assert.assertEquals("", map.get("哈喽").get(0));
+	}
+
+	@Test
+	public void normalizeQueryTest() {
+		final String encodeResult = UrlQueryUtil.normalizeQuery("参数", CharsetUtil.UTF_8);
+		Assert.assertEquals("%E5%8F%82%E6%95%B0", encodeResult);
+	}
+
+	@Test
+	public void normalizeBlankQueryTest() {
+		final String encodeResult = UrlQueryUtil.normalizeQuery("", CharsetUtil.UTF_8);
+		Assert.assertEquals("", encodeResult);
+	}
+}