Skip to content

Commit 364b2fa

Browse files
cstamascstamas
committed
WIP and simplify
1 parent a6af792 commit 364b2fa

File tree

4 files changed

+15
-36
lines changed

4 files changed

+15
-36
lines changed

‎maven-plugin/src/main/java/eu/maveniverse/maven/toolbox/plugin/GavTreeMojo.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,9 @@ public class GavTreeMojo extends AbstractMojo {
4242
public void execute() throws MojoExecutionException {
4343
Runtime runtime = Runtimes.INSTANCE.getRuntime();
4444
try (Context context = runtime.create(ContextOverrides.create().build())) {
45-
Toolbox toolbox = new ToolboxImpl(context.repositorySystem());
46-
Toolbox.ResolutionScope resolutionScope =
47-
Toolbox.ResolutionScope.valueOf(scope.toUpperCase(Locale.ENGLISH));
45+
Toolbox toolbox = new ToolboxImpl(context);
4846
CollectResult collectResult = toolbox.collectAsDependency(
49-
context.repositorySystemSession(),
50-
resolutionScope,
47+
Toolbox.ResolutionScope.valueOf(scope.toUpperCase(Locale.ENGLISH)),
5148
new Dependency(new DefaultArtifact(gav), scope),
5249
context.remoteRepositories(),
5350
verbose);

‎maven-plugin/src/main/java/eu/maveniverse/maven/toolbox/plugin/TreeMojo.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,9 @@ public void execute() throws MojoExecutionException {
4343
try (Context context = runtime.create(ContextOverrides.create().build())) {
4444
ArtifactTypeRegistry artifactTypeRegistry =
4545
context.repositorySystemSession().getArtifactTypeRegistry();
46-
Toolbox toolbox = new ToolboxImpl(context.repositorySystem());
47-
Toolbox.ResolutionScope resolutionScope =
48-
Toolbox.ResolutionScope.valueOf(scope.toUpperCase(Locale.ENGLISH));
46+
Toolbox toolbox = new ToolboxImpl(context);
4947
CollectResult collectResult = toolbox.collectAsProject(
50-
context.repositorySystemSession(),
51-
resolutionScope,
48+
Toolbox.ResolutionScope.valueOf(scope.toUpperCase(Locale.ENGLISH)),
5249
RepositoryUtils.toArtifact(mavenProject.getArtifact()),
5350
mavenProject.getDependencies().stream()
5451
.map(d -> RepositoryUtils.toDependency(d, artifactTypeRegistry))

‎shared/src/main/java/eu/maveniverse/maven/toolbox/shared/Toolbox.java

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import eu.maveniverse.maven.toolbox.shared.internal.ScopeDependencySelector;
44
import java.util.Arrays;
55
import java.util.List;
6-
import org.eclipse.aether.RepositorySystemSession;
76
import org.eclipse.aether.artifact.Artifact;
87
import org.eclipse.aether.collection.CollectResult;
98
import org.eclipse.aether.collection.DependencyCollectionException;
@@ -44,7 +43,6 @@ public ScopeDependencyFilter getScopeDependencyFilter() {
4443
* dependencies for given resolution scope.
4544
*/
4645
CollectResult collectAsProject(
47-
RepositorySystemSession repositorySystemSession,
4846
ResolutionScope resolutionScope,
4947
Artifact root,
5048
List<Dependency> dependencies,
@@ -57,7 +55,6 @@ CollectResult collectAsProject(
5755
* Collects given existing {@link Dependency} by reusing POM information for given resolution scope.
5856
*/
5957
CollectResult collectAsDependency(
60-
RepositorySystemSession repositorySystemSession,
6158
ResolutionScope resolutionScope,
6259
Dependency root,
6360
List<RemoteRepository> remoteRepositories,
@@ -67,9 +64,6 @@ CollectResult collectAsDependency(
6764
/**
6865
* Resolves given artifacts from given remote repositories.
6966
*/
70-
List<ArtifactResult> resolveArtifacts(
71-
RepositorySystemSession repositorySystemSession,
72-
List<Artifact> artifacts,
73-
List<RemoteRepository> remoteRepositories)
67+
List<ArtifactResult> resolveArtifacts(List<Artifact> artifacts, List<RemoteRepository> remoteRepositories)
7468
throws ArtifactResolutionException;
7569
}

‎shared/src/main/java/eu/maveniverse/maven/toolbox/shared/internal/ToolboxImpl.java

+10-19
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
import static java.util.Objects.requireNonNull;
44

5+
import eu.maveniverse.maven.mima.context.Context;
56
import eu.maveniverse.maven.toolbox.shared.Toolbox;
67
import java.util.ArrayList;
78
import java.util.List;
89
import org.eclipse.aether.DefaultRepositorySystemSession;
9-
import org.eclipse.aether.RepositorySystem;
10-
import org.eclipse.aether.RepositorySystemSession;
1110
import org.eclipse.aether.RequestTrace;
1211
import org.eclipse.aether.artifact.Artifact;
1312
import org.eclipse.aether.collection.CollectRequest;
@@ -29,26 +28,24 @@
2928

3029
public class ToolboxImpl implements Toolbox {
3130
private final Logger logger = LoggerFactory.getLogger(getClass());
32-
private final RepositorySystem repositorySystem;
31+
private final Context context;
3332

34-
public ToolboxImpl(RepositorySystem repositorySystem) {
35-
this.repositorySystem = requireNonNull(repositorySystem);
33+
public ToolboxImpl(Context context) {
34+
this.context = requireNonNull(context);
3635
}
3736

3837
@Override
3938
public CollectResult collectAsProject(
40-
RepositorySystemSession repositorySystemSession,
4139
ResolutionScope resolutionScope,
4240
Artifact root,
4341
List<Dependency> dependencies,
4442
List<Dependency> managedDependencies,
4543
List<RemoteRepository> remoteRepositories,
4644
boolean verbose)
4745
throws DependencyCollectionException {
48-
requireNonNull(repositorySystemSession);
4946
requireNonNull(resolutionScope);
5047

51-
DefaultRepositorySystemSession session = new DefaultRepositorySystemSession(repositorySystemSession);
48+
DefaultRepositorySystemSession session = new DefaultRepositorySystemSession(context.repositorySystemSession());
5249
if (verbose) {
5350
session.setConfigProperty(ConflictResolver.CONFIG_PROP_VERBOSE, ConflictResolver.Verbosity.FULL);
5451
session.setConfigProperty(DependencyManagerUtils.CONFIG_PROP_VERBOSE, true);
@@ -67,7 +64,7 @@ public CollectResult collectAsProject(
6764
collectRequest.setTrace(RequestTrace.newChild(null, collectRequest));
6865

6966
logger.debug("Collecting {}", collectRequest);
70-
CollectResult result = repositorySystem.collectDependencies(session, collectRequest);
67+
CollectResult result = context.repositorySystem().collectDependencies(session, collectRequest);
7168
if (resolutionScope.getScopeDependencyFilter() != null) {
7269
CloningDependencyVisitor cloning = new CloningDependencyVisitor();
7370
FilteringDependencyVisitor filter =
@@ -80,17 +77,15 @@ public CollectResult collectAsProject(
8077

8178
@Override
8279
public CollectResult collectAsDependency(
83-
RepositorySystemSession repositorySystemSession,
8480
ResolutionScope resolutionScope,
8581
Dependency root,
8682
List<RemoteRepository> remoteRepositories,
8783
boolean verbose)
8884
throws DependencyCollectionException {
89-
requireNonNull(repositorySystemSession);
9085
requireNonNull(resolutionScope);
9186
requireNonNull(root);
9287

93-
DefaultRepositorySystemSession session = new DefaultRepositorySystemSession(repositorySystemSession);
88+
DefaultRepositorySystemSession session = new DefaultRepositorySystemSession(context.repositorySystemSession());
9489
if (verbose) {
9590
session.setConfigProperty(ConflictResolver.CONFIG_PROP_VERBOSE, ConflictResolver.Verbosity.FULL);
9691
session.setConfigProperty(DependencyManagerUtils.CONFIG_PROP_VERBOSE, true);
@@ -107,7 +102,7 @@ public CollectResult collectAsDependency(
107102
collectRequest.setTrace(RequestTrace.newChild(null, collectRequest));
108103

109104
logger.debug("Collecting {}", collectRequest);
110-
CollectResult result = repositorySystem.collectDependencies(session, collectRequest);
105+
CollectResult result = context.repositorySystem().collectDependencies(session, collectRequest);
111106
if (resolutionScope.getScopeDependencyFilter() != null) {
112107
CloningDependencyVisitor cloning = new CloningDependencyVisitor();
113108
FilteringDependencyVisitor filter =
@@ -119,16 +114,12 @@ public CollectResult collectAsDependency(
119114
}
120115

121116
@Override
122-
public List<ArtifactResult> resolveArtifacts(
123-
RepositorySystemSession repositorySystemSession,
124-
List<Artifact> artifacts,
125-
List<RemoteRepository> remoteRepositories)
117+
public List<ArtifactResult> resolveArtifacts(List<Artifact> artifacts, List<RemoteRepository> remoteRepositories)
126118
throws ArtifactResolutionException {
127-
requireNonNull(repositorySystemSession);
128119
requireNonNull(artifacts);
129120

130121
List<ArtifactRequest> artifactRequests = new ArrayList<>();
131122
artifacts.forEach(a -> artifactRequests.add(new ArtifactRequest(a, remoteRepositories, null)));
132-
return repositorySystem.resolveArtifacts(repositorySystemSession, artifactRequests);
123+
return context.repositorySystem().resolveArtifacts(context.repositorySystemSession(), artifactRequests);
133124
}
134125
}

0 commit comments

Comments
 (0)