bug fix for overriding dependencies while storing project data

gs-gunjan · Sep 22, 2023 · 644463c · 644463c
1 parent 5f15db3
commit 644463c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...main/java/org/finos/legend/depot/services/dependencies/ManageDependenciesServiceImpl.java b/...main/java/org/finos/legend/depot/services/dependencies/ManageDependenciesServiceImpl.java
@@ -90,7 +90,7 @@ else if (!projectData.get().getTransitiveDependenciesReport().isValid())
                         throw new IllegalStateException(String.format("Cannot calculate dependencies for project version: %s", deps.getGav()));
                     }
                     projectDependencies.addAll(projectData.get().getVersionData().getDependencies());
-                    projectDependencies.addAll(this.dependencyUtil.overrideDependencies(directDependencies, projectData.get().getTransitiveDependenciesReport().getTransitiveDependencies(), this::getCalculatedTransitiveDependencies));
+                    projectDependencies.addAll(projectData.get().getTransitiveDependenciesReport().getTransitiveDependencies());
                 }
                 else
                 {
@@ -116,7 +116,8 @@ else if (!projectData.get().getTransitiveDependenciesReport().isValid())
             return new VersionDependencyReport(new ArrayList<>(), false);
         }
         LOGGER.info("Completed finding dependencies");
-        return new VersionDependencyReport(projectDependencies.stream().collect(Collectors.toList()), true);
+        List<ProjectVersion> finalDependencies = this.dependencyUtil.overrideDependencies(directDependencies, projectDependencies.stream().collect(Collectors.toList()), this::getCalculatedTransitiveDependencies);
+        return new VersionDependencyReport(finalDependencies, true);
     }
 
     private Set<ProjectVersion> getCalculatedTransitiveDependencies(List<ProjectVersion> directDependencies, boolean transitive)