Merge pull request #340 from solarlodge/fix/fix-npe-for-propagation-u…

…rl-settings Fix: Fix npe for propagation url settings
jenkinsci · Sep 19, 2024 · ba4090f · ba4090f
2 parents bcc10b8 + fbcc48b
commit ba4090f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/...nkins/plugins/bitbucketpushandpullrequest/action/BitBucketPPRPullRequestServerAction.java b/...nkins/plugins/bitbucketpushandpullrequest/action/BitBucketPPRPullRequestServerAction.java
@@ -88,7 +88,7 @@ public BitBucketPPRPullRequestServerAction(@Nonnull BitBucketPPRPayload payload)
       }
     }
 
-    if (!globalConfig.getPropagationUrl().isEmpty()) {
+    if (globalConfig.isPropagationUrlSet()) {
       try {
         this.baseUrl = new URL(globalConfig.getPropagationUrl());
       } catch (MalformedURLException e) {

diff --git a/.../java/io/jenkins/plugins/bitbucketpushandpullrequest/config/BitBucketPPRPluginConfig.java b/.../java/io/jenkins/plugins/bitbucketpushandpullrequest/config/BitBucketPPRPluginConfig.java
@@ -101,6 +101,10 @@ public String getPropagationUrl() {
     return propagationUrl;
   }
 
+  public boolean isPropagationUrlSet() {
+    return !isEmpty(propagationUrl);
+  }
+
   @DataBoundSetter
   public void setNotifyBitBucket(@CheckForNull boolean notifyBitBucket) {
     this.notifyBitBucket = notifyBitBucket;

diff --git a/...s/plugins/bitbucketpushandpullrequest/action/BitBucketPPRPullRequestServerActionTest.java b/...s/plugins/bitbucketpushandpullrequest/action/BitBucketPPRPullRequestServerActionTest.java
@@ -21,6 +21,7 @@ public void testBaseUrlSet() {
                 BitBucketPPRPluginConfig.class)) {
             BitBucketPPRPluginConfig c = mock(BitBucketPPRPluginConfig.class);
             config.when(BitBucketPPRPluginConfig::getInstance).thenReturn(c);
+            when(c.isPropagationUrlSet()).thenReturn(true);
             when(c.getPropagationUrl()).thenReturn("https://example.org/scm/some-namespace/some-repo.git");
 
             BitBucketPPRPayload payloadMock = mock(BitBucketPPRPayload.class, RETURNS_DEEP_STUBS);

diff --git a/...bucketpushandpullrequest/processor/BitBucketPPRPullRequestServerPayloadProcessorTest.java b/...bucketpushandpullrequest/processor/BitBucketPPRPullRequestServerPayloadProcessorTest.java
@@ -76,7 +76,6 @@ public void testProcessPayload() throws Exception {
         Mockito.mockStatic(BitBucketPPRPluginConfig.class)) {
       BitBucketPPRPluginConfig c = mock(BitBucketPPRPluginConfig.class);
       config.when(BitBucketPPRPluginConfig::getInstance).thenReturn(c);
-      when(c.getPropagationUrl()).thenReturn("");
 
       BitBucketPPRJobProbe probe = mock(BitBucketPPRJobProbe.class);