Revert

soramitsu · Dec 11, 2023 · bad5315 · bad5315
1 parent 331f443
commit bad5315
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version=1.16.1
+version=1.16.2
diff --git a/src/main/java/com/github/mc1arke/sonarqube/plugin/ce/CommunityBranch.java b/src/main/java/com/github/mc1arke/sonarqube/plugin/ce/CommunityBranch.java
@@ -81,5 +81,4 @@ public String getPullRequestKey() {
     public String getTargetBranchName() {
         return targetBranchName;
     }
-
 }
diff --git a/src/main/java/com/github/mc1arke/sonarqube/plugin/server/CommunityBranchSupportDelegate.java b/src/main/java/com/github/mc1arke/sonarqube/plugin/server/CommunityBranchSupportDelegate.java
@@ -100,7 +100,7 @@ public ComponentDto createBranchComponent(DbSession dbSession, BranchSupport.Com
         dbClient.componentDao().insert(dbSession, componentDto, false);
 
         BranchDto branchDto = new BranchDto()
-            .setProjectUuid(mainComponentBranchDto.getProjectUuid())
+            .setProjectUuid(mainComponentDto.uuid())
             .setUuid(branchUuid);
         componentKey.getPullRequestKey().ifPresent(pullRequestKey -> branchDto.setBranchType(BranchType.PULL_REQUEST)
             .setExcludeFromPurge(false)
@@ -110,6 +110,7 @@ public ComponentDto createBranchComponent(DbSession dbSession, BranchSupport.Com
             .setExcludeFromPurge(isBranchExcludedFromPurge(projectConfigurationLoader.loadProjectConfiguration(dbSession, branchDto.getProjectUuid()), branchName))
             .setKey(branchName)
             .setIsMain(false));
+        branchDto.setProjectUuid(mainComponentBranchDto.getProjectUuid());
         dbClient.branchDao().insert(dbSession, branchDto);
 
         return componentDto;
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,5 +81,4 @@ public String getPullRequestKey() { @@
         public String getTargetBranchName() {
             return targetBranchName;
         }
     }