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

UrlBuilder.addPath 方法传入非有效路径字符串时，会出现空指针异常

Browse Source
This commit is contained in:
Looly 2022-08-27 01:10:13 +08:00
parent 2327af84ca
commit ef0fc738f1
4 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -25,6 +25,7 @@
* 【core 】 修复UrlBuilder的toURI方法将url重复编码（issue#2503@Github）
* 【core 】 修复CollUtil.lastIndexOf序号错误问题
* 【core 】 修复zip被识别成jar和apk被识别成jar或zip的问题（pr#2548@Github）
* 【core 】 修复UrlBuilder.addPath 方法传入非有效路径字符串时，会出现空指针异常的问题（issue#I5O4ML@Gitee）
-------------------------------------------------------------------------------------------------------------

11
hutool-core/src/main/java/cn/hutool/core/net/url/UrlBuilder.java
View File

@ -187,11 +187,22 @@ public final class UrlBuilder implements Builder<String> {
* 创建空的UrlBuilder
*
* @return UrlBuilder
* @deprecated 请使用 {@link #of()}
*/
@Deprecated
public static UrlBuilder create() {
return new UrlBuilder();
}
/**
* 创建空的UrlBuilder
*
* @return UrlBuilder
*/
public static UrlBuilder of() {
return new UrlBuilder();
}
/**
* 构造
*/

4
hutool-core/src/main/java/cn/hutool/core/net/url/UrlPath.java
View File

@ -1,10 +1,12 @@
package cn.hutool.core.net.url;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.net.RFC3986;
import cn.hutool.core.net.URLDecoder;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import java.nio.charset.Charset;
@ -52,7 +54,7 @@ public class UrlPath {
* @return 节点列表
*/
public List<String> getSegments() {
return this.segments;
return ObjectUtil.defaultIfNull(this.segments, ListUtil.empty());
}
/**

29
hutool-core/src/test/java/cn/hutool/core/net/UrlBuilderTest.java
View File

@ -16,17 +16,17 @@ public class UrlBuilderTest {
@Test
public void buildTest() {
final String buildUrl = UrlBuilder.create().setHost("www.hutool.cn").build();
final String buildUrl = UrlBuilder.of().setHost("www.hutool.cn").build();
Assert.assertEquals("http://www.hutool.cn/", buildUrl);
}
@Test
public void buildWithoutSlashTest(){
// https://github.com/dromara/hutool/issues/2459
String buildUrl = UrlBuilder.create().setScheme("http").setHost("192.168.1.1").setPort(8080).setWithEndTag(false).build();
String buildUrl = UrlBuilder.of().setScheme("http").setHost("192.168.1.1").setPort(8080).setWithEndTag(false).build();
Assert.assertEquals("http://192.168.1.1:8080", buildUrl);
buildUrl = UrlBuilder.create().setScheme("http").setHost("192.168.1.1").setPort(8080).addQuery("url", "http://192.168.1.1/test/1")
buildUrl = UrlBuilder.of().setScheme("http").setHost("192.168.1.1").setPort(8080).addQuery("url", "http://192.168.1.1/test/1")
.setWithEndTag(false).build();
Assert.assertEquals("http://192.168.1.1:8080?url=http://192.168.1.1/test/1", buildUrl);
}
@ -40,7 +40,7 @@ public class UrlBuilderTest {
@Test
public void testHost() {
final String buildUrl = UrlBuilder.create()
final String buildUrl = UrlBuilder.of()
.setScheme("https")
.setHost("www.hutool.cn").build();
Assert.assertEquals("https://www.hutool.cn/", buildUrl);
@ -48,7 +48,7 @@ public class UrlBuilderTest {
@Test
public void testHostPort() {
final String buildUrl = UrlBuilder.create()
final String buildUrl = UrlBuilder.of()
.setScheme("https")
.setHost("www.hutool.cn")
.setPort(8080)
@ -58,7 +58,7 @@ public class UrlBuilderTest {
@Test
public void testPathAndQuery() {
final String buildUrl = UrlBuilder.create()
final String buildUrl = UrlBuilder.of()
.setScheme("https")
.setHost("www.hutool.cn")
.addPath("/aaa").addPath("bbb")
@ -71,7 +71,7 @@ public class UrlBuilderTest {
@Test
public void testQueryWithChinese() {
final String buildUrl = UrlBuilder.create()
final String buildUrl = UrlBuilder.of()
.setScheme("https")
.setHost("www.hutool.cn")
.addPath("/aaa").addPath("bbb")
@ -84,7 +84,7 @@ public class UrlBuilderTest {
@Test
public void testMultiQueryWithChinese() {
final String buildUrl = UrlBuilder.create()
final String buildUrl = UrlBuilder.of()
.setScheme("https")
.setHost("www.hutool.cn")
.addPath("/s")
@ -314,7 +314,7 @@ public class UrlBuilderTest {
@Test
public void addPathEncodeTest(){
final String url = UrlBuilder.create()
final String url = UrlBuilder.of()
.setScheme("https")
.setHost("domain.cn")
.addPath("api")
@ -328,7 +328,7 @@ public class UrlBuilderTest {
@Test
public void addPathEncodeTest2(){
// https://github.com/dromara/hutool/issues/1912
final String url = UrlBuilder.create()
final String url = UrlBuilder.of()
.setScheme("https")
.setHost("domain.cn")
.addPath("/api/xxx/bbb")
@ -462,4 +462,13 @@ public class UrlBuilderTest {
.toString();
Assert.assertEquals(duplicate, normal);
}
@Test
public void addPathTest(){
//https://gitee.com/dromara/hutool/issues/I5O4ML
UrlBuilder.of().addPath("");
UrlBuilder.of().addPath("/");
UrlBuilder.of().addPath("//");
UrlBuilder.of().addPath("//a");
}
}