chore: code cleanup, remove redundant and obsolete codes and simplify some method calls. (#190)

soul2zimate · web-flow · commit 9cf020849ac7 · 2025-06-22T19:56:41.000+08:00
* chore: code cleanup, remove redundant and obsolete codes and simplify some method calls.

Signed-off-by: Chao Wang &lt;chaowan@redhat.com&gt;
diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/CAAnnotator.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/CAAnnotator.java
@@ -31,8 +31,12 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
-import java.util.concurrent.ExecutionException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 
@@ -86,7 +90,6 @@ public abstract class CAAnnotator extends ExternalAnnotator<CAAnnotator.Info, Ma
             LOG.info("Get vulnerability report from cache");
             Map<Dependency, Map<VulnerabilitySource, DependencyReport>> reports = CAService.getReports(path);
             Map<Dependency, Result> dependencyResultMap = this.matchDependencies(info.getDependencies(), reports);
-            String debugString;
             return dependencyResultMap;
         }
 
diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/CAIntentionAction.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/CAIntentionAction.java
@@ -126,7 +126,7 @@ private static boolean thereIsTcRemediation(DependencyReport dependency) {
     }
 
     static boolean thereIsRecommendation(DependencyReport dependency) {
-        return dependency.getRecommendation() != null && !dependency.getRecommendation().version().trim().equals("");
+        return dependency.getRecommendation() != null && !dependency.getRecommendation().version().trim().isEmpty();
     }
 
     static boolean thereAreNoIssues(DependencyReport dependency) {
diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/CAService.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/CAService.java
@@ -24,19 +24,19 @@
 import com.redhat.exhort.api.v4.Source;
 import org.apache.commons.io.FileUtils;
 import org.jboss.tools.intellij.exhort.ApiService;
-import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static java.util.stream.Collectors.joining;
-
 @Service(Service.Level.PROJECT)
 public final class CAService {
 
diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/golang/GoCAAnnotator.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/golang/GoCAAnnotator.java
@@ -19,9 +19,19 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.redhat.exhort.api.v4.DependencyReport;
-import org.jboss.tools.intellij.componentanalysis.*;
+import org.jboss.tools.intellij.componentanalysis.CAAnnotator;
+import org.jboss.tools.intellij.componentanalysis.CAIntentionAction;
+import org.jboss.tools.intellij.componentanalysis.CAUpdateManifestIntentionAction;
+import org.jboss.tools.intellij.componentanalysis.Dependency;
+import org.jboss.tools.intellij.componentanalysis.VulnerabilitySource;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 import static org.jboss.tools.intellij.componentanalysis.CAUtil.EXHORT_IGNORE;
 
diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/gradle/GradleCAAnnotator.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/gradle/GradleCAAnnotator.java
@@ -11,20 +11,23 @@
 
 package org.jboss.tools.intellij.componentanalysis.gradle;
 
-import com.intellij.openapi.util.Key;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.intellij.psi.xml.XmlComment;
-import com.intellij.psi.xml.XmlDocument;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.psi.xml.XmlText;
 import com.redhat.exhort.api.v4.DependencyReport;
-import org.jboss.tools.intellij.componentanalysis.*;
+import org.jboss.tools.intellij.componentanalysis.CAAnnotator;
+import org.jboss.tools.intellij.componentanalysis.CAIntentionAction;
+import org.jboss.tools.intellij.componentanalysis.CAUpdateManifestIntentionAction;
+import org.jboss.tools.intellij.componentanalysis.Dependency;
+import org.jboss.tools.intellij.componentanalysis.VulnerabilitySource;
 import org.jboss.tools.intellij.componentanalysis.gradle.build.psi.Artifact;
-import org.jboss.tools.intellij.componentanalysis.maven.MavenCAUpdateManifestIntentionAction;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 import static org.jboss.tools.intellij.componentanalysis.CAUtil.EXHORT_IGNORE;
 
@@ -39,7 +42,6 @@ protected String getInspectionShortName() {
     protected Map<Dependency, List<PsiElement>> getDependencies(PsiFile file) {
         if ("build.gradle".equals(file.getName())) {
             Map<Dependency, List<PsiElement>> resultMap = new HashMap<>();
-            List<Artifact> elements;
             Arrays.stream(file.getChildren())
                     .filter(e -> e instanceof Artifact)
                     .filter(artifact -> ((Artifact)artifact).getComment() == null || Objects.nonNull(((Artifact)artifact).getComment()) && !((Artifact)artifact).getComment().getText().contains(EXHORT_IGNORE))
diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/gradle/GradleCAUpdateManifestIntentionAction.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/gradle/GradleCAUpdateManifestIntentionAction.java
@@ -14,7 +14,6 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;
-import java.util.stream.Collectors;
 
 public class GradleCAUpdateManifestIntentionAction extends CAUpdateManifestIntentionAction {
     @Override
diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/gradle/build/filetype/BuildGradleFileType.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/gradle/build/filetype/BuildGradleFileType.java
@@ -20,7 +20,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
+import javax.swing.Icon;
 
 public class BuildGradleFileType extends LanguageFileType {
 
diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/gradle/build/lexer/BuildGradleLexerAdapter.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/gradle/build/lexer/BuildGradleLexerAdapter.java
@@ -12,7 +12,6 @@
 package org.jboss.tools.intellij.componentanalysis.gradle.build.lexer;
 
 import com.intellij.lexer.FlexAdapter;
-import org.jboss.tools.intellij.componentanalysis.pypi.requirements.lexer.RequirementsLexer;
 
 public class BuildGradleLexerAdapter extends FlexAdapter {
     public BuildGradleLexerAdapter() {
diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/gradle/build/psi/BuildGradleParserDefinition.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/gradle/build/psi/BuildGradleParserDefinition.java
@@ -24,7 +24,6 @@
 import org.jboss.tools.intellij.componentanalysis.gradle.build.lang.BuildGradleLanguage;
 import org.jboss.tools.intellij.componentanalysis.gradle.build.lexer.BuildGradleLexerAdapter;
 import org.jboss.tools.intellij.componentanalysis.gradle.build.parser.BuildGradleParser;
-import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.RequirementsTypes;
 import org.jetbrains.annotations.NotNull;
 
 public class BuildGradleParserDefinition implements ParserDefinition {
diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/maven/MavenCAAnnotator.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/maven/MavenCAAnnotator.java
@@ -18,10 +18,20 @@
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.psi.xml.XmlText;
 import com.redhat.exhort.api.v4.DependencyReport;
-import org.jboss.tools.intellij.componentanalysis.*;
+import org.jboss.tools.intellij.componentanalysis.CAAnnotator;
+import org.jboss.tools.intellij.componentanalysis.CAIntentionAction;
+import org.jboss.tools.intellij.componentanalysis.CAUpdateManifestIntentionAction;
+import org.jboss.tools.intellij.componentanalysis.Dependency;
+import org.jboss.tools.intellij.componentanalysis.VulnerabilitySource;
 
-import java.util.*;
-import java.util.stream.Collectors;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 import static org.jboss.tools.intellij.componentanalysis.CAUtil.DEPENDENCIES;
 import static org.jboss.tools.intellij.componentanalysis.CAUtil.EXHORT_IGNORE;
@@ -54,7 +64,7 @@ protected Map<Dependency, List<PsiElement>> getDependencies(PsiFile file) {
                         List<XmlTag> elements = Arrays.stream(d.getChildren())
                                 .filter(c -> c instanceof XmlTag)
                                 .map(c -> (XmlTag) c)
-                                .collect(Collectors.toList());
+                                .toList();
 
                         String groupId = null;
                         String artifactId = null;
diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/maven/MavenCAUpdateManifestIntentionAction.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/maven/MavenCAUpdateManifestIntentionAction.java
@@ -1,29 +1,19 @@
 package org.jboss.tools.intellij.componentanalysis.maven;
 
-import com.intellij.icons.AllIcons;
-import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiDirectory;
-import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.impl.source.xml.XmlTagImpl;
 import com.intellij.psi.xml.XmlDocument;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.psi.xml.XmlText;
-import com.intellij.xml.util.XmlUtil;
 import com.redhat.exhort.api.v4.DependencyReport;
-import com.redhat.exhort.api.PackageRef;
 import org.jboss.tools.intellij.componentanalysis.CAUpdateManifestIntentionAction;
 import org.jetbrains.annotations.NotNull;
 
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlValue;
 import java.util.Arrays;
-import java.util.Objects;
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicReference;
 
 public final class MavenCAUpdateManifestIntentionAction extends CAUpdateManifestIntentionAction {
     @Override
diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/PipCAAnnotator.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/PipCAAnnotator.java
@@ -14,11 +14,20 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.redhat.exhort.api.v4.DependencyReport;
-import org.jboss.tools.intellij.componentanalysis.*;
+import org.jboss.tools.intellij.componentanalysis.CAAnnotator;
+import org.jboss.tools.intellij.componentanalysis.CAIntentionAction;
+import org.jboss.tools.intellij.componentanalysis.CAUpdateManifestIntentionAction;
+import org.jboss.tools.intellij.componentanalysis.Dependency;
+import org.jboss.tools.intellij.componentanalysis.VulnerabilitySource;
 import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.NameReq;
 import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.NameReqComment;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 import static org.jboss.tools.intellij.componentanalysis.CAUtil.EXHORT_IGNORE;
 
diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/filetype/RequirementsFileType.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/filetype/RequirementsFileType.java
@@ -20,7 +20,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
+import javax.swing.Icon;
 
 public class RequirementsFileType extends LanguageFileType {
 
diff --git a/src/main/java/org/jboss/tools/intellij/exhort/TelemetryService.java b/src/main/java/org/jboss/tools/intellij/exhort/TelemetryService.java
@@ -13,7 +13,6 @@
 import com.intellij.psi.PsiFile;
 import com.redhat.devtools.intellij.telemetry.core.service.TelemetryMessageBuilder;
 import com.redhat.devtools.intellij.telemetry.core.util.Lazy;
-import com.redhat.exhort.api.v4.DependencyReport;
 import org.jboss.tools.intellij.componentanalysis.CAAnnotator;
 import org.jboss.tools.intellij.settings.ApiSettingsState;
 
diff --git a/src/main/java/org/jboss/tools/intellij/image/BaseImage.java b/src/main/java/org/jboss/tools/intellij/image/BaseImage.java
@@ -14,8 +14,8 @@
 import java.util.Objects;
 
 public class BaseImage {
-    private String imageName;
-    private String platform;
+    private final String imageName;
+    private final String platform;
 
     public BaseImage(String imageName, String platform) {
         this.imageName = imageName;
diff --git a/src/main/java/org/jboss/tools/intellij/image/ImageReportAction.java b/src/main/java/org/jboss/tools/intellij/image/ImageReportAction.java
@@ -12,7 +12,11 @@
 package org.jboss.tools.intellij.image;
 
 import com.intellij.docker.dockerFile.DockerFileType;
-import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import org.jetbrains.annotations.NotNull;
 
 public class ImageReportAction extends AnAction {
diff --git a/src/main/java/org/jboss/tools/intellij/image/ImageService.java b/src/main/java/org/jboss/tools/intellij/image/ImageService.java
@@ -256,10 +256,10 @@ JsonObject performImageAnalysis(List<BaseImage> images, VirtualFile dockerfile)
 
     void openAnalysisHtmlReport(Project project, PsiFile dockerfile) {
         if (dockerfile != null && project != null) {
-            var imageService = ImageService.getInstance();
+            var imageService = getInstance();
             var images = imageService.getBaseImages(dockerfile);
 
-            if (images != null && !images.isEmpty()) {
+            if (!images.isEmpty()) {
                 ApplicationManager.getApplication().executeOnPooledThread(() -> {
                     try {
                         var manifestDetails = imageService.performImageAnalysis(
diff --git a/src/main/java/org/jboss/tools/intellij/report/AnalyticsReportUtils.java b/src/main/java/org/jboss/tools/intellij/report/AnalyticsReportUtils.java
@@ -17,7 +17,12 @@
 import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
 
-import java.io.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 
 public class AnalyticsReportUtils {
 
@@ -33,7 +38,7 @@ public class AnalyticsReportUtils {
     public void openCustomEditor(FileEditorManager instance, JsonObject manifestDetails) throws IOException {
 
         // Close custom editor if already opened in previous run,
-        // if its a different manifest file with same name then dont close existing one and open a new tab.
+        // if it's a different manifest file with same name then don't close existing one and open a new tab.
         manifestDetails = closeCustomEditor(instance, manifestDetails);
 
         // Create a temp file in which is registered with AnalyticsReportEditorProvider.
@@ -73,7 +78,7 @@ private JsonObject closeCustomEditor(FileEditorManager instance, JsonObject mani
 
             // iterate  through all files and if Report file is open then close it
             for (VirtualFile openFile : openFiles) {
-                // Check if opened file extension is ra, and existing tab manifest file type is same as new (pom.xml, go.mod)
+                // Check if opened file extension is ar, and existing tab manifest file type is same as new (pom.xml, go.mod)
                 // if not then no need to close any existing tab, just create new tab.
                 if ("ar".equals(openFile.getExtension())
                         && openFile.getNameWithoutExtension()
@@ -94,7 +99,7 @@ private JsonObject closeCustomEditor(FileEditorManager instance, JsonObject mani
                         openFile.refresh(true, true);
                         break;
                     } else {
-                        // If paths are not same it means file types are same but they are in different locations
+                        // If paths are not same it means file types are same, but they are in different locations
                         // In that case show parent directory to distinguish between tabs
                         // Ex Dependency Analytics Report for requirements.txt and Dependency Analytics Report for test/requirements.txt
                         manifestDetails.addProperty("showParent", true);
diff --git a/src/main/java/org/jboss/tools/intellij/stackanalysis/SaAction.java b/src/main/java/org/jboss/tools/intellij/stackanalysis/SaAction.java
@@ -12,7 +12,11 @@
 
 
 import com.google.gson.JsonObject;
-import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.fileEditor.FileEditorManager;

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ private static boolean thereIsTcRemediation(DependencyReport dependency) {`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`static boolean thereIsRecommendation(DependencyReport dependency) {`
`129`		`- return dependency.getRecommendation() != null && !dependency.getRecommendation().version().trim().equals("");`
	`129`	`+ return dependency.getRecommendation() != null && !dependency.getRecommendation().version().trim().isEmpty();`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`static boolean thereAreNoIssues(DependencyReport dependency) {`