Skip to content
This repository was archived by the owner on Jun 9, 2021. It is now read-only.

Commit 1e2d237

Browse files
tomasbjerretomasbjerre
committed
Replacing spaces with dashes in PULL_REQUEST_URL #82
* Was evaluating to wrong URL if repo name included spaces.
1 parent 2264001 commit 1e2d237

11 files changed

+30
-26
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
Changelog of Pull Request Notifier for Bitbucket.
44

5+
## 2.11
6+
* Bugfix: Replacing spaces with dashes in ${PULL_REQUEST_URL}. Was evaluating to wrong URL if repo name included spaces.
7+
58
## 2.10
69
* Processing events on Bitbucket Server's event threads.
710

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,9 @@ private static String cloneUrlFromRepository(REPO_PROTOCOL protocol, Repository
420420
}
421421

422422
private static String getPullRequestUrl(ApplicationPropertiesService propertiesService, PullRequest pullRequest) {
423-
return propertiesService.getBaseUrl() + "/projects/" + pullRequest.getToRef().getRepository().getProject().getKey()
424-
+ "/repos/" + pullRequest.getToRef().getRepository().getName() + "/pull-requests/" + pullRequest.getId();
423+
return (propertiesService.getBaseUrl() + "/projects/" + pullRequest.getToRef().getRepository().getProject().getKey()
424+
+ "/repos/" + pullRequest.getToRef().getRepository().getName() + "/pull-requests/" + pullRequest.getId())
425+
.replaceAll(" ", "-");
425426
}
426427

427428
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package se.bjurr.prnbs.admin.data;
1+
package se.bjurr.prnbb.admin.data;
22

33
import static com.google.common.collect.Maps.newTreeMap;
44

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package se.bjurr.prnbs.admin.utils;
1+
package se.bjurr.prnbb.admin.utils;
22

33
import static se.bjurr.prnfb.admin.AdminFormValues.NAME;
44
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package se.bjurr.prnbs.admin.utils;
1+
package se.bjurr.prnbb.admin.utils;
22

33
import static org.mockito.Mockito.mock;
44
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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package se.bjurr.prnbs.admin.utils;
1+
package se.bjurr.prnbb.admin.utils;
22

33
import static com.google.common.base.Optional.fromNullable;
44
import static com.google.common.base.Throwables.propagate;
@@ -17,7 +17,7 @@
1717
import static org.mockito.Matchers.anyLong;
1818
import static org.mockito.Mockito.mock;
1919
import static org.mockito.Mockito.when;
20-
import static se.bjurr.prnbs.admin.utils.PullRequestEventBuilder.pullRequestEventBuilder;
20+
import static se.bjurr.prnbb.admin.utils.PullRequestEventBuilder.pullRequestEventBuilder;
2121
import static se.bjurr.prnfb.admin.AdminFormValues.NAME;
2222
import static se.bjurr.prnfb.admin.AdminFormValues.VALUE;
2323
import static se.bjurr.prnfb.admin.AdminFormValues.FIELDS.FORM_IDENTIFIER;
@@ -37,7 +37,7 @@
3737

3838
import org.mockito.Matchers;
3939

40-
import se.bjurr.prnbs.admin.data.PluginSettingsImpl;
40+
import se.bjurr.prnbb.admin.data.PluginSettingsImpl;
4141
import se.bjurr.prnfb.ManualResource;
4242
import se.bjurr.prnfb.admin.AdminFormError;
4343
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package se.bjurr.prnbs.admin.utils;
1+
package se.bjurr.prnbb.admin.utils;
22

33
import static com.atlassian.bitbucket.pull.PullRequestAction.COMMENTED;
44
import static com.atlassian.bitbucket.pull.PullRequestAction.RESCOPED;
@@ -7,7 +7,7 @@
77
import static java.lang.Boolean.TRUE;
88
import static org.mockito.Mockito.mock;
99
import static org.mockito.Mockito.when;
10-
import static se.bjurr.prnbs.admin.utils.PullRequestRefBuilder.pullRequestRefBuilder;
10+
import static se.bjurr.prnbb.admin.utils.PullRequestRefBuilder.pullRequestRefBuilder;
1111

1212
import java.util.Set;
1313

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package se.bjurr.prnbs.admin.utils;
1+
package se.bjurr.prnbb.admin.utils;
22

33
import static com.google.common.collect.Sets.newHashSet;
44
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package se.bjurr.prnbs.admin.utils;
1+
package se.bjurr.prnbb.admin.utils;
22

33
import java.util.Collection;
44
import java.util.List;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package se.bjurr.prnfb.admin;
22

