Align API

maveniverse · Mar 29, 2024 · 889e011 · 889e011
1 parent 819f554
commit 889e011
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/shared/src/main/java/eu/maveniverse/maven/toolbox/shared/ToolboxCommando.java b/shared/src/main/java/eu/maveniverse/maven/toolbox/shared/ToolboxCommando.java
@@ -126,10 +126,10 @@ boolean copyTransitive(
 
     boolean copyAllRecorded(ArtifactSink sink, boolean stopRecording, Output output) throws Exception;
 
-    boolean deploy(String remoteRepositorySpec, Supplier<Collection<Artifact>> artifactSupplier, Output output)
+    boolean deploy(RemoteRepository remoteRepository, Supplier<Collection<Artifact>> artifactSupplier, Output output)
             throws Exception;
 
-    boolean deployAllRecorded(String remoteRepositorySpec, boolean stopRecording, Output output) throws Exception;
+    boolean deployAllRecorded(RemoteRepository remoteRepository, boolean stopRecording, Output output) throws Exception;
 
     boolean install(Supplier<Collection<Artifact>> artifactSupplier, Output output) throws Exception;
 

diff --git a/shared/src/main/java/eu/maveniverse/maven/toolbox/shared/internal/ToolboxCommandoImpl.java b/shared/src/main/java/eu/maveniverse/maven/toolbox/shared/internal/ToolboxCommandoImpl.java
@@ -408,10 +408,10 @@ public boolean copyAllRecorded(ArtifactSink sink, boolean stopRecording, Output
     }
 
     @Override
-    public boolean deploy(String remoteRepositorySpec, Supplier<Collection<Artifact>> artifactSupplier, Output output)
+    public boolean deploy(
+            RemoteRepository remoteRepository, Supplier<Collection<Artifact>> artifactSupplier, Output output)
             throws Exception {
         Collection<Artifact> artifacts = artifactSupplier.get();
-        RemoteRepository remoteRepository = toolboxResolver.parseRemoteRepository(remoteRepositorySpec);
         DeployRequest deployRequest = new DeployRequest();
         deployRequest.setRepository(remoteRepository);
         artifacts.forEach(deployRequest::addArtifact);
@@ -422,10 +422,10 @@ public boolean deploy(String remoteRepositorySpec, Supplier<Collection<Artifact>
     }
 
     @Override
-    public boolean deployAllRecorded(String remoteRepositorySpec, boolean stopRecording, Output output)
+    public boolean deployAllRecorded(RemoteRepository remoteRepository, boolean stopRecording, Output output)
             throws Exception {
         artifactRecorder.setActive(!stopRecording);
-        return deploy(remoteRepositorySpec, () -> new HashSet<>(artifactRecorder.getAllArtifacts()), output);
+        return deploy(remoteRepository, () -> new HashSet<>(artifactRecorder.getAllArtifacts()), output);
     }
 
     @Override

diff --git a/toolbox/src/main/java/eu/maveniverse/maven/toolbox/plugin/gav/GavDeployMojo.java b/toolbox/src/main/java/eu/maveniverse/maven/toolbox/plugin/gav/GavDeployMojo.java
@@ -84,6 +84,7 @@ protected boolean doExecute(Output output, ToolboxCommando toolboxCommando) thro
         if (javadoc != null) {
             projectArtifacts.addJavadoc(javadoc.toPath());
         }
-        return toolboxCommando.deploy(remoteRepositorySpec, projectArtifacts, output);
+        return toolboxCommando.deploy(
+                toolboxCommando.parseRemoteRepository(remoteRepositorySpec), projectArtifacts, output);
     }
 }
diff --git a/toolbox/src/main/java/eu/maveniverse/maven/toolbox/plugin/gav/GavDeployRecordedMojo.java b/toolbox/src/main/java/eu/maveniverse/maven/toolbox/plugin/gav/GavDeployRecordedMojo.java
@@ -31,6 +31,7 @@ public final class GavDeployRecordedMojo extends GavMojoSupport {
 
     @Override
     protected boolean doExecute(Output output, ToolboxCommando toolboxCommando) throws Exception {
-        return toolboxCommando.deployAllRecorded(remoteRepositorySpec, true, output);
+        return toolboxCommando.deployAllRecorded(
+                toolboxCommando.parseRemoteRepository(remoteRepositorySpec), true, output);
     }
 }