[MNG-8329] ArtifactInstallerRequest and ArtifactDeployerRequest should use Collection<ProducedArtifact>

Author: gnodet

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployerRequest.java

@@ -20,7 +20,7 @@
 
 import java.util.Collection;
 
-import org.apache.maven.api.Artifact;
+import org.apache.maven.api.ProducedArtifact;
 import org.apache.maven.api.RemoteRepository;
 import org.apache.maven.api.Session;
 import org.apache.maven.api.annotations.Experimental;
@@ -45,7 +45,7 @@ public interface ArtifactDeployerRequest {
     RemoteRepository getRepository();
 
     @Nonnull
-    Collection<Artifact> getArtifacts();
+    Collection<ProducedArtifact> getArtifacts();
 
     int getRetryFailedDeploymentCount();
 
@@ -56,7 +56,9 @@ static ArtifactDeployerRequestBuilder builder() {
 
     @Nonnull
     static ArtifactDeployerRequest build(
-            @Nonnull Session session, @Nonnull RemoteRepository repository, @Nonnull Collection<Artifact> artifacts) {
+            @Nonnull Session session,
+            @Nonnull RemoteRepository repository,
+            @Nonnull Collection<ProducedArtifact> artifacts) {
         return builder()
                 .session(nonNull(session, "session cannot be null"))
                 .repository(nonNull(repository, "repository cannot be null"))
@@ -67,7 +69,7 @@ static ArtifactDeployerRequest build(
     class ArtifactDeployerRequestBuilder {
         Session session;
         RemoteRepository repository;
-        Collection<Artifact> artifacts;
+        Collection<ProducedArtifact> artifacts;
         int retryFailedDeploymentCount;
 
         ArtifactDeployerRequestBuilder() {}
@@ -84,7 +86,7 @@ public ArtifactDeployerRequestBuilder repository(RemoteRepository repository) {
             return this;
         }
 
-        public ArtifactDeployerRequestBuilder artifacts(Collection<Artifact> artifacts) {
+        public ArtifactDeployerRequestBuilder artifacts(Collection<ProducedArtifact> artifacts) {
             this.artifacts = artifacts;
             return this;
         }
@@ -102,13 +104,13 @@ public ArtifactDeployerRequest build() {
         private static class DefaultArtifactDeployerRequest extends BaseRequest implements ArtifactDeployerRequest {
 
             private final RemoteRepository repository;
-            private final Collection<Artifact> artifacts;
+            private final Collection<? extends ProducedArtifact> artifacts;
             private final int retryFailedDeploymentCount;
 
             DefaultArtifactDeployerRequest(
                     @Nonnull Session session,
                     @Nonnull RemoteRepository repository,
-                    @Nonnull Collection<Artifact> artifacts,
+                    @Nonnull Collection<? extends ProducedArtifact> artifacts,
                     int retryFailedDeploymentCount) {
                 super(session);
                 this.repository = nonNull(repository, "repository cannot be null");
@@ -124,7 +126,7 @@ public RemoteRepository getRepository() {
 
             @Nonnull
             @Override
-            public Collection<Artifact> getArtifacts() {
+            public Collection<? extends ProducedArtifact> getArtifacts() {
                 return artifacts;
             }
 

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstallerRequest.java

@@ -21,7 +21,7 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import org.apache.maven.api.Artifact;
+import org.apache.maven.api.ProducedArtifact;
 import org.apache.maven.api.Session;
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
@@ -44,15 +44,15 @@ public interface ArtifactInstallerRequest {
     Session getSession();
 
     @Nonnull
-    Collection<Artifact> getArtifacts();
+    Collection<ProducedArtifact> getArtifacts();
 
     @Nonnull
     static ArtifactInstallerRequestBuilder builder() {
         return new ArtifactInstallerRequestBuilder();
     }
 
     @Nonnull
-    static ArtifactInstallerRequest build(Session session, Collection<Artifact> artifacts) {
+    static ArtifactInstallerRequest build(Session session, Collection<ProducedArtifact> artifacts) {
         return builder()
                 .session(nonNull(session, "session cannot be null"))
                 .artifacts(nonNull(artifacts, "artifacts cannot be null"))
@@ -62,7 +62,7 @@ static ArtifactInstallerRequest build(Session session, Collection<Artifact> arti
     @NotThreadSafe
     class ArtifactInstallerRequestBuilder {
         Session session;
-        Collection<Artifact> artifacts = Collections.emptyList();
+        Collection<ProducedArtifact> artifacts = Collections.emptyList();
 
         ArtifactInstallerRequestBuilder() {}
 
@@ -73,7 +73,7 @@ public ArtifactInstallerRequestBuilder session(@Nonnull Session session) {
         }
 
         @Nonnull
-        public ArtifactInstallerRequestBuilder artifacts(@Nullable Collection<Artifact> artifacts) {
+        public ArtifactInstallerRequestBuilder artifacts(@Nullable Collection<ProducedArtifact> artifacts) {
             this.artifacts = artifacts != null ? artifacts : Collections.emptyList();
             return this;
         }
@@ -85,16 +85,16 @@ public ArtifactInstallerRequest build() {
 
         static class DefaultArtifactInstallerRequest extends BaseRequest implements ArtifactInstallerRequest {
 
-            private final Collection<Artifact> artifacts;
+            private final Collection<ProducedArtifact> artifacts;
 
-            DefaultArtifactInstallerRequest(@Nonnull Session session, @Nonnull Collection<Artifact> artifacts) {
+            DefaultArtifactInstallerRequest(@Nonnull Session session, @Nonnull Collection<ProducedArtifact> artifacts) {
                 super(session);
                 this.artifacts = unmodifiable(nonNull(artifacts, "artifacts cannot be null"));
             }
 
             @Nonnull
             @Override
-            public Collection<Artifact> getArtifacts() {
+            public Collection<ProducedArtifact> getArtifacts() {
                 return artifacts;
             }
         }