33
import static com.atlassian.bitbucket.pull.PullRequestAction.OPENED;
4-
import static se.bjurr.prnbs.admin.utils.NotificationBuilder.notificationBuilder;
5-
import static se.bjurr.prnbs.admin.utils.PrnfbTestBuilder.prnfbTestBuilder;
4+
import static se.bjurr.prnbb.admin.utils.NotificationBuilder.notificationBuilder;
5+
import static se.bjurr.prnbb.admin.utils.PrnfbTestBuilder.prnfbTestBuilder;
66
import static se.bjurr.prnfb.admin.AdminFormValues.DEFAULT_NAME;
77
import static se.bjurr.prnfb.admin.AdminFormValues.FIELDS.FORM_IDENTIFIER;
88
import static se.bjurr.prnfb.admin.AdminFormValues.FIELDS.events;

‎src/test/java/se/bjurr/prnfb/admin/PrnfbPullRequestEventListenerTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;
1818
import static org.junit.Assert.assertEquals;
1919
import static org.junit.Assert.assertTrue;
20-
import static se.bjurr.prnbs.admin.utils.NotificationBuilder.notificationBuilder;
21-
import static se.bjurr.prnbs.admin.utils.PrnfbParticipantBuilder.prnfbParticipantBuilder;
22-
import static se.bjurr.prnbs.admin.utils.PrnfbTestBuilder.prnfbTestBuilder;
23-
import static se.bjurr.prnbs.admin.utils.PullRequestEventBuilder.PREVIOUS_FROM_HASH;
24-
import static se.bjurr.prnbs.admin.utils.PullRequestEventBuilder.PREVIOUS_TO_HASH;
25-
import static se.bjurr.prnbs.admin.utils.PullRequestEventBuilder.pullRequestEventBuilder;
26-
import static se.bjurr.prnbs.admin.utils.PullRequestRefBuilder.pullRequestRefBuilder;
20+
import static se.bjurr.prnbb.admin.utils.NotificationBuilder.notificationBuilder;
21+
import static se.bjurr.prnbb.admin.utils.PrnfbParticipantBuilder.prnfbParticipantBuilder;
22+
import static se.bjurr.prnbb.admin.utils.PrnfbTestBuilder.prnfbTestBuilder;
23+
import static se.bjurr.prnbb.admin.utils.PullRequestEventBuilder.PREVIOUS_FROM_HASH;
24+
import static se.bjurr.prnbb.admin.utils.PullRequestEventBuilder.PREVIOUS_TO_HASH;
25+
import static se.bjurr.prnbb.admin.utils.PullRequestEventBuilder.pullRequestEventBuilder;
26+
import static se.bjurr.prnbb.admin.utils.PullRequestRefBuilder.pullRequestRefBuilder;
2727
import static se.bjurr.prnfb.admin.AdminFormValues.BUTTON_VISIBILITY.EVERYONE;
2828
import static se.bjurr.prnfb.admin.AdminFormValues.FIELDS.FORM_IDENTIFIER;
2929
import static se.bjurr.prnfb.admin.AdminFormValues.FIELDS.FORM_TYPE;
@@ -83,9 +83,9 @@
8383

8484
import org.junit.Test;
8585

86-
import se.bjurr.prnbs.admin.utils.PrnfbTestBuilder;
87-
import se.bjurr.prnbs.admin.utils.PullRequestEventBuilder;
88-
import se.bjurr.prnbs.admin.utils.PullRequestRefBuilder;
86+
import se.bjurr.prnbb.admin.utils.PrnfbTestBuilder;
87+
import se.bjurr.prnbb.admin.utils.PullRequestEventBuilder;
88+
import se.bjurr.prnbb.admin.utils.PullRequestRefBuilder;
8989
import se.bjurr.prnfb.listener.PrnfbPullRequestAction;
9090
import se.bjurr.prnfb.listener.PrnfbRenderer.PrnfbVariable;
9191

@@ -410,7 +410,7 @@ public void testThatAUrlWithVariablesExceptFromAndToCanBeInvoked() throws Except
410410
.withToRef( //
411411
pullRequestRefBuilder() //
412412
.withProjectKey("theProject") //
413-
.withRepositoryName("theRepoName") //
413+
.withRepositoryName("the Repo Name") //
414414
) //
415415
.withPullRequestAction(OPENED) //
416416
.withAuthor( //
@@ -426,7 +426,7 @@ public void testThatAUrlWithVariablesExceptFromAndToCanBeInvoked() throws Except
426426
) //
427427
.invokedUrl(
428428
0,
429-
"http://bjurr.se/id=10&action=OPENED&displayName=authorDisplayName&authorEmail=authorEmail&authorId=100&authorName=authorName&authorSlug=authorSlug&pullRequestUrl=http%3A%2F%2Fbitbucket.server%2Fprojects%2FtheProject%2Frepos%2FtheRepoName%2Fpull-requests%2F10" //
429+
"http://bjurr.se/id=10&action=OPENED&displayName=authorDisplayName&authorEmail=authorEmail&authorId=100&authorName=authorName&authorSlug=authorSlug&pullRequestUrl=http%3A%2F%2Fbitbucket.server%2Fprojects%2FtheProject%2Frepos%2Fthe-Repo-Name%2Fpull-requests%2F10" //
430430
);
431431
}
432432

0 commit comments

Comments
 (0)