lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-05-07 06:08:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

deprecated class

Browse Source
This commit is contained in:
Looly 2022-03-19 21:14:27 +08:00
parent b848efb7b4
commit 20794884a7
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -8,6 +8,7 @@
* 【db 】 【不向下兼容】增加MongoDB4.x支持（pr#568@Gitee） * 【db 】 【不向下兼容】增加MongoDB4.x支持（pr#568@Gitee）
* 【json 】 【可能兼容问题】修改JSONObject结构，继承自MapWrapper * 【json 】 【可能兼容问题】修改JSONObject结构，继承自MapWrapper
* 【core 】 【可能兼容问题】BeanCopier重构，新建XXXCopier，删除XXXValueProvider * 【core 】 【可能兼容问题】BeanCopier重构，新建XXXCopier，删除XXXValueProvider
* 【core 】 【可能兼容问题】URLEncoder废弃，URLEncoderUtil使用RFC3986
### 🐣新特性 ### 🐣新特性
* 【http 】 HttpRequest.form采用TableMap方式（issue#I4W427@Gitee） * 【http 】 HttpRequest.form采用TableMap方式（issue#I4W427@Gitee）

16
hutool-core/src/main/java/cn/hutool/core/net/URLEncodeUtil.java
View File

@ -36,7 +36,7 @@ public class URLEncodeUtil {
* @throws UtilException UnsupportedEncodingException * @throws UtilException UnsupportedEncodingException
*/ */
public static String encodeAll(String url, Charset charset) throws UtilException { public static String encodeAll(String url, Charset charset) throws UtilException {
return URLEncoder.ALL.encode(url, charset); return RFC3986.UNRESERVED.encode(url, charset);
} }
/** /**
@ -64,7 +64,7 @@ public class URLEncodeUtil {
* @since 4.4.1 * @since 4.4.1
*/ */
public static String encode(String url, Charset charset) { public static String encode(String url, Charset charset) {
return URLEncoder.DEFAULT.encode(url, charset); return RFC3986.PATH.encode(url, charset);
} }
/** /**
@ -92,7 +92,7 @@ public class URLEncodeUtil {
* @since 4.4.1 * @since 4.4.1
*/ */
public static String encodeQuery(String url, Charset charset) { public static String encodeQuery(String url, Charset charset) {
return URLEncoder.QUERY.encode(url, charset); return RFC3986.QUERY.encode(url, charset);
} }
/** /**
@ -135,10 +135,7 @@ public class URLEncodeUtil {
if (StrUtil.isEmpty(url)) { if (StrUtil.isEmpty(url)) {
return url; return url;
} }
if (null == charset) { return RFC3986.SEGMENT.encode(url, charset);
charset = CharsetUtil.defaultCharset();
}
return URLEncoder.PATH_SEGMENT.encode(url, charset);
} }
/** /**
@ -185,9 +182,6 @@ public class URLEncodeUtil {
if (StrUtil.isEmpty(url)) { if (StrUtil.isEmpty(url)) {
return url; return url;
} }
if (null == charset) { return RFC3986.FRAGMENT.encode(url, charset);
charset = CharsetUtil.defaultCharset();
}
return URLEncoder.FRAGMENT.encode(url, charset);
} }
} }

2
hutool-core/src/main/java/cn/hutool/core/net/URLEncoder.java
View File

@ -23,7 +23,9 @@ import java.util.BitSet;
* *
* @author looly * @author looly
* @see cn.hutool.core.codec.PercentCodec * @see cn.hutool.core.codec.PercentCodec
* @deprecated 此类中的方法并不规范，请使用 {@link RFC3986}
*/ */
@Deprecated
public class URLEncoder implements Serializable { public class URLEncoder implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

9
hutool-core/src/test/java/cn/hutool/core/util/URLUtilTest.java
View File

@ -83,7 +83,14 @@ public class URLUtilTest {
Assert.assertEquals(body, URLUtil.decode(encode)); Assert.assertEquals(body, URLUtil.decode(encode));
String encode2 = URLUtil.encodeQuery(body); String encode2 = URLUtil.encodeQuery(body);
Assert.assertEquals("366466+-+%E5%89%AF%E6%9C%AC.jpg", encode2); Assert.assertEquals("366466%20-%20%E5%89%AF%E6%9C%AC.jpg", encode2);
}
@Test
public void encodeQueryPlusTest() {
String body = "+";
String encode2 = URLUtil.encodeQuery(body);
Assert.assertEquals("+", encode2);
} }
@Test @Test