From dd47b17bb4259ce422e3a643d07178f21185a406 Mon Sep 17 00:00:00 2001
From: Duarte Meneses <duarte.meneses@sonarsource.com>
Date: Wed, 9 Aug 2017 15:30:45 +0200
Subject: SONAR-9674 Load branch information from scanner report

---
 .../server/computation/task/projectanalysis/analysis/Branch.java    | 2 +-
 .../task/projectanalysis/component/DefaultBranchImpl.java           | 6 +++++-
 .../computation/task/projectanalysis/component/TreeRootHolder.java  | 1 +
 .../api/posttask/PostProjectAnalysisTasksExecutorTest.java          | 2 +-
 .../task/projectanalysis/step/ReportPersistComponentsStepTest.java  | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'server')

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Branch.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Branch.java
index 641bea77437..352dfa1ee18 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Branch.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Branch.java
@@ -47,7 +47,7 @@ public interface Branch extends ComponentKeyGenerator {
    * For short living branches, indicates the branch from which it was forked.
    * It will be empty for other types of branches.
    */
-  Optional<String> getMergeBranchName();
+  Optional<String> getMergeBranchUuid();
 
   /**
    * Whether the cross-project duplication tracker must be enabled
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DefaultBranchImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DefaultBranchImpl.java
index bb340eabe44..c6db2d07aa8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DefaultBranchImpl.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DefaultBranchImpl.java
@@ -42,6 +42,10 @@ public class DefaultBranchImpl implements Branch {
   @Nullable
   private final String branchName;
 
+  public DefaultBranchImpl() {
+    this(null);
+  }
+
   public DefaultBranchImpl(@Nullable String name) {
     this.branchName = name;
     if (name != null && !ComponentKeys.isValidBranch(name)) {
@@ -61,7 +65,7 @@ public class DefaultBranchImpl implements Branch {
   }
 
   @Override
-  public Optional<String> getMergeBranchName() {
+  public Optional<String> getMergeBranchUuid() {
     return Optional.empty();
   }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolder.java
index 24c57476a2d..f9ae8404eff 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolder.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolder.java
@@ -25,6 +25,7 @@ package org.sonar.server.computation.task.projectanalysis.component;
 public interface TreeRootHolder {
   /**
    * The root of the tree, for example the project or the portfolio.
+   * With branches, it will refer to the root component of the branch.
    *
    * @throws IllegalStateException if the holder is empty (ie. there is no root yet)
    */
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java
index 8b721ea8a73..4e96fd24484 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java
@@ -249,7 +249,7 @@ public class PostProjectAnalysisTasksExecutorTest {
       }
 
       @Override
-      public Optional<String> getMergeBranchName() {
+      public Optional<String> getMergeBranchUuid() {
         return Optional.empty();
       }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java
index a0fd8666611..a0ab0a2933a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java
@@ -922,7 +922,7 @@ public class ReportPersistComponentsStepTest extends BaseStepTest {
     }
 
     @Override
-    public java.util.Optional<String> getMergeBranchName() {
+    public java.util.Optional<String> getMergeBranchUuid() {
       return java.util.Optional.empty();
     }
 
-- 
cgit v1.2.3