abstract class and central propagation url overriden by the trigger c…

…lass
jenkinsci · Sep 12, 2024 · 325bef8 · 325bef8
1 parent dfbb5bc
commit 325bef8
Show file tree

Hide file tree

Showing 11 changed files with 87 additions and 60 deletions.
diff --git a/src/main/java/io/jenkins/plugins/bitbucketpushandpullrequest/BitBucketPPRTrigger.java b/src/main/java/io/jenkins/plugins/bitbucketpushandpullrequest/BitBucketPPRTrigger.java
@@ -33,6 +33,7 @@
 import java.util.logging.Logger;
 import javax.annotation.CheckForNull;
 
+import io.jenkins.plugins.bitbucketpushandpullrequest.action.BitBucketPPRActionAbstract;
 import io.jenkins.plugins.bitbucketpushandpullrequest.action.BitBucketPPRPullRequestServerAction;
 import io.jenkins.plugins.bitbucketpushandpullrequest.action.BitBucketPPRServerRepositoryAction;
 import org.apache.commons.jelly.XMLOutput;
@@ -81,6 +82,8 @@
 import jenkins.model.ParameterizedJobMixIn;
 import jenkins.triggers.SCMTriggerItem;
 
+import static org.apache.commons.lang3.ObjectUtils.isEmpty;
+
 /**
  * @author cdelmonte
  */
