mirror of
https://gitee.com/chinabugotech/hutool.git
synced 2025-05-09 23:51:34 +08:00
!835 add UrlBuilder getPortWithDefault
Merge pull request !835 from 不忘初心/v5-dev
This commit is contained in:
commit
364d6a2560
@ -291,6 +291,20 @@ public final class UrlBuilder implements Builder<String> {
|
|||||||
return port;
|
return port;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取端口,如果未自定义返回协议默认端口
|
||||||
|
*
|
||||||
|
* @return 端口
|
||||||
|
*/
|
||||||
|
public int getPortWithDefault() {
|
||||||
|
int port = getPort();
|
||||||
|
if (port > 0) {
|
||||||
|
return port;
|
||||||
|
}
|
||||||
|
URL url = this.toURL();
|
||||||
|
return url.getDefaultPort();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 设置端口,默认-1
|
* 设置端口,默认-1
|
||||||
*
|
*
|
||||||
|
@ -16,8 +16,10 @@ public class UrlBuilderTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void buildTest() {
|
public void buildTest() {
|
||||||
final String buildUrl = UrlBuilder.of().setHost("www.hutool.cn").build();
|
UrlBuilder builder = UrlBuilder.of();
|
||||||
|
final String buildUrl = builder.setHost("www.hutool.cn").build();
|
||||||
Assert.assertEquals("http://www.hutool.cn/", buildUrl);
|
Assert.assertEquals("http://www.hutool.cn/", buildUrl);
|
||||||
|
Assert.assertEquals(buildUrl, 80, builder.getPortWithDefault());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@ -26,9 +28,11 @@ public class UrlBuilderTest {
|
|||||||
String buildUrl = UrlBuilder.of().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);
|
Assert.assertEquals("http://192.168.1.1:8080", buildUrl);
|
||||||
|
|
||||||
buildUrl = UrlBuilder.of().setScheme("http").setHost("192.168.1.1").setPort(8080).addQuery("url", "http://192.168.1.1/test/1")
|
UrlBuilder urlBuilder = UrlBuilder.of();
|
||||||
|
buildUrl = urlBuilder.setScheme("http").setHost("192.168.1.1").setPort(8080).addQuery("url", "http://192.168.1.1/test/1")
|
||||||
.setWithEndTag(false).build();
|
.setWithEndTag(false).build();
|
||||||
Assert.assertEquals("http://192.168.1.1:8080?url=http://192.168.1.1/test/1", buildUrl);
|
Assert.assertEquals("http://192.168.1.1:8080?url=http://192.168.1.1/test/1", buildUrl);
|
||||||
|
Assert.assertEquals(buildUrl, 8080, urlBuilder.getPortWithDefault());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
Loading…
x
Reference in New Issue
Block a user