Skip to content

Commit 8584e94

Browse files
gnodetgnodet
committed
[MNG-8329] ArtifactInstallerRequest and ArtifactDeployerRequest should use Collection<ProducedArtifact>
1 parent a2095c0 commit 8584e94

File tree

8 files changed

+40
-36
lines changed

8 files changed

+40
-36
lines changed

‎api/maven-api-core/src/main/java/org/apache/maven/api/Session.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ Collection<DownloadedArtifact> resolveArtifacts(
521521
*
522522
* @see org.apache.maven.api.services.ArtifactInstaller#install(Session, Collection)
523523
*/
524-
void installArtifacts(@Nonnull Artifact... artifacts);
524+
void installArtifacts(@Nonnull ProducedArtifact... artifacts);
525525

526526
/**
527527
* Shortcut for {@code getService(ArtifactInstaller.class).install(...)}.
@@ -531,7 +531,7 @@ Collection<DownloadedArtifact> resolveArtifacts(
531531
*
532532
* @see org.apache.maven.api.services.ArtifactInstaller#install(Session, Collection)
533533
*/
534-
void installArtifacts(@Nonnull Collection<Artifact> artifacts);
534+
void installArtifacts(@Nonnull Collection<ProducedArtifact> artifacts);
535535

536536
/**
537537
* Shortcut for {@code getService(ArtifactDeployer.class).deploy(...)}.
@@ -542,7 +542,7 @@ Collection<DownloadedArtifact> resolveArtifacts(
542542
*
543543
* @see org.apache.maven.api.services.ArtifactDeployer#deploy(Session, RemoteRepository, Collection)
544544
*/
545-
void deployArtifact(@Nonnull RemoteRepository repository, @Nonnull Artifact... artifacts);
545+
void deployArtifact(@Nonnull RemoteRepository repository, @Nonnull ProducedArtifact... artifacts);
546546

547547
/**
548548
* Shortcut for {@code getService(ArtifactManager.class).setPath(...)}.

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@
2020

2121
import java.util.Collection;
2222

23-
import org.apache.maven.api.Artifact;
23+
import org.apache.maven.api.ProducedArtifact;
2424
import org.apache.maven.api.RemoteRepository;
2525
import org.apache.maven.api.Service;
2626
import org.apache.maven.api.Session;
2727
import org.apache.maven.api.annotations.Experimental;
2828
import org.apache.maven.api.annotations.Nonnull;
2929

3030
/**
31-
* Deploys {@link Artifact}s to a {@link RemoteRepository}.
31+
* Deploys {@link ProducedArtifact}s to a {@link RemoteRepository}.
3232
*
3333
* @since 4.0.0
34-
* @see Session#deployArtifact(RemoteRepository, Artifact...)
34+
* @see Session#deployArtifact(RemoteRepository, ProducedArtifact...)
3535
*/
3636
@Experimental
3737
public interface ArtifactDeployer extends Service {
@@ -50,7 +50,9 @@ public interface ArtifactDeployer extends Service {
5050
* @throws IllegalArgumentException if an argument is {@code null} or invalid
5151
*/
5252
default void deploy(
53-
@Nonnull Session session, @Nonnull RemoteRepository repository, @Nonnull Collection<Artifact> artifacts) {
53+
@Nonnull Session session,
54+
@Nonnull RemoteRepository repository,
55+
@Nonnull Collection<ProducedArtifact> artifacts) {
5456
deploy(ArtifactDeployerRequest.build(session, repository, artifacts));
5557
}
5658
}

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import java.util.Collection;
2222

23-
import org.apache.maven.api.Artifact;
23+
import org.apache.maven.api.ProducedArtifact;
2424
import org.apache.maven.api.RemoteRepository;
2525
import org.apache.maven.api.Session;
2626
import org.apache.maven.api.annotations.Experimental;
@@ -45,7 +45,7 @@ public interface ArtifactDeployerRequest {
4545
RemoteRepository getRepository();
4646

4747
@Nonnull
48-
Collection<Artifact> getArtifacts();
48+
Collection<ProducedArtifact> getArtifacts();
4949

5050
int getRetryFailedDeploymentCount();
5151

@@ -56,7 +56,9 @@ static ArtifactDeployerRequestBuilder builder() {
5656

5757
@Nonnull
5858
static ArtifactDeployerRequest build(
59-
@Nonnull Session session, @Nonnull RemoteRepository repository, @Nonnull Collection<Artifact> artifacts) {
59+
@Nonnull Session session,
60+
@Nonnull RemoteRepository repository,
61+
@Nonnull Collection<ProducedArtifact> artifacts) {
6062
return builder()
6163
.session(nonNull(session, "session cannot be null"))
6264
.repository(nonNull(repository, "repository cannot be null"))
@@ -67,7 +69,7 @@ static ArtifactDeployerRequest build(
6769
class ArtifactDeployerRequestBuilder {
6870
Session session;
6971
RemoteRepository repository;
70-
Collection<Artifact> artifacts;
72+
Collection<ProducedArtifact> artifacts;
7173
int retryFailedDeploymentCount;
7274

7375
ArtifactDeployerRequestBuilder() {}
@@ -84,7 +86,7 @@ public ArtifactDeployerRequestBuilder repository(RemoteRepository repository) {
8486
return this;
8587
}
8688

87-
public ArtifactDeployerRequestBuilder artifacts(Collection<Artifact> artifacts) {
89+
public ArtifactDeployerRequestBuilder artifacts(Collection<ProducedArtifact> artifacts) {
8890
this.artifacts = artifacts;
8991
return this;
9092
}
@@ -102,13 +104,13 @@ public ArtifactDeployerRequest build() {
102104
private static class DefaultArtifactDeployerRequest extends BaseRequest implements ArtifactDeployerRequest {
103105

104106
private final RemoteRepository repository;
105-
private final Collection<Artifact> artifacts;
107+
private final Collection<ProducedArtifact> artifacts;
106108
private final int retryFailedDeploymentCount;
107109

108110
DefaultArtifactDeployerRequest(
109111
@Nonnull Session session,
110112
@Nonnull RemoteRepository repository,
111-
@Nonnull Collection<Artifact> artifacts,
113+
@Nonnull Collection<ProducedArtifact> artifacts,
112114
int retryFailedDeploymentCount) {
113115
super(session);
114116
this.repository = nonNull(repository, "repository cannot be null");
@@ -124,7 +126,7 @@ public RemoteRepository getRepository() {
124126

125127
@Nonnull
126128
@Override
127-
public Collection<Artifact> getArtifacts() {
129+
public Collection<ProducedArtifact> getArtifacts() {
128130
return artifacts;
129131
}
130132

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
import java.util.Collection;
2222
import java.util.Collections;
2323

24-
import org.apache.maven.api.Artifact;
24+
import org.apache.maven.api.ProducedArtifact;
2525
import org.apache.maven.api.Service;
2626
import org.apache.maven.api.Session;
2727
import org.apache.maven.api.annotations.Experimental;
2828
import org.apache.maven.api.annotations.Nonnull;
2929

3030
/**
31-
* Installs {@link Artifact}s to the local repository.
31+
* Installs {@link ProducedArtifact}s to the local repository.
3232
*
3333
* @since 4.0.0
3434
* @see Session#withLocalRepository(org.apache.maven.api.LocalRepository)
@@ -44,27 +44,27 @@ public interface ArtifactInstaller extends Service {
4444

4545
/**
4646
* @param session the repository session
47-
* @param artifact the {@link Artifact} to install
47+
* @param artifact the {@link ProducedArtifact} to install
4848
* @throws ArtifactInstallerException In case of an error which can be the a given artifact cannot be found or the
4949
* installation has failed.
5050
* @throws IllegalArgumentException in case of parameter {@code session} is {@code null} or
5151
* {@code artifact} is {@code null}.
5252
*/
53-
default void install(Session session, Artifact artifact) {
53+
default void install(Session session, ProducedArtifact artifact) {
5454
install(session, Collections.singletonList(artifact));
5555
}
5656

5757
/**
5858
* @param session the repository session
59-
* @param artifacts Collection of {@link Artifact MavenArtifacts}
59+
* @param artifacts Collection of {@link ProducedArtifact MavenArtifacts}
6060
* @throws ArtifactInstallerException In case of an error which can be the a given artifact cannot be found or the
6161
* installation has failed.
6262
* @throws IllegalArgumentException in case of parameter {@code request} is {@code null} or parameter
6363
* {@code localRepository} is {@code null} or {@code localRepository} is not a directory
6464
* or parameter {@code mavenArtifacts} is {@code null} or
6565
* {@code mavenArtifacts.isEmpty()} is {@code true}.
6666
*/
67-
default void install(Session session, Collection<Artifact> artifacts) {
67+
default void install(Session session, Collection<ProducedArtifact> artifacts) {
6868
install(ArtifactInstallerRequest.build(session, artifacts));
6969
}
7070
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.Collection;
2222
import java.util.Collections;
2323

24-
import org.apache.maven.api.Artifact;
24+
import org.apache.maven.api.ProducedArtifact;
2525
import org.apache.maven.api.Session;
2626
import org.apache.maven.api.annotations.Experimental;
2727
import org.apache.maven.api.annotations.Immutable;
@@ -44,15 +44,15 @@ public interface ArtifactInstallerRequest {
4444
Session getSession();
4545

4646
@Nonnull
47-
Collection<Artifact> getArtifacts();
47+
Collection<ProducedArtifact> getArtifacts();
4848

4949
@Nonnull
5050
static ArtifactInstallerRequestBuilder builder() {
5151
return new ArtifactInstallerRequestBuilder();
5252
}
5353

5454
@Nonnull
55-
static ArtifactInstallerRequest build(Session session, Collection<Artifact> artifacts) {
55+
static ArtifactInstallerRequest build(Session session, Collection<ProducedArtifact> artifacts) {
5656
return builder()
5757
.session(nonNull(session, "session cannot be null"))
5858
.artifacts(nonNull(artifacts, "artifacts cannot be null"))
@@ -62,7 +62,7 @@ static ArtifactInstallerRequest build(Session session, Collection<Artifact> arti
6262
@NotThreadSafe
6363
class ArtifactInstallerRequestBuilder {
6464
Session session;
65-
Collection<Artifact> artifacts = Collections.emptyList();
65+
Collection<ProducedArtifact> artifacts = Collections.emptyList();
6666

6767
ArtifactInstallerRequestBuilder() {}
6868

@@ -73,7 +73,7 @@ public ArtifactInstallerRequestBuilder session(@Nonnull Session session) {
7373
}
7474

7575
@Nonnull
76-
public ArtifactInstallerRequestBuilder artifacts(@Nullable Collection<Artifact> artifacts) {
76+
public ArtifactInstallerRequestBuilder artifacts(@Nullable Collection<ProducedArtifact> artifacts) {
7777
this.artifacts = artifacts != null ? artifacts : Collections.emptyList();
7878
return this;
7979
}
@@ -85,16 +85,16 @@ public ArtifactInstallerRequest build() {
8585

8686
static class DefaultArtifactInstallerRequest extends BaseRequest implements ArtifactInstallerRequest {
8787

88-
private final Collection<Artifact> artifacts;
88+
private final Collection<ProducedArtifact> artifacts;
8989

90-
DefaultArtifactInstallerRequest(@Nonnull Session session, @Nonnull Collection<Artifact> artifacts) {
90+
DefaultArtifactInstallerRequest(@Nonnull Session session, @Nonnull Collection<ProducedArtifact> artifacts) {
9191
super(session);
9292
this.artifacts = unmodifiable(nonNull(artifacts, "artifacts cannot be null"));
9393
}
9494

9595
@Nonnull
9696
@Override
97-
public Collection<Artifact> getArtifacts() {
97+
public Collection<ProducedArtifact> getArtifacts() {
9898
return artifacts;
9999
}
100100
}

‎impl/maven-impl/src/main/java/org/apache/maven/internal/impl/AbstractSession.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ private org.eclipse.aether.graph.Exclusion toExclusion(Exclusion exclusion) {
344344
}
345345

346346
@Override
347-
public List<org.eclipse.aether.artifact.Artifact> toArtifacts(Collection<Artifact> artifacts) {
347+
public List<org.eclipse.aether.artifact.Artifact> toArtifacts(Collection<? extends Artifact> artifacts) {
348348
return artifacts == null ? null : map(artifacts, this::toArtifact);
349349
}
350350

@@ -637,7 +637,7 @@ public Collection<DownloadedArtifact> resolveArtifacts(Artifact... artifacts) {
637637
* @see ArtifactInstaller#install(Session, Collection)
638638
*/
639639
@Override
640-
public void installArtifacts(Artifact... artifacts) {
640+
public void installArtifacts(ProducedArtifact... artifacts) {
641641
installArtifacts(Arrays.asList(artifacts));
642642
}
643643

@@ -648,7 +648,7 @@ public void installArtifacts(Artifact... artifacts) {
648648
* @see ArtifactInstaller#install(Session, Collection)
649649
*/
650650
@Override
651-
public void installArtifacts(Collection<Artifact> artifacts) {
651+
public void installArtifacts(Collection<ProducedArtifact> artifacts) {
652652
getService(ArtifactInstaller.class).install(this, artifacts);
653653
}
654654

@@ -659,7 +659,7 @@ public void installArtifacts(Collection<Artifact> artifacts) {
659659
* @see ArtifactDeployer#deploy(Session, RemoteRepository, Collection)
660660
*/
661661
@Override
662-
public void deployArtifact(RemoteRepository repository, Artifact... artifacts) {
662+
public void deployArtifact(RemoteRepository repository, ProducedArtifact... artifacts) {
663663
getService(ArtifactDeployer.class).deploy(this, repository, Arrays.asList(artifacts));
664664
}
665665

‎impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import java.util.Collection;
2222

23-
import org.apache.maven.api.Artifact;
23+
import org.apache.maven.api.ProducedArtifact;
2424
import org.apache.maven.api.RemoteRepository;
2525
import org.apache.maven.api.annotations.Nonnull;
2626
import org.apache.maven.api.di.Named;
@@ -44,7 +44,7 @@ public class DefaultArtifactDeployer implements ArtifactDeployer {
4444
public void deploy(@Nonnull ArtifactDeployerRequest request) {
4545
nonNull(request, "request");
4646
InternalSession session = InternalSession.from(request.getSession());
47-
Collection<Artifact> artifacts = nonNull(request.getArtifacts(), "request.artifacts");
47+
Collection<ProducedArtifact> artifacts = nonNull(request.getArtifacts(), "request.artifacts");
4848
RemoteRepository repository = nonNull(request.getRepository(), "request.repository");
4949
try {
5050
DeployRequest deployRequest = new DeployRequest()

‎impl/maven-impl/src/main/java/org/apache/maven/internal/impl/InternalSession.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ List<org.eclipse.aether.graph.Dependency> toDependencies(
7777

7878
org.eclipse.aether.graph.Dependency toDependency(DependencyCoordinates dependency, boolean managed);
7979

80-
List<org.eclipse.aether.artifact.Artifact> toArtifacts(Collection<Artifact> artifacts);
80+
List<org.eclipse.aether.artifact.Artifact> toArtifacts(Collection<? extends Artifact> artifacts);
8181

8282
org.eclipse.aether.artifact.Artifact toArtifact(Artifact artifact);
8383

0 commit comments

Comments
 (0)