fix: remove dependency on GSON

The dependency was causing an issue for a customer. We didn't really need it anyway.

Author: rrama

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Snyk Security Changelog
 
+## [3.2.1]
+### Changes
+- fixed compatibility with some older Eclipse versions, by removing GSON dependency
+
 ## [3.2.0]
 ### Changes
 - Fixed Issue Status view filters for ignored issues not hiding non-shown issues in editor (early access).

plugin/META-INF/MANIFEST.MF

@@ -24,8 +24,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.editors,
  org.eclipse.ui.genericeditor,
  org.eclipse.swt,
- org.eclipse.jface,
- com.google.gson;bundle-version="2.11.0"
+ org.eclipse.jface
 Automatic-Module-Name: io.snyk.eclipse.plugin.tests
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/BrowserHandler.java

@@ -23,7 +23,7 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.handlers.IHandlerService;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.snyk.eclipse.plugin.html.BaseHtmlProvider;
 import io.snyk.eclipse.plugin.html.HtmlProviderFactory;
@@ -175,10 +175,16 @@ public CompletableFuture<Void> updateBrowserContent(TreeNode node) {
 			String errorJson = ptn.getErrorMessage();
 			if (errorJson != null && !errorJson.isBlank()) {
 				shouldShowDefaultMessage = false;
-				var error = new Gson().fromJson(errorJson, ErrorMessage.class);
-				String errorHtml = htmlProvider.getErrorHtml(error.error, error.path);
+				String errorHTML;
+				try {
+					ErrorMessage errorMessage = new ObjectMapper().readValue(errorJson, ErrorMessage.class);
+					errorHTML = htmlProvider.getErrorHtml(errorMessage.error, errorMessage.path);
+				} catch (Exception e) {
+					errorHTML = htmlProvider.getErrorHtml("Error: failed to display error", "");
+				}
+				final String errorHTMLFinal = errorHTML;
 				Display.getDefault().syncExec(() -> {
-					browser.setText(errorHtml);
+					browser.setText(errorHTMLFinal);
 				});
 			}
 		}

plugin/src/main/java/io/snyk/languageserver/protocolextension/messageObjects/Fix.java

@@ -2,10 +2,8 @@
 
 import java.util.Map;
 
-import com.google.gson.annotations.SerializedName;
-
-public record Fix(
-		@SerializedName("fixId") String fixId,
-		@SerializedName("unifiedDiffsPerFile") Map<String, String> unifiedDiffsPerFile) {
+public record Fix (
+	String fixId,
+	Map<String, String> unifiedDiffsPerFile) {
 	// no-arg constructor is generated automatically by Java compiler
-}
+}

plugin/src/main/java/io/snyk/languageserver/protocolextension/messageObjects/FolderConfig.java

@@ -3,26 +3,18 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.google.gson.annotations.SerializedName;
-
 public class FolderConfig {
 
-    @SerializedName("folderPath")
     private String folderPath;
 
-    @SerializedName("baseBranch")
     private String baseBranch = "";
 
-    @SerializedName("localBranches")
     private List<String> localBranches = new ArrayList<>();
 
-    @SerializedName("additionalParameters")
     private List<String> additionalParameters = new ArrayList<>();
-    
-    @SerializedName("referenceFolderPath") 
+
     private String referenceFolderPath = "";
-    	    
-    @SerializedName("scanCommandConfig") 
+
     private ScanCommandConfig scanCommandConfig;
 
     public FolderConfig(String folderPath) {
@@ -80,4 +72,4 @@ public ScanCommandConfig getScanCommandConfig() {
 	public void setScanCommandConfig(ScanCommandConfig scanCommandConfig) {
 		this.scanCommandConfig = scanCommandConfig;
 	}
-}
+}

plugin/src/main/java/io/snyk/languageserver/protocolextension/messageObjects/FolderConfigsParam.java

@@ -2,11 +2,8 @@
 
 import java.util.List;
 
-import com.google.gson.annotations.SerializedName;
-
 public class FolderConfigsParam {
 
-	@SerializedName("folderConfigs")
 	private List<FolderConfig> folderConfigs;
 
 	public FolderConfigsParam(List<FolderConfig> folderConfigs) {
@@ -20,4 +17,4 @@ public List<FolderConfig> getFolderConfigs() {
 	public void setFolderConfigs(List<FolderConfig> folderConfigs) {
 		this.folderConfigs = folderConfigs;
 	}
-}
+}