Trimmin regexp filter and string #197

Author: tomasbjerre

CHANGELOG.md

@@ -3,10 +3,16 @@
 Changelog of Pull Request Notifier for Bitbucket.
 
 ## Unreleased
+### GitHub [#197](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/197) Button not displaying on PRs which are merged
+  Trimmin regexp filter and string
+  
+  [fcb16d4c700e7d8](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/fcb16d4c700e7d8) Tomas Bjerre *2017-02-17 13:10:58*
+
+## 2.54
 ### GitHub [#195](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/195) Merges are not triggering a request?
   Clarifying 'state' option in notification GUI
 
-  [8e84ae0e76aac69](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/8e84ae0e76aac69) Tomas Bjerre *2017-02-15 16:31:23*
+  [ba67df63342b90e](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/ba67df63342b90e) Tomas Bjerre *2017-02-15 16:55:43*
 
 ### No issue
   Building for current and 4.2.0 in Travis

src/main/java/se/bjurr/prnfb/settings/PrnfbNotification.java

@@ -84,8 +84,8 @@ public PrnfbNotification(PrnfbNotificationBuilder builder) throws ValidationExce
     if (this.triggers.isEmpty()) {
       throw new ValidationException("triggers", "At least one trigger must be selected.");
     }
-    this.filterString = builder.getFilterString();
-    this.filterRegexp = builder.getFilterRegexp();
+    this.filterString = emptyToNull(nullToEmpty(builder.getFilterString()).trim());
+    this.filterRegexp = emptyToNull(nullToEmpty(builder.getFilterRegexp()).trim());
     this.name = firstNonNull(emptyToNull(nullToEmpty(builder.getName()).trim()), DEFAULT_NAME);
     this.injectionUrl = emptyToNull(nullToEmpty(builder.getInjectionUrl()).trim());
     this.injectionUrlRegexp = emptyToNull(nullToEmpty(builder.getInjectionUrlRegexp()).trim());

src/test/java/se/bjurr/prnfb/listener/PrnfbPullRequestEventListenerTest.java

@@ -360,6 +360,31 @@ public void testThatNotifiationIsTriggeredByActionIfAFilterIsMatching()
         .isTrue();
   }
 
+  @Test
+  public void testThatNotifiationIsTriggeredByActionIfAFilterIsMatchingWhenTrimmed()
+      throws ValidationException {
+    PrnfbNotification notification =
+        prnfbNotificationBuilder() //
+            .withTrigger(RESCOPED_FROM) //
+            .withUrl("http://hej.com") //
+            .withFilterRegexp(" ^abc$   ") //
+            .withFilterString("  abc ") //
+            .build();
+    PrnfbPullRequestAction pullRequestAction = RESCOPED_FROM;
+
+    boolean actual =
+        sut.isNotificationTriggeredByAction(
+            notification,
+            pullRequestAction,
+            renderer,
+            pullRequest,
+            clientKeyStore,
+            shouldAcceptAnyCertificate);
+
+    assertThat(actual) //
+        .isTrue();
+  }
+
   @Test
   public void testThatNotifiationIsTriggeredByActionIfProjectSame() throws ValidationException {
     PrnfbNotification notification =