use sonar.host.url (rather than sonar.core.serverBaseURL) for calling webservices

Author: thomasgl-orange

src/main/java/com/talanlabs/sonar/plugins/gitlab/GitLabPluginConfiguration.java

@@ -51,6 +51,7 @@ public class GitLabPluginConfiguration {
     private final Settings settings;
     private final System2 system2;
     private final String baseUrl;
+    private final String baseWsUrl;
 
     public GitLabPluginConfiguration(Settings settings, System2 system2) {
         super();
@@ -59,13 +60,20 @@ public GitLabPluginConfiguration(Settings settings, System2 system2) {
         this.system2 = system2;
 
         String tempBaseUrl = settings.hasKey(CoreProperties.SERVER_BASE_URL) ? settings.getString(CoreProperties.SERVER_BASE_URL) : settings.getString("sonar.host.url");
+        this.baseUrl = sanitizeBaseUrl(tempBaseUrl);
+
+        String tempBaseWsUrl = settings.getString("sonar.host.url");
+        this.baseWsUrl = sanitizeBaseUrl(tempBaseWsUrl);
+    }
+
+    private static String sanitizeBaseUrl(String tempBaseUrl) {
         if (tempBaseUrl == null) {
-            tempBaseUrl = "http://localhost:9090";
+            tempBaseUrl = "http://localhost:9000";
         }
         if (!tempBaseUrl.endsWith("/")) {
             tempBaseUrl += "/";
         }
-        this.baseUrl = tempBaseUrl;
+        return tempBaseUrl;
     }
 
     public String projectId() {
@@ -259,7 +267,18 @@ public PasswordAuthentication getPasswordAuthentication() {
         }
     }
 
+    /**
+     * The base URL for user-facing links (usually sonar.core.serverBaseURL, when defined in the
+     * SonarQube global configuration, or sonar.host.url otherwise).
+     */
     public String baseUrl() {
         return baseUrl;
     }
+
+    /**
+     * The base URL for calling SonarQube web-services (usually sonar.host.url).
+     */
+    public String baseWsUrl() {
+        return baseWsUrl;
+    }
 }

src/main/java/com/talanlabs/sonar/plugins/gitlab/SonarFacade.java

@@ -68,7 +68,7 @@ public class SonarFacade {
     public SonarFacade(Settings settings, GitLabPluginConfiguration gitLabPluginConfiguration) {
         this.gitLabPluginConfiguration = gitLabPluginConfiguration;
 
-        HttpConnector httpConnector = HttpConnector.newBuilder().url(gitLabPluginConfiguration.baseUrl())
+        HttpConnector httpConnector = HttpConnector.newBuilder().url(gitLabPluginConfiguration.baseWsUrl())
                 .credentials(settings.getString(CoreProperties.LOGIN), settings.getString(CoreProperties.PASSWORD)).build();
 
         wsClient = WsClientFactories.getDefault().newClient(httpConnector);

src/test/java/com/talanlabs/sonar/plugins/gitlab/GitLabPluginConfigurationTest.java

@@ -51,6 +51,15 @@ public void before() {
         config = new GitLabPluginConfiguration(settings, new System2());
     }
 
+    @Test
+    public void testBaseWsUrl() {
+        Assertions.assertThat(config.baseWsUrl()).isEqualTo("http://localhost:9000/");
+
+        settings.setProperty("sonar.host.url", "http://myserver2/");
+        config = new GitLabPluginConfiguration(settings, new System2());
+        Assertions.assertThat(config.baseWsUrl()).isEqualTo("http://myserver2/");
+    }
+
     @Test
     public void testGlobal() {
         Assertions.assertThat(config.url()).isEqualTo("https://gitlab.com");

src/test/java/com/talanlabs/sonar/plugins/gitlab/SonarFacadeTest.java

@@ -34,7 +34,6 @@
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.batch.rule.Severity;
-import org.sonar.api.config.PropertyDefinition;
 import org.sonar.api.config.PropertyDefinitions;
 import org.sonar.api.config.Settings;
 import org.sonar.api.resources.Qualifiers;
@@ -60,10 +59,9 @@ public class SonarFacadeTest {
 
     @Before
     public void prepare() throws IOException {
-        settings = new Settings(new PropertyDefinitions(PropertyDefinition.builder(CoreProperties.SERVER_BASE_URL).name("Server base URL")
-                .description("HTTP URL of this SonarQube server, such as <i>http://yourhost.yourdomain/sonar</i>. This value is used i.e. to create links in emails.")
-                .category(CoreProperties.CATEGORY_GENERAL).defaultValue(CoreProperties.SERVER_BASE_URL_DEFAULT_VALUE).build()).addComponents(GitLabPlugin.definitions()));
-        settings.setProperty(CoreProperties.SERVER_BASE_URL, String.format("http://%s:%d", sonar.getHostName(), sonar.getPort()));
+        settings = new Settings(new PropertyDefinitions(GitLabPlugin.definitions()));
+        settings.setProperty(CoreProperties.SERVER_BASE_URL, "http://whatever");
+        settings.setProperty("sonar.host.url", String.format("http://%s:%d", sonar.getHostName(), sonar.getPort()));
         settings.setProperty(GitLabPlugin.GITLAB_QUERY_MAX_RETRY, 5);
 
         projectDir = temp.newFolder();