Skip to content

[MRESOLVER-248] Make DF and BF collector implementations coexist #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cstamas merged 10 commits into from
Apr 8, 2022
Merged

[MRESOLVER-248] Make DF and BF collector implementations coexist #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d486dea
[MRESOLVER-248] Make BF and DF collectors coexists
cstamas Apr 4, 2022
9572e88
Resurrect replaced DF as well
cstamas Apr 4, 2022
d8e3512
Collapse DependencyCycle implementation into one
cstamas Apr 4, 2022
79e1734
Collapse skipper
cstamas Apr 4, 2022
9ef46cf
Pull out common config and shared bits.
cstamas Apr 4, 2022
50f7453
PR comments and more
cstamas Apr 5, 2022
4dcd9f6
Add configuration entries
cstamas Apr 8, 2022
49efbbe
Add a hint
cstamas Apr 8, 2022
c434e79
PR comments
cstamas Apr 8, 2022
362c33f
Rename param
cstamas Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 0 additions & 59 deletions maven-resolver-impl/src/main/java/org/eclipse/aether/impl/DependencyResolutionSkipper.java
View file
Open in desktop

This file was deleted.

22 changes: 22 additions & 0 deletions maven-resolver-impl/src/main/java/org/eclipse/aether/impl/guice/AetherModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@
import org.eclipse.aether.internal.impl.checksum.Sha256ChecksumAlgorithmFactory;
import org.eclipse.aether.internal.impl.checksum.Sha512ChecksumAlgorithmFactory;
import org.eclipse.aether.internal.impl.checksum.DefaultChecksumAlgorithmFactorySelector;
import org.eclipse.aether.internal.impl.collect.DependencyCollectorDelegate;
import org.eclipse.aether.internal.impl.collect.bf.BfDependencyCollector;
import org.eclipse.aether.internal.impl.collect.df.DfDependencyCollector;
import org.eclipse.aether.internal.impl.synccontext.DefaultSyncContextFactory;
import org.eclipse.aether.internal.impl.synccontext.named.NamedLockFactorySelector;
import org.eclipse.aether.internal.impl.synccontext.named.SimpleNamedLockFactorySelector;
Expand Down Expand Up @@ -132,8 +135,14 @@ protected void configure()
.to( DefaultRepositorySystem.class ).in( Singleton.class );
bind( ArtifactResolver.class ) //
.to( DefaultArtifactResolver.class ).in( Singleton.class );

bind( DependencyCollector.class ) //
.to( DefaultDependencyCollector.class ).in( Singleton.class );
bind( DependencyCollectorDelegate.class ).annotatedWith( Names.named( BfDependencyCollector.NAME ) )
Comment thread
michael-o marked this conversation as resolved.
.to( BfDependencyCollector.class ).in( Singleton.class );
bind( DependencyCollectorDelegate.class ).annotatedWith( Names.named( DfDependencyCollector.NAME ) )
.to( DfDependencyCollector.class ).in( Singleton.class );

bind( Deployer.class ) //
.to( DefaultDeployer.class ).in( Singleton.class );
bind( Installer.class ) //
Expand Down Expand Up @@ -212,6 +221,19 @@ protected void configure()

}

@Provides
@Singleton
Map<String, DependencyCollectorDelegate> dependencyCollectorDelegates(
@Named( BfDependencyCollector.NAME ) DependencyCollectorDelegate bf,
@Named( DfDependencyCollector.NAME ) DependencyCollectorDelegate df
)
{
Map<String, DependencyCollectorDelegate> dependencyCollectorDelegates = new HashMap<>();
dependencyCollectorDelegates.put( BfDependencyCollector.NAME, bf );
dependencyCollectorDelegates.put( DfDependencyCollector.NAME, df );
return dependencyCollectorDelegates;
}

