Merge pull request #297 from aloubyansky/add-back-release-repo-id

Add back and deprecate some methods removed by accident
quarkusio · Nov 9, 2023 · 697ffcd · 697ffcd
2 parents 4915743 + 04dd7be
commit 697ffcd
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/domino/api/src/main/java/io/quarkus/domino/CircularReleaseDependency.java b/domino/api/src/main/java/io/quarkus/domino/CircularReleaseDependency.java
@@ -1,6 +1,8 @@
 package io.quarkus.domino;
 
+import io.quarkus.bom.decomposer.ReleaseId;
 import io.quarkus.domino.scm.ScmRevision;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -22,10 +24,24 @@ private CircularReleaseDependency(List<ScmRevision> chain) {
         this.chain = List.copyOf(chain);
     }
 
-    public List<ScmRevision> getReleaseDependencyChain() {
+    public List<ScmRevision> getDependencyChain() {
         return chain;
     }
 
+    /**
+     * @deprecated for removal in favor of {@link #getDependencyChain()}
+     *
+     * @return chain of dependencies that form a loop
+     */
+    @Deprecated(forRemoval = true)
+    public List<ReleaseId> getReleaseDependencyChain() {
+        var result = new ArrayList<ReleaseId>(chain.size());
+        for (var r : chain) {
+            result.add(r);
+        }
+        return result;
+    }
+
     @Override
     public String toString() {
         var sb = new StringBuilder();

diff --git a/domino/api/src/main/java/io/quarkus/domino/ProjectDependencyResolver.java b/domino/api/src/main/java/io/quarkus/domino/ProjectDependencyResolver.java
@@ -367,7 +367,7 @@ public void log() {
                         int i = 0;
                         while (chains.hasNext()) {
                             logComment("  Chain #" + ++i + ":");
-                            chains.next().getReleaseDependencyChain().forEach(id -> logComment("    " + id));
+                            chains.next().getDependencyChain().forEach(id -> logComment("    " + id));
                             logComment("");
                         }
                     }

diff --git a/domino/api/src/main/java/io/quarkus/domino/ReleaseRepo.java b/domino/api/src/main/java/io/quarkus/domino/ReleaseRepo.java
@@ -1,5 +1,6 @@
 package io.quarkus.domino;
 
+import io.quarkus.bom.decomposer.ReleaseId;
 import io.quarkus.domino.scm.ScmRevision;
 import io.quarkus.maven.dependency.ArtifactCoords;
 import java.util.Collection;
@@ -20,6 +21,16 @@ public class ReleaseRepo {
         this.revision = revision;
     }
 
+    /**
+     * @deprecated for removal in favor of {@link #getRevision()}
+     *
+     * @return release id
+     */
+    @Deprecated(forRemoval = true)
+    public ReleaseId id() {
+        return revision;
+    }
+
     public ScmRevision getRevision() {
         return revision;
     }