Fixed error on ScannerProperty.

mc1arke · Jul 8, 2020 · f925fb7 · f925fb7
1 parent 9c35f70
commit f925fb7
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/...thub/mc1arke/sonarqube/plugin/ce/pullrequest/gitlab/GitlabServerPullRequestDecorator.java b/...thub/mc1arke/sonarqube/plugin/ce/pullrequest/gitlab/GitlabServerPullRequestDecorator.java
@@ -104,15 +104,16 @@ public DecorationResult decorateQualityGateStatus(AnalysisDetails analysis, AlmS
 
  try {
  final String apiURL = Optional.ofNullable(StringUtils.stripToNull(almSettingDto.getUrl()))
- .orElse(analysis.getScannerProperty(PULLREQUEST_GITLAB_INSTANCE_URL)
- .orElseThrow(() -> new IllegalStateException(String.format(
- "Could not decorate Gitlab merge request. '%s' has not been set in scanner properties",
- PULLREQUEST_GITLAB_INSTANCE_URL))));
+  .orElseGet(() -> analysis.getScannerProperty(PULLREQUEST_GITLAB_INSTANCE_URL)
+  .orElseThrow(() -> new IllegalStateException(String.format(
+  "Could not decorate Gitlab merge request. '%s' has not been set in scanner properties",
+  PULLREQUEST_GITLAB_INSTANCE_URL))));
  final String apiToken = almSettingDto.getPersonalAccessToken();
- final String projectId = analysis.getScannerProperty(PULLREQUEST_GITLAB_PROJECT_ID).orElseThrow(
- () -> new IllegalStateException(String.format(
- "Could not decorate Gitlab merge request. '%s' has not been set in scanner properties",
- PULLREQUEST_GITLAB_PROJECT_ID)));
+ final String projectId = Optional.ofNullable(StringUtils.stripToNull(projectAlmSettingDto.getAlmRepo()))
+ .orElseGet(() -> analysis.getScannerProperty(PULLREQUEST_GITLAB_PROJECT_ID)
+ .orElseThrow(() -> new IllegalStateException(String.format(
+ "Could not decorate Gitlab merge request. '%s' has not been set in scanner properties",
+ PULLREQUEST_GITLAB_PROJECT_ID))));
  final String pullRequestId = analysis.getBranchName();
 
  final String projectURL = apiURL + String.format("/projects/%s", URLEncoder