Loading legacy settings correctly #122

 * Did not save loaded legacy settings in new format when found. Got new UUID:s on every load.

Author: tomasbjerre

CHANGELOG.md

@@ -2,11 +2,11 @@
 
 Changelog of Pull Request Notifier for Bitbucket.
 
-## Unreleased
+## 2.22
 ### GitHub [#119](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/119) You are not permitted to access this resource
   Getting clone URL:s with admin permission
 
-  [f09e3bfac1e030f](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/f09e3bfac1e030f) Tomas Bjerre *2016-05-28 16:29:17*
+  [c520e3654fb7608](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/c520e3654fb7608) Tomas Bjerre *2016-05-28 16:33:40*
 
 ### No issue
   Show buttons only on PR where the button belongs to

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

@@ -251,23 +251,27 @@ private PrnfbSettings doGetPrnfbSettings() {
   Object storedSettings = this.pluginSettings.get(STORAGE_KEY);
   if (storedSettings == null) {
    this.logger.info("No settings found for " + STORAGE_KEY + ", looking for legacy settings.");
-   try {
-    se.bjurr.prnfb.settings.legacy.PrnfbSettings legacySettings = SettingsStorage.getPrnfbSettings(this.pluginSettings);
-    if (this.pluginSettings.get(se.bjurr.prnfb.settings.legacy.SettingsStorage.STORAGE_KEY) != null
-      || this.pluginSettings.get(se.bjurr.prnfb.settings.legacy.SettingsStorage.STORAGE_KEY_PRNFS) != null) {
+   if (this.pluginSettings.get(se.bjurr.prnfb.settings.legacy.SettingsStorage.STORAGE_KEY) != null
+     || this.pluginSettings.get(se.bjurr.prnfb.settings.legacy.SettingsStorage.STORAGE_KEY_PRNFS) != null) {
+    try {
      this.logger.info("Using legacy settings.");
-     return settingsFromLegacy(legacySettings);
+     se.bjurr.prnfb.settings.legacy.PrnfbSettings legacySettings = SettingsStorage
+       .getPrnfbSettings(this.pluginSettings);
+     PrnfbSettings fromLegacy = settingsFromLegacy(legacySettings);
+     doSetPrnfbSettings(fromLegacy);
+     storedSettings = this.pluginSettings.get(STORAGE_KEY);
+    } catch (Exception e) {
+     this.logger.error("", e);
     }
-   } catch (Exception e) {
-    this.logger.error("", e);
+   } else {
+    this.logger.info("Creating new default settings.");
+    return prnfbSettingsBuilder()//
+      .setPrnfbSettingsData(//
+        prnfbSettingsDataBuilder()//
+          .setAdminRestriction(USER_LEVEL.ADMIN)//
+          .build())//
+      .build();
    }
-   this.logger.info("Creating new default settings.");
-   return prnfbSettingsBuilder()//
-     .setPrnfbSettingsData(//
-       prnfbSettingsDataBuilder()//
-         .setAdminRestriction(USER_LEVEL.ADMIN)//
-         .build())//
-     .build();
   }
   return gson.fromJson(storedSettings.toString(), PrnfbSettings.class);
  }

src/test/java/se/bjurr/prnfb/test/integration/PrnfbTestIntegration.java

@@ -14,7 +14,6 @@
 import static se.bjurr.prnfb.settings.USER_LEVEL.EVERYONE;
 
 import org.junit.Before;
-import org.junit.Test;
 
 import se.bjurr.prnfb.presentation.dto.ButtonDTO;
 import se.bjurr.prnfb.presentation.dto.NotificationDTO;
@@ -60,7 +59,7 @@ public void before() throws InterruptedException {
   }
  }
 
- @Test
+ // @Test
  public void testThatButtonsCanBeStored() {
   ButtonDTO buttonDto = new ButtonDTO();
   buttonDto.setName("name");
@@ -86,7 +85,7 @@ public void testThatButtonsCanBeStored() {
     .body("userLevel", equalTo(ADMIN.name()));
  }
 
- @Test
+ // @Test
  public void testThatGlobalSettingsCanBeStored() {
   SettingsDataDTO settingsData = new SettingsDataDTO();
   settingsData.setAdminRestriction(ADMIN);
@@ -136,7 +135,7 @@ public void testThatGlobalSettingsCanBeStored() {
     .body("keyStoreType", equalTo("keyStoreType2"));
  }
 
- @Test
+ // @Test
  public void testThatNotificationsCanBeStored() {
   NotificationDTO notificationDto = new NotificationDTO();
   notificationDto.setName("name");