Adding migration code for old settings format #109

Author: tomasbjerre

CHANGELOG.md

@@ -12,7 +12,7 @@ Changelog of Pull Request Notifier for Bitbucket.
 
  * Also adding EVERYTHING_URL variable . Resolved to every other variable.
 
-  [f52d8ae78aaa0e7](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/f52d8ae78aaa0e7) Tomas Bjerre *2016-05-07 12:53:31*
+  [da4e64ab06398ff](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/da4e64ab06398ff) Tomas Bjerre *2016-05-08 08:16:03*
 
   Refactoring
 
@@ -23,14 +23,14 @@ Changelog of Pull Request Notifier for Bitbucket.
 
  * Also adding EVERYTHING_URL variable . Resolved to every other variable.
 
-  [f52d8ae78aaa0e7](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/f52d8ae78aaa0e7) Tomas Bjerre *2016-05-07 12:53:31*
+  [da4e64ab06398ff](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/da4e64ab06398ff) Tomas Bjerre *2016-05-08 08:16:03*
 
 ### GitHub [#25](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/25) Enable  configuration in per-repository hook screen
   Admin GUI   
 
  * Also adding EVERYTHING_URL variable . Resolved to every other variable.
 
-  [f52d8ae78aaa0e7](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/f52d8ae78aaa0e7) Tomas Bjerre *2016-05-07 12:53:31*
+  [da4e64ab06398ff](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/da4e64ab06398ff) Tomas Bjerre *2016-05-08 08:16:03*
 
   Adding repo and global admin pages
 
@@ -45,9 +45,13 @@ Changelog of Pull Request Notifier for Bitbucket.
 
  * Also adding EVERYTHING_URL variable . Resolved to every other variable.
 
-  [f52d8ae78aaa0e7](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/f52d8ae78aaa0e7) Tomas Bjerre *2016-05-07 12:53:31*
+  [da4e64ab06398ff](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/da4e64ab06398ff) Tomas Bjerre *2016-05-08 08:16:03*
 
 ### No issue
+  Adding migration code for old settings format
+  
+  [515086b440e76de](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/515086b440e76de) Tomas Bjerre *2016-05-08 08:48:18*
+
   changelog maven plugin 1.29
 
   [25ccd05b465bd4a](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/25ccd05b465bd4a) Tomas Bjerre *2016-04-14 16:36:16*

src/main/java/se/bjurr/prnfb/service/SettingsService.java

@@ -7,20 +7,31 @@
 import static com.google.common.collect.Iterables.find;
 import static com.google.common.collect.Iterables.tryFind;
 import static com.google.common.collect.Lists.newArrayList;
+import static se.bjurr.prnfb.settings.PrnfbNotificationBuilder.prnfbNotificationBuilder;
 import static se.bjurr.prnfb.settings.PrnfbSettingsBuilder.prnfbSettingsBuilder;
 import static se.bjurr.prnfb.settings.PrnfbSettingsDataBuilder.prnfbSettingsDataBuilder;
 
 import java.util.List;
 import java.util.UUID;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import se.bjurr.prnfb.listener.PrnfbPullRequestAction;
 import se.bjurr.prnfb.settings.HasUuid;
 import se.bjurr.prnfb.settings.PrnfbButton;
 import se.bjurr.prnfb.settings.PrnfbNotification;
+import se.bjurr.prnfb.settings.PrnfbNotificationBuilder;
 import se.bjurr.prnfb.settings.PrnfbSettings;
 import se.bjurr.prnfb.settings.PrnfbSettingsData;
+import se.bjurr.prnfb.settings.TRIGGER_IF_MERGE;
 import se.bjurr.prnfb.settings.USER_LEVEL;
 import se.bjurr.prnfb.settings.ValidationException;
+import se.bjurr.prnfb.settings.legacy.AdminFormValues.BUTTON_VISIBILITY;
+import se.bjurr.prnfb.settings.legacy.Header;
+import se.bjurr.prnfb.settings.legacy.SettingsStorage;
 
+import com.atlassian.bitbucket.pull.PullRequestState;
 import com.atlassian.bitbucket.user.SecurityService;
 import com.atlassian.bitbucket.util.Operation;
 import com.atlassian.sal.api.pluginsettings.PluginSettings;
