Removed exception "IllegalStateException" if could not find New Coverage Condition in analysis and replaced to "0"

build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 Michael Clarke
+ * Copyright (C) 2020 Michael Clarke
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ repositories {
     }
 }
 
-def sonarqubeVersion = '7.8'
+def sonarqubeVersion = '8.1.0.31237'
 def sonarqubeLibDir = "${projectDir}/sonarqube-lib"
 def sonarLibraries = "${sonarqubeLibDir}/sonarqube-${sonarqubeVersion}/lib"
 

src/main/java/com/github/mc1arke/sonarqube/plugin/ce/CommunityBranch.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 Michael Clarke
+ * Copyright (C) 2020 Michael Clarke
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -27,22 +27,22 @@
 /**
  * @author Michael Clarke
  */
-public class CommunityBranch implements Branch, BranchCompatibility.BranchCompatibilityMajor7.BranchCompatibilityMinor9 {
+public class CommunityBranch implements Branch {
 
     private final String name;
     private final BranchType branchType;
     private final boolean main;
-    private final String mergeBranchUuid;
+    private final String referenceBranchUuid;
     private final String pullRequestKey;
     private final String targetBranchName;
 
-    public CommunityBranch(String name, BranchType branchType, boolean main, String mergeBranchUuid,
+    public CommunityBranch(String name, BranchType branchType, boolean main, String referenceBranchUuid,
                            String pullRequestKey, String targetBranchName) {
         super();
         this.name = name;
         this.branchType = branchType;
         this.main = main;
-        this.mergeBranchUuid = mergeBranchUuid;
+        this.referenceBranchUuid = referenceBranchUuid;
         this.pullRequestKey = pullRequestKey;
         this.targetBranchName = targetBranchName;
     }
@@ -63,13 +63,8 @@ public boolean isMain() {
     }
 
     @Override
-    public boolean isLegacyFeature() {
-        return false;
-    }
-
-    @Override
-    public String getMergeBranchUuid() {
-        return mergeBranchUuid;
+    public String getReferenceBranchUuid() {
+        return referenceBranchUuid;
     }
 
     @Override

src/main/java/com/github/mc1arke/sonarqube/plugin/ce/CommunityBranchLoaderDelegate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 Michael Clarke
+ * Copyright (C) 2020 Michael Clarke
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -29,6 +29,7 @@
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.project.Project;
 
+import javax.annotation.Nonnull;
 import java.util.Optional;
 
 /**
@@ -45,7 +46,7 @@ public CommunityBranchLoaderDelegate(DbClient dbClient, MutableAnalysisMetadataH
     }
 
     @Override
-    public void load(ScannerReport.Metadata metadata) {
+    public void load(@Nonnull ScannerReport.Metadata metadata) {
         Branch branch = load(metadata, metadataHolder.getProject(), dbClient);
 
         metadataHolder.setBranch(branch);
@@ -67,17 +68,16 @@ private static Branch load(ScannerReport.Metadata metadata, Project project, DbC
                 throw new IllegalStateException("Could not find main branch");
             }
         } else {
-            String targetBranch = StringUtils.trimToNull(metadata.getMergeBranchName());
+            String targetBranch = StringUtils.trimToNull(metadata.getReferenceBranchName());
             ScannerReport.Metadata.BranchType branchType = metadata.getBranchType();
             if (null == targetBranchName) {
                 targetBranchName = targetBranch;
             }
 
             if (ScannerReport.Metadata.BranchType.PULL_REQUEST == branchType) {
                 return createPullRequest(metadata, dbClient, branchName, projectUuid, targetBranch, targetBranchName);
-            } else if (ScannerReport.Metadata.BranchType.LONG == branchType ||
-                       ScannerReport.Metadata.BranchType.SHORT == branchType) {
-                return createBranch(dbClient, branchName, projectUuid, targetBranch, branchType, targetBranchName);
+            } else if (ScannerReport.Metadata.BranchType.BRANCH == branchType) {
+                return createBranch(dbClient, branchName, projectUuid, targetBranch, targetBranchName);
             } else {
                 throw new IllegalStateException(String.format("Invalid branch type '%s'", branchType.name()));
             }
@@ -100,7 +100,7 @@ private static Branch createPullRequest(ScannerReport.Metadata metadata, DbClien
     }
 
     private static Branch createBranch(DbClient dbClient, String branchName, String projectUuid, String targetBranch,
-                                       ScannerReport.Metadata.BranchType branchType, String targetBranchName) {
+                                       String targetBranchName) {
         String targetUuid;
         if (null == targetBranch) {
             targetUuid = projectUuid;
@@ -113,8 +113,7 @@ private static Branch createBranch(DbClient dbClient, String branchName, String
                         String.format("Could not find target branch '%s' in project", targetBranch));
             }
         }
-        return new CommunityBranch(branchName, ScannerReport.Metadata.BranchType.LONG == branchType ? BranchType.LONG :
-                                               BranchType.SHORT,
+        return new CommunityBranch(branchName, BranchType.BRANCH,
                                    findBranchByKey(projectUuid, branchName, dbClient).map(BranchDto::isMain)
                                            .orElse(false), targetUuid, null, targetBranchName);
     }

src/main/java/com/github/mc1arke/sonarqube/plugin/ce/pullrequest/AnalysisDetails.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 Michael Clarke
+ * Copyright (C) 2020 Michael Clarke
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,8 +19,6 @@
 package com.github.mc1arke.sonarqube.plugin.ce.pullrequest;
 
 
-import com.github.mc1arke.sonarqube.plugin.SonarqubeCompatibility;
-import org.apache.commons.lang.StringUtils;
 import com.github.mc1arke.sonarqube.plugin.ce.pullrequest.markup.Document;
 import com.github.mc1arke.sonarqube.plugin.ce.pullrequest.markup.FormatterFactory;
 import com.github.mc1arke.sonarqube.plugin.ce.pullrequest.markup.Heading;
@@ -30,10 +28,12 @@
 import com.github.mc1arke.sonarqube.plugin.ce.pullrequest.markup.Node;
 import com.github.mc1arke.sonarqube.plugin.ce.pullrequest.markup.Paragraph;
 import com.github.mc1arke.sonarqube.plugin.ce.pullrequest.markup.Text;
+import org.apache.commons.lang.StringUtils;
 import org.sonar.api.ce.posttask.Analysis;
 import org.sonar.api.ce.posttask.Project;
 import org.sonar.api.ce.posttask.QualityGate;
 import org.sonar.api.ce.posttask.QualityGate.EvaluationStatus;
+import org.sonar.api.ce.posttask.ScannerContext;
 import org.sonar.api.config.Configuration;
 import org.sonar.api.issue.Issue;
 import org.sonar.api.measures.CoreMetrics;
@@ -47,8 +47,11 @@
 import org.sonar.core.issue.DefaultIssue;
 import org.sonar.server.measure.Rating;
 
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
@@ -83,10 +86,11 @@ public class AnalysisDetails {
     private final Analysis analysis;
     private final Project project;
     private final Configuration configuration;
+    private final ScannerContext scannerContext;
 
     AnalysisDetails(BranchDetails branchDetails, PostAnalysisIssueVisitor postAnalysisIssueVisitor,
                     QualityGate qualityGate, MeasuresHolder measuresHolder, Analysis analysis, Project project,
-                    Configuration configuration, String publicRootURL) {
+                    Configuration configuration, String publicRootURL, ScannerContext scannerContext) {
         super();
         this.publicRootURL = publicRootURL;
         this.branchDetails = branchDetails;
@@ -96,6 +100,7 @@ public class AnalysisDetails {
         this.analysis = analysis;
         this.project = project;
         this.configuration = configuration;
+        this.scannerContext = scannerContext;
     }
 
     public String getBranchName() {
@@ -110,16 +115,15 @@ public QualityGate.Status getQualityGateStatus() {
         return qualityGate.getStatus();
     }
 
+    public Optional<String> getScannerProperty(String propertyName) {
+        return Optional.ofNullable(scannerContext.getProperties().get(propertyName));
+    }
+
     public String createAnalysisSummary(FormatterFactory formatterFactory) {
 
-        BigDecimal newCoverage =
-                findQualityGateCondition(CoreMetrics.NEW_COVERAGE_KEY)
-                    .filter(condition -> condition.getStatus() != EvaluationStatus.NO_VALUE)
-                    .map(QualityGate.Condition::getValue)
-                    .map(BigDecimal::new)
-                    .orElse(null);
+        BigDecimal newCoverage = getNewCoverage().orElse(null);
 
-        double coverage = findMeasure(CoreMetrics.COVERAGE_KEY).map(MeasureWrapper::getDoubleValue).orElse(0D);
+        double coverage = findMeasure(CoreMetrics.COVERAGE_KEY).map(Measure::getDoubleValue).orElse(0D);
 
         BigDecimal newDuplications = findQualityGateCondition(CoreMetrics.NEW_DUPLICATED_LINES_DENSITY_KEY)
             .filter(condition -> condition.getStatus() != EvaluationStatus.NO_VALUE)
@@ -128,7 +132,7 @@ public String createAnalysisSummary(FormatterFactory formatterFactory) {
             .orElse(null);
 
         double duplications =
-                findMeasure(CoreMetrics.DUPLICATED_LINES_DENSITY_KEY).map(MeasureWrapper::getDoubleValue).orElse(0D);
+                findMeasure(CoreMetrics.DUPLICATED_LINES_DENSITY_KEY).map(Measure::getDoubleValue).orElse(0D);
 
         NumberFormat decimalFormat = new DecimalFormat("#0.00", DecimalFormatSymbols.getInstance(Locale.ENGLISH));
 
@@ -184,8 +188,9 @@ public String createAnalysisSummary(FormatterFactory formatterFactory) {
                                                                  .map(i -> i + "% Duplicated Code")
                                                                  .orElse("No duplication information") + " (" +
                                                          decimalFormat.format(duplications) +
-                                                         "% Estimated after merge)"))),
-                                         new Link(publicRootURL + "/dashboard?id=" + URLEncoder.encode(project.getKey()) + "&pullRequest=" + branchDetails.getBranchName(), new Text("View in SonarQube")));
+                                                         "% Estimated after merge)"))), new Link(
+                publicRootURL + "/dashboard?id=" + encode(project.getKey(), StandardCharsets.UTF_8) + "&pullRequest=" +
+                branchDetails.getBranchName(), new Text("View in SonarQube")));
 
         return formatterFactory.documentFormatter().format(document, formatterFactory);
     }
@@ -206,9 +211,10 @@ public String createAnalysisIssueSummary(PostAnalysisIssueVisitor.ComponentIssue
                 new Paragraph(new Text(String.format("**Type:** %s ", issue.type().name())), new Image(issue.type().name(), String.format("%s/checks/IssueType/%s.svg?sanitize=true", baseImageUrl, issue.type().name().toLowerCase()))),
                 new Paragraph(new Text(String.format("**Severity:** %s ", issue.severity())), new Image(issue.severity(), String.format("%s/checks/Severity/%s.svg?sanitize=true", baseImageUrl, issue.severity().toLowerCase()))),
                 new Paragraph(new Text(String.format("**Message:** %s", issue.getMessage()))),
-                effortNode,
-                resolutionNode,
-                new Link(publicRootURL + "/project/issues?id=" + URLEncoder.encode(project.getKey()) + "&pullRequest=" + branchDetails.getBranchName() + "&issues=" + issue.key() + "&open=" + issue.key(), new Text("View in SonarQube"))
+                effortNode, resolutionNode, new Link(
+                publicRootURL + "/project/issues?id=" + encode(project.getKey(), StandardCharsets.UTF_8) +
+                "&pullRequest=" + branchDetails.getBranchName() + "&issues=" + issue.key() + "&open=" + issue.key(),
+                new Text("View in SonarQube"))
         );
         return formatterFactory.documentFormatter().format(document, formatterFactory);
     }
@@ -276,11 +282,10 @@ private List<QualityGate.Condition> findFailedConditions() {
                 .collect(Collectors.toList());
     }
 
-    private Optional<MeasureWrapper> findMeasure(String metricKey) {
+    private Optional<Measure> findMeasure(String metricKey) {
         return measuresHolder.getMeasureRepository().getRawMeasure(measuresHolder.getTreeRootHolder().getRoot(),
                                                                    measuresHolder.getMetricRepository()
-                                                                           .getByKey(metricKey))
-                .map(MeasureWrapper::new);
+                                                                           .getByKey(metricKey));
     }
 
     public Optional<QualityGate.Condition> findQualityGateCondition(String metricKey) {
@@ -322,6 +327,21 @@ private static String format(QualityGate.Condition condition) {
         }
     }
 
+    public Optional<BigDecimal> getNewCoverage(){
+        return findQualityGateCondition(CoreMetrics.NEW_COVERAGE_KEY)
+                .filter(condition -> condition.getStatus() != EvaluationStatus.NO_VALUE)
+                .map(QualityGate.Condition::getValue)
+                .map(BigDecimal::new);
+    }
+
+    private static String encode(String original, Charset charset) {
+        try {
+            return URLEncoder.encode(original, charset.name());
+        } catch (UnsupportedEncodingException ex) {
+            throw new IllegalStateException("Could not encode input", ex);
+        }
+    }
+
     public static class BranchDetails {
 
         private final String branchName;
@@ -388,23 +408,4 @@ private String getImageName() {
         }
     }
 
-    private static class MeasureWrapper implements SonarqubeCompatibility.Major7.Minor9 {
-
-        private final Measure measure;
-
-        MeasureWrapper(Measure measure) {
-            super();
-            this.measure = measure;
-        }
-
-        Double getDoubleValue() {
-            try {
-                return (Double) Measure.class.getDeclaredMethod("getDoubleValue").invoke(measure);
-            } catch (ReflectiveOperationException ex) {
-                throw new IllegalStateException("Could not invoke getDoubleValue", ex);
-            }
-        }
-
-    }
-
 }