Skip to content

Commit cf4ffcc

Browse files
slawekjaranowskislawekjaranowski
committed
Simplify usage of RepositoryManager and DependencyResolver
Move it where is used, not all Mojos need it
1 parent 91a03a6 commit cf4ffcc

14 files changed

+30
-199
lines changed

‎src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@
5050
import org.apache.maven.shared.artifact.filter.collection.ProjectTransitivityFilter;
5151
import org.apache.maven.shared.artifact.filter.collection.ScopeFilter;
5252
import org.apache.maven.shared.artifact.filter.collection.TypeFilter;
53-
import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
54-
import org.apache.maven.shared.transfer.repository.RepositoryManager;
5553
import org.eclipse.aether.resolution.ArtifactResolutionException;
5654
import org.sonatype.plexus.build.incremental.BuildContext;
5755

@@ -233,33 +231,23 @@ public abstract class AbstractDependencyFilterMojo extends AbstractDependencyMoj
233231

234232
private final ResolverUtil resolverUtil;
235233

236-
private final DependencyResolver dependencyResolver;
237-
238-
private final RepositoryManager repositoryManager;
239-
240234
private final ProjectBuilder projectBuilder;
241235

242236
private final ArtifactHandlerManager artifactHandlerManager;
243237

244238
@Inject
245-
// CHECKSTYLE_OFF: ParameterNumber
246239
protected AbstractDependencyFilterMojo(
247240
MavenSession session,
248241
BuildContext buildContext,
249242
MavenProject project,
250243
ResolverUtil resolverUtil,
251-
DependencyResolver dependencyResolver,
252-
RepositoryManager repositoryManager,
253244
ProjectBuilder projectBuilder,
254245
ArtifactHandlerManager artifactHandlerManager) {
255246
super(session, buildContext, project);
256247
this.resolverUtil = resolverUtil;
257-
this.dependencyResolver = dependencyResolver;
258-
this.repositoryManager = repositoryManager;
259248
this.projectBuilder = projectBuilder;
260249
this.artifactHandlerManager = artifactHandlerManager;
261250
}
262-
// CHECKSTYLE_ON: ParameterNumber
263251

264252
/**
265253
* Return an {@link ArtifactsFilter} indicating which artifacts must be filtered out.
@@ -524,18 +512,4 @@ public void setPrependGroupId(boolean prependGroupId) {
524512
protected final ResolverUtil getResolverUtil() {
525513
return resolverUtil;
526514
}
527-
528-
/**
529-
* @return {@link #dependencyResolver}
530-
*/
531-
protected final DependencyResolver getDependencyResolver() {
532-
return dependencyResolver;
533-
}
534-
535-
/**
536-
* @return {@link #repositoryManager}
537-
*/
538-
protected final RepositoryManager getRepositoryManager() {
539-
return repositoryManager;
540-
}
541515
}

‎src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractFromDependenciesMojo.java‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
import org.apache.maven.plugins.dependency.utils.ResolverUtil;
2727
import org.apache.maven.project.MavenProject;
2828
import org.apache.maven.project.ProjectBuilder;
29-
import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
30-
import org.apache.maven.shared.transfer.repository.RepositoryManager;
3129
import org.sonatype.plexus.build.incremental.BuildContext;
3230

