Return dependency list in Fetch results (#112)

Author: alexarchambault

interface-test/src/test/java/coursierapi/test/FetchTests.java

@@ -2,6 +2,7 @@
 
 import coursierapi.Dependency;
 import coursierapi.Fetch;
+import coursierapi.FetchResult;
 import coursierapi.error.CoursierError;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -19,21 +20,27 @@ public void simple() {
         Fetch fetch = Fetch.create()
                 .addDependencies(dep);
 
-        List<File> files;
+        FetchResult result;
         try {
-            files = fetch.fetch();
+            result = fetch.fetchResult();
         } catch (CoursierError e) {
             throw new RuntimeException(e);
         }
 
         Set<String> fileNames = new HashSet<>();
-        for (File f : files) {
+        for (File f : result.getFiles()) {
             fileNames.add(f.getName());
         }
 
         Set<String> expectedFileNames = new HashSet<>(Arrays.asList("shapeless_2.13-2.3.3.jar", "scala-library-2.13.0.jar"));
 
+        List<Dependency> expectedDependencies = new ArrayList<>(Arrays.asList(
+                Dependency.of("com.chuusai", "shapeless_2.13", "2.3.3").withConfiguration("default"),
+                Dependency.of("org.scala-lang", "scala-library", "2.13.0").withConfiguration("default")
+        ));
+
         assertEquals(expectedFileNames, fileNames);
+        assertEquals(expectedDependencies, result.getDependencies());
 
     }
 

interface/src/main/java/coursierapi/FetchResult.java

@@ -10,13 +10,19 @@
 public final class FetchResult implements Serializable {
 
     private List<Map.Entry<Artifact, File>> artifacts;
+    private List<Dependency> dependencies;
 
-    private FetchResult(List<Map.Entry<Artifact, File>> artifacts) {
+    private FetchResult(List<Map.Entry<Artifact, File>> artifacts, List<Dependency> dependencies) {
         this.artifacts = Collections.unmodifiableList(new ArrayList<>(artifacts));
+        this.dependencies = Collections.unmodifiableList(new ArrayList<>(dependencies));
     }
 
     public static FetchResult of(List<Map.Entry<Artifact, File>> artifacts) {
-        return new FetchResult(artifacts);
+        return new FetchResult(artifacts, Collections.emptyList());
+    }
+
+    public static FetchResult of(List<Map.Entry<Artifact, File>> artifacts, List<Dependency> dependencies) {
+        return new FetchResult(artifacts, dependencies);
     }
 
     @Override
@@ -25,19 +31,20 @@ public boolean equals(Object obj) {
             return true;
         if (obj instanceof FetchResult) {
             FetchResult other = (FetchResult) obj;
-            return this.artifacts.equals(other.artifacts);
+            return this.artifacts.equals(other.artifacts) &&
+                    this.dependencies.equals(other.dependencies);
         }
         return false;
     }
 
     @Override
     public int hashCode() {
-        return 37 * (17 + artifacts.hashCode());
+        return 37 * (37 * (17 + artifacts.hashCode())) + dependencies.hashCode();
     }
 
     @Override
     public String toString() {
-        StringBuilder b = new StringBuilder("FetchResult(");
+        StringBuilder b = new StringBuilder("FetchResult(artifacts=[");
         boolean isFirst = true;
         for (Map.Entry<Artifact, File> entry : artifacts) {
             if (isFirst) {
@@ -50,7 +57,20 @@ public String toString() {
             b.append(": ");
             b.append(entry.getValue().toString());
         }
-        b.append(")");
+        b.append("], dependencies=[");
+
+        isFirst = true;
+        for (Dependency dependency : dependencies) {
+            if (isFirst) {
+                isFirst = false;
+            } else {
+                b.append(", ");
+            }
+
+            b.append(dependency.toString());
+        }
+        b.append("])");
+
         return b.toString();
     }
 
@@ -65,4 +85,8 @@ public List<File> getFiles() {
         }
         return l;
     }
+
+    public List<Dependency> getDependencies() {
+        return dependencies;
+    }
 }

interface/src/main/scala/coursier/internal/api/ApiHelper.scala

@@ -331,10 +331,10 @@ object ApiHelper {
     val fetch0 = fetch(apiFetch)
     val either =
       if (apiFetch.getFetchCacheIKnowWhatImDoing == null)
-        fetch0.eitherResult().map(_.artifacts)
+        fetch0.eitherResult()
       else {
-        val dummyArtifact = coursier.util.Artifact("", Map(), Map(), false, false, None)
-        fetch0.either().map(_.map((dummyArtifact, _)))
+        val dummyArtifact = coursier.util.Artifact("", Map(), Map(), changing = false, optional = false, None)
+        fetch0.either().map(files => Fetch.Result().withExtraArtifacts(files.map((dummyArtifact, _))))
       }
 
     // TODO Pass exception causes if any
@@ -366,16 +366,23 @@ object ApiHelper {
 
         throw ex
 
-      case Right(artifacts) =>
-        val l = new ju.ArrayList[ju.Map.Entry[coursierapi.Artifact, File]]
-        for ((a, f) <- artifacts) {
+      case Right(result) =>
+        val artifactFiles = new ju.ArrayList[ju.Map.Entry[coursierapi.Artifact, File]]
+        for ((a, f) <- result.artifacts) {
           val credentials0 = a.authentication.map(credentials).orNull
           val a0 = coursierapi.Artifact.of(a.url, a.changing, a.optional, credentials0)
           val ent = new ju.AbstractMap.SimpleEntry(a0, f)
-          l.add(ent)
+          artifactFiles.add(ent)
         }
 
-        coursierapi.FetchResult.of(l)
+        val deps = new ju.ArrayList[coursierapi.Dependency]
+        result
+          .resolution
+          .orderedDependencies
+          .map(dependency)
+          .foreach(deps.add)
+
+        coursierapi.FetchResult.of(artifactFiles, deps)
     }
   }