Skip to content

Commit

Permalink
Tidy up more
Browse files Browse the repository at this point in the history
  • Loading branch information
@cstamas
cstamas committed Mar 15, 2024
1 parent d7d4c63 commit 65e64f7
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 37 deletions.
16 changes: 5 additions & 11 deletions ...src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,12 @@

import org.apache.maven.api.services.TypeRegistry;
import org.apache.maven.api.xml.XmlNode;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.eventspy.internal.EventSpyDispatcher;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.internal.xml.XmlNodeImpl;
import org.apache.maven.internal.xml.XmlPlexusConfiguration;
import org.apache.maven.model.ModelBase;
import org.apache.maven.repository.internal.MavenSessionBuilderSupplier;
import org.apache.maven.repository.internal.scopes.MavenSystemScopeHandler;
import org.apache.maven.resolver.RepositorySystemSessionFactory;
import org.apache.maven.rtinfo.RuntimeInformation;
import org.apache.maven.settings.Mirror;
Expand All @@ -61,7 +59,6 @@
import org.eclipse.aether.collection.VersionFilter;
import org.eclipse.aether.repository.RepositoryPolicy;
import org.eclipse.aether.resolution.ResolutionErrorPolicy;
import org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
import org.eclipse.aether.util.graph.version.*;
import org.eclipse.aether.util.listener.ChainedRepositoryListener;
import org.eclipse.aether.util.repository.AuthenticationBuilder;
Expand Down Expand Up @@ -169,8 +166,6 @@ class DefaultRepositorySystemSessionFactory implements RepositorySystemSessionFa

private final Logger logger = LoggerFactory.getLogger(getClass());

private final ArtifactHandlerManager artifactHandlerManager;

private final RepositorySystem repoSystem;

private final SettingsDecrypter settingsDecrypter;
Expand All @@ -190,7 +185,6 @@ class DefaultRepositorySystemSessionFactory implements RepositorySystemSessionFa
@SuppressWarnings("checkstyle:ParameterNumber")
@Inject
DefaultRepositorySystemSessionFactory(
ArtifactHandlerManager artifactHandlerManager,
RepositorySystem repoSystem,
SettingsDecrypter settingsDecrypter,
EventSpyDispatcher eventSpyDispatcher,
Expand All @@ -199,7 +193,6 @@ class DefaultRepositorySystemSessionFactory implements RepositorySystemSessionFa
VersionScheme versionScheme,
Map<String, MavenExecutionRequestExtender> requestExtenders,
Map<String, RepositorySystemSessionExtender> sessionExtenders) {
this.artifactHandlerManager = artifactHandlerManager;
this.repoSystem = repoSystem;
this.settingsDecrypter = settingsDecrypter;
this.eventSpyDispatcher = eventSpyDispatcher;
Expand All @@ -224,7 +217,8 @@ public SessionBuilder newRepositorySessionBuilder(MavenExecutionRequest request)
requestExtender.extend(request);
}

SessionBuilder sessionBuilder = new MavenSessionBuilderSupplier(repoSystem).get();
MavenSessionBuilderSupplier supplier = new MavenSessionBuilderSupplier(repoSystem);
SessionBuilder sessionBuilder = supplier.get();
sessionBuilder.setArtifactTypeRegistry(new TypeRegistryAdapter(typeRegistry)); // dynamic
sessionBuilder.setCache(request.getRepositoryCache());

Expand Down Expand Up @@ -434,8 +428,8 @@ public SessionBuilder newRepositorySessionBuilder(MavenExecutionRequest request)
// may be overridden
String resolverDependencyManagerTransitivity =
mergedProps.getOrDefault(MAVEN_RESOLVER_DEPENDENCY_MANAGER_TRANSITIVITY_KEY, Boolean.TRUE.toString());
sessionBuilder.setDependencyManager(new ClassicDependencyManager(
Boolean.parseBoolean(resolverDependencyManagerTransitivity), new MavenSystemScopeHandler()));
sessionBuilder.setDependencyManager(
supplier.getDependencyManager(Boolean.parseBoolean(resolverDependencyManagerTransitivity)));

