fix: post merge cleanup

Author: acke

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterCriticalHandler.java

@@ -28,4 +28,4 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 
 		return null;
 	}
-
+}

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterHighHandler.java

@@ -27,4 +27,4 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 
 		return null;
 	}
-
+}

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterIgnoresIgnoredIssuesHandler.java

@@ -27,3 +27,4 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 
 		return null;
 	}
+}

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterIgnoresOpenIssuesHandler.java

@@ -29,3 +29,4 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 
 		return null;
 	}
+}

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterLowHandler.java

@@ -27,4 +27,5 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 
 		return null;
 	}
+}
 

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterMediumHandler.java

@@ -28,4 +28,5 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 
 		return null;
 	}
+}
 

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/snykFilterFixableIssuesHandler.java

@@ -135,6 +135,9 @@ public void refreshFeatureFlags() {
 	}
 
 	private void toggleIgnores(Boolean enableConsistentIgnores) {
+		if(Preferences.getInstance().isTest()) {
+			return;
+		}
 		Preferences.getInstance().store(Preferences.IS_GLOBAL_IGNORES_FEATURE_ENABLED,
 				Boolean.valueOf(enableConsistentIgnores).toString());
 		PlatformUI.getWorkbench().getDisplay().asyncExec(() -> {
@@ -514,21 +517,19 @@ private void addInfoNodes(ProductTreeNode productNode, String folderPath, SnykIs
 	}
 
 	@JsonNotification(value = LsNotificationID.SNYK_PUBLISH_DIAGNOSTICS_316)
-	public CompletableFuture<Void> publishDiagnostics316(PublishDiagnostics316Param param) {
-		return CompletableFuture.runAsync(() -> {
-			var uri = param.getUri();
-			if (StringUtils.isEmpty(uri)) {
-				SnykLogger.logInfo("uri for PublishDiagnosticsParams is empty");
-				return;
-			}
-			var filePath = LSPEclipseUtils.fromUri(URI.create(uri)).getAbsolutePath();
-			if (filePath == null) {
-				SnykLogger.logError(new InvalidPathException(uri, "couldn't resolve uri " + uri + " to file"));
-				return;
-			}
-
-			populateIssueCache(param, filePath);
-		});
+	public void publishDiagnostics316(PublishDiagnostics316Param param) {
+		var uri = param.getUri();
+		if (StringUtils.isEmpty(uri)) {
+			SnykLogger.logInfo("uri for PublishDiagnosticsParams is empty");
+			return;
+		}
+		var filePath = LSPEclipseUtils.fromUri(URI.create(uri)).getAbsolutePath();
+		if (filePath == null) {
+			SnykLogger.logError(new InvalidPathException(uri, "couldn't resolve uri " + uri + " to file"));
+			return;
+		}
+		
+		populateIssueCache(param, filePath);
 	}
 
 	private void populateFileAndIssueNodes(ProductTreeNode productTreeNode, String folderPath, SnykIssueCache issueCache) {
@@ -566,7 +567,7 @@ private ArrayList<Issue> filterIgnoredIssues(ArrayList<Issue> issueList) {
 	private void populateIssueCache(PublishDiagnostics316Param param, String filePath) {
 		var issueCache = getIssueCache(filePath);
 		Diagnostic316[] diagnostics = param.getDiagnostics();
-		if (diagnostics.length == 0) {
+		if (diagnostics == null || diagnostics.length == 0) {
 			issueCache.removeAllIssuesForPath(filePath);
 			return;
 		}

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

@@ -11,7 +11,6 @@
 import static io.snyk.eclipse.plugin.views.snyktoolview.ISnykToolView.CONGRATS_NO_ISSUES_FOUND;
 import static io.snyk.eclipse.plugin.views.snyktoolview.ISnykToolView.getPlural;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.mockStatic;
@@ -27,7 +26,6 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
 import org.eclipse.lsp4e.LSPEclipseUtils;
@@ -155,14 +153,13 @@ void testSendsPluginInstalledEventAndRefreshFeatureFlagOnFirstStart() {
 
 			cut = new SnykExtendedLanguageClient();
 
-			ArgumentCaptor<Consumer<SnykExtendedLanguageClient>> captor =
-					ArgumentCaptor.forClass((Class<Consumer<SnykExtendedLanguageClient>>) (Class<?>) Consumer.class);
+			ArgumentCaptor<Consumer<SnykExtendedLanguageClient>> captor = ArgumentCaptor
+					.forClass((Class<Consumer<SnykExtendedLanguageClient>>) (Class<?>) Consumer.class);
 			verify(asMock, times(2)).registerTask(captor.capture(), any());
 			verifyNoMoreInteractions(asMock);
-	    }
+		}
 	}
 
-
 	@Test
 	void testDoesNotSendPluginInstalledEventOnSecondStart() {
 		try (MockedStatic<TaskProcessor> mockedAnalyticsSender = mockStatic(TaskProcessor.class)) {
@@ -172,8 +169,8 @@ void testDoesNotSendPluginInstalledEventOnSecondStart() {
 
 			cut = new SnykExtendedLanguageClient();
 
-			ArgumentCaptor<Consumer<SnykExtendedLanguageClient>> captor =
-					ArgumentCaptor.forClass((Class<Consumer<SnykExtendedLanguageClient>>) (Class<?>) Consumer.class);
+			ArgumentCaptor<Consumer<SnykExtendedLanguageClient>> captor = ArgumentCaptor
+					.forClass((Class<Consumer<SnykExtendedLanguageClient>>) (Class<?>) Consumer.class);
 			verify(asMock, times(1)).registerTask(captor.capture(), any());
 			verifyNoMoreInteractions(asMock);
 		}
@@ -197,17 +194,7 @@ void testPublishDiagnosticsShouldChangeCache() {
 		diagnostic.setData(issue);
 		param.setDiagnostics(new Diagnostic316[] { diagnostic });
 		cut = new SnykExtendedLanguageClient();
-		var future = cut.publishDiagnostics316(param);
-		try {
-			future.get(10, TimeUnit.SECONDS);
-		} catch (Exception ex) {
-
-		Collection<Issue> actualIssueList = null;
-		if (issue.additionalData().isSecurityType()) {
-			actualIssueList = issueCache.getCodeSecurityIssuesForPath(filePath);
-		} else {
-			actualIssueList = issueCache.getCodeQualityIssuesForPath(filePath);
-		}
+		cut.publishDiagnostics316(param);
 
 		Collection<Issue> actualIssueList = null;
 		if (issue.additionalData().isSecurityType()) {
@@ -223,14 +210,9 @@ void testPublishDiagnosticsShouldChangeCache() {
 		param.setUri(uri);
 
 		cut = new SnykExtendedLanguageClient();
-		future = cut.publishDiagnostics316(param);
-		try {
-			future.thenRun(() -> {
-				assertEquals(true, issueCache.getCodeSecurityIssuesForPath(filePath).isEmpty());
-			});
-		} catch (Exception ex) {
-			fail(ex);
-		}
+		cut.publishDiagnostics316(param);
+
+		assertEquals(true, issueCache.getCodeSecurityIssuesForPath(filePath).isEmpty());
 
 	}
 
@@ -587,4 +569,4 @@ void testGetTotal() {
 	private AdditionalData getSecurityIssue() {
 		return Instancio.of(AdditionalData.class).set(Select.field(AdditionalData::isSecurityType), true).create();
 	}
-}
+}