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 @@ -73,18 +73,29 @@ public static String getServerUrlFromName(String serverName) {

@NonNull
public static String getServerUrl(GitLabServer server) {
return server != null ? server.getServerUrl() : GitLabServer.GITLAB_SERVER_URL;
if (server == null) {
return GitLabServer.GITLAB_SERVER_URL;
}
String url = server.getServerUrl();
return sanitizeUrlValue(url);
}

@NonNull
private static String getServerUrl(String server) {
if (server.startsWith("http://") || server.startsWith("https://")) {
return server;
return sanitizeUrlValue(server);
} else {
return getServerUrlFromName(server);
}
}

private static String sanitizeUrlValue(String url) {
if (url.endsWith("/")) {
return url.substring(0, url.length() - 1);
}
return url;
}

public static UriTemplateBuilder getUriTemplateFromServer(String server) {
return UriTemplate.buildFromTemplate(getServerUrl(server));
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package io.jenkins.plugins.gitlabbranchsource.helpers;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;

import io.jenkins.plugins.gitlabserverconfig.servers.GitLabServer;
import org.junit.Test;

public class GitLabHelperTest {

@Test
public void server_url_does_not_have_trailing_slash() {
assertThat(GitLabHelper.getServerUrl(null), is("https://gitlab.com"));

GitLabServer server1 = new GitLabServer("https://company.com/gitlab/", "comp_server", "1245");
assertThat(GitLabHelper.getServerUrl(server1), is("https://company.com/gitlab"));

GitLabServer server2 = new GitLabServer("https://gitlab.example.org", "", "pw-id");
assertThat(GitLabHelper.getServerUrl(server2), is("https://gitlab.example.org"));
}
}