fix: refactor get open projects function

Author: acke

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

@@ -2,14 +2,15 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.osgi.service.prefs.BackingStoreException;
 
 import com.google.gson.Gson;
-import com.google.gson.JsonSyntaxException;
 
+import io.snyk.eclipse.plugin.utils.ResourceUtils;
 import io.snyk.eclipse.plugin.utils.SnykLogger;
 import io.snyk.languageserver.protocolextension.messageObjects.FolderConfig;
 import io.snyk.languageserver.protocolextension.messageObjects.FolderConfigsParam;
@@ -71,22 +72,34 @@ public String getBaseBranch(String folderPath) {
 		FolderConfig folderConfig = gson.fromJson(json, FolderConfig.class);
 		return folderConfig.getBaseBranch();
 	}
-	
+
 	public void addAll(List<FolderConfig> folderConfigs) {
 		for (FolderConfig folderConfig : folderConfigs) {
 			addFolderConfig(folderConfig);
 		}
 	}
-	
-	public FolderConfigsParam getFolderConfigs(List<String> folderPaths) {
-	    List<FolderConfig> folderConfigs = new ArrayList<>();
-	    for (String folderPath : folderPaths) {
-	        String json = preferenceState.get(folderPath, null);
-	        if (json != null) {
-	            FolderConfig folderConfig = gson.fromJson(json, FolderConfig.class);
-	            folderConfigs.add(folderConfig);
-	        }
-	    }
-	    return new FolderConfigsParam(folderConfigs);
+
+	public FolderConfigsParam updateFolderConfigs() {
+		List<IProject> openProjects = ResourceUtils.getOpenProjects();
+
+		List<String> projectPaths = openProjects.stream().map(project -> project.getLocation().toOSString())
+				.collect(Collectors.toList());
+
+		FolderConfigsParam folderConfigs = getFolderConfigs(projectPaths);
+
+		return folderConfigs;
+
+	}
+
+	private FolderConfigsParam getFolderConfigs(List<String> folderPaths) {
+		List<FolderConfig> folderConfigs = new ArrayList<>();
+		for (String folderPath : folderPaths) {
+			String json = preferenceState.get(folderPath, null);
+			if (json != null) {
+				FolderConfig folderConfig = gson.fromJson(json, FolderConfig.class);
+				folderConfigs.add(folderConfig);
+			}
+		}
+		return new FolderConfigsParam(folderConfigs);
 	}
 }

plugin/src/main/java/io/snyk/eclipse/plugin/utils/ResourceUtils.java

@@ -106,4 +106,3 @@ public static List<IProject> getAccessibleTopLevelProjects() {
 
 		return new ArrayList<>(topLevel);
 	}
-}

plugin/src/main/java/io/snyk/languageserver/LsConfigurationUpdater.java

@@ -1,11 +1,8 @@
 package io.snyk.languageserver;
 
 import java.io.File;
-import java.util.List;
-import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.SystemUtils;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.lsp4j.DidChangeConfigurationParams;
 
 import io.snyk.eclipse.plugin.Activator;
@@ -65,32 +62,14 @@ Settings getCurrentSettings() {
 			authMethod = "token";
 		}
 		String enableDeltaFindings = preferences.getPref(Preferences.FILTER_DELTA_NEW_ISSUES, Boolean.FALSE.toString());
-		FolderConfigsParam folderConfigsParam = updateFolderConfigs();
+		FolderConfigsParam folderConfigsParam = FolderConfigs.getInstance().updateFolderConfigs();
 		return new Settings(activateSnykOpenSource, activateSnykCodeSecurity, activateSnykCodeQuality, activateSnykIac,
 				insecure, endpoint, additionalParams, additionalEnv, path, sendErrorReports, enableTelemetry,
 				organization, manageBinariesAutomatically, cliPath, token, integrationName, integrationVersion,
 				automaticAuthentication, trustedFolders, enableTrustedFolderFeature, scanningMode, enableDeltaFindings,
 				authMethod, folderConfigsParam);
 	}
 
-	// TODO is there a better place for this function?
-	private FolderConfigsParam updateFolderConfigs() {
-		SnykExtendedLanguageClient lc = SnykExtendedLanguageClient.getInstance();
-		if (lc != null) {
-			List<IProject> openProjects = lc.getOpenProjects();
-
-			List<String> projectPaths = openProjects.stream().map(project -> project.getLocation().toOSString())
-					.collect(Collectors.toList());
-
-			FolderConfigs configs = FolderConfigs.getInstance();
-			FolderConfigsParam folderConfigs = configs.getFolderConfigs(projectPaths);
-
-			return folderConfigs;
-		}
-
-		return null;
-	}
-
 	static class Settings {
 		private final String activateSnykOpenSource;
 		private final String activateSnykCodeSecurity;

plugin/src/main/java/io/snyk/languageserver/protocolextension/SnykExtendedLanguageClient.java

@@ -157,13 +157,6 @@ private void toggleIgnores(Boolean enableConsistentIgnores) {
 		});
 	}
 
-	private void createIssueCaches() {
-		List<IProject> openProjects = getOpenProjects();
-		for (IProject iProject : openProjects) {
-			IssueCacheHolder.getInstance().getCacheInstance(iProject);
-		}
-	}
-
 	private void registerPluginInstalledEventTask() {
 		if (!Preferences.getInstance().getBooleanPref(Preferences.ANALYTICS_PLUGIN_INSTALLED_SENT, false)) {
 			if (taskProcessor == null) {
@@ -688,13 +681,17 @@ public void setToolWindow(ISnykToolView toolView) {
 	}
 
 	public void clearCache() {
-		List<IProject> openProjects = getOpenProjects();
+		List<IProject> openProjects = ResourceUtils.getOpenProjects();
 		for (IProject iProject : openProjects) {
 			IssueCacheHolder.getInstance().getCacheInstance(iProject).clearAll();
 		}
 
 	}
 
+	public void setProgressMgr(ProgressManager progressMgr) {
+		this.progressManager = progressMgr;
+	}
+
 	@Override
 	public void notifyProgress(final ProgressParams params) {
 		if (params.getValue() == null) {