Merge branch 'jfrog:master' into go-embed

noyshabtay · Nov 30, 2023 · 748d6ec · 748d6ec
2 parents b56cdc3 + bc67740
commit 748d6ec
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/src/main/java/com/jfrog/ide/common/nodes/DependencyNode.java b/src/main/java/com/jfrog/ide/common/nodes/DependencyNode.java
@@ -85,9 +85,7 @@ public ImpactTree getImpactTree() {
 
     @SuppressWarnings("unused")
     public void setImpactTree(ImpactTree impactTree) {
-        if (this.impactTree == null) {
-            this.impactTree = impactTree;
-        }
+        this.impactTree = impactTree;
     }
 
     public void addIssue(IssueNode issue) {

diff --git a/src/main/java/com/jfrog/ide/common/nodes/subentities/ImpactTree.java b/src/main/java/com/jfrog/ide/common/nodes/subentities/ImpactTree.java
@@ -4,8 +4,7 @@
 import lombok.Getter;
 
 public class ImpactTree {
-
-    public static final int IMPACT_PATHS_LIMIT = 50;
+    public static final int IMPACT_PATHS_LIMIT = 20;
 
     @Getter
     @JsonProperty

diff --git a/src/main/java/com/jfrog/ide/common/yarn/YarnTreeBuilder.java b/src/main/java/com/jfrog/ide/common/yarn/YarnTreeBuilder.java
@@ -148,11 +148,13 @@ private List<String> extractSinglePath(String projectRootId, String packageFullN
      */
     List<List<String>> extractMultiplePaths(String projectRootId, String packageFullName, List<String> rawDependencyPaths) {
         List<List<String>> paths = new ArrayList<>();
-        int limit = Math.min(rawDependencyPaths.size(), ImpactTree.IMPACT_PATHS_LIMIT);
-        for (int i = 0; i < limit; i++) {
-            List<String> path = extractSinglePath(projectRootId, packageFullName, rawDependencyPaths.get(i));
+        for (String rawDepPath : rawDependencyPaths) {
+            List<String> path = extractSinglePath(projectRootId, packageFullName, rawDepPath);
             if (path != null) {
                 paths.add(path);
+                if (paths.size() >= ImpactTree.IMPACT_PATHS_LIMIT) {
+                    break;
+                }
             }
         }
         return paths;