SONAR-9616 Move BranchType to Common

6 files changed, 30 insertions, 22 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/ListAction.java b/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/ListAction.java
index 3fe1052e356..cf13348c88e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/ListAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/ListAction.java
@@ -57,6 +57,7 @@ import static org.sonar.db.component.BranchType.LONG;
 import static org.sonar.db.component.BranchType.SHORT;
 import static org.sonar.server.ws.KeyExamples.KEY_PROJECT_EXAMPLE_001;
 import static org.sonar.server.ws.WsUtils.checkFoundWithOptional;
+import static org.sonarqube.ws.Common.BranchType;
 import static org.sonarqube.ws.client.projectbranches.ProjectBranchesParameters.ACTION_LIST;
 import static org.sonarqube.ws.client.projectbranches.ProjectBranchesParameters.PARAM_PROJECT;
 
@@ -123,7 +124,7 @@ public class ListAction implements BranchWsAction {
     WsBranches.Branch.Builder builder = response.addBranchesBuilder();
     setNullable(branch.getKey(), builder::setName);
     builder.setIsMain(branch.isMain());
-    builder.setType(WsBranches.Branch.BranchType.valueOf(branch.getBranchType().name()));
+    builder.setType(BranchType.valueOf(branch.getBranchType().name()));
     String mergeBranchUuid = branch.getMergeBranchUuid();
     if (mergeBranchUuid != null) {
       BranchDto mergeBranch = mergeBranchesByUuid.get(mergeBranchUuid);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/ShowAction.java
index 9ede7b80bc1..a8a68b16053 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/ShowAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/ShowAction.java
@@ -57,6 +57,7 @@ import static org.sonar.db.component.BranchType.LONG;
 import static org.sonar.db.component.BranchType.SHORT;
 import static org.sonar.server.ws.KeyExamples.KEY_BRANCH_EXAMPLE_001;
 import static org.sonar.server.ws.KeyExamples.KEY_FILE_EXAMPLE_001;
+import static org.sonarqube.ws.Common.BranchType;
 import static org.sonarqube.ws.client.projectbranches.ProjectBranchesParameters.ACTION_SHOW;
 import static org.sonarqube.ws.client.projectbranches.ProjectBranchesParameters.PARAM_BRANCH;
 import static org.sonarqube.ws.client.projectbranches.ProjectBranchesParameters.PARAM_COMPONENT;
@@ -131,7 +132,7 @@ public class ShowAction implements BranchWsAction {
     WsBranches.Branch.Builder builder = WsBranches.Branch.newBuilder();
     setNullable(branch.getKey(), builder::setName);
     builder.setIsMain(branch.isMain());
-    builder.setType(WsBranches.Branch.BranchType.valueOf(branch.getBranchType().name()));
+    builder.setType(BranchType.valueOf(branch.getBranchType().name()));
     if (mergeBranch != null) {
       setNullable(mergeBranch.getKey(), builder::setMergeBranch);
     }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/ListActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/ListActionTest.java
index d6fc838000b..dc0cfcb32b0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/ListActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/ListActionTest.java
@@ -35,6 +35,7 @@ import org.sonar.db.metric.MetricDto;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.WsActionTester;
+import org.sonarqube.ws.Common;
 import org.sonarqube.ws.MediaTypes;
 import org.sonarqube.ws.WsBranches;
 import org.sonarqube.ws.WsBranches.Branch;
@@ -128,7 +129,7 @@ public class ListActionTest {
 
     assertThat(response.getBranchesList())
       .extracting(Branch::hasName, Branch::getIsMain, Branch::getType)
-      .containsExactlyInAnyOrder(tuple(false, true, Branch.BranchType.LONG));
+      .containsExactlyInAnyOrder(tuple(false, true, Common.BranchType.LONG));
   }
 
   @Test
@@ -158,9 +159,9 @@ public class ListActionTest {
     assertThat(response.getBranchesList())
       .extracting(Branch::getName, Branch::getType)
       .containsExactlyInAnyOrder(
-        tuple("", Branch.BranchType.LONG),
-        tuple("feature/foo", Branch.BranchType.LONG),
-        tuple("feature/bar", Branch.BranchType.LONG));
+        tuple("", Common.BranchType.LONG),
+        tuple("feature/foo", Common.BranchType.LONG),
+        tuple("feature/bar", Common.BranchType.LONG));
   }
 
   @Test
@@ -181,10 +182,10 @@ public class ListActionTest {
     assertThat(response.getBranchesList())
       .extracting(Branch::getName, Branch::getType, Branch::getMergeBranch)
       .containsExactlyInAnyOrder(
-        tuple("", Branch.BranchType.LONG, ""),
-        tuple(longLivingBranch.getBranch(), Branch.BranchType.LONG, ""),
-        tuple(shortLivingBranch.getBranch(), Branch.BranchType.SHORT, longLivingBranch.getBranch()),
-        tuple(shortLivingBranchOnMaster.getBranch(), Branch.BranchType.SHORT, ""));
+        tuple("", Common.BranchType.LONG, ""),
+        tuple(longLivingBranch.getBranch(), Common.BranchType.LONG, ""),
+        tuple(shortLivingBranch.getBranch(), Common.BranchType.SHORT, longLivingBranch.getBranch()),
+        tuple(shortLivingBranchOnMaster.getBranch(), Common.BranchType.SHORT, ""));
   }
 
   @Test
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/ShowActionTest.java
index a6adf956b79..0625c0dfe93 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/ShowActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/ShowActionTest.java
@@ -37,6 +37,7 @@ import org.sonar.server.component.ComponentFinder;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.WsActionTester;
+import org.sonarqube.ws.Common;
 import org.sonarqube.ws.WsBranches.ShowWsResponse;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -102,7 +103,7 @@ public class ShowActionTest {
 
     assertThat(response.getBranch())
       .extracting(Branch::getName, Branch::getType, Branch::getMergeBranch)
-      .containsExactlyInAnyOrder(longLivingBranch.getBranch(), Branch.BranchType.LONG, "");
+      .containsExactlyInAnyOrder(longLivingBranch.getBranch(), Common.BranchType.LONG, "");
   }
 
   @Test
@@ -121,7 +122,7 @@ public class ShowActionTest {
 
     assertThat(response.getBranch())
       .extracting(Branch::getName, Branch::getType, Branch::getMergeBranch)
-      .containsExactlyInAnyOrder(shortLivingBranch.getBranch(), Branch.BranchType.SHORT, longLivingBranch.getBranch());
+      .containsExactlyInAnyOrder(shortLivingBranch.getBranch(), Common.BranchType.SHORT, longLivingBranch.getBranch());
   }
 
   @Test
@@ -179,7 +180,7 @@ public class ShowActionTest {
 
     assertThat(response.getBranch())
       .extracting(Branch::getName, Branch::getType, Branch::getMergeBranch)
-      .containsExactlyInAnyOrder(file.getBranch(), Branch.BranchType.LONG, "");
+      .containsExactlyInAnyOrder(file.getBranch(), Common.BranchType.LONG, "");
   }
 
   @Test
diff --git a/sonar-ws/src/main/protobuf/ws-commons.proto b/sonar-ws/src/main/protobuf/ws-commons.proto
index 50a4fa4268c..9690b295d21 100644
--- a/sonar-ws/src/main/protobuf/ws-commons.proto
+++ b/sonar-ws/src/main/protobuf/ws-commons.proto
@@ -113,3 +113,12 @@ enum RuleType {
   BUG = 2;
   VULNERABILITY = 3;
 }
+
+enum BranchType {
+  // Zero is required in order to not get MAINTAINABILITY as default value
+  // See http://androiddevblog.com/protocol-buffers-pitfall-adding-enum-values/
+  UNKNOWN_BRANCH_TYPE = 0;
+
+  LONG = 1;
+  SHORT = 2;
+}
diff --git a/sonar-ws/src/main/protobuf/ws-projectbranches.proto b/sonar-ws/src/main/protobuf/ws-projectbranches.proto
index 4500dc5a784..59f9e9038f5 100644
--- a/sonar-ws/src/main/protobuf/ws-projectbranches.proto
+++ b/sonar-ws/src/main/protobuf/ws-projectbranches.proto
@@ -24,6 +24,7 @@ option java_package = "org.sonarqube.ws";
 option java_outer_classname = "WsBranches";
 option optimize_for = SPEED;
 
+import "ws-commons.proto";
 
 // WS api/project_branches/list
 message ListWsResponse {
@@ -38,7 +39,7 @@ message ShowWsResponse {
 message Branch {
   optional string name = 1;
   optional bool isMain = 2;
-  optional BranchType type = 3;
+  optional sonarqube.ws.commons.BranchType type = 3;
   // Merge branch is only present for short living branch
   optional string mergeBranch = 4;
   optional Status status = 5;
@@ -52,12 +53,6 @@ message Branch {
     optional int32 codeSmells = 4;
   }
 
-  enum BranchType {
-    // Zero is required in order to not get MAINTAINABILITY as default value
-    // See http://androiddevblog.com/protocol-buffers-pitfall-adding-enum-values/
-    UNKNOWN = 0;
-
-    LONG = 1;
-    SHORT = 2;
-  }
 }
+
+