Replacing spaces with dashes in PULL_REQUEST_URL #82

 * Was evaluating to wrong URL if repo name included spaces.

Author: tomasbjerre

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 Changelog of Pull Request Notifier for Bitbucket.
 
+## 2.11
+* Bugfix: Replacing spaces with dashes in ${PULL_REQUEST_URL}. Was evaluating to wrong URL if repo name included spaces.
+
 ## 2.10
 * Processing events on Bitbucket Server's event threads.
 

src/main/java/se/bjurr/prnfb/listener/PrnfbRenderer.java

@@ -420,8 +420,9 @@ private static String cloneUrlFromRepository(REPO_PROTOCOL protocol, Repository
   }
 
   private static String getPullRequestUrl(ApplicationPropertiesService propertiesService, PullRequest pullRequest) {
-   return propertiesService.getBaseUrl() + "/projects/" + pullRequest.getToRef().getRepository().getProject().getKey()
-     + "/repos/" + pullRequest.getToRef().getRepository().getName() + "/pull-requests/" + pullRequest.getId();
+   return (propertiesService.getBaseUrl() + "/projects/" + pullRequest.getToRef().getRepository().getProject().getKey()
+     + "/repos/" + pullRequest.getToRef().getRepository().getName() + "/pull-requests/" + pullRequest.getId())
+     .replaceAll(" ", "-");
   }
 
   PrnfbVariable(Resolver resolver) {

src/test/java/se/bjurr/prnbs/admin/data/PluginSettingsImpl.java renamed to src/test/java/se/bjurr/prnbb/admin/data/PluginSettingsImpl.java

@@ -1,4 +1,4 @@
-package se.bjurr.prnbs.admin.data;
+package se.bjurr.prnbb.admin.data;
 
 import static com.google.common.collect.Maps.newTreeMap;
 

src/test/java/se/bjurr/prnbs/admin/utils/NotificationBuilder.java renamed to src/test/java/se/bjurr/prnbb/admin/utils/NotificationBuilder.java

@@ -1,4 +1,4 @@
-package se.bjurr.prnbs.admin.utils;
+package se.bjurr.prnbb.admin.utils;
 
 import static se.bjurr.prnfb.admin.AdminFormValues.NAME;
 import static se.bjurr.prnfb.admin.AdminFormValues.VALUE;

src/test/java/se/bjurr/prnbs/admin/utils/PrnfbParticipantBuilder.java renamed to src/test/java/se/bjurr/prnbb/admin/utils/PrnfbParticipantBuilder.java

@@ -1,4 +1,4 @@
-package se.bjurr.prnbs.admin.utils;
+package se.bjurr.prnbb.admin.utils;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

src/test/java/se/bjurr/prnbs/admin/utils/PrnfbTestBuilder.java renamed to src/test/java/se/bjurr/prnbb/admin/utils/PrnfbTestBuilder.java

@@ -1,4 +1,4 @@
-package se.bjurr.prnbs.admin.utils;
+package se.bjurr.prnbb.admin.utils;
 
 import static com.google.common.base.Optional.fromNullable;
 import static com.google.common.base.Throwables.propagate;
@@ -17,7 +17,7 @@
 import static org.mockito.Matchers.anyLong;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static se.bjurr.prnbs.admin.utils.PullRequestEventBuilder.pullRequestEventBuilder;
+import static se.bjurr.prnbb.admin.utils.PullRequestEventBuilder.pullRequestEventBuilder;
 import static se.bjurr.prnfb.admin.AdminFormValues.NAME;
 import static se.bjurr.prnfb.admin.AdminFormValues.VALUE;
 import static se.bjurr.prnfb.admin.AdminFormValues.FIELDS.FORM_IDENTIFIER;
@@ -37,7 +37,7 @@
 
 import org.mockito.Matchers;
 
-import se.bjurr.prnbs.admin.data.PluginSettingsImpl;
+import se.bjurr.prnbb.admin.data.PluginSettingsImpl;
 import se.bjurr.prnfb.ManualResource;
 import se.bjurr.prnfb.admin.AdminFormError;
 import se.bjurr.prnfb.admin.AdminFormValues;

src/test/java/se/bjurr/prnbs/admin/utils/PullRequestEventBuilder.java renamed to src/test/java/se/bjurr/prnbb/admin/utils/PullRequestEventBuilder.java

@@ -1,4 +1,4 @@
-package se.bjurr.prnbs.admin.utils;
+package se.bjurr.prnbb.admin.utils;
 
 import static com.atlassian.bitbucket.pull.PullRequestAction.COMMENTED;
 import static com.atlassian.bitbucket.pull.PullRequestAction.RESCOPED;
@@ -7,7 +7,7 @@
 import static java.lang.Boolean.TRUE;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static se.bjurr.prnbs.admin.utils.PullRequestRefBuilder.pullRequestRefBuilder;
+import static se.bjurr.prnbb.admin.utils.PullRequestRefBuilder.pullRequestRefBuilder;
 
 import java.util.Set;
 

src/test/java/se/bjurr/prnbs/admin/utils/PullRequestRefBuilder.java renamed to src/test/java/se/bjurr/prnbb/admin/utils/PullRequestRefBuilder.java

@@ -1,4 +1,4 @@
-package se.bjurr.prnbs.admin.utils;
+package se.bjurr.prnbb.admin.utils;
 
 import static com.google.common.collect.Sets.newHashSet;
 import static org.mockito.Mockito.when;

src/test/java/se/bjurr/prnbs/admin/utils/SyncExecutorService.java renamed to src/test/java/se/bjurr/prnbb/admin/utils/SyncExecutorService.java

@@ -1,4 +1,4 @@
-package se.bjurr.prnbs.admin.utils;
+package se.bjurr.prnbb.admin.utils;
 
 import java.util.Collection;
 import java.util.List;

src/test/java/se/bjurr/prnfb/admin/NotificationsStorageTest.java

@@ -1,8 +1,8 @@
 package se.bjurr.prnfb.admin;
 
 import static com.atlassian.bitbucket.pull.PullRequestAction.OPENED;
-import static se.bjurr.prnbs.admin.utils.NotificationBuilder.notificationBuilder;
-import static se.bjurr.prnbs.admin.utils.PrnfbTestBuilder.prnfbTestBuilder;
+import static se.bjurr.prnbb.admin.utils.NotificationBuilder.notificationBuilder;
+import static se.bjurr.prnbb.admin.utils.PrnfbTestBuilder.prnfbTestBuilder;
 import static se.bjurr.prnfb.admin.AdminFormValues.DEFAULT_NAME;
 import static se.bjurr.prnfb.admin.AdminFormValues.FIELDS.FORM_IDENTIFIER;
 import static se.bjurr.prnfb.admin.AdminFormValues.FIELDS.events;