@Provides
@Singleton
Map<String, ProvidedChecksumsSource> provideChecksumSources(
Expand Down
5 changes: 3 additions & 2 deletions ...l/src/main/java/org/eclipse/aether/internal/impl/collect/CachingArtifactTypeRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@
import org.eclipse.aether.artifact.ArtifactTypeRegistry;

/**
* A short-lived artifact type registry that caches results from a presumedly slower type registry.
* A short-lived artifact type registry that caches results from a presumably slower type registry.
* Internal helper class for collector implementations.
*/
class CachingArtifactTypeRegistry
public class CachingArtifactTypeRegistry
Comment thread
cstamas marked this conversation as resolved.
implements ArtifactTypeRegistry
{

Expand Down
23 changes: 12 additions & 11 deletions maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DataPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@
import org.eclipse.aether.version.VersionConstraint;

/**
* Internal helper class for collector implementations.
*/
final class DataPool
public final class DataPool
Comment thread
cstamas marked this conversation as resolved.
{

private static final String ARTIFACT_POOL = DataPool.class.getName() + "$Artifact";
Expand All @@ -58,7 +59,7 @@ final class DataPool

private static final String DESCRIPTORS = DataPool.class.getName() + "$Descriptors";

static final ArtifactDescriptorResult NO_DESCRIPTOR =
public static final ArtifactDescriptorResult NO_DESCRIPTOR =
new ArtifactDescriptorResult( new ArtifactDescriptorRequest() );

private ObjectPool<Artifact> artifacts;
Expand All @@ -72,7 +73,7 @@ final class DataPool
private final Map<Object, List<DependencyNode>> nodes = new HashMap<>( 256 );

@SuppressWarnings( "unchecked" )
DataPool( RepositorySystemSession session )
public DataPool( RepositorySystemSession session )
{
RepositoryCache cache = session.getCache();

Expand Down Expand Up @@ -103,7 +104,7 @@ final class DataPool

if ( descriptors == null )
{
descriptors = Collections.synchronizedMap( new WeakHashMap<Object, Descriptor>( 256 ) );
descriptors = Collections.synchronizedMap( new WeakHashMap<>( 256 ) );
if ( cache != null )
{
cache.put( session, DESCRIPTORS, descriptors );
Expand All @@ -121,12 +122,12 @@ public Dependency intern( Dependency dependency )
return dependencies.intern( dependency );
}

Object toKey( ArtifactDescriptorRequest request )
public Object toKey( ArtifactDescriptorRequest request )
{
return request.getArtifact();
}

ArtifactDescriptorResult getDescriptor( Object key, ArtifactDescriptorRequest request )
public ArtifactDescriptorResult getDescriptor( Object key, ArtifactDescriptorRequest request )
{
Descriptor descriptor = descriptors.get( key );
if ( descriptor != null )
Expand All @@ -136,22 +137,22 @@ ArtifactDescriptorResult getDescriptor( Object key, ArtifactDescriptorRequest re
return null;
}

void putDescriptor( Object key, ArtifactDescriptorResult result )
public void putDescriptor( Object key, ArtifactDescriptorResult result )
{
descriptors.put( key, new GoodDescriptor( result ) );
}

void putDescriptor( Object key, ArtifactDescriptorException e )
public void putDescriptor( Object key, ArtifactDescriptorException e )
{
descriptors.put( key, BadDescriptor.INSTANCE );
}

Object toKey( VersionRangeRequest request )
public Object toKey( VersionRangeRequest request )
{
return new ConstraintKey( request );
}

VersionRangeResult getConstraint( Object key, VersionRangeRequest request )
public VersionRangeResult getConstraint( Object key, VersionRangeRequest request )
{
Constraint constraint = constraints.get( key );
if ( constraint != null )
Expand All @@ -161,7 +162,7 @@ VersionRangeResult getConstraint( Object key, VersionRangeRequest request )
return null;
}

void putConstraint( Object key, VersionRangeResult result )
public void putConstraint( Object key, VersionRangeResult result )
{
constraints.put( key, new Constraint( result ) );
}
Expand Down
6 changes: 3 additions & 3 deletions ...ain/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectionContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
import org.eclipse.aether.graph.Dependency;

/**
* @see DefaultDependencyCollector
* Internal helper class for collector implementations.
*/
final class DefaultDependencyCollectionContext
public final class DefaultDependencyCollectionContext
Comment thread
cstamas marked this conversation as resolved.
implements DependencyCollectionContext
{

Expand All @@ -41,7 +41,7 @@ final class DefaultDependencyCollectionContext

private List<Dependency> managedDependencies;

DefaultDependencyCollectionContext( RepositorySystemSession session, Artifact artifact,
public DefaultDependencyCollectionContext( RepositorySystemSession session, Artifact artifact,
Dependency dependency, List<Dependency> managedDependencies )
{
this.session = session;
Expand Down
Loading