@@ -36,6 +47,7 @@ public class SettingsService {
 
  public static final String STORAGE_KEY = "se.bjurr.prnfb.pull-request-notifier-for-bitbucket-3";
  private static Gson gson = new Gson();
+ private final Logger logger = LoggerFactory.getLogger(SettingsService.class);
  private final PluginSettings pluginSettings;
  private final SecurityService securityService;
  private final TransactionTemplate transactionTemplate;
@@ -233,6 +245,88 @@ private void doDeleteNotification(UUID uuid) {
  private PrnfbSettings doGetPrnfbSettings() {
   Object storedSettings = this.pluginSettings.get(STORAGE_KEY);
   if (storedSettings == null) {
+   try {
+    se.bjurr.prnfb.settings.legacy.PrnfbSettings oldSettings = SettingsStorage.getPrnfbSettings(this.pluginSettings);
+
+    String ks = oldSettings.getKeyStore().orNull();
+    String ksp = oldSettings.getKeyStorePassword().orNull();
+    String kst = oldSettings.getKeyStoreType();
+    USER_LEVEL adminRestr = USER_LEVEL.SYSTEM_ADMIN;
+    if (oldSettings.isAdminsAllowed()) {
+     adminRestr = USER_LEVEL.ADMIN;
+    }
+    if (oldSettings.isUsersAllowed()) {
+     adminRestr = USER_LEVEL.EVERYONE;
+    }
+
+    boolean shouldAcceptAnyCertificate = false;
+
+    List<PrnfbButton> newButtons = newArrayList();
+    for (se.bjurr.prnfb.settings.legacy.PrnfbButton oldButton : oldSettings.getButtons()) {
+     USER_LEVEL userLevel = USER_LEVEL.SYSTEM_ADMIN;
+     if (oldButton.getVisibility() == BUTTON_VISIBILITY.ADMIN) {
+      userLevel = USER_LEVEL.ADMIN;
+     }
+     if (oldButton.getVisibility() == BUTTON_VISIBILITY.EVERYONE) {
+      userLevel = USER_LEVEL.EVERYONE;
+     }
+     newButtons.add(new PrnfbButton(UUID.randomUUID(), oldButton.getTitle(), userLevel, null, null));
+    }
+
+    List<PrnfbNotification> newNotifications = newArrayList();
+    for (se.bjurr.prnfb.settings.legacy.PrnfbNotification oldNotification : oldSettings.getNotifications()) {
+     try {
+      PrnfbNotificationBuilder builder = prnfbNotificationBuilder()//
+        .withFilterRegexp(oldNotification.getFilterRegexp().orNull())//
+        .withFilterString(oldNotification.getFilterString().orNull())//
+        .withInjectionUrl(oldNotification.getInjectionUrl().orNull())//
+        .withInjectionUrlRegexp(oldNotification.getInjectionUrlRegexp().orNull())//
+        .withMethod(oldNotification.getMethod())//
+        .withName(oldNotification.getName())//
+        .withPassword(oldNotification.getPassword().orNull())//
+        .withPostContent(oldNotification.getPostContent().orNull())//
+        .withProxyPassword(oldNotification.getProxyPassword().orNull())//
+        .withProxyPort(oldNotification.getProxyPort())//
+        .withProxyServer(oldNotification.getProxyServer().orNull())//
+        .withProxyUser(oldNotification.getProxyUser().orNull())//
+        .withTriggerIfCanMerge(TRIGGER_IF_MERGE.valueOf(oldNotification.getTriggerIfCanMerge().name()))//
+        .withUrl(oldNotification.getUrl())//
+        .withUser(oldNotification.getUser().orNull());
+
+      for (Header h : oldNotification.getHeaders()) {
+       builder.withHeader(h.getName(), h.getValue());
+      }
+
+      for (PullRequestState t : oldNotification.getTriggerIgnoreStateList()) {
+       builder.withTriggerIgnoreState(t);
+      }
+
+      for (PrnfbPullRequestAction t : oldNotification.getTriggers()) {
+       builder.withTrigger(t);
+      }
+
+      newNotifications.add(builder.build());
+     } catch (ValidationException e) {
+      this.logger.error("", e);
+     }
+    }
+
+    return prnfbSettingsBuilder()//
+      .setPrnfbSettingsData(//
+        prnfbSettingsDataBuilder()//
+          .setAdminRestriction(adminRestr)//
+          .setKeyStore(ks)//
+          .setKeyStorePassword(ksp)//
+          .setKeyStoreType(kst)//
+          .setShouldAcceptAnyCertificate(shouldAcceptAnyCertificate)//
+          .build())//
+      .setButtons(newButtons)//
+      .setNotifications(newNotifications)//
+      .build();
+
+   } catch (se.bjurr.prnfb.settings.legacy.ValidationException e) {
+    this.logger.error("", e);
+   }
    return prnfbSettingsBuilder()//
      .setPrnfbSettingsData(//
        prnfbSettingsDataBuilder()//

src/main/java/se/bjurr/prnfb/settings/legacy/AdminFormValues.java

@@ -0,0 +1,65 @@
+package se.bjurr.prnfb.settings.legacy;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
+public final class AdminFormValues extends ArrayList<Map<String, String>> {
+ public enum BUTTON_VISIBILITY {
+  ADMIN, EVERYONE, NONE, SYSTEM_ADMIN
+ }
+
+ public enum FIELDS {
+  accept_any_certificate, //
+  admin_allowed, //
+  button_title, //
+  button_visibility, //
+  events, //
+  filter_regexp, //
+  filter_string, //
+  FORM_IDENTIFIER, //
+  FORM_TYPE, //
+  header_name, //
+  header_value, //
+  injection_url, //
+  injection_url_regexp, //
+  key_store, //
+  key_store_password, //
+  key_store_type, //
+  method, //
+  name, //
+  password, //
+  post_content, //
+  proxy_password, //
+  proxy_port, //
+  proxy_server, //
+  proxy_user, //
+  trigger_if_isconflicting, //
+  trigger_ignore_state, //
+  url, //
+  user, //
+  user_allowed;
+ }
+
+ public enum FORM_TYPE {
+  BUTTON_CONFIG_FORM, GLOBAL_SETTINGS, TRIGGER_CONFIG_FORM
+ }
+
+ public enum TRIGGER_IF_MERGE {
+  ALWAYS, CONFLICTING, NOT_CONFLICTING
+ }
+
+ public static final String DEFAULT_NAME = "Unnamed trigger";;
+
+ public static final String NAME = "name";;
+
+ public static final String VALUE = "value";;
+
+ private static final long serialVersionUID = 9084184120202816120L;
+}

src/main/java/se/bjurr/prnfb/settings/legacy/Header.java

@@ -0,0 +1,25 @@
+package se.bjurr.prnfb.settings.legacy;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Strings.emptyToNull;
+import static com.google.common.base.Strings.nullToEmpty;
+
+@Deprecated
+public class Header {
+
+ private final String name;
+ private final String value;
+
+ public Header(String name, String value) {
+  this.name = checkNotNull(emptyToNull(nullToEmpty(name).trim()));
+  this.value = checkNotNull(emptyToNull(nullToEmpty(value).trim()));
+ }
+
+ public String getName() {
+  return this.name;
+ }
+
+ public String getValue() {
+  return this.value;
+ }
+}

src/main/java/se/bjurr/prnfb/settings/legacy/PrnfbButton.java

@@ -0,0 +1,34 @@
+package se.bjurr.prnfb.settings.legacy;
+
+import se.bjurr.prnfb.settings.legacy.AdminFormValues.BUTTON_VISIBILITY;
+
+@Deprecated
+public class PrnfbButton {
+
+ private final String formIdentifier;
+ private final String title;
+ private final BUTTON_VISIBILITY visibility;
+
+ public PrnfbButton(String title, BUTTON_VISIBILITY visibility, String formIdentifier) {
+  this.title = title;
+  this.visibility = visibility;
+  this.formIdentifier = formIdentifier;
+ }
+
+ public String getFormIdentifier() {
+  return this.formIdentifier;
+ }
+
+ public String getTitle() {
+  return this.title;
+ }
+
+ public BUTTON_VISIBILITY getVisibility() {
+  return this.visibility;
+ }
+
+ @Override
+ public String toString() {
+  return "Title: " + this.title;
+ }
+}