@@ -198,22 +201,11 @@ private void checkLocalPropagationUrl(BitBucketPPRAction bitBucketPPRAction) {
     if (bitBucketPPRAction == null) {
       return;
     }
-    if (bitBucketPPRAction instanceof BitBucketPPRServerRepositoryAction
-        && propagationUrl != null
-        && !propagationUrl.isEmpty()) {
-      // cast
-      BitBucketPPRServerRepositoryAction bitBucketPPRServerRepositoryAction =
-          (BitBucketPPRServerRepositoryAction) bitBucketPPRAction;
-      bitBucketPPRServerRepositoryAction.setBaseUrl(propagationUrl);
-    }
-
-    if (bitBucketPPRAction instanceof BitBucketPPRPullRequestServerAction
-        && propagationUrl != null
-        && !propagationUrl.isEmpty()) {
-      // cast
-      BitBucketPPRPullRequestServerAction bitBucketPPRPullRequestServerAction =
-          (BitBucketPPRPullRequestServerAction) bitBucketPPRAction;
-      bitBucketPPRPullRequestServerAction.setBaseUrl(propagationUrl);
+    assert bitBucketPPRAction instanceof BitBucketPPRActionAbstract;
+    if (!isEmpty(propagationUrl)) {
+      BitBucketPPRActionAbstract bitBucketPPRActionAbstract =
+          (BitBucketPPRActionAbstract) bitBucketPPRAction;
+      bitBucketPPRActionAbstract.setPropagationUrl(propagationUrl);
     }
   }
 

diff --git a/src/main/java/io/jenkins/plugins/bitbucketpushandpullrequest/action/BitBucketPPRAction.java b/src/main/java/io/jenkins/plugins/bitbucketpushandpullrequest/action/BitBucketPPRAction.java
@@ -21,6 +21,7 @@
 
 package io.jenkins.plugins.bitbucketpushandpullrequest.action;
 
+import java.net.MalformedURLException;
 import java.util.List;
 
 import hudson.model.Action;
@@ -40,11 +41,11 @@ public default String getLinkSelf() {
     return null;
   }
 
-  public default String getLinkApprove() {
+  public default String getLinkApprove() throws MalformedURLException {
     return null;
   }
 
-  public default String getLinkDecline() {
+  public default String getLinkDecline() throws MalformedURLException {
     return null;
   }
 
@@ -125,11 +126,11 @@ public default String getLatestCommit() {
     return null;
   }
 
-  public default String getCommitLink() {
+  public default String getCommitLink() throws MalformedURLException {
     return null;
   }
 
-  public default List<String> getCommitLinks() {
+  public default List<String> getCommitLinks() throws MalformedURLException {
     return null;
   }
 

diff --git a/...ava/io/jenkins/plugins/bitbucketpushandpullrequest/action/BitBucketPPRActionAbstract.java b/...ava/io/jenkins/plugins/bitbucketpushandpullrequest/action/BitBucketPPRActionAbstract.java
@@ -0,0 +1,31 @@
+package io.jenkins.plugins.bitbucketpushandpullrequest.action;
+
+import hudson.model.InvisibleAction;
+import io.jenkins.plugins.bitbucketpushandpullrequest.config.BitBucketPPRPluginConfig;
+
+import static org.apache.commons.lang3.ObjectUtils.isEmpty;
+
+public class BitBucketPPRActionAbstract extends InvisibleAction {
+  private String propagationUrl = "";
+
+  public BitBucketPPRActionAbstract() {
+    if (!isEmpty(getGlobalConfig().propagationUrl)) {
+      this.setPropagationUrl(getGlobalConfig().propagationUrl);
+    }
+  }
+
+  private static final BitBucketPPRPluginConfig globalConfig =
+      BitBucketPPRPluginConfig.getInstance();
+
+  public BitBucketPPRPluginConfig getGlobalConfig() {
+    return globalConfig;
+  }
+
+  public void setPropagationUrl(String propagationUrl) {
+    this.propagationUrl = propagationUrl;
+  }
+
+  public String getPropagationUrl() {
+    return propagationUrl;
+  }
+}
diff --git a/.../io/jenkins/plugins/bitbucketpushandpullrequest/action/BitBucketPPRPullRequestAction.java b/.../io/jenkins/plugins/bitbucketpushandpullrequest/action/BitBucketPPRPullRequestAction.java
@@ -24,6 +24,8 @@
 import io.jenkins.plugins.bitbucketpushandpullrequest.common.BitBucketPPRUtils;
 import io.jenkins.plugins.bitbucketpushandpullrequest.exception.BitBucketPPRRepositoryNotParsedException;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -34,8 +36,10 @@
 import hudson.model.InvisibleAction;
 import io.jenkins.plugins.bitbucketpushandpullrequest.model.BitBucketPPRPayload;
 import static java.util.Objects.nonNull;
+import static org.apache.commons.lang3.ObjectUtils.isEmpty;
 
-public class BitBucketPPRPullRequestAction extends InvisibleAction implements BitBucketPPRAction {
+public class BitBucketPPRPullRequestAction extends BitBucketPPRActionAbstract
+    implements BitBucketPPRAction {
   private static final Logger logger =
       Logger.getLogger(BitBucketPPRPullRequestAction.class.getName());
   public static final String APPROVE = "/approve";
@@ -224,8 +228,9 @@ public String getLatestCommit() {
 
   @Override
   public String getCommitLink() {
-    return String.join(
-            "/", BITBUCKET_API_BASE_URL, BITBUCKET_REPOSITORIES, workspace, repoSlug, COMMIT)
+    String baseCommitLink =
+        isEmpty(this.getPropagationUrl()) ? BITBUCKET_API_BASE_URL : this.getPropagationUrl();
+    return String.join("/", baseCommitLink, BITBUCKET_REPOSITORIES, workspace, repoSlug, COMMIT)
         + '/'
         + this.getLatestCommit();
   }

diff --git a/...nkins/plugins/bitbucketpushandpullrequest/action/BitBucketPPRPullRequestServerAction.java b/...nkins/plugins/bitbucketpushandpullrequest/action/BitBucketPPRPullRequestServerAction.java
@@ -35,8 +35,9 @@
 import java.util.logging.Logger;
 
 import static java.util.Objects.isNull;
+import static org.apache.commons.lang3.ObjectUtils.isEmpty;
 
-public class BitBucketPPRPullRequestServerAction extends InvisibleAction
+public class BitBucketPPRPullRequestServerAction extends BitBucketPPRActionAbstract
     implements BitBucketPPRAction {
 
   private static final Logger logger =
@@ -177,7 +178,7 @@ public String getRepositoryId() {
   }
 
   @Override
-  public String getLinkApprove() {
+  public String getLinkApprove() throws MalformedURLException {
     String projectKey =
         payload.getServerPullRequest().getFromRef().getRepository().getProject().getKey();
     String repoSlug = payload.getServerPullRequest().getFromRef().getRepository().getSlug();
@@ -194,7 +195,7 @@ public String getLinkApprove() {
   }
 
   @Override
-  public String getLinkDecline() {
+  public String getLinkDecline() throws MalformedURLException {
     // returns:
     // {baseUrl}/rest/api/1.0/projects/{projectKey}/repos/{repositorySlug}/pull-requests/{pullRequestId}/approve
 
@@ -219,16 +220,22 @@ public String getLatestCommit() {
   }
 
   @Override
-  public String getCommitLink() {
+  public String getCommitLink() throws MalformedURLException {
     // returns:
     // /rest/build-status/1.0/commits/{commitId}
     String commitId = payload.getServerPullRequest().getFromRef().getLatestCommit();
 
     return getBaseUrl() + "/rest/build-status/1.0/commits/" + commitId;
   }
 
-  private String getBaseUrl() {
-    return baseUrl.getProtocol() + "://" + baseUrl.getHost() + ":" + baseUrl.getPort();
+  private String getBaseUrl() throws MalformedURLException {
+    URL baseCommitLink =
+        isEmpty(this.getPropagationUrl()) ? baseUrl : new URL(this.getPropagationUrl());
+    return baseCommitLink.getProtocol()
+        + "://"
+        + baseCommitLink.getHost()
+        + ":"
+        + baseCommitLink.getPort();
   }
 
   @Override

diff --git a/...a/io/jenkins/plugins/bitbucketpushandpullrequest/action/BitBucketPPRRepositoryAction.java b/...a/io/jenkins/plugins/bitbucketpushandpullrequest/action/BitBucketPPRRepositoryAction.java
@@ -35,7 +35,10 @@
 import io.jenkins.plugins.bitbucketpushandpullrequest.model.cloud.BitBucketPPRChange;
 import java.util.stream.Collectors;
 
-public class BitBucketPPRRepositoryAction extends InvisibleAction implements BitBucketPPRAction {
+import static org.apache.commons.lang3.ObjectUtils.isEmpty;
+
+public class BitBucketPPRRepositoryAction extends BitBucketPPRActionAbstract
+    implements BitBucketPPRAction {
   private static final Logger logger = Logger.getLogger(BitBucketPPRAction.class.getName());
   public static final String COMMIT = "commit";
   private static final String BITBUCKET_API_BASE_URL = "https://api.bitbucket.org/2.0";
@@ -142,12 +145,14 @@ public String getLatestCommit() {
 
   @Override
   public List<String> getCommitLinks() {
+    String baseCommitLink =
+        isEmpty(this.getPropagationUrl()) ? BITBUCKET_API_BASE_URL : this.getPropagationUrl();
     return payload.getPush().getChanges().stream()
         .map(
             c ->
                 String.join(
                     "/",
-                    BITBUCKET_API_BASE_URL,
+                    baseCommitLink,
                     BITBUCKET_REPOSITORIES,
                     workspace,
                     repoSlug,

diff --git a/...enkins/plugins/bitbucketpushandpullrequest/action/BitBucketPPRServerRepositoryAction.java b/...enkins/plugins/bitbucketpushandpullrequest/action/BitBucketPPRServerRepositoryAction.java
@@ -35,7 +35,9 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class BitBucketPPRServerRepositoryAction extends InvisibleAction
+import static org.apache.commons.lang3.ObjectUtils.isEmpty;
+
+public class BitBucketPPRServerRepositoryAction extends BitBucketPPRActionAbstract
     implements BitBucketPPRAction {
   private static final Logger logger = Logger.getLogger(BitBucketPPRAction.class.getName());
   private static final BitBucketPPRPluginConfig globalConfig =
@@ -68,14 +70,6 @@ public BitBucketPPRServerRepositoryAction(BitBucketPPRPayload payload) {
       }
     }
 
-    if (!globalConfig.getPropagationUrl().isEmpty()) {
-      try {
-        this.baseUrl = new URL(globalConfig.getPropagationUrl());
-      } catch (MalformedURLException e) {
-        throw new RuntimeException(e);
-      }
-    }
-
     for (BitBucketPPRServerChange change : payload.getServerChanges()) {
       if (change.getRefId() != null) {
         this.targetBranchName = change.getRef().getDisplayId();
@@ -172,16 +166,17 @@ public String getLatestCommit() {
   }
 
   @Override
-  public List<String> getCommitLinks() {
+  public List<String> getCommitLinks() throws MalformedURLException {
     // returns:
     // /rest/build-status/1.0/commits/{commitId}
 
-    String baseUrl = getBaseUrl();
+    URL baseCommitLink =
+        isEmpty(this.getPropagationUrl()) ? baseUrl : new URL(this.getPropagationUrl());
 
     List<BitBucketPPRServerChange> changes = payload.getServerChanges();
     List<String> links = new ArrayList<>();
     for (BitBucketPPRServerChange change : changes) {
-      links.add(baseUrl + "/rest/build-status/1.0/commits/" + change.getToHash());
+      links.add(baseCommitLink + "/rest/build-status/1.0/commits/" + change.getToHash());
     }
 
     return links;
@@ -190,13 +185,4 @@ public List<String> getCommitLinks() {
   private String getBaseUrl() {
     return baseUrl.getProtocol() + "://" + baseUrl.getHost() + ":" + baseUrl.getPort();
   }
-
-  public String setBaseUrl(String url) {
-    try {
-      this.baseUrl = new URL(url);
-    } catch (MalformedURLException e) {
-      throw new RuntimeException(e);
-    }
-    return url;
-  }
 }
diff --git a/...ns/plugins/bitbucketpushandpullrequest/observer/BitBucketPPRPullRequestCloudObserver.java b/...ns/plugins/bitbucketpushandpullrequest/observer/BitBucketPPRPullRequestCloudObserver.java
@@ -92,7 +92,7 @@ public void setBuildStatusOnFinished() throws MalformedURLException {
   }
 
   @Override
-  public void setBuildStatusInProgress() {
+  public void setBuildStatusInProgress() throws MalformedURLException {
     BitBucketPPRAction bitbucketAction = context.getAction();
     String url = bitbucketAction.getCommitLink() + "/statuses/build";
 

diff --git a/...s/plugins/bitbucketpushandpullrequest/observer/BitBucketPPRPullRequestServerObserver.java b/...s/plugins/bitbucketpushandpullrequest/observer/BitBucketPPRPullRequestServerObserver.java
@@ -48,7 +48,7 @@ public void getNotification(BitBucketPPREvent event) {
   }
 
   @Override
-  public void setApprovedOrDeclined() {
+  public void setApprovedOrDeclined() throws MalformedURLException {
     if (!(context.getFilter().shouldSendApprove() || context.getFilter().shouldSendDecline())) {
       return;
     }
@@ -77,7 +77,7 @@ public void setApprovedOrDeclined() {
   }
 
   @Override
-  public void setBuildStatusOnFinished() {
+  public void setBuildStatusOnFinished() throws MalformedURLException {
     BitBucketPPRAction bitbucketAction = context.getAction();
     String url = bitbucketAction.getCommitLink();
     Result result = context.getRun().getResult();
@@ -92,7 +92,7 @@ public void setBuildStatusOnFinished() {
   }
 
   @Override
-  public void setBuildStatusInProgress() {
+  public void setBuildStatusInProgress() throws MalformedURLException {
     BitBucketPPRAction bitbucketAction = context.getAction();
     String url = bitbucketAction.getCommitLink();
 

diff --git a/...o/jenkins/plugins/bitbucketpushandpullrequest/observer/BitBucketPPRPushCloudObserver.java b/...o/jenkins/plugins/bitbucketpushandpullrequest/observer/BitBucketPPRPushCloudObserver.java
@@ -46,7 +46,7 @@ public void getNotification(BitBucketPPREvent event) {
   }
 
   @Override
-  public void setBuildStatusOnFinished() {
+  public void setBuildStatusOnFinished() throws MalformedURLException {
     BitBucketPPRAction bitbucketAction = context.getAction();
     Result result = context.getRun().getResult();
     String state =
@@ -61,7 +61,7 @@ public void setBuildStatusOnFinished() {
   }
 
   @Override
-  public void setBuildStatusInProgress() {
+  public void setBuildStatusInProgress() throws MalformedURLException {
     BitBucketPPRAction bitbucketAction = context.getAction();
 
     Map<String, String> map = new HashMap<>();

diff --git a/.../jenkins/plugins/bitbucketpushandpullrequest/observer/BitBucketPPRPushServerObserver.java b/.../jenkins/plugins/bitbucketpushandpullrequest/observer/BitBucketPPRPushServerObserver.java
@@ -46,7 +46,7 @@ public void getNotification(BitBucketPPREvent event) {
   }
 
   @Override
-  public void setBuildStatusOnFinished() {
+  public void setBuildStatusOnFinished() throws MalformedURLException {
     BitBucketPPRAction bitbucketAction = context.getAction();
     Result result = context.getRun().getResult();
     String state = result == Result.SUCCESS ? "SUCCESSFUL" : "FAILED";
@@ -60,7 +60,7 @@ public void setBuildStatusOnFinished() {
   }
 
   @Override
-  public void setBuildStatusInProgress() {
+  public void setBuildStatusInProgress() throws MalformedURLException {
     BitBucketPPRAction bitbucketAction = context.getAction();
     Map<String, String> map = new HashMap<>();
     map.put("key", computeBitBucketBuildKey(context));