From: Martin Stockhammer Date: Sat, 7 Apr 2018 17:59:13 +0000 (+0200) Subject: Migrating usage of repositoryAdmin to repositoryRegistry X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ae49e500672f5115ad0af4fbdd39b44af6552085;p=archiva.git Migrating usage of repositoryAdmin to repositoryRegistry --- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java index c065a2f81..e1d91563a 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java @@ -19,7 +19,6 @@ package org.apache.archiva.consumers.core.repository; * under the License. */ -import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.ConfigurationNames; import org.apache.archiva.configuration.FileTypes; @@ -73,9 +72,6 @@ public class RepositoryPurgeConsumer @Named( value = "archivaConfiguration#default" ) private ArchivaConfiguration configuration; - @Inject - private ManagedRepositoryAdmin managedRepositoryAdmin; - @Inject private RepositoryRegistry repositoryRegistry; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java index d8c482d1b..0c16c5804 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java @@ -19,7 +19,6 @@ package org.apache.archiva.consumers.lucene; * under the License. */ -import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; import org.apache.archiva.common.utils.PathUtil; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.ConfigurationNames; @@ -32,11 +31,9 @@ import org.apache.archiva.redback.components.registry.Registry; import org.apache.archiva.redback.components.registry.RegistryListener; import org.apache.archiva.redback.components.taskqueue.TaskQueueException; import org.apache.archiva.repository.ManagedRepository; -import org.apache.archiva.repository.RepositoryRegistry; import org.apache.archiva.repository.RepositoryType; import org.apache.archiva.scheduler.ArchivaTaskScheduler; import org.apache.archiva.scheduler.indexing.ArtifactIndexingTask; -import org.apache.maven.index.context.IndexCreator; import org.apache.maven.index.context.IndexingContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -63,8 +60,6 @@ public class NexusIndexerConsumer implements KnownRepositoryContentConsumer, RegistryListener { - @Inject - private RepositoryRegistry repositoryRegistry; private Logger log = LoggerFactory.getLogger( getClass() ); @@ -82,21 +77,14 @@ public class NexusIndexerConsumer private ManagedRepository repository; - private List allIndexCreators; - - private ManagedRepositoryAdmin managedRepositoryAdmin; - @Inject public NexusIndexerConsumer( @Named( value = "archivaTaskScheduler#indexing" ) ArchivaTaskScheduler scheduler, - @Named( value = "archivaConfiguration" ) ArchivaConfiguration configuration, FileTypes filetypes, - List indexCreators, ManagedRepositoryAdmin managedRepositoryAdmin) + @Named( value = "archivaConfiguration" ) ArchivaConfiguration configuration, FileTypes filetypes) { this.configuration = configuration; this.filetypes = filetypes; this.scheduler = scheduler; - this.allIndexCreators = indexCreators; - this.managedRepositoryAdmin = managedRepositoryAdmin; } @Override diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java index d0fcada2f..e52baa30d 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java @@ -20,7 +20,6 @@ package org.apache.archiva.consumers.lucene; */ import junit.framework.TestCase; -import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; import org.apache.archiva.common.utils.PathUtil; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.FileTypes; @@ -31,7 +30,6 @@ import org.apache.archiva.repository.RepositoryRegistry; import org.apache.archiva.scheduler.ArchivaTaskScheduler; import org.apache.archiva.scheduler.indexing.ArtifactIndexingTask; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; -import org.apache.maven.index.context.IndexCreator; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -45,11 +43,7 @@ import java.net.URI; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Calendar; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.util.*; /** * NexusIndexerConsumerTest @@ -99,12 +93,6 @@ public class NexusIndexerConsumerTest @Inject private ApplicationContext applicationContext; - @Inject - private List indexCreators; - - @Inject - private ManagedRepositoryAdmin managedRepositoryAdmin; - @Inject RepositoryRegistry repositoryRegistry; @@ -123,8 +111,7 @@ public class NexusIndexerConsumerTest FileTypes filetypes = applicationContext.getBean( FileTypes.class ); nexusIndexerConsumer = - new NexusIndexerConsumer( scheduler, configuration, filetypes, indexCreators, - managedRepositoryAdmin); + new NexusIndexerConsumer( scheduler, configuration, filetypes); // initialize to set the file types to be processed nexusIndexerConsumer.initialize(); diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java index e0317dee1..7981b4658 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java @@ -103,9 +103,6 @@ public abstract class AbstractRestService @Inject protected ProxyConnectorAdmin proxyConnectorAdmin; - @Inject - protected ManagedRepositoryAdmin managedRepositoryAdmin; - @Inject protected RepositoryRegistry repositoryRegistry; diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java index 34800ff4f..9bbc81659 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java @@ -18,7 +18,6 @@ package org.apache.archiva.rest.services; * under the License. */ -import org.apache.archiva.admin.model.RepositoryAdminException; import org.apache.archiva.admin.model.beans.ManagedRepository; import org.apache.archiva.common.utils.VersionComparator; import org.apache.archiva.common.utils.VersionUtil; @@ -31,11 +30,7 @@ import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.metadata.model.MetadataFacet; import org.apache.archiva.metadata.model.ProjectVersionMetadata; import org.apache.archiva.metadata.model.ProjectVersionReference; -import org.apache.archiva.metadata.repository.MetadataRepository; -import org.apache.archiva.metadata.repository.MetadataRepositoryException; -import org.apache.archiva.metadata.repository.MetadataResolutionException; -import org.apache.archiva.metadata.repository.MetadataResolver; -import org.apache.archiva.metadata.repository.RepositorySession; +import org.apache.archiva.metadata.repository.*; import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMetadataVersionComparator; import org.apache.archiva.metadata.repository.storage.maven2.MavenProjectFacet; import org.apache.archiva.model.ArchivaArtifact; @@ -43,16 +38,11 @@ import org.apache.archiva.model.ArchivaRepositoryMetadata; import org.apache.archiva.proxy.model.RepositoryProxyConnectors; import org.apache.archiva.redback.components.cache.Cache; import org.apache.archiva.repository.ManagedRepositoryContent; +import org.apache.archiva.repository.ReleaseScheme; import org.apache.archiva.repository.RepositoryException; import org.apache.archiva.repository.RepositoryNotFoundException; import org.apache.archiva.repository.metadata.MetadataTools; -import org.apache.archiva.rest.api.model.ArtifactContent; -import org.apache.archiva.rest.api.model.ArtifactContentEntry; -import org.apache.archiva.rest.api.model.BrowseResult; -import org.apache.archiva.rest.api.model.BrowseResultEntry; -import org.apache.archiva.rest.api.model.Entry; -import org.apache.archiva.rest.api.model.MetadataAddRequest; -import org.apache.archiva.rest.api.model.VersionsList; +import org.apache.archiva.rest.api.model.*; import org.apache.archiva.rest.api.services.ArchivaRestServiceException; import org.apache.archiva.rest.api.services.BrowseService; import org.apache.archiva.rest.services.utils.ArtifactContentEntryComparator; @@ -71,15 +61,7 @@ import java.io.InputStream; import java.nio.charset.Charset; import java.nio.file.Files; import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.zip.ZipEntry; @@ -847,10 +829,10 @@ public class DefaultBrowseService for ( String repoId : selectedRepos ) { - ManagedRepository managedRepository = managedRepositoryAdmin.getManagedRepository( repoId ); + org.apache.archiva.repository.ManagedRepository managedRepo = repositoryRegistry.getManagedRepository(repoId); - if ( ( snapshot && !managedRepository.isSnapshots() ) || ( !snapshot - && managedRepository.isSnapshots() ) ) + if ( ( snapshot && !managedRepo.getActiveReleaseSchemes().contains(ReleaseScheme.SNAPSHOT) ) || ( !snapshot + && managedRepo.getActiveReleaseSchemes().contains(ReleaseScheme.SNAPSHOT) ) ) { continue; } @@ -914,14 +896,7 @@ public class DefaultBrowseService return true; } } - } - catch ( RepositoryAdminException e ) - { - log.error( e.getMessage(), e ); - throw new ArchivaRestServiceException( e.getMessage(), - Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), e ); - } - catch ( RepositoryException e ) + } catch ( RepositoryException e ) { log.error( e.getMessage(), e ); throw new ArchivaRestServiceException( e.getMessage(), diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java index 2f4058e03..0f66207be 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java @@ -21,6 +21,7 @@ package org.apache.archiva.rest.services; import org.apache.archiva.admin.model.RepositoryAdminException; import org.apache.archiva.admin.model.RepositoryCommonValidator; import org.apache.archiva.admin.model.beans.ManagedRepository; +import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.MetadataRepositoryException; import org.apache.archiva.metadata.repository.RepositorySession; @@ -58,6 +59,9 @@ public class DefaultManagedRepositoriesService @Inject private RepositoryStatisticsManager repositoryStatisticsManager; + @Inject + private ManagedRepositoryAdmin managedRepositoryAdmin; + @Override public List getManagedRepositories() throws ArchivaRestServiceException diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java index 0ad703ed9..256d73a11 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java @@ -29,6 +29,7 @@ import org.apache.archiva.metadata.repository.MetadataRepositoryException; import org.apache.archiva.metadata.repository.RepositorySession; import org.apache.archiva.metadata.repository.filter.Filter; import org.apache.archiva.metadata.repository.filter.IncludesFilter; +import org.apache.archiva.repository.ReleaseScheme; import org.apache.archiva.rest.api.services.ArchivaRestServiceException; import org.apache.archiva.rest.api.services.MergeRepositoriesService; import org.apache.archiva.stagerepository.merge.Maven2RepositoryMerger; @@ -111,11 +112,11 @@ public class DefaultMergeRepositoriesService try { - ManagedRepository repository = managedRepositoryAdmin.getManagedRepository( targetRepositoryId ); + org.apache.archiva.repository.ManagedRepository managedRepo = repositoryRegistry.getManagedRepository(targetRepositoryId); MetadataRepository metadataRepository = repositorySession.getRepository(); List sourceArtifacts = metadataRepository.getArtifacts( sourceRepositoryId ); - if ( repository.isReleases() && !repository.isSnapshots() ) + if ( managedRepo.getActiveReleaseSchemes().contains(ReleaseScheme.RELEASE) && !managedRepo.getActiveReleaseSchemes().contains(ReleaseScheme.SNAPSHOT) ) { mergeWithOutSnapshots( metadataRepository, sourceArtifacts, sourceRepositoryId, targetRepositoryId ); } @@ -134,12 +135,7 @@ public class DefaultMergeRepositoriesService catch ( MetadataRepositoryException e ) { throw new ArchivaRestServiceException( e.getMessage(), e ); - } - catch ( RepositoryAdminException e ) - { - throw new ArchivaRestServiceException( e.getMessage(), e ); - } - finally + } finally { repositorySession.close(); } @@ -159,9 +155,9 @@ public class DefaultMergeRepositoriesService List sourceArtifacts = metadataRepository.getArtifacts( sourceRepositoryId ); sourceArtifacts.removeAll( conflictSourceArtifacts ); - ManagedRepository repository = managedRepositoryAdmin.getManagedRepository( targetRepositoryId ); + org.apache.archiva.repository.ManagedRepository managedRepo = repositoryRegistry.getManagedRepository(targetRepositoryId); - if ( repository.isReleases() && !repository.isSnapshots() ) + if ( managedRepo.getActiveReleaseSchemes().contains(ReleaseScheme.RELEASE) && !managedRepo.getActiveReleaseSchemes().contains(ReleaseScheme.SNAPSHOT)) { mergeWithOutSnapshots( metadataRepository, sourceArtifacts, sourceRepositoryId, targetRepositoryId ); } @@ -183,13 +179,7 @@ public class DefaultMergeRepositoriesService catch ( MetadataRepositoryException e ) { throw new ArchivaRestServiceException( e.getMessage(), e ); - } - catch ( RepositoryAdminException e ) - { - throw new ArchivaRestServiceException( e.getMessage(), e ); - - } - finally + } finally { repositorySession.close(); }