SONAR-20452 SONAR-19759 fix SSF-423 + ITs

(cherry picked from commit 08141530600898864c20c2999831d0250ff431ad)

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/almsettings/AlmSettingsService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/almsettings/AlmSettingsService.java
index b9d8597a6e264c43f6f6e2d66e47903c739a05bc..4edec9b9c7b014adbe35e26ae864bbccf777ec18 100644 (file)
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/almsettings/AlmSettingsService.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/almsettings/AlmSettingsService.java
@@ -125,6 +125,7 @@ public class AlmSettingsService extends BaseService {
         .setParam("url", request.getUrl())
         .setParam("clientId", request.getClientId())
         .setParam("clientSecret", request.getClientSecret())
+        .setParam("webhookSecret", request.getWebhookSecret())
         .setMediaType(MediaTypes.JSON)).content();
   }
 

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/almsettings/CreateGithubRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/almsettings/CreateGithubRequest.java
index ef02ef668b238ba9f3b4d29bb0db8821148066d8..843ab8306d0ac2c631286edd5195a562646c5b0a 100644 (file)
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/almsettings/CreateGithubRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/almsettings/CreateGithubRequest.java
@@ -37,6 +37,7 @@ public class CreateGithubRequest {
   private String url;
   private String clientId;
   private String clientSecret;
+  private String webhookSecret;
 
   /**
    * This is a mandatory parameter.
@@ -105,4 +106,14 @@ public class CreateGithubRequest {
   public String getClientSecret() {
     return clientSecret;
   }
+
+  public CreateGithubRequest setWebhookSecret(@Nullable String webhookSecret) {
+    this.webhookSecret = webhookSecret;
+    return this;
+  }
+
+  @CheckForNull
+  public String getWebhookSecret() {
+    return webhookSecret;
+  }
 }