3331
/**
@@ -114,27 +112,15 @@ public abstract class AbstractFromDependenciesMojo extends AbstractDependencyFil
114112
@Parameter(property = "mdep.failOnMissingClassifierArtifact", defaultValue = "false")
115113
protected boolean failOnMissingClassifierArtifact;
116114

117-
// CHECKSTYLE_OFF: ParameterNumber
118115
protected AbstractFromDependenciesMojo(
119116
MavenSession session,
120117
BuildContext buildContext,
121118
MavenProject project,
122119
ResolverUtil resolverUtil,
123-
DependencyResolver dependencyResolver,
124-
RepositoryManager repositoryManager,
125120
ProjectBuilder projectBuilder,
126121
ArtifactHandlerManager artifactHandlerManager) {
127-
super(
128-
session,
129-
buildContext,
130-
project,
131-
resolverUtil,
132-
dependencyResolver,
133-
repositoryManager,
134-
projectBuilder,
135-
artifactHandlerManager);
136-
}
137-
// CHECKSTYLE_ON: ParameterNumber
122+
super(session, buildContext, project, resolverUtil, projectBuilder, artifactHandlerManager);
123+
}
138124

139125
/**
140126
* @return returns the output directory

‎src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,7 @@
5151
import org.apache.maven.project.MavenProject;
5252
import org.apache.maven.project.MavenProjectHelper;
5353
import org.apache.maven.project.ProjectBuilder;
54-
import org.apache.maven.project.ProjectBuildingRequest;
5554
import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
56-
import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
57-
import org.apache.maven.shared.transfer.repository.RepositoryManager;
5855
import org.sonatype.plexus.build.incremental.BuildContext;
5956

6057
/**
@@ -168,29 +165,17 @@ public class BuildClasspathMojo extends AbstractDependencyFilterMojo implements
168165
private final MavenProjectHelper projectHelper;
169166

170167
@Inject
171-
// CHECKSTYLE_OFF: ParameterNumber
172168
protected BuildClasspathMojo(
173169
MavenSession session,
174170
BuildContext buildContext,
175171
MavenProject project,
176172
ResolverUtil resolverUtil,
177-
DependencyResolver dependencyResolver,
178-
RepositoryManager repositoryManager,
179173
ProjectBuilder projectBuilder,
180174
ArtifactHandlerManager artifactHandlerManager,
181175
MavenProjectHelper projectHelper) {
182-
super(
183-
session,
184-
buildContext,
185-
project,
186-
resolverUtil,
187-
dependencyResolver,
188-
repositoryManager,
189-
projectBuilder,
190-
artifactHandlerManager);
176+
super(session, buildContext, project, resolverUtil, projectBuilder, artifactHandlerManager);
191177
this.projectHelper = projectHelper;
192178
}
193-
// CHECKSTYLE_ON: ParameterNumber
194179

195180
/**
196181
* Main entry into mojo. Gets the list of dependencies and iterates to create a classpath.
@@ -288,9 +273,8 @@ protected void appendArtifactPath(Artifact art, StringBuilder sb) {
288273
String file = art.getFile().getPath();
289274
// substitute the property for the local repo path to make the classpath file portable.
290275
if (localRepoProperty != null && !localRepoProperty.isEmpty()) {
291-
ProjectBuildingRequest projectBuildingRequest = session.getProjectBuildingRequest();
292-
File localBasedir = getRepositoryManager().getLocalRepositoryBasedir(projectBuildingRequest);
293-
276+
File localBasedir =
277+
session.getRepositorySession().getLocalRepository().getBasedir();
294278
file = StringUtils.replace(file, localBasedir.getAbsolutePath(), localRepoProperty);
295279
}
296280
sb.append(file);

‎src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
4848
import org.apache.maven.shared.transfer.artifact.install.ArtifactInstaller;
4949
import org.apache.maven.shared.transfer.artifact.install.ArtifactInstallerException;
50-
import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
5150
import org.apache.maven.shared.transfer.repository.RepositoryManager;
5251
import org.eclipse.aether.resolution.ArtifactResolutionException;
5352
import org.eclipse.aether.util.artifact.SubArtifact;
@@ -80,6 +79,8 @@ public class CopyDependenciesMojo extends AbstractFromDependenciesMojo {
8079

8180
private final ArtifactInstaller installer;
8281

82+
private final RepositoryManager repositoryManager;
83+
8384
/**
8485
* Either append the artifact's baseVersion or uniqueVersion to the filename. Will only be used if
8586
* {@link #isStripVersion()} is {@code false}.
@@ -106,31 +107,22 @@ public class CopyDependenciesMojo extends AbstractFromDependenciesMojo {
106107
protected boolean copySignatures;
107108

108109
@Inject
109-
// CHECKSTYLE_OFF: ParameterNumber
110+
@SuppressWarnings("checkstyle:ParameterNumber")
110111
public CopyDependenciesMojo(
111112
MavenSession session,
112113
BuildContext buildContext,
113114
MavenProject project,
114115
ResolverUtil resolverUtil,
115-
DependencyResolver dependencyResolver,
116116
RepositoryManager repositoryManager,
117117
ProjectBuilder projectBuilder,
118118
ArtifactHandlerManager artifactHandlerManager,
119119
CopyUtil copyUtil,
120120
ArtifactInstaller installer) {
121-
super(
122-
session,
123-
buildContext,
124-
project,
125-
resolverUtil,
126-
dependencyResolver,
127-
repositoryManager,
128-
projectBuilder,
129-
artifactHandlerManager);
121+
super(session, buildContext, project, resolverUtil, projectBuilder, artifactHandlerManager);
130122
this.copyUtil = copyUtil;
131123
this.installer = installer;
124+
this.repositoryManager = repositoryManager;
132125
}
133-
// CHECKSTYLE_ON: ParameterNumber
134126

135127
/**
136128
* Main entry into mojo. Gets the list of dependencies and iterates through calling copyArtifact.
@@ -165,8 +157,8 @@ protected void doExecute() throws MojoExecutionException {
165157
artifact, isStripVersion(), this.prependGroupId, this.useBaseVersion, this.stripClassifier);
166158
}
167159
} else {
168-
ProjectBuildingRequest buildingRequest = getRepositoryManager()
169-
.setLocalRepositoryBasedir(session.getProjectBuildingRequest(), outputDirectory);
160+
ProjectBuildingRequest buildingRequest =
161+
repositoryManager.setLocalRepositoryBasedir(session.getProjectBuildingRequest(), outputDirectory);
170162

171163
artifacts.forEach(artifact -> installArtifact(artifact, buildingRequest));
172164
}

‎src/main/java/org/apache/maven/plugins/dependency/fromDependencies/UnpackDependenciesMojo.java‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
import org.apache.maven.project.MavenProject;
4040
import org.apache.maven.project.ProjectBuilder;
4141
import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
42-
import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
43-
import org.apache.maven.shared.transfer.repository.RepositoryManager;
4442
import org.codehaus.plexus.components.io.filemappers.FileMapper;
4543
import org.sonatype.plexus.build.incremental.BuildContext;
4644

@@ -106,29 +104,17 @@ public class UnpackDependenciesMojo extends AbstractFromDependenciesMojo {
106104
private final UnpackUtil unpackUtil;
107105

108106
@Inject
109-
// CHECKSTYLE_OFF: ParameterNumber
110107
public UnpackDependenciesMojo(
111108
MavenSession session,
112109
BuildContext buildContext,
113110
MavenProject project,
114111
ResolverUtil resolverUtil,
115-
DependencyResolver dependencyResolver,
116-
RepositoryManager repositoryManager,
117112
ProjectBuilder projectBuilder,
118113
ArtifactHandlerManager artifactHandlerManager,
119114
UnpackUtil unpackUtil) {
120-
super(
121-
session,
122-
buildContext,
123-
project,
124-
resolverUtil,
125-
dependencyResolver,
126-
repositoryManager,
127-
projectBuilder,
128-
artifactHandlerManager);
115+
super(session, buildContext, project, resolverUtil, projectBuilder, artifactHandlerManager);
129116
this.unpackUtil = unpackUtil;
130117
}
131-
// CHECKSTYLE_ON: ParameterNumber
132118

133119
/**
134120
* Main entry into mojo. This method gets the dependencies and iterates through each one passing it to

‎src/main/java/org/apache/maven/plugins/dependency/resolvers/AbstractResolveMojo.java‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
import org.apache.maven.shared.artifact.filter.collection.GroupIdFilter;
3535
import org.apache.maven.shared.artifact.filter.collection.ScopeFilter;
3636
import org.apache.maven.shared.artifact.filter.collection.TypeFilter;
37-
import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
38-
import org.apache.maven.shared.transfer.repository.RepositoryManager;
3937
import org.sonatype.plexus.build.incremental.BuildContext;
4038

4139
/**
@@ -68,27 +66,15 @@ public abstract class AbstractResolveMojo extends AbstractDependencyFilterMojo {
6866
@Parameter(property = "excludeReactor", defaultValue = "true")
6967
protected boolean excludeReactor;
7068

71-
// CHECKSTYLE_OFF: ParameterNumber
7269
protected AbstractResolveMojo(
7370
MavenSession session,
7471
BuildContext buildContext,
7572
MavenProject project,
7673
ResolverUtil resolverUtil,
77-
DependencyResolver dependencyResolver,
78-
RepositoryManager repositoryManager,
7974
ProjectBuilder projectBuilder,
8075
ArtifactHandlerManager artifactHandlerManager) {
81-
super(
82-
session,
83-
buildContext,
84-
project,
85-
resolverUtil,
86-
dependencyResolver,
87-
repositoryManager,
88-
projectBuilder,
89-
artifactHandlerManager);
76+
super(session, buildContext, project, resolverUtil, projectBuilder, artifactHandlerManager);
9077
}
91-
// CHECKSTYLE_ON: ParameterNumber
9278

9379
/**
9480
* @return {@link FilterArtifacts}

‎src/main/java/org/apache/maven/plugins/dependency/resolvers/CollectDependenciesMojo.java‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
import org.apache.maven.plugins.dependency.utils.ResolverUtil;
2929
import org.apache.maven.project.MavenProject;
3030
import org.apache.maven.project.ProjectBuilder;
31-
import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
32-
import org.apache.maven.shared.transfer.repository.RepositoryManager;
3331
import org.sonatype.plexus.build.incremental.BuildContext;
3432

3533
/**
@@ -58,26 +56,13 @@
5856
public class CollectDependenciesMojo extends ResolveDependenciesMojo {
5957

6058
@Inject
61-
// CHECKSTYLE_OFF: ParameterNumber
6259
protected CollectDependenciesMojo(
6360
MavenSession session,
6461
BuildContext buildContext,
6562
MavenProject project,
6663
ResolverUtil resolverUtil,
67-
DependencyResolver dependencyResolver,
68-
RepositoryManager repositoryManager,
6964
ProjectBuilder projectBuilder,
7065
ArtifactHandlerManager artifactHandlerManager) {
71-
super(
72-
session,
73-
buildContext,
74-
project,
75-
resolverUtil,
76-
dependencyResolver,
77-
repositoryManager,
78-
projectBuilder,
79-
artifactHandlerManager);
66+
super(session, buildContext, project, resolverUtil, projectBuilder, artifactHandlerManager);
8067
}
81-
// CHECKSTYLE_ON: ParameterNumber
82-
8368
}

‎src/main/java/org/apache/maven/plugins/dependency/resolvers/GoOfflineMojo.java‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import org.apache.maven.shared.transfer.dependencies.DependableCoordinate;
5050
import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
5151
import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException;
52-
import org.apache.maven.shared.transfer.repository.RepositoryManager;
5352
import org.sonatype.plexus.build.incremental.BuildContext;
5453

5554
/**
@@ -63,6 +62,8 @@
6362
@Mojo(name = "go-offline", threadSafe = true)
6463
public class GoOfflineMojo extends AbstractResolveMojo {
6564

65+
private final DependencyResolver dependencyResolver;
66+
6667
@Inject
6768
// CHECKSTYLE_OFF: ParameterNumber
6869
public GoOfflineMojo(
@@ -71,18 +72,10 @@ public GoOfflineMojo(
7172
MavenProject project,
7273
ResolverUtil resolverUtil,
7374
DependencyResolver dependencyResolver,
74-
RepositoryManager repositoryManager,
7575
ProjectBuilder projectBuilder,
7676
ArtifactHandlerManager artifactHandlerManager) {
77-
super(
78-
session,
79-
buildContext,
80-
project,
81-
resolverUtil,
82-
dependencyResolver,
83-
repositoryManager,
84-
projectBuilder,
85-
artifactHandlerManager);
77+
super(session, buildContext, project, resolverUtil, projectBuilder, artifactHandlerManager);
78+
this.dependencyResolver = dependencyResolver;
8679
}
8780
// CHECKSTYLE_ON: ParameterNumber
8881

@@ -152,7 +145,7 @@ private Set<Artifact> resolveDependableCoordinate(
152145

153146
for (DependableCoordinate dependableCoordinate : dependableCoordinates) {
154147
final Iterable<ArtifactResult> artifactResults =
155-
getDependencyResolver().resolveDependencies(buildingRequest, dependableCoordinate, filter);
148+
dependencyResolver.resolveDependencies(buildingRequest, dependableCoordinate, filter);
156149

157150
for (final ArtifactResult artifactResult : artifactResults) {
158151
results.add(artifactResult.getArtifact());

0 commit comments

Comments
 (0)