Test 16.4

soramitsu · Dec 11, 2023 · 8f58152 · 8f58152
1 parent 6f32265
commit 8f58152
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/src/main/java/com/github/mc1arke/sonarqube/plugin/ce/CommunityBranchLoaderDelegate.java b/src/main/java/com/github/mc1arke/sonarqube/plugin/ce/CommunityBranchLoaderDelegate.java
@@ -68,14 +68,7 @@ private static Branch load(ScannerReport.Metadata metadata, Project project, DbC
                 throw new IllegalStateException("Could not find main branch");
             }
         } else {
-            String targetBranch = "main";
-            try {
-                targetBranch = StringUtils.trimToNull(metadata.getReferenceBranchName());
-            } catch (IllegalStateException ex) {
-                throw new IllegalStateException(String.format("Target branch exceptions:"), ex);
-            }
-
-
+            String targetBranch = StringUtils.trimToNull(metadata.getReferenceBranchName());
             ScannerReport.Metadata.BranchType branchType = metadata.getBranchType();
             if (null == targetBranchName) {
                 targetBranchName = targetBranch;
@@ -109,7 +102,7 @@ private static Branch createPullRequest(ScannerReport.Metadata metadata, DbClien
     private static Branch createBranch(DbClient dbClient, String branchName, String projectUuid, String targetBranch) {
         String targetUuid;
         if (null == targetBranch) {
-            targetUuid = projectUuid;
+            targetUuid = selectMainBranchByProjectUuid(dbClient, projectUuid);
         } else {
             Optional<BranchDto> branchDto = findBranchByKey(projectUuid, targetBranch, dbClient);
             if (branchDto.isPresent()) {
@@ -136,4 +129,9 @@ private static Optional<BranchDto> findBranchByKey(String projectUuid, String ke
         }
     }
 
+    public Optional<BranchDto> selectMainBranchByProjectUuid(DbClient dbClient, String projectUuid) {
+        try (DbSession dbSession = dbClient.openSession(false)) {
+            return dbClient.branchDao().selectMainBranchByProjectUuid(dbSession, projectUuid);
+        }
+    }
 }