Merge pull request hpsa#253 from eemanuelhpe/eli_fix_webhook

radislavB · web-flow · commit 3335ebe0242d · 2021-02-05T12:03:09.000+02:00
tech: allow user skip webhook creation
diff --git a/src/main/java/com/microfocus/application/automation/tools/run/SonarOctaneListener.java b/src/main/java/com/microfocus/application/automation/tools/run/SonarOctaneListener.java
@@ -203,10 +203,10 @@ public void perform(@Nonnull Run<?, ?> run, @Nonnull FilePath workspace, @Nonnul
             } catch (SonarIntegrationException e) {
                 logger.println("Webhook registration in sonarQube for build " + getBuildNumber(run) + " failed: " + e.getMessage());
             }
-            run.addAction(new WebhookAction(true, getSonarServerUrl(), dataTypeSet));
         } else {
             logger.println("Webhook creation is skipped. Be sure that Sonar server " + this.sonarServerUrl + " has configured webhook to: " + callbackWebHooksURL);
         }
+        run.addAction(new WebhookAction(true, getSonarServerUrl(), dataTypeSet));
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -203,10 +203,10 @@ public void perform(@Nonnull Run<?, ?> run, @Nonnull FilePath workspace, @Nonnul`
`203`	`203`	`} catch (SonarIntegrationException e) {`
`204`	`204`	`logger.println("Webhook registration in sonarQube for build " + getBuildNumber(run) + " failed: " + e.getMessage());`
`205`	`205`	`}`
`206`		`- run.addAction(new WebhookAction(true, getSonarServerUrl(), dataTypeSet));`
`207`	`206`	`} else {`
`208`	`207`	`logger.println("Webhook creation is skipped. Be sure that Sonar server " + this.sonarServerUrl + " has configured webhook to: " + callbackWebHooksURL);`
`209`	`208`	`}`
	`209`	`+ run.addAction(new WebhookAction(true, getSonarServerUrl(), dataTypeSet));`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`@Override`