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
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,16 @@ private static String bucketPath(final String bucket) {
}

public static String buildHostField(final ConnectionDetails details) {
return details.getEndpoint();
return filterHttp(details.getEndpoint());
}

public static String filterHttp(final String url) {
if (url.startsWith("http://") || url.startsWith("https://"))
{
final int colonIndex = url.indexOf(":");
return url.substring(colonIndex + 3);
}
return url;
}

public static int getPort(final URL url) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,12 @@ public static ConnectionDetails getConnection() {
public static ConnectionDetails getConnection(final int port) {
return ConnectionDetailsImpl.builder("localhost:" + port, new Credentials("id", "key")).build();
}

public static ConnectionDetails getHttpConnection() {
return getHttpConnection(8080);
}

public static ConnectionDetails getHttpConnection(final int port) {
return ConnectionDetailsImpl.builder("http://localhost:" + port, new Credentials("id", "key")).build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,12 @@ public void getHttpDefaultPort() throws MalformedURLException {
assertTrue(port == 80);
}

@Test
public void buildHostFieldWithHttp() {
final String result = NetUtils.buildHostField(ConnectionFixture.getHttpConnection());
assertThat(result, is("localhost:8080"));
}

@Test
public void buildHost() throws MalformedURLException {
final ConnectionDetails details = new ConnectionDetails() {
Expand Down