feat: provide configured jdk for java projects (#234)

bastiandoetsch · web-flow · commit f8d0b4292ff3 · 2024-12-03T11:37:31.000Z
* feat: provide JRE if java project

* fix: dont fail on missing jdt

* chore: add comment

* chore: add comment
diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/SnykStartup.java b/plugin/src/main/java/io/snyk/eclipse/plugin/SnykStartup.java
@@ -164,7 +164,6 @@ static LsDownloader getLsDownloader() throws URISyntaxException {
 		return new LsDownloader(HttpClientFactory.getInstance(), runtimeEnvironment, logger);
 	}
 
-	@SuppressWarnings("ResultOfMethodCallIgnored")
 	public static IStatus download(IProgressMonitor monitor) {
 		final File lsFile = new File(Preferences.getInstance().getCliPath());
 		try {
@@ -183,6 +182,6 @@ public static boolean isDownloading() {
 	}
 
 	public void setLogger(ILog logger) {
-		this.logger = logger;
+		SnykStartup.logger = logger;
 	}
 }
diff --git a/plugin/src/main/java/io/snyk/languageserver/LsConfigurationUpdater.java b/plugin/src/main/java/io/snyk/languageserver/LsConfigurationUpdater.java
@@ -10,7 +10,6 @@
 import io.snyk.languageserver.download.LsBinaries;
 import io.snyk.languageserver.protocolextension.SnykExtendedLanguageClient;
 
-@SuppressWarnings("restriction")
 public class LsConfigurationUpdater {
 
     public void configurationChanged() {
diff --git a/plugin/src/main/java/io/snyk/languageserver/protocolextension/SdkHelper.java b/plugin/src/main/java/io/snyk/languageserver/protocolextension/SdkHelper.java
@@ -0,0 +1,42 @@
+package io.snyk.languageserver.protocolextension;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+
+import io.snyk.eclipse.plugin.utils.SnykLogger;
+import io.snyk.languageserver.protocolextension.messageObjects.LsSdk;
+
+public class SdkHelper {
+	private static final String JAVA = "java";
+
+	public LsSdk getJDK(IProject project) {
+		try {	
+			IJavaProject javaProject = JavaCore.create(project);
+			IClasspathEntry[] classpathEntries;
+			classpathEntries = javaProject.getResolvedClasspath(true);
+			for (IClasspathEntry entry : classpathEntries) {
+				if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
+					IPath classPath = entry.getPath();
+					var segments = classPath.segments();
+					for (String segment : segments) {
+						if (segment.toLowerCase().contains("jdk") || segment.toLowerCase().contains("jre")) {
+							// the classpath contains the rt.jar, which is located in the lib folder
+							// thus, we go two segments up in the path, to get the java home
+							String javaHome = classPath.removeLastSegments(2).toOSString();
+							return new LsSdk(JAVA, javaHome);
+						}
+					}
+				}
+			}
+		} catch (Exception e) {
+			SnykLogger.logInfo(ExceptionUtils.getStackTrace(e));
+			return null;
+		}
+		return null;
+	}
+
+}
diff --git a/plugin/src/main/java/io/snyk/languageserver/protocolextension/SnykExtendedLanguageClient.java b/plugin/src/main/java/io/snyk/languageserver/protocolextension/SnykExtendedLanguageClient.java
@@ -24,6 +24,7 @@
 import java.io.File;
 import java.net.URI;
 import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -42,6 +43,8 @@
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.internal.core.JavaProject;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.WizardDialog;
@@ -54,8 +57,10 @@
 import org.eclipse.lsp4j.WorkDoneProgressEnd;
 import org.eclipse.lsp4j.WorkDoneProgressKind;
 import org.eclipse.lsp4j.WorkDoneProgressNotification;
+import org.eclipse.lsp4j.WorkspaceFolder;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
 import org.eclipse.lsp4j.services.LanguageServer;
 import org.eclipse.swt.widgets.Display;
@@ -73,6 +78,7 @@
 import io.snyk.eclipse.plugin.analytics.AnalyticsEventTask;
 import io.snyk.eclipse.plugin.analytics.TaskProcessor;
 import io.snyk.eclipse.plugin.properties.preferences.Preferences;
+import io.snyk.eclipse.plugin.utils.ResourceUtils;
 import io.snyk.eclipse.plugin.utils.SnykLogger;
 import io.snyk.eclipse.plugin.views.SnykView;
 import io.snyk.eclipse.plugin.views.snyktoolview.FileTreeNode;
@@ -94,6 +100,7 @@
 import io.snyk.languageserver.protocolextension.messageObjects.Diagnostic316;
 import io.snyk.languageserver.protocolextension.messageObjects.FeatureFlagStatus;
 import io.snyk.languageserver.protocolextension.messageObjects.HasAuthenticatedParam;
+import io.snyk.languageserver.protocolextension.messageObjects.LsSdk;
 import io.snyk.languageserver.protocolextension.messageObjects.PublishDiagnostics316Param;
 import io.snyk.languageserver.protocolextension.messageObjects.SnykIsAvailableCliParams;
 import io.snyk.languageserver.protocolextension.messageObjects.SnykScanParam;
@@ -749,4 +756,25 @@ public ProgressManager getProgressManager() {
 	public void setLs(LanguageServer ls) {
 		this.ls = ls;
 	}
+
+	@JsonRequest(value = "workspace/snyk.sdks")
+	public CompletableFuture<List<LsSdk>> getSdks(WorkspaceFolder workspaceFolder) {
+		return CompletableFuture.supplyAsync(() -> {
+			var uri = URI.create(workspaceFolder.getUri());
+			var path = Path.of(uri);
+			var sdkHelper = new SdkHelper();
+			List<LsSdk> list = new ArrayList<>();
+			var project = ResourceUtils.getProjectByPath(path);
+			try {
+				if (!project.hasNature(JavaCore.NATURE_ID))
+					return List.of();
+
+				list.add(sdkHelper.getJDK(project));
+			} catch (Exception e) {
+				SnykLogger.logInfo(ExceptionUtils.getStackTrace(e));
+				return List.of();
+			}
+			return list;
+		});
+	}
 }
diff --git a/plugin/src/main/java/io/snyk/languageserver/protocolextension/messageObjects/LsSdk.java b/plugin/src/main/java/io/snyk/languageserver/protocolextension/messageObjects/LsSdk.java
@@ -0,0 +1,4 @@
+package io.snyk.languageserver.protocolextension.messageObjects;
+
+public record LsSdk(String type, String path) {
+}
diff --git a/tests/src/test/java/io/snyk/eclipse/plugin/properties/preferences/PreferencesTest.java b/tests/src/test/java/io/snyk/eclipse/plugin/properties/preferences/PreferencesTest.java
@@ -13,7 +13,6 @@
 import io.snyk.eclipse.plugin.EnvironmentConstants;
 import io.snyk.languageserver.LsRuntimeEnvironment;
 
-@SuppressWarnings("restriction")
 class PreferencesTest {
 
   @BeforeEach
diff --git a/tests/src/test/java/io/snyk/eclipse/plugin/runner/ProcessRunnerTest.java b/tests/src/test/java/io/snyk/eclipse/plugin/runner/ProcessRunnerTest.java
@@ -1,29 +1,28 @@
 package io.snyk.eclipse.plugin.runner;
 
-import io.snyk.eclipse.plugin.EnvironmentConstants;
-import io.snyk.eclipse.plugin.properties.preferences.Preferences;
-import io.snyk.eclipse.plugin.properties.preferences.PreferencesUtils;
-import io.snyk.languageserver.LsRuntimeEnvironment;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.List;
+import java.util.Optional;
 
 import org.eclipse.core.net.proxy.IProxyData;
 import org.eclipse.core.net.proxy.IProxyService;
 import org.eclipse.core.runtime.ILog;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Version;
 
-import java.util.List;
-import java.util.Optional;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import io.snyk.eclipse.plugin.EnvironmentConstants;
+import io.snyk.eclipse.plugin.properties.preferences.Preferences;
+import io.snyk.eclipse.plugin.properties.preferences.PreferencesUtils;
+import io.snyk.languageserver.LsRuntimeEnvironment;
 
 class ProcessRunnerTest {
   private Preferences preferenceMock;
diff --git a/tests/src/test/java/io/snyk/languageserver/LsBaseTest.java b/tests/src/test/java/io/snyk/languageserver/LsBaseTest.java
@@ -1,6 +1,5 @@
 package io.snyk.languageserver;
 
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.clearAllCaches;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -16,7 +15,6 @@
 import io.snyk.eclipse.plugin.properties.preferences.Preferences;
 import io.snyk.eclipse.plugin.properties.preferences.PreferencesUtils;
 
-@SuppressWarnings("ResultOfMethodCallIgnored")
 public class LsBaseTest {
   protected LsRuntimeEnvironment environment = null;
   protected IProxyService proxyServiceMock;
diff --git a/tests/src/test/java/io/snyk/languageserver/protocolextension/SnykExtendedLanguageClientTest.java b/tests/src/test/java/io/snyk/languageserver/protocolextension/SnykExtendedLanguageClientTest.java
@@ -12,7 +12,6 @@
 import static io.snyk.eclipse.plugin.views.snyktoolview.ISnykToolView.getPlural;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.CALLS_REAL_METHODS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.reset;
@@ -25,7 +24,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collection;

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,6 @@ static LsDownloader getLsDownloader() throws URISyntaxException {`
`164`	`164`	`return new LsDownloader(HttpClientFactory.getInstance(), runtimeEnvironment, logger);`
`165`	`165`	`}`
`166`	`166`
`167`		`- @SuppressWarnings("ResultOfMethodCallIgnored")`
`168`	`167`	`public static IStatus download(IProgressMonitor monitor) {`
`169`	`168`	`final File lsFile = new File(Preferences.getInstance().getCliPath());`
`170`	`169`	`try {`
`@@ -183,6 +182,6 @@ public static boolean isDownloading() {`
`183`	`182`	`}`
`184`	`183`
`185`	`184`	`public void setLogger(ILog logger) {`
`186`		`- this.logger = logger;`
	`185`	`+ SnykStartup.logger = logger;`
`187`	`186`	`}`
`188`	`187`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +package io.snyk.languageserver.protocolextension.messageObjects;
++
 +public record LsSdk(String type, String path) {
 +}