Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/com/aliyun/tea/Tea.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ private static String composeUrl(TeaRequest request) {
StringBuilder urlBuilder = new StringBuilder();
urlBuilder.append(protocol);
urlBuilder.append("://").append(host);
if (null != request.port) {
urlBuilder.append(":").append(request.port);
}
if (null != request.pathname) {
urlBuilder.append(request.pathname);
}
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/com/aliyun/tea/TeaTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,20 @@ public void composeUrlTest() throws NoSuchMethodException, InvocationTargetExcep
request.query.put("test", "null");
str = (String) composeUrl.invoke(Tea.class, request);
Assert.assertEquals("HTTP://test?test&test=null", str);

request.query = new HashMap<>();
request.query.put("host", "test");
request.pathname = "/test";
request.protocol = "http";
request.port = 80;
str = (String) composeUrl.invoke(Tea.class, request);
Assert.assertEquals("http://test:80/test?host=test", str);
request.port = 443;
str = (String) composeUrl.invoke(Tea.class, request);
Assert.assertEquals("http://test:443/test?host=test", str);
request.port = null;
str = (String) composeUrl.invoke(Tea.class, request);
Assert.assertEquals("http://test/test?host=test", str);
}

@Test
Expand Down