chore: adjust preference visibility, use setter (#245)

Author: bastiandoetsch

plugin/src/main/java/io/snyk/eclipse/plugin/preferences/Preferences.java

@@ -13,19 +13,19 @@
 import io.snyk.languageserver.LsRuntimeEnvironment;
 
 public class Preferences {
-	public static Preferences CURRENT_PREFERENCES;
-	public static LsRuntimeEnvironment LS_RUNTIME_ENV = new LsRuntimeEnvironment();
+	private static Preferences CURRENT_PREFERENCES;
+	private static LsRuntimeEnvironment LS_RUNTIME_ENV = new LsRuntimeEnvironment();
 
 	public static synchronized Preferences getInstance() {
 		if (CURRENT_PREFERENCES == null) {
-			CURRENT_PREFERENCES = new Preferences(new SecurePreferenceStore());
+			setCurrentPreferences(new Preferences(new SecurePreferenceStore()));
 		}
 		return CURRENT_PREFERENCES;
 	}
 
 	public static synchronized Preferences getInstance(PreferenceStore store) {
 		Preferences preferences = new Preferences(store);
-		CURRENT_PREFERENCES = preferences;
+		setCurrentPreferences(preferences);
 		return preferences;
 	}
 
@@ -265,4 +265,8 @@ public static boolean isDeltaEnabled() {
 		return Preferences.getInstance().getBooleanPref(Preferences.FILTER_DELTA_NEW_ISSUES);
 	}
 
+	public static void setCurrentPreferences(Preferences prefs) {
+		CURRENT_PREFERENCES = prefs;
+	}
+
 }

plugin/src/main/java/io/snyk/eclipse/plugin/properties/FolderConfigs.java

@@ -1,6 +1,7 @@
 package io.snyk.eclipse.plugin.properties;
 
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -35,12 +36,8 @@ public static synchronized FolderConfigs getInstance() {
 	}
 
 	public void addFolderConfig(FolderConfig folderConfig) {
-		instancePreferences.put(folderConfig.getFolderPath(), gson.toJson(folderConfig));
-		try {
-			instancePreferences.flush();
-		} catch (Exception e) {
-			SnykLogger.logError(e);
-		}
+		var folderPath = Paths.get(folderConfig.getFolderPath());
+		persist(folderPath, folderConfig);
 	}
 
 	public List<String> getLocalBranches(Path projectPath) {
@@ -94,7 +91,11 @@ public FolderConfigsParam updateFolderConfigs() {
 		return param;
 	}
 
-	// returns null if nothing found
+	/**
+	 * Gets folder config for given path, if none exists it is created with defaults and returned
+	 * @param folderPath the path of the folder (usually the project)
+	 * @return a folder config (always)
+	 */
 	public FolderConfig getFolderConfig(Path folderPath) {
 		Path path = folderPath.normalize();
 		String json = instancePreferences.get(path.toString(), null);

tests/src/test/java/io/snyk/eclipse/plugin/properties/preferences/PreferencesUtils.java

@@ -4,10 +4,10 @@
 
 public abstract class PreferencesUtils {
   public static void setPreferences(Preferences p) {
-    Preferences.CURRENT_PREFERENCES = p;
+    Preferences.setCurrentPreferences(p);
   }
 
   public static void reset() {
-    Preferences.CURRENT_PREFERENCES = null;
+    Preferences.setCurrentPreferences(null);
   }
 }