[MNG-6190] maven-resolver-provider's DefaultArtifactDescriptorReader has mismatched constructor and initService methods

This commit is contained in:
Christian Schulte 2017-03-21 04:06:02 +01:00
parent 13adc1bc2b
commit 27ab7503a7
1 changed files with 5 additions and 4 deletions

View File

@ -111,8 +111,9 @@ public DefaultArtifactDescriptorReader()
@Inject @Inject
DefaultArtifactDescriptorReader( RemoteRepositoryManager remoteRepositoryManager, VersionResolver versionResolver, DefaultArtifactDescriptorReader( RemoteRepositoryManager remoteRepositoryManager, VersionResolver versionResolver,
ArtifactResolver artifactResolver, ModelBuilder modelBuilder, VersionRangeResolver versionRangeResolver, ArtifactResolver artifactResolver,
RepositoryEventDispatcher repositoryEventDispatcher, LoggerFactory loggerFactory ) ModelBuilder modelBuilder, RepositoryEventDispatcher repositoryEventDispatcher,
LoggerFactory loggerFactory )
{ {
setRemoteRepositoryManager( remoteRepositoryManager ); setRemoteRepositoryManager( remoteRepositoryManager );
setVersionResolver( versionResolver ); setVersionResolver( versionResolver );
@ -124,17 +125,17 @@ public DefaultArtifactDescriptorReader()
public void initService( ServiceLocator locator ) public void initService( ServiceLocator locator )
{ {
setLoggerFactory( locator.getService( LoggerFactory.class ) );
setRemoteRepositoryManager( locator.getService( RemoteRepositoryManager.class ) ); setRemoteRepositoryManager( locator.getService( RemoteRepositoryManager.class ) );
setVersionResolver( locator.getService( VersionResolver.class ) ); setVersionResolver( locator.getService( VersionResolver.class ) );
setVersionRangeResolver( locator.getService( VersionRangeResolver.class ) ); setVersionRangeResolver( locator.getService( VersionRangeResolver.class ) );
setArtifactResolver( locator.getService( ArtifactResolver.class ) ); setArtifactResolver( locator.getService( ArtifactResolver.class ) );
setRepositoryEventDispatcher( locator.getService( RepositoryEventDispatcher.class ) );
modelBuilder = locator.getService( ModelBuilder.class ); modelBuilder = locator.getService( ModelBuilder.class );
if ( modelBuilder == null ) if ( modelBuilder == null )
{ {
setModelBuilder( new DefaultModelBuilderFactory().newInstance() ); setModelBuilder( new DefaultModelBuilderFactory().newInstance() );
} }
setRepositoryEventDispatcher( locator.getService( RepositoryEventDispatcher.class ) );
setLoggerFactory( locator.getService( LoggerFactory.class ) );
} }
public DefaultArtifactDescriptorReader setLoggerFactory( LoggerFactory loggerFactory ) public DefaultArtifactDescriptorReader setLoggerFactory( LoggerFactory loggerFactory )