Fixed Sonar base URL detection

mibexsoftware · Apr 16, 2017 · f1c7075 · f1c7075
1 parent 55f8cbb
commit f1c7075
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/scala/ch/mibex/bitbucket/sonar/review/SonarReviewPostJob.scala b/src/main/scala/ch/mibex/bitbucket/sonar/review/SonarReviewPostJob.scala
@@ -8,6 +8,7 @@ import ch.mibex.bitbucket.sonar.utils.{LogUtils, SonarUtils}
 import org.sonar.api.CoreProperties
 import org.sonar.api.batch.CheckProject
 import org.sonar.api.batch.postjob.{PostJob, PostJobContext, PostJobDescriptor}
+import org.sonar.api.config.Settings
 import org.sonar.api.resources.Project
 import org.sonar.api.utils.log.Loggers
 
@@ -28,10 +29,13 @@ class SonarReviewPostJob(bitbucketClient: BitbucketClient,
   }
 
   private def getProjectUrl(context: PostJobContext, pullRequest: PullRequest) =
-    context.settings().getString(CoreProperties.SERVER_BASE_URL) + "/dashboard?id=" +
+    getSonarBaseUrl(context.settings()) + "/dashboard?id=" +
       context.settings().getString(CoreProperties.PROJECT_KEY_PROPERTY) + ":" +
       URLEncoder.encode(pullRequest.srcBranch, "UTF-8")
 
+  private def getSonarBaseUrl(settings: Settings) =
+    Option(settings.getString(CoreProperties.SERVER_BASE_URL)).getOrElse(settings.getString("sonar.host.url"))
+
   private def handlePullRequest(context: PostJobContext, pullRequest: PullRequest) {
     setBuildStatus(InProgressBuildStatus, context, pullRequest)
     val ourComments = bitbucketClient.findOwnPullRequestComments(pullRequest)