diff --git a/gradle.properties b/gradle.properties index da709a6..c9debad 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ ideaVersion = 2022.1 -projectVersion=1.1.0-SNAPSHOT-1 +projectVersion=1.1.0-SNAPSHOT jetBrainsToken=invalid jetBrainsChannel=stable diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/CAAnnotator.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/CAAnnotator.java index 9e3c57a..1c64aa8 100644 --- a/src/main/java/org/jboss/tools/intellij/componentanalysis/CAAnnotator.java +++ b/src/main/java/org/jboss/tools/intellij/componentanalysis/CAAnnotator.java @@ -35,7 +35,7 @@ import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; -import static org.jboss.tools.intellij.componentanalysis.CAService.iterateOverListOfStringDelimitedByCommaAndNewLineGetString; + public abstract class CAAnnotator extends ExternalAnnotator> { @@ -85,33 +85,14 @@ public abstract class CAAnnotator extends ExternalAnnotator> reports = CAService.getReports(path); - List pairsOfDepsVulnsFromMap = CAService.getPairsOfDepsVulnsFromMap(reports); - LOG.info("Resolved Dependency->vuln pairs from cache"); - LOG.info(iterateOverListOfStringDelimitedByCommaAndNewLineGetString(pairsOfDepsVulnsFromMap)); Map dependencyResultMap = this.matchDependencies(info.getDependencies(), reports); String debugString; - if(Objects.nonNull(dependencyResultMap)) { - debugString = reformatDependencyResultMapForDebugging(dependencyResultMap); - LOG.info("Pairs with offsets that are going to be applied=>"); - LOG.info(debugString); - } - return dependencyResultMap; } return null; } - private String reformatDependencyResultMapForDebugging(Map dependencyResultMap) { - List allPairsWithOffsetsInUi = dependencyResultMap.entrySet().stream().map(entry -> { - String dependency = entry.getKey().toPurl("maven").toString(); - String stringOffSets = entry.getValue().elements.get(0).getTextRange().toString(); - String dependencyVuln = entry.getValue().getReports().entrySet().stream().map(Map.Entry::getValue).map(dep -> dep.getRef().toString()).findFirst().get(); - return String.format("%s==>%s==>%s", dependency, dependencyVuln, stringOffSets); - }).collect(Collectors.toList()); - return iterateOverListOfStringDelimitedByCommaAndNewLineGetString(allPairsWithOffsetsInUi); - } - @Override public void apply(@NotNull PsiFile file, Map annotationResult, @NotNull AnnotationHolder holder) { LOG.info("Annotate dependencies"); diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/CAService.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/CAService.java index cd4112b..3e6a616 100644 --- a/src/main/java/org/jboss/tools/intellij/componentanalysis/CAService.java +++ b/src/main/java/org/jboss/tools/intellij/componentanalysis/CAService.java @@ -148,40 +148,19 @@ public static boolean performAnalysis(String packageManager, } }); } - List allPairs = getPairsOfDepsVulnsFromMap(resultMap); - LOG.info("Before - List of all dependencies and their purl from vulnerability dependency report " + iterateOverListOfStringDelimitedByCommaAndNewLineGetString(allPairs)); - if (!resultMap.isEmpty()) { getInstance().vulnerabilityCache.put(filePath, resultMap); } else { getInstance().vulnerabilityCache.invalidate(filePath); } - if(Objects.nonNull(resultMap)) { - allPairs = getPairsOfDepsVulnsFromMap(resultMap); - LOG.info("After - List of all dependencies and their purl from vulnerability dependency report " + iterateOverListOfStringDelimitedByCommaAndNewLineGetString(allPairs)); - } - LOG.info("List of dependencies in cache, before update" + System.lineSeparator() + getListOfDependencies(getInstance().dependencyCache.get(filePath, p -> Collections.emptySet()))); getInstance().dependencyCache.put(filePath, dependencies); - LOG.info("List of dependencies in cache, after after" + System.lineSeparator() + getListOfDependencies(dependencies)); return true; - } return false; } - public static String iterateOverListOfStringDelimitedByCommaAndNewLineGetString(List allPairs) { - return allPairs.stream().collect(Collectors.joining("," + System.lineSeparator())); - } - public static @NotNull List getPairsOfDepsVulnsFromMap(Map> resultMap) { - Map collect = resultMap.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().entrySet().stream().map(Map.Entry::getValue).findAny().get())); - List allPairs = collect.entrySet().stream().map(p -> p.getKey().toPurl("maven").toString() + "==>" + p.getValue().getRef().toString()).collect(Collectors.toList()); - return allPairs; - } - public static String getListOfDependencies(Set dependencies) { - return dependencies.stream().map(dep -> dep.toPurl("maven").toString()).collect(joining(";" + System.lineSeparator())); - } }