This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a commit to branch pre-MRESOLVER-92 in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/pre-MRESOLVER-92 by this push: new 94bc57d solved DefaultDependencyCollectionContext 94bc57d is described below commit 94bc57db5d5ff22e3a1ff2f4286543907678fb84 Author: tibordigana <tibordig...@apache.org> AuthorDate: Sun Aug 11 15:00:15 2019 +0200 solved DefaultDependencyCollectionContext --- .../DefaultDependencyCollectionContext.java | 178 +-------------------- 1 file changed, 3 insertions(+), 175 deletions(-) diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectionContext.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectionContext.java index 6ea858b..3bf4fe1 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectionContext.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectionContext.java @@ -22,22 +22,14 @@ package org.eclipse.aether.internal.impl.collect; import java.util.List; import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.RequestTrace; import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.collection.CollectResult; import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.DependencyManager; -import org.eclipse.aether.collection.DependencySelector; -import org.eclipse.aether.collection.DependencyTraverser; -import org.eclipse.aether.collection.VersionFilter; import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.version.Version; /** * @see DefaultDependencyCollector */ -class DefaultDependencyCollectionContext +final class DefaultDependencyCollectionContext implements DependencyCollectionContext { @@ -48,31 +40,9 @@ class DefaultDependencyCollectionContext private Dependency dependency; private List<Dependency> managedDependencies; - private CollectResult collectResult; - - private RequestTrace trace; - - private Args args; - - private Results results; - - private List<Dependency> dependencies; - - private List<RemoteRepository> repositories; - - private DependencySelector depSelector; - - private DependencyManager depManager; - - private DependencyTraverser depTraverser; - - private VersionFilter verFilter; - - private Version version; - DefaultDependencyCollectionContext( RepositorySystemSession session, Artifact artifact, - Dependency dependency, List<Dependency> managedDependencies ) + Dependency dependency, List<Dependency> managedDependencies ) { this.session = session; this.artifact = ( dependency != null ) ? dependency.getArtifact() : artifact; @@ -80,34 +50,6 @@ class DefaultDependencyCollectionContext this.managedDependencies = managedDependencies; } - public void prepareDescent() - { - DependencySelector dependencySelector = session.getDependencySelector(); - DependencyManager dependencyManager = session.getDependencyManager(); - VersionFilter versionFilter = session.getVersionFilter(); - setDepSelector( dependencySelector != null ? dependencySelector.deriveChildSelector( this ) : null ); - setDepManager( dependencyManager != null ? dependencyManager.deriveChildManager( this ) : null ); - setDepTraverser( depTraverser != null ? depTraverser.deriveChildTraverser( this ) : null ); - setVerFilter( versionFilter != null ? versionFilter.deriveChildFilter( this ) : null ); - - } - - public DefaultDependencyCollectionContext createChildContext() - { - DefaultDependencyCollectionContext childContext = - new DefaultDependencyCollectionContext( getSession(), getArtifact(), - getDependency(), getManagedDependencies() ); - childContext.depSelector = - getDepSelector() != null ? getDepSelector().deriveChildSelector( this ) : null; - childContext.depManager = - getDepManager() != null ? getDepManager().deriveChildManager( this ) : null; - childContext.depTraverser = - getDepTraverser() != null ? getDepTraverser().deriveChildTraverser( this ) : null; - childContext.verFilter = - getVerFilter() != null ? getVerFilter().deriveChildFilter( this ) : null; - return childContext; - } - public RepositorySystemSession getSession() { return session; @@ -128,127 +70,13 @@ class DefaultDependencyCollectionContext return managedDependencies; } - public CollectResult getCollectResult() - { - return collectResult; - } - - public void setCollectResult( CollectResult collectResult ) - { - this.collectResult = collectResult; - } - - public Args getArgs() - { - return args; - } - - public void setArgs( Args args ) - { - this.args = args; - } - - public Results getResults() - { - return results; - } - - public void setResults( Results results ) - { - this.results = results; - } - - public List<Dependency> getDependencies() - { - return dependencies; - } - - public void setDependencies( List<Dependency> dependencies ) - { - this.dependencies = dependencies; - } - - public List<RemoteRepository> getRepositories() - { - return repositories; - } - - public void setRepositories( List<RemoteRepository> repositories ) - { - this.repositories = repositories; - } - - public DependencySelector getDepSelector() - { - return depSelector; - } - - public void setDepSelector( DependencySelector depSelector ) - { - this.depSelector = depSelector; - } - - public DependencyManager getDepManager() - { - return depManager; - } - - public void setDepManager( DependencyManager depManager ) - { - this.depManager = depManager; - } - - public DependencyTraverser getDepTraverser() - { - return depTraverser; - } - - public void setDepTraverser( DependencyTraverser depTraverser ) - { - this.depTraverser = depTraverser; - } - - public VersionFilter getVerFilter() - { - return verFilter; - } - - public void setVerFilter( VersionFilter verFilter ) - { - this.verFilter = verFilter; - } - - public void setDependency( Dependency dependency ) + public void set( Dependency dependency, List<Dependency> managedDependencies ) { artifact = dependency.getArtifact(); this.dependency = dependency; - } - - public void setManagedDependencies( List<Dependency> managedDependencies ) - { this.managedDependencies = managedDependencies; } - public RequestTrace getTrace() - { - return trace; - } - - public void setTrace( RequestTrace trace ) - { - this.trace = trace; - } - - public Version getVersion() - { - return version; - } - - public void setVersion( Version version ) - { - this.version = version; - } - @Override public String toString() {