Add BOM-related methods to coursierapi.Fetch

Author: alexarchambault

interface/src/main/java/coursierapi/Fetch.java

@@ -9,6 +9,7 @@
 public final class Fetch {
 
     private final List<Dependency> dependencies;
+    private final List<Dependency> bomDependencies;
     private final List<Repository> repositories;
     private Cache cache;
     private Boolean mainArtifacts;
@@ -19,6 +20,7 @@ public final class Fetch {
 
     private Fetch() {
         dependencies = new ArrayList<>();
+        bomDependencies = new ArrayList<>();
         repositories = new ArrayList<>(Arrays.asList(ApiHelper.defaultRepositories()));
         cache = Cache.create();
         mainArtifacts = null;
@@ -33,6 +35,7 @@ public boolean equals(Object obj) {
         if (obj instanceof Fetch) {
             Fetch other = (Fetch) obj;
             return this.dependencies.equals(other.dependencies) &&
+                    this.bomDependencies.equals(other.bomDependencies) &&
                     this.repositories.equals(other.repositories) &&
                     this.cache.equals(other.cache) &&
                     Objects.equals(this.mainArtifacts, other.mainArtifacts) &&
@@ -46,7 +49,7 @@ public boolean equals(Object obj) {
 
     @Override
     public int hashCode() {
-        return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + dependencies.hashCode()) + repositories.hashCode()) + cache.hashCode()) + Objects.hashCode(mainArtifacts)) + classifiers.hashCode()) + Objects.hashCode(fetchCache)) + resolutionParams.hashCode()) + Objects.hashCode(artifactTypes);
+        return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + dependencies.hashCode()) + bomDependencies.hashCode()) + repositories.hashCode()) + cache.hashCode()) + Objects.hashCode(mainArtifacts)) + classifiers.hashCode()) + Objects.hashCode(fetchCache)) + resolutionParams.hashCode()) + Objects.hashCode(artifactTypes);
     }
 
     @Override
@@ -56,6 +59,11 @@ public String toString() {
             b.append(dep.toString());
             b.append(", ");
         }
+        b.append("], bomDependencies=[");
+        for (Dependency bomDep : bomDependencies) {
+            b.append(bomDep.toString());
+            b.append(", ");
+        }
         b.append("], repositories=[");
         for (Repository repo : repositories) {
             b.append(repo.toString());
@@ -111,6 +119,17 @@ public Fetch withDependencies(Dependency... dependencies) {
         return this;
     }
 
+    public Fetch addBomDependencies(Dependency... bomDependencies) {
+        this.bomDependencies.addAll(Arrays.asList(bomDependencies));
+        return this;
+    }
+
+    public Fetch withBomDependencies(Dependency... bomDependencies) {
+        this.bomDependencies.clear();
+        this.bomDependencies.addAll(Arrays.asList(bomDependencies));
+        return this;
+    }
+
     public Fetch addRepositories(Repository... repositories) {
         this.repositories.addAll(Arrays.asList(repositories));
         return this;
@@ -195,6 +214,10 @@ public List<Dependency> getDependencies() {
         return Collections.unmodifiableList(dependencies);
     }
 
+    public List<Dependency> getBomDependencies() {
+        return Collections.unmodifiableList(bomDependencies);
+    }
+
     public List<Repository> getRepositories() {
         return Collections.unmodifiableList(repositories);
     }

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

@@ -294,6 +294,12 @@ object ApiHelper {
       .map(dependency)
       .toVector
 
+    val bomDependencies = fetch
+      .getBomDependencies
+      .asScala
+      .map(dependency)
+      .toVector
+
     val repositories = fetch
       .getRepositories
       .asScala
@@ -311,17 +317,22 @@ object ApiHelper {
 
     val params = resolutionParams(fetch.getResolutionParams)
 
-    var f = Fetch()
+    // temporarily creating a Resolve and and Artifacts manually,
+    // to work around missing BOM-related methods on Fetch
+    val resolve = Resolve()
       .withDependencies(dependencies)
+      .withBomDependencies(bomDependencies)
       .withRepositories(repositories)
       .withCache(cache0)
+      .withResolutionParams(params)
+    var artifacts = Artifacts()
       .withMainArtifacts(fetch.getMainArtifacts)
       .withClassifiers(classifiers)
-      .withFetchCache(Option(fetch.getFetchCacheIKnowWhatImDoing))
-      .withResolutionParams(params)
     if (fetch.getArtifactTypes != null)
-      f = f.withArtifactTypes(fetch.getArtifactTypes.asScala.toSet[String].map(Type(_)))
-    f
+      artifacts = artifacts.withArtifactTypes(fetch.getArtifactTypes.asScala.toSet[String].map(Type(_)))
+
+    Fetch(resolve, artifacts, None)
+      .withFetchCache(Option(fetch.getFetchCacheIKnowWhatImDoing))
   }
 
   def fetch(fetch: Fetch[Task]): coursierapi.Fetch = {