Storing projectKey and repoSlug #238

Author: tomasbjerre

CHANGELOG.md

@@ -3,6 +3,23 @@
 Changelog of Pull Request Notifier for Bitbucket.
 
 ## Unreleased
+### No issue
+  doc
+  
+  [a9fbe75c3fcca7d](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/a9fbe75c3fcca7d) Tomas Bjerre *2017-07-30 19:28:12*
+
+## 3.7
+### GitHub [#238](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/238) Project and Repo not shown correctly in dropboxes in global admin GUI
+  Storing projectKey and repoSlug
+  
+  [74ac44bb6ae5648](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/74ac44bb6ae5648) Tomas Bjerre *2017-07-30 19:24:31*
+
+### No issue
+  doc
+  
+  [34ef39f654c3a36](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/34ef39f654c3a36) Tomas Bjerre *2017-07-30 17:21:43*
+
+## 3.6
 ### GitHub [#236](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/236) username and password missing from saved configuration and HTTP requests
   Bugfix setting credentials correctly
 

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

@@ -106,7 +106,7 @@ public boolean equals(Object obj) {
     if (getClass() != obj.getClass()) {
       return false;
     }
-    PrnfbNotification other = (PrnfbNotification) obj;
+    final PrnfbNotification other = (PrnfbNotification) obj;
     if (filterRegexp == null) {
       if (other.filterRegexp != null) {
         return false;

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

@@ -9,19 +9,68 @@
 import java.util.List;
 import java.util.UUID;
 
-import com.atlassian.bitbucket.pull.PullRequestState;
-
 import se.bjurr.prnfb.http.UrlInvoker.HTTP_METHOD;
 import se.bjurr.prnfb.listener.PrnfbPullRequestAction;
 import se.bjurr.prnfb.service.PrnfbRenderer.ENCODE_FOR;
 
+import com.atlassian.bitbucket.pull.PullRequestState;
+
 public class PrnfbNotificationBuilder {
   public static PrnfbNotificationBuilder prnfbNotificationBuilder() {
     return new PrnfbNotificationBuilder();
   }
 
+  public PrnfbNotificationBuilder(
+      String filterRegexp,
+      String filterString,
+      List<PrnfbHeader> headers,
+      String injectionUrl,
+      String injectionUrlRegexp,
+      HTTP_METHOD method,
+      String name,
+      String password,
+      String postContent,
+      String projectKey,
+      String proxyPassword,
+      Integer proxyPort,
+      String proxyServer,
+      String proxyUser,
+      String repositorySlug,
+      TRIGGER_IF_MERGE triggerIfCanMerge,
+      List<PullRequestState> triggerIgnoreStateList,
+      List<PrnfbPullRequestAction> triggers,
+      String url,
+      String user,
+      UUID uuid,
+      ENCODE_FOR postContentEncoding,
+      String proxySchema) {
+    this.filterRegexp = filterRegexp;
+    this.filterString = filterString;
+    this.headers = headers;
+    this.injectionUrl = injectionUrl;
+    this.injectionUrlRegexp = injectionUrlRegexp;
+    this.method = method;
+    this.name = name;
+    this.password = password;
+    this.postContent = postContent;
+    this.projectKey = projectKey;
+    this.proxyPassword = proxyPassword;
+    this.proxyPort = proxyPort;
+    this.proxyServer = proxyServer;
+    this.proxyUser = proxyUser;
+    this.repositorySlug = repositorySlug;
+    this.triggerIfCanMerge = triggerIfCanMerge;
+    this.triggerIgnoreStateList = triggerIgnoreStateList;
+    this.triggers = triggers;
+    this.url = url;
+    this.user = user;
+    this.uuid = uuid;
+    this.postContentEncoding = postContentEncoding;
+    this.proxySchema = proxySchema;
+  }
+
   public static PrnfbNotificationBuilder prnfbNotificationBuilder(PrnfbNotification from) {
-    PrnfbNotificationBuilder b = new PrnfbNotificationBuilder();
+    final PrnfbNotificationBuilder b = new PrnfbNotificationBuilder();
 
     b.uuid = from.getUuid();
     b.password = from.getPassword().orNull();
@@ -39,6 +88,8 @@ public static PrnfbNotificationBuilder prnfbNotificationBuilder(PrnfbNotificatio
     b.proxyServer = from.getProxyServer().orNull();
     b.proxySchema = from.getProxySchema().orNull();
     b.proxyPort = from.getProxyPort();
+    b.projectKey = from.getProjectKey().orNull();
+    b.repositorySlug = from.getRepositorySlug().orNull();
     b.name = from.getName();
     b.injectionUrl = from.getInjectionUrl().orNull();
     b.injectionUrlRegexp = from.getInjectionUrlRegexp().orNull();

src/test/java/se/bjurr/prnfb/settings/PrnfbNotificationBuilderTest.java

@@ -0,0 +1,21 @@
+package se.bjurr.prnfb.settings;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static se.bjurr.prnfb.settings.PrnfbNotificationBuilder.prnfbNotificationBuilder;
+import static se.bjurr.prnfb.test.Podam.populatedInstanceOf;
+
+import org.junit.Test;
+
+public class PrnfbNotificationBuilderTest {
+
+  @Test
+  public void testBuild() throws ValidationException {
+    final PrnfbNotificationBuilder originalBuilder =
+        populatedInstanceOf(PrnfbNotificationBuilder.class);
+    originalBuilder.withUrl("http://bjurr.com/");
+    final PrnfbNotification original = originalBuilder.build();
+    final PrnfbNotificationBuilder builder = prnfbNotificationBuilder(original);
+    final PrnfbNotification built = builder.build();
+    assertThat(built).isEqualTo(original);
+  }
+}