From 1e1e26d5dc136036fc4cbfde759e4879e098f519 Mon Sep 17 00:00:00 2001 From: Benjamin Campomenosi <109955405+benjamin-campomenosi-sonarsource@users.noreply.github.com> Date: Fri, 16 Sep 2022 14:49:19 +0200 Subject: [PATCH] SONAR-17271 update issue from github webhook --- .../github/scanning/alert/GithubScanningAlertState.java | 9 ++------- .../java/org/sonar/server/issue/ws/IssueUpdater.java | 3 ++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/scanning/alert/GithubScanningAlertState.java b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/scanning/alert/GithubScanningAlertState.java index 625799d34fd..547ccda0b13 100644 --- a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/scanning/alert/GithubScanningAlertState.java +++ b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/scanning/alert/GithubScanningAlertState.java @@ -23,15 +23,10 @@ import com.google.gson.annotations.SerializedName; import javax.annotation.Nullable; public class GithubScanningAlertState { - protected static final String GH_OPEN = "open"; - protected static final String GH_DISMISSED = "dismissed"; - protected static final String GH_WONTFIX = "won't fix"; - protected static final String GH_FALSE_POSITIVE = "false positive"; - @SerializedName("state") - private String state; + private final String state; @SerializedName("dismissed_reason") - private String dismissedReason; + private final String dismissedReason; public GithubScanningAlertState(String state, @Nullable String dismissedReason) { this.state = state; diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/IssueUpdater.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/IssueUpdater.java index ceb3870e7a3..741726e68e6 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/IssueUpdater.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/IssueUpdater.java @@ -111,7 +111,8 @@ public class IssueUpdater { // name of rule is displayed in notification, rule must therefor be present || ruleDto == null // notification are not supported on PRs - || !hasNotificationSupport(branchDto)) { + || !hasNotificationSupport(branchDto) + || context.fromAlm()) { return issueDto; } -- 2.39.5