ArrayList<Path> paths = new ArrayList<>();
paths.add(Paths.get(request.getLocalRepository().getBasedir()));
Expand Down Expand Up @@ -470,7 +464,7 @@ private VersionFilter buildVersionFilter(String filterExpression) {
if (filterExpression != null) {
List<String> expressions = Arrays.stream(filterExpression.split(";"))
.filter(s -> s != null && !s.trim().isEmpty())
.collect(Collectors.toList());
.toList();
for (String expression : expressions) {
if ("h".equals(expression)) {
filters.add(new HighestVersionFilter());
Expand Down
14 changes: 0 additions & 14 deletions ...test/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactoryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import java.util.Properties;

import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.bridge.MavenRepositorySystem;
import org.apache.maven.eventspy.internal.EventSpyDispatcher;
Expand Down Expand Up @@ -68,9 +67,6 @@ public class DefaultRepositorySystemSessionFactoryTest {
@Inject
protected org.eclipse.aether.RepositorySystem aetherRepositorySystem;

@Inject
protected ArtifactHandlerManager artifactHandlerManager;

@Inject
protected RuntimeInformation information;

Expand All @@ -83,7 +79,6 @@ public class DefaultRepositorySystemSessionFactoryTest {
@Test
void isNoSnapshotUpdatesTest() throws InvalidRepositoryException {
DefaultRepositorySystemSessionFactory systemSessionFactory = new DefaultRepositorySystemSessionFactory(
artifactHandlerManager,
aetherRepositorySystem,
settingsDecrypter,
eventSpyDispatcher,
Expand All @@ -108,7 +103,6 @@ void isNoSnapshotUpdatesTest() throws InvalidRepositoryException {
@Test
void isSnapshotUpdatesTest() throws InvalidRepositoryException {
DefaultRepositorySystemSessionFactory systemSessionFactory = new DefaultRepositorySystemSessionFactory(
artifactHandlerManager,
aetherRepositorySystem,
settingsDecrypter,
eventSpyDispatcher,
Expand Down Expand Up @@ -145,7 +139,6 @@ void wagonProviderConfigurationTest() throws InvalidRepositoryException {
request.setServers(servers);

DefaultRepositorySystemSessionFactory systemSessionFactory = new DefaultRepositorySystemSessionFactory(
artifactHandlerManager,
aetherRepositorySystem,
settingsDecrypter,
eventSpyDispatcher,
Expand Down Expand Up @@ -190,7 +183,6 @@ void httpConfigurationWithHttpHeadersTest() throws InvalidRepositoryException {
request.setServers(servers);

DefaultRepositorySystemSessionFactory systemSessionFactory = new DefaultRepositorySystemSessionFactory(
artifactHandlerManager,
aetherRepositorySystem,
settingsDecrypter,
eventSpyDispatcher,
Expand Down Expand Up @@ -229,7 +221,6 @@ void connectTimeoutConfigurationTest() throws InvalidRepositoryException {
request.setServers(servers);

DefaultRepositorySystemSessionFactory systemSessionFactory = new DefaultRepositorySystemSessionFactory(
artifactHandlerManager,
aetherRepositorySystem,
settingsDecrypter,
eventSpyDispatcher,
Expand Down Expand Up @@ -272,7 +263,6 @@ void connectionTimeoutFromHttpConfigurationTest() throws InvalidRepositoryExcept
request.setServers(servers);

DefaultRepositorySystemSessionFactory systemSessionFactory = new DefaultRepositorySystemSessionFactory(
artifactHandlerManager,
aetherRepositorySystem,
settingsDecrypter,
eventSpyDispatcher,
Expand Down Expand Up @@ -309,7 +299,6 @@ void requestTimeoutConfigurationTest() throws InvalidRepositoryException {
request.setServers(servers);

DefaultRepositorySystemSessionFactory systemSessionFactory = new DefaultRepositorySystemSessionFactory(
artifactHandlerManager,
aetherRepositorySystem,
settingsDecrypter,
eventSpyDispatcher,
Expand Down Expand Up @@ -352,7 +341,6 @@ void readTimeoutFromHttpConfigurationTest() throws InvalidRepositoryException {
request.setServers(servers);

DefaultRepositorySystemSessionFactory systemSessionFactory = new DefaultRepositorySystemSessionFactory(
artifactHandlerManager,
aetherRepositorySystem,
settingsDecrypter,
eventSpyDispatcher,
Expand All @@ -372,7 +360,6 @@ void readTimeoutFromHttpConfigurationTest() throws InvalidRepositoryException {
@Test
void transportConfigurationTest() throws InvalidRepositoryException {
DefaultRepositorySystemSessionFactory systemSessionFactory = new DefaultRepositorySystemSessionFactory(
artifactHandlerManager,
aetherRepositorySystem,
settingsDecrypter,
eventSpyDispatcher,
Expand Down Expand Up @@ -420,7 +407,6 @@ void transportConfigurationTest() throws InvalidRepositoryException {
@Test
void versionFilteringTest() throws InvalidRepositoryException {
DefaultRepositorySystemSessionFactory systemSessionFactory = new DefaultRepositorySystemSessionFactory(
artifactHandlerManager,
aetherRepositorySystem,
settingsDecrypter,
eventSpyDispatcher,
Expand Down
28 changes: 16 additions & 12 deletions ...vider/src/main/java/org/apache/maven/repository/internal/MavenSessionBuilderSupplier.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ public class MavenSessionBuilderSupplier implements Supplier<SessionBuilder> {

public MavenSessionBuilderSupplier(RepositorySystem repositorySystem) {
this.repositorySystem = requireNonNull(repositorySystem);
this.scopeManager = getScopeManager();
this.systemScopeHandler = getSystemScopeHandler();
this.scopeManager = new ScopeManagerImpl(Maven4ScopeManagerConfiguration.INSTANCE);
this.systemScopeHandler = new MavenSystemScopeHandler();
}

/**
Expand All @@ -81,24 +81,28 @@ public MavenSessionBuilderSupplier(RepositorySystem repositorySystem) {
@Deprecated
MavenSessionBuilderSupplier() {
this.repositorySystem = null;
this.scopeManager = getScopeManager();
this.systemScopeHandler = getSystemScopeHandler();
this.scopeManager = new ScopeManagerImpl(Maven4ScopeManagerConfiguration.INSTANCE);
this.systemScopeHandler = new MavenSystemScopeHandler();
}

protected InternalScopeManager getScopeManager() {
return new ScopeManagerImpl(Maven4ScopeManagerConfiguration.INSTANCE);
return scopeManager;
}

protected SystemScopeHandler getSystemScopeHandler() {
return new MavenSystemScopeHandler();
return systemScopeHandler;
}

protected DependencyTraverser getDependencyTraverser() {
return new FatArtifactTraverser();
}

protected DependencyManager getDependencyManager() {
return new ClassicDependencyManager(true, systemScopeHandler); // same default as in Maven4
return getDependencyManager(true); // same default as in Maven4
}

public DependencyManager getDependencyManager(boolean transitive) {
return new ClassicDependencyManager(transitive, getSystemScopeHandler());
}

protected DependencySelector getDependencySelector() {
Expand All @@ -112,9 +116,9 @@ protected DependencySelector getDependencySelector() {
protected DependencyGraphTransformer getDependencyGraphTransformer() {
return new ChainedDependencyGraphTransformer(
new ConflictResolver(
new NearestVersionSelector(), new ManagedScopeSelector(scopeManager),
new SimpleOptionalitySelector(), new ManagedScopeDeriver(scopeManager)),
new ManagedDependencyContextRefiner(scopeManager));
new NearestVersionSelector(), new ManagedScopeSelector(getScopeManager()),
new SimpleOptionalitySelector(), new ManagedScopeDeriver(getScopeManager())),
new ManagedDependencyContextRefiner(getScopeManager()));
}

/**
Expand Down Expand Up @@ -143,8 +147,8 @@ protected void configureSessionBuilder(SessionBuilder session) {
session.setDependencyGraphTransformer(getDependencyGraphTransformer());
session.setArtifactTypeRegistry(getArtifactTypeRegistry());
session.setArtifactDescriptorPolicy(getArtifactDescriptorPolicy());
session.setSystemScopeHandler(systemScopeHandler);
session.setScopeManager(scopeManager);
session.setSystemScopeHandler(getSystemScopeHandler());
session.setScopeManager(getScopeManager());
}

/**
Expand Down

0 comments on commit 65e64f7

Please sign in to comment.