Reorganizing imports
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/f1012523 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/f1012523 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/f1012523 Branch: refs/heads/master Commit: f1012523759e82b871d1d2ef038899d1e3237a9a Parents: f7facff Author: Martin Stockhammer <[email protected]> Authored: Fri Mar 30 20:11:57 2018 +0200 Committer: Martin Stockhammer <[email protected]> Committed: Fri Mar 30 20:11:57 2018 +0200 ---------------------------------------------------------------------- .../java/org/apache/archiva/cli/ArchivaCli.java | 2 - .../main/resources/META-INF/spring-context.xml | 4 +- .../apache/archiva/common/utils/BaseFile.java | 1 - .../archiva/common/utils/BaseFileTest.java | 3 +- .../archiva/common/utils/DateUtilTest.java | 4 +- .../archiva/common/utils/FileUtilsTest.java | 1 - .../ArchivaConfigurationMRM789Test.java | 17 ++++---- .../configuration/ArchivaConfigurationTest.java | 2 - .../configuration/ConfigurationTest.java | 8 ++-- .../archiva/configuration/FileTypesTest.java | 7 ++- .../configuration/LegacyArtifactPathTest.java | 4 +- .../MavenProxyPropertyLoaderTest.java | 13 +++--- ...nnectorConfigurationOrderComparatorTest.java | 11 +++-- .../RepositoryConfigurationComparatorTest.java | 6 ++- .../functors/ConsumerWantsFilePredicate.java | 10 ++--- .../src/main/java/SimpleArtifactConsumer.java | 19 ++++---- .../src/test/java/RepositoryProviderMock.java | 1 - .../test/java/SimpleArtifactConsumerTest.java | 8 ++-- .../src/test/resources/spring-context.xml | 4 +- .../consumers/core/MetadataUpdaterConsumer.java | 2 +- ...CleanupReleasedSnapshotsRepositoryPurge.java | 2 +- .../core/repository/DaysOldRepositoryPurge.java | 2 +- .../repository/RepositoryPurgeConsumer.java | 2 - .../RetentionCountRepositoryPurge.java | 2 +- .../repository/RepositoryPurgeConsumerTest.java | 6 --- .../RetentionCountRepositoryPurgeTest.java | 1 - .../repository/mock/RepositoryProviderMock.java | 14 +++++- .../test/resources/META-INF/spring-context.xml | 5 +-- .../consumers/lucene/test/TestRBACManager.java | 2 +- .../DefaultLegacyRepositoryConverter.java | 2 - .../legacy/LegacyConverterArtifactConsumer.java | 2 +- .../converter/RepositoryConverterTest.java | 4 +- .../DefaultFileLockManagerTimeoutTest.java | 6 ++- .../indexer/maven/MavenIndexManager.java | 19 ++++++-- .../maven/search/MavenRepositorySearch.java | 26 +++++++++-- .../indexer/maven/MavenIndexManagerTest.java | 1 - .../search/AbstractMavenRepositorySearch.java | 11 ++++- .../MavenRepositorySearchPaginateTest.java | 6 +-- .../maven/search/MavenRepositorySearchTest.java | 6 ++- .../mock/MockRepositorySessionFactory.java | 7 ++- .../apache/archiva/model/ArchivaArtifact.java | 2 +- .../main/resources/META-INF/spring-context.xml | 7 +-- .../archiva/policies/ChecksumPolicyTest.java | 6 +-- .../archiva/policies/ReleasePolicyTest.java | 5 +-- .../proxy/DefaultRepositoryProxyConnectors.java | 4 +- .../proxy/CacheFailuresTransferTest.java | 2 +- .../apache/archiva/proxy/ErrorHandlingTest.java | 1 - .../archiva/proxy/HttpProxyTransferTest.java | 15 +++---- .../archiva/proxy/MetadataTransferTest.java | 6 ++- .../apache/archiva/proxy/MockConfiguration.java | 13 +++++- .../repository/mock/RepositoryProviderMock.java | 14 +++++- .../test/resources/META-INF/spring-context.xml | 5 +-- .../admin/model/beans/AbstractRepository.java | 1 - .../model/managed/ManagedRepositoryAdmin.java | 2 - .../repository/AbstractRepositoryAdmin.java | 2 +- .../DefaultRepositoryCommonValidator.java | 2 +- .../admin/DefaultArchivaAdministration.java | 1 - .../managed/DefaultManagedRepositoryAdmin.java | 6 ++- .../DefaultProxyConnectorAdmin.java | 2 - .../admin/mock/ArchivaIndexManagerMock.java | 29 ++++++++++-- .../managed/ManagedRepositoryAdminTest.java | 1 - .../archiva/indexer/ArchivaIndexManager.java | 2 - .../archiva/indexer/ArchivaIndexingContext.java | 2 - .../archiva/indexer/GenericIndexManager.java | 1 - .../indexer/search/ArtifactInfoFilter.java | 1 - .../archiva/repository/ManagedRepository.java | 2 - .../apache/archiva/repository/Repository.java | 2 - .../repository/RepositoryContentFactory.java | 2 - .../features/IndexCreationFeature.java | 3 -- .../main/resources/META-INF/spring-context.xml | 5 +-- .../repository/AbstractRemoteRepository.java | 3 -- .../archiva/repository/AbstractRepository.java | 10 ++++- .../repository/BasicManagedRepository.java | 2 - .../repository/BasicRemoteRepository.java | 2 - .../archiva/repository/RepositoryRegistry.java | 23 ++++++++-- .../repository/metadata/MetadataTools.java | 22 ++++++++-- .../metadata/RepositoryMetadataMerge.java | 8 ++-- .../mock/ManagedRepositoryContentMock.java | 2 +- .../mock/RemoteRepositoryContentMock.java | 2 +- .../mock/RepositoryContentProviderMock.java | 10 ++++- .../repository/mock/RepositoryProviderMock.java | 14 +++++- .../src/test/resources/spring-context.xml | 5 +-- .../scanner/DefaultRepositoryScanner.java | 6 ++- .../scanner/RepositoryContentConsumers.java | 7 ++- .../scanner/RepositoryScannerInstance.java | 14 +++++- .../functors/ConsumerProcessFileClosure.java | 2 +- .../functors/TriggerBeginScanClosure.java | 4 +- .../functors/TriggerScanCompletedClosure.java | 2 +- .../repository/scanner/InvalidScanConsumer.java | 2 - .../src/test/resources/spring-context.xml | 5 +-- .../transaction/AbstractTransactionEvent.java | 7 ++- .../archiva/transaction/CreateFileEvent.java | 4 +- .../transaction/AbstractFileEventTest.java | 6 +-- .../java/org/apache/archiva/xml/XMLReader.java | 15 ++++++- .../org/apache/archiva/xml/XMLReaderTest.java | 6 +-- .../org/apache/archiva/xml/XMLWriterTest.java | 2 +- .../ArchivaRepositoryScanningTaskExecutor.java | 8 ++-- .../main/resources/META-INF/spring-context.xml | 4 +- .../mock/MockManagedRepositoryAdmin.java | 3 +- .../scheduler/repository/TestConsumer.java | 2 +- .../rest/api/services/BrowseService.java | 16 ++++++- .../services/ManagedRepositoriesService.java | 2 +- .../rest/api/services/NetworkProxyService.java | 2 +- .../api/services/ProxyConnectorService.java | 2 +- .../RedbackRuntimeConfigurationService.java | 2 +- .../api/services/RemoteRepositoriesService.java | 2 +- .../rest/api/services/RepositoriesService.java | 1 - .../api/services/RepositoryGroupService.java | 2 +- .../rest/api/services/SearchService.java | 6 ++- .../rest/api/services/SystemStatusService.java | 2 +- .../rest/services/AbstractRestService.java | 7 ++- .../DefaultArchivaAdministrationService.java | 6 ++- .../rest/services/DefaultBrowseService.java | 26 ++++++++--- ...faultRedbackRuntimeConfigurationService.java | 7 ++- .../services/DefaultRepositoriesService.java | 29 +++++++++--- .../rest/services/DefaultSearchService.java | 16 ++++++- .../services/DefaultSystemStatusService.java | 8 +++- .../utils/AddAdminRepoConsumerClosure.java | 2 +- .../rest/services/AbstractArchivaRestTest.java | 17 +++++++- .../rest/services/BrowseServiceTest.java | 13 +++++- .../apache/archiva/rss/RssFeedGenerator.java | 7 ++- .../processor/NewArtifactsRssFeedProcessor.java | 7 ++- .../NewVersionsOfArtifactRssFeedProcessor.java | 6 ++- .../NewArtifactsRssFeedProcessorTest.java | 8 +++- ...wVersionsOfArtifactRssFeedProcessorTest.java | 7 ++- .../archiva/security/mock/MockBeanServices.java | 8 +++- .../web/api/DefaultFileUploadService.java | 8 +++- .../archiva/web/api/FileUploadService.java | 9 +++- .../archiva/web/api/RuntimeInfoService.java | 6 ++- .../apache/archiva/web/rss/RssFeedServlet.java | 12 ++++- .../ArchivaConfigurableUsersManager.java | 7 ++- .../ArchivaLdapRoleMapperConfiguration.java | 7 ++- .../web/security/ArchivaRbacManager.java | 19 +++++++- .../ArchivaUserManagerAuthenticator.java | 9 +++- .../archiva/web/startup/ArchivaStartup.java | 1 - .../remotedownload/AbstractDownloadTest.java | 7 ++- .../DownloadArtifactFromQueryTest.java | 6 ++- .../remotedownload/DownloadArtifactsTest.java | 6 ++- .../DownloadMergedIndexNonDefaultPathTest.java | 6 ++- .../remotedownload/DownloadMergedIndexTest.java | 6 ++- .../archiva/web/rss/RssFeedServletTest.java | 6 ++- .../archiva/web/rss/SecuritySystemStub.java | 13 +++++- .../webtest/memory/TestMetadataRepository.java | 6 ++- .../webtest/memory/TestMetadataResolver.java | 8 +++- .../web/test/parent/AbstractSeleniumTest.java | 6 ++- .../webdav/ArchivaDavResourceFactory.java | 2 +- .../webdav/ArchivaVirtualDavResource.java | 21 +++++++-- .../archiva/webdav/RepositoryServlet.java | 12 ++++- .../apache/archiva/webdav/util/IndexWriter.java | 8 +++- .../AbstractRepositoryServletTestCase.java | 6 ++- .../archiva/metadata/model/CiManagement.java | 1 - .../metadata/model/ProjectVersionMetadata.java | 1 - .../model/facets/RepositoryProblemFacet.java | 4 +- .../repository/AbstractMetadataRepository.java | 8 ++-- .../metadata/repository/RepositorySession.java | 1 - .../repository/storage/RepositoryStorage.java | 1 - .../AbstractMetadataRepositoryTest.java | 28 ++++++++++-- .../model/DefaultRepositoryStatisticsTest.java | 2 +- .../metadata/generic/GenericMetadataFacet.java | 4 +- .../storage/maven2/Maven2RepositoryStorage.java | 46 ++++++++++++++++---- .../storage/maven2/RepositoryModelResolver.java | 2 - .../AbstractDefaultRepositoryContent.java | 2 +- .../content/maven2/DefaultPathParser.java | 2 +- .../maven2/MavenManagedRepository.java | 5 --- .../maven2/MavenRemoteRepository.java | 2 - .../maven2/MavenRepositoryProvider.java | 16 ++++++- .../archiva/configuration/MockRepoAdmin.java | 1 - .../ManagedDefaultRepositoryContentTest.java | 2 +- ...oryMetadataResolverMRM1411RepoGroupTest.java | 13 +++++- ...n2RepositoryMetadataResolverMRM1411Test.java | 12 ++++- .../Maven2RepositoryMetadataResolverTest.java | 20 +++++++-- .../RemoteDefaultRepositoryContentTest.java | 2 +- .../AbstractRepositoryLayerTestCase.java | 3 -- .../archiva/repository/RepositoryURLTest.java | 7 ++- .../content/maven2/RepositoryRequestTest.java | 2 +- .../index/mock/ArchivaIndexManagerMock.java | 30 ++++++++++--- .../metadata/Maven2RepositoryStorageTest.java | 2 - .../repository/metadata/MetadataToolsTest.java | 2 +- .../spring-context-metadata-tools-test.xml | 5 +-- .../cassandra/CassandraMetadataRepository.java | 3 -- .../CassandraRepositorySessionFactory.java | 2 - .../repository/cassandra/CassandraUtils.java | 1 - .../DefaultCassandraArchivaManager.java | 4 +- .../cassandra/model/ArtifactMetadataModel.java | 4 +- .../cassandra/model/MetadataFacetModel.java | 4 +- .../cassandra/MockRepositoryStorage.java | 1 - .../cassandra/RepositoriesNamespaceTest.java | 3 +- .../repository/file/FileMetadataRepository.java | 35 +++++++++++++-- .../file/FileRepositorySessionFactory.java | 9 ++-- .../jcr/JcrRepositorySessionFactory.java | 8 +++- .../repository/jcr/RepositoryFactory.java | 6 ++- .../JcrRepositoryStatisticsGatheringTest.java | 6 ++- .../consumers/DuplicateArtifactsConsumer.java | 6 ++- .../DuplicateArtifactsConsumerTest.java | 4 +- .../src/test/resources/spring-context.xml | 5 +-- .../src/test/resources/spring-context.xml | 5 +-- .../merge/Maven2RepositoryMerger.java | 7 ++- 197 files changed, 940 insertions(+), 408 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java ---------------------------------------------------------------------- diff --git a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java index b2ca378..d8078a9 100644 --- a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java +++ b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java @@ -28,7 +28,6 @@ import org.apache.archiva.consumers.RepositoryContentConsumer; import org.apache.archiva.converter.RepositoryConversionException; import org.apache.archiva.converter.legacy.LegacyRepositoryConverter; import org.apache.archiva.repository.BasicManagedRepository; -import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.scanner.RepositoryScanStatistics; import org.apache.archiva.repository.scanner.RepositoryScanner; import org.apache.archiva.repository.scanner.RepositoryScannerException; @@ -48,7 +47,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-cli/src/main/resources/META-INF/spring-context.xml ---------------------------------------------------------------------- diff --git a/archiva-cli/src/main/resources/META-INF/spring-context.xml b/archiva-cli/src/main/resources/META-INF/spring-context.xml index b40e385..c19c370 100644 --- a/archiva-cli/src/main/resources/META-INF/spring-context.xml +++ b/archiva-cli/src/main/resources/META-INF/spring-context.xml @@ -21,12 +21,10 @@ <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:context="http://www.springframework.org/schema/context"; - xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"; + http://www.springframework.org/schema/context/spring-context-3.0.xsd"; default-lazy-init="true"> <!-- Note: must include util namespace above to accommodate MSHADE-175 --> http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/BaseFile.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/BaseFile.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/BaseFile.java index bc2db2a..0548cd4 100644 --- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/BaseFile.java +++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/BaseFile.java @@ -21,7 +21,6 @@ package org.apache.archiva.common.utils; import java.io.File; import java.net.URI; -import java.nio.file.Paths; /** * BaseFile - convenient File object that tracks the Base Directory and can provide relative path values http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/BaseFileTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/BaseFileTest.java b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/BaseFileTest.java index df3f19b..a9778eb 100644 --- a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/BaseFileTest.java +++ b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/BaseFileTest.java @@ -19,9 +19,8 @@ package org.apache.archiva.common.utils; * under the License. */ -import org.apache.commons.lang.StringUtils; - import junit.framework.TestCase; +import org.apache.commons.lang.StringUtils; import java.io.File; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/DateUtilTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/DateUtilTest.java b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/DateUtilTest.java index a097e5a..1c2e230 100644 --- a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/DateUtilTest.java +++ b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/DateUtilTest.java @@ -19,12 +19,12 @@ package org.apache.archiva.common.utils; * under the License. */ +import junit.framework.TestCase; + import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import junit.framework.TestCase; - /** * DateUtilTest * http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/FileUtilsTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/FileUtilsTest.java b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/FileUtilsTest.java index c589e7c..855a268 100644 --- a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/FileUtilsTest.java +++ b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/FileUtilsTest.java @@ -19,7 +19,6 @@ package org.apache.archiva.common.utils; * under the License. */ -import org.junit.Assert; import org.junit.Assume; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationMRM789Test.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationMRM789Test.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationMRM789Test.java index c91d2f8..5cc6617 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationMRM789Test.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationMRM789Test.java @@ -19,22 +19,23 @@ package org.apache.archiva.configuration; * under the License. */ -import java.nio.charset.Charset; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.List; -import javax.inject.Inject; - import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; -import static org.junit.Assert.*; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; +import javax.inject.Inject; +import java.nio.charset.Charset; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; + +import static org.junit.Assert.*; + /** * Test the configuration store. */ http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java index 36a8a7d..e8af9a5 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java @@ -22,7 +22,6 @@ package org.apache.archiva.configuration; import org.apache.archiva.redback.components.registry.RegistryException; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.commons.io.FileUtils; -import org.custommonkey.xmlunit.XMLAssert; import org.junit.Test; import org.junit.runner.RunWith; import org.slf4j.Logger; @@ -38,7 +37,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; -import java.util.Map; import static org.easymock.EasyMock.*; import static org.junit.Assert.*; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ConfigurationTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ConfigurationTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ConfigurationTest.java index cc058e6..2a5e9b4 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ConfigurationTest.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ConfigurationTest.java @@ -19,13 +19,15 @@ package org.apache.archiva.configuration; * under the License. */ +import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; +import org.junit.Test; +import org.junit.runner.RunWith; + import java.util.Arrays; import java.util.HashSet; import java.util.Map; -import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; + import static org.junit.Assert.*; -import org.junit.Test; -import org.junit.runner.RunWith; /** * Test the generated Configuration class from Modello. This is primarily to test the hand coded methods. http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/FileTypesTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/FileTypesTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/FileTypesTest.java index f0e5701..83874b7 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/FileTypesTest.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/FileTypesTest.java @@ -19,13 +19,16 @@ package org.apache.archiva.configuration; * under the License. */ -import javax.inject.Inject; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; -import static org.junit.Assert.*; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; +import javax.inject.Inject; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + @RunWith( ArchivaSpringJUnit4ClassRunner.class ) @ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml" } ) public class FileTypesTest http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/LegacyArtifactPathTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/LegacyArtifactPathTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/LegacyArtifactPathTest.java index db4117c..c36a93b 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/LegacyArtifactPathTest.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/LegacyArtifactPathTest.java @@ -20,10 +20,12 @@ package org.apache.archiva.configuration; */ import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; -import static org.junit.Assert.*; import org.junit.Test; import org.junit.runner.RunWith; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + /** * Test the generated LegacyArtifactPath class from Modello. This is primarily to test the hand coded methods. * http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/MavenProxyPropertyLoaderTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/MavenProxyPropertyLoaderTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/MavenProxyPropertyLoaderTest.java index 5e620bc..dfc41e9 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/MavenProxyPropertyLoaderTest.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/MavenProxyPropertyLoaderTest.java @@ -19,16 +19,19 @@ package org.apache.archiva.configuration; * under the License. */ +import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.Map; import java.util.Properties; -import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; -import static org.junit.Assert.*; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** */ http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparatorTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparatorTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparatorTest.java index 9bac5bf..62a666c 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparatorTest.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparatorTest.java @@ -19,16 +19,19 @@ package org.apache.archiva.configuration.functors; * under the License. */ -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; import org.apache.archiva.configuration.ProxyConnectorConfiguration; import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; import org.apache.commons.lang.StringUtils; -import static org.junit.Assert.*; import org.junit.Test; import org.junit.runner.RunWith; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + /** * ProxyConnectorConfigurationOrderComparatorTest * http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparatorTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparatorTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparatorTest.java index e1f4d0d..2dd659c 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparatorTest.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparatorTest.java @@ -19,14 +19,16 @@ package org.apache.archiva.configuration.functors; * under the License. */ -import java.util.Comparator; import org.apache.archiva.configuration.AbstractRepositoryConfiguration; import org.apache.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; -import static org.junit.Assert.*; import org.junit.Test; import org.junit.runner.RunWith; +import java.util.Comparator; + +import static org.junit.Assert.assertEquals; + /** * Test the repositry comparator. */ http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java index 91f58ac..b7404e5 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java @@ -19,20 +19,20 @@ package org.apache.archiva.consumers.functors; * under the License. */ -import java.nio.file.Paths; -import java.util.List; - +import org.apache.archiva.common.utils.BaseFile; +import org.apache.archiva.consumers.RepositoryContentConsumer; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.features.IndexCreationFeature; import org.apache.commons.collections.Predicate; import org.apache.commons.io.FilenameUtils; -import org.apache.archiva.common.utils.BaseFile; -import org.apache.archiva.consumers.RepositoryContentConsumer; import org.apache.commons.lang.StringUtils; import org.apache.tools.ant.types.selectors.SelectorUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.nio.file.Paths; +import java.util.List; + /** * ConsumerWantsFilePredicate */ http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java index 54e04dc..5c5f45f 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java @@ -19,10 +19,6 @@ package $package; * under the License. */ -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.FileTypes; import org.apache.archiva.consumers.AbstractMonitoredConsumer; @@ -34,20 +30,21 @@ import org.apache.archiva.metadata.repository.RepositorySessionFactory; import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.redback.components.registry.Registry; import org.apache.archiva.redback.components.registry.RegistryListener; - +import org.apache.archiva.repository.LayoutException; +import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RepositoryContentFactory; -import org.apache.archiva.repository.RepositoryException; -import org.apache.archiva.repository.LayoutException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Service; + import javax.annotation.PostConstruct; import javax.inject.Inject; import javax.inject.Named; - -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Service; -import org.apache.archiva.repository.ManagedRepository; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** * <code>SimpleArtifactConsumer</code> http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/RepositoryProviderMock.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/RepositoryProviderMock.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/RepositoryProviderMock.java index ec13f21..f871fbb 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/RepositoryProviderMock.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/RepositoryProviderMock.java @@ -39,7 +39,6 @@ import org.apache.archiva.repository.features.RemoteIndexFeature; import org.apache.archiva.repository.features.StagingRepositoryFeature; import org.springframework.stereotype.Service; - import java.net.URI; import java.nio.file.Paths; import java.time.Duration; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java index 0b134ba..54ec5d0 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java @@ -20,14 +20,12 @@ package $package; */ import org.apache.archiva.admin.model.RepositoryAdminException; -import org.apache.archiva.repository.ManagedRepository; -import org.apache.archiva.repository.BasicManagedRepository; -import org.apache.archiva.repository.RepositoryRegistry; -import org.apache.archiva.repository.RepositoryException; import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; import org.apache.archiva.metadata.repository.MetadataRepository; -import org.apache.archiva.metadata.repository.RepositorySession; import org.apache.archiva.metadata.repository.RepositorySessionFactory; +import org.apache.archiva.repository.BasicManagedRepository; +import org.apache.archiva.repository.RepositoryException; +import org.apache.archiva.repository.RepositoryRegistry; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml index 56894fc..908c9b5 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml @@ -20,12 +20,12 @@ --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:context="http://www.springframework.org/schema/context"; xmlns:tx="http://www.springframework.org/schema/tx"; + xmlns:context="http://www.springframework.org/schema/context"; xmlns:mockito="http://www.mockito.org/spring/mockito"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd + http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.mockito.org/spring/mockito http://www.mockito.org/spring/mockito.xsd"; default-lazy-init="true"> http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java index 8f537b5..6af89a3 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java @@ -28,12 +28,12 @@ import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.model.ProjectReference; import org.apache.archiva.model.VersionedReference; import org.apache.archiva.repository.ContentNotFoundException; +import org.apache.archiva.repository.LayoutException; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RepositoryException; import org.apache.archiva.repository.RepositoryNotFoundException; import org.apache.archiva.repository.RepositoryRegistry; -import org.apache.archiva.repository.LayoutException; import org.apache.archiva.repository.metadata.MetadataTools; import org.apache.archiva.repository.metadata.RepositoryMetadataException; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java index 265c8e2..ce6dc28 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java @@ -28,12 +28,12 @@ import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.model.ProjectReference; import org.apache.archiva.model.VersionedReference; import org.apache.archiva.repository.ContentNotFoundException; +import org.apache.archiva.repository.LayoutException; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.ReleaseScheme; import org.apache.archiva.repository.RepositoryException; import org.apache.archiva.repository.RepositoryRegistry; import org.apache.archiva.repository.events.RepositoryListener; -import org.apache.archiva.repository.LayoutException; import org.apache.archiva.repository.metadata.MetadataTools; import org.apache.archiva.repository.metadata.RepositoryMetadataException; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java index 2952f7f..6c6607d 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java @@ -25,9 +25,9 @@ import org.apache.archiva.metadata.repository.RepositorySession; import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.model.VersionedReference; import org.apache.archiva.repository.ContentNotFoundException; +import org.apache.archiva.repository.LayoutException; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.events.RepositoryListener; -import org.apache.archiva.repository.LayoutException; import org.apache.commons.lang.time.DateUtils; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java ---------------------------------------------------------------------- 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 d869666..c065a2f 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 @@ -33,8 +33,6 @@ import org.apache.archiva.redback.components.registry.RegistryListener; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RepositoryContentFactory; -import org.apache.archiva.repository.RepositoryException; -import org.apache.archiva.repository.RepositoryNotFoundException; import org.apache.archiva.repository.RepositoryRegistry; import org.apache.archiva.repository.events.RepositoryListener; import org.apache.archiva.repository.features.ArtifactCleanupFeature; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java index bcecc8a..a364dc3 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java @@ -25,9 +25,9 @@ import org.apache.archiva.metadata.repository.RepositorySession; import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.model.VersionedReference; import org.apache.archiva.repository.ContentNotFoundException; +import org.apache.archiva.repository.LayoutException; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.events.RepositoryListener; -import org.apache.archiva.repository.LayoutException; import java.nio.file.Files; import java.nio.file.Path; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java index 11e0ffe..65047ee 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java @@ -19,11 +19,6 @@ package org.apache.archiva.consumers.core.repository; * under the License. */ -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.admin.repository.DefaultRepositoryCommonValidator; -import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin; import org.apache.archiva.common.utils.BaseFile; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.FileType; @@ -38,7 +33,6 @@ import org.apache.archiva.repository.features.ArtifactCleanupFeature; import org.custommonkey.xmlunit.XMLAssert; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java index 13d6b68..d80a0b6 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java @@ -19,7 +19,6 @@ package org.apache.archiva.consumers.core.repository; * under the License. */ -import org.apache.archiva.admin.model.beans.ManagedRepository; import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.repository.events.RepositoryListener; import org.apache.archiva.repository.features.ArtifactCleanupFeature; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java index 4af39c3..af3597e 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java @@ -21,7 +21,19 @@ package org.apache.archiva.repository.mock; import org.apache.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.archiva.configuration.RemoteRepositoryConfiguration; -import org.apache.archiva.repository.*; +import org.apache.archiva.repository.BasicManagedRepository; +import org.apache.archiva.repository.BasicRemoteRepository; +import org.apache.archiva.repository.EditableManagedRepository; +import org.apache.archiva.repository.EditableRemoteRepository; +import org.apache.archiva.repository.ManagedRepository; +import org.apache.archiva.repository.PasswordCredentials; +import org.apache.archiva.repository.ReleaseScheme; +import org.apache.archiva.repository.RemoteRepository; +import org.apache.archiva.repository.RepositoryCredentials; +import org.apache.archiva.repository.RepositoryEvent; +import org.apache.archiva.repository.RepositoryException; +import org.apache.archiva.repository.RepositoryProvider; +import org.apache.archiva.repository.RepositoryType; import org.apache.archiva.repository.features.ArtifactCleanupFeature; import org.apache.archiva.repository.features.IndexCreationFeature; import org.apache.archiva.repository.features.RemoteIndexFeature; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml index baa381e..810411f 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml @@ -20,11 +20,8 @@ --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:context="http://www.springframework.org/schema/context"; xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd"; default-lazy-init="true"> + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"; default-lazy-init="true"> <bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> <property name="properties"> http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java index 6c974c3..7c237e2 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java @@ -21,13 +21,13 @@ package org.apache.archiva.consumers.lucene.test; import org.apache.archiva.redback.rbac.Operation; import org.apache.archiva.redback.rbac.Permission; import org.apache.archiva.redback.rbac.RBACManager; +import org.apache.archiva.redback.rbac.RBACManagerListener; import org.apache.archiva.redback.rbac.RbacManagerException; import org.apache.archiva.redback.rbac.RbacObjectInvalidException; import org.apache.archiva.redback.rbac.RbacObjectNotFoundException; import org.apache.archiva.redback.rbac.Resource; import org.apache.archiva.redback.rbac.Role; import org.apache.archiva.redback.rbac.UserAssignment; -import org.apache.archiva.redback.rbac.RBACManagerListener; import org.springframework.stereotype.Service; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java index cc1af39..8431dcb 100644 --- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java +++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java @@ -19,7 +19,6 @@ package org.apache.archiva.converter.legacy; * under the License. */ -import org.apache.archiva.admin.model.beans.ManagedRepository; import org.apache.archiva.common.plexusbridge.PlexusSisuBridge; import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException; import org.apache.archiva.common.utils.PathUtil; @@ -41,7 +40,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Locale; /** * DefaultLegacyRepositoryConverter http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java index 04653a5..13a79dd 100644 --- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java +++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java @@ -29,10 +29,10 @@ import org.apache.archiva.converter.artifact.ArtifactConversionException; import org.apache.archiva.converter.artifact.ArtifactConverter; import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider; import org.apache.archiva.model.ArtifactReference; +import org.apache.archiva.repository.LayoutException; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.content.maven2.ManagedDefaultRepositoryContent; -import org.apache.archiva.repository.LayoutException; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java b/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java index 8abe89d..fe82cd8 100644 --- a/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java +++ b/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java @@ -21,9 +21,10 @@ package org.apache.archiva.converter; import junit.framework.TestCase; import org.apache.archiva.common.plexusbridge.PlexusSisuBridge; +import org.apache.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.archiva.converter.legacy.LegacyRepositoryConverter; +import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.commons.io.FileUtils; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; @@ -40,7 +41,6 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; -import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; /** * Test the repository converter. http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java b/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java index 6ed069a..4eecb2b 100644 --- a/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java +++ b/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java @@ -30,7 +30,11 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import javax.inject.Inject; import javax.inject.Named; import java.io.IOException; -import java.nio.file.*; +import java.nio.file.FileSystemException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; /** * @author Olivier Lamy http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java b/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java index f80e39b..cc7cef0 100644 --- a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java +++ b/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java @@ -33,12 +33,24 @@ import org.apache.archiva.indexer.UnsupportedBaseContextException; import org.apache.archiva.proxy.common.WagonFactory; import org.apache.archiva.proxy.common.WagonFactoryException; import org.apache.archiva.proxy.common.WagonFactoryRequest; -import org.apache.archiva.repository.*; -import org.apache.archiva.repository.features.IndexCreationEvent; +import org.apache.archiva.repository.EditableRepository; +import org.apache.archiva.repository.ManagedRepository; +import org.apache.archiva.repository.PasswordCredentials; +import org.apache.archiva.repository.RemoteRepository; +import org.apache.archiva.repository.Repository; +import org.apache.archiva.repository.RepositoryType; +import org.apache.archiva.repository.UnsupportedRepositoryTypeException; import org.apache.archiva.repository.features.IndexCreationFeature; import org.apache.archiva.repository.features.RemoteIndexFeature; import org.apache.commons.lang.StringUtils; -import org.apache.maven.index.*; +import org.apache.maven.index.ArtifactContext; +import org.apache.maven.index.ArtifactContextProducer; +import org.apache.maven.index.DefaultScannerListener; +import org.apache.maven.index.Indexer; +import org.apache.maven.index.IndexerEngine; +import org.apache.maven.index.Scanner; +import org.apache.maven.index.ScanningRequest; +import org.apache.maven.index.ScanningResult; import org.apache.maven.index.context.IndexCreator; import org.apache.maven.index.context.IndexingContext; import org.apache.maven.index.packer.IndexPacker; @@ -65,7 +77,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; import javax.inject.Inject; import java.io.FileNotFoundException; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearch.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearch.java b/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearch.java index e18e101..d2123c0 100644 --- a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearch.java +++ b/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearch.java @@ -25,7 +25,13 @@ import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorAdmin; import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException; import org.apache.archiva.indexer.UnsupportedBaseContextException; import org.apache.archiva.indexer.search.ArtifactInfoFilter; -import org.apache.archiva.indexer.search.*; +import org.apache.archiva.indexer.search.NoClassifierArtifactInfoFilter; +import org.apache.archiva.indexer.search.RepositorySearch; +import org.apache.archiva.indexer.search.RepositorySearchException; +import org.apache.archiva.indexer.search.SearchFields; +import org.apache.archiva.indexer.search.SearchResultHit; +import org.apache.archiva.indexer.search.SearchResultLimits; +import org.apache.archiva.indexer.search.SearchResults; import org.apache.archiva.indexer.util.SearchUtil; import org.apache.archiva.model.ArchivaArtifactModel; import org.apache.archiva.repository.RemoteRepository; @@ -33,7 +39,14 @@ import org.apache.archiva.repository.Repository; import org.apache.archiva.repository.RepositoryRegistry; import org.apache.archiva.repository.RepositoryType; import org.apache.commons.lang.StringUtils; -import org.apache.maven.index.*; +import org.apache.maven.index.ArtifactInfo; +import org.apache.maven.index.FlatSearchRequest; +import org.apache.maven.index.FlatSearchResponse; +import org.apache.maven.index.Indexer; +import org.apache.maven.index.MAVEN; +import org.apache.maven.index.OSGI; +import org.apache.maven.index.QueryCreator; +import org.apache.maven.index.SearchType; import org.apache.maven.index.context.IndexingContext; import org.apache.maven.index.expr.SearchExpression; import org.apache.maven.index.expr.SearchTyped; @@ -42,14 +55,19 @@ import org.apache.maven.index.expr.UserInputSearchExpression; import org.apache.maven.index_shaded.lucene.search.BooleanClause; import org.apache.maven.index_shaded.lucene.search.BooleanClause.Occur; import org.apache.maven.index_shaded.lucene.search.BooleanQuery; -import org.apache.maven.index_shaded.lucene.search.Query; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import javax.inject.Inject; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * RepositorySearch implementation which uses the Maven Indexer for searching. http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/MavenIndexManagerTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/MavenIndexManagerTest.java b/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/MavenIndexManagerTest.java index 32e3b6f..71363dc 100644 --- a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/MavenIndexManagerTest.java +++ b/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/MavenIndexManagerTest.java @@ -42,7 +42,6 @@ import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import javax.inject.Inject; - import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java b/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java index e5171d2..de69ac5 100644 --- a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java +++ b/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java @@ -35,7 +35,16 @@ import org.apache.archiva.repository.RepositoryRegistry; import org.apache.archiva.repository.features.IndexCreationFeature; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.commons.lang.SystemUtils; -import org.apache.maven.index.*; +import org.apache.maven.index.ArtifactContext; +import org.apache.maven.index.ArtifactContextProducer; +import org.apache.maven.index.ArtifactScanningListener; +import org.apache.maven.index.DefaultScannerListener; +import org.apache.maven.index.Indexer; +import org.apache.maven.index.IndexerEngine; +import org.apache.maven.index.QueryCreator; +import org.apache.maven.index.Scanner; +import org.apache.maven.index.ScanningRequest; +import org.apache.maven.index.ScanningResult; import org.apache.maven.index.context.IndexCreator; import org.apache.maven.index.context.IndexingContext; import org.easymock.EasyMock; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchPaginateTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchPaginateTest.java b/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchPaginateTest.java index d679edf..3390cc4 100644 --- a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchPaginateTest.java +++ b/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchPaginateTest.java @@ -19,7 +19,6 @@ package org.apache.archiva.indexer.maven.search; */ import junit.framework.TestCase; -import org.apache.archiva.indexer.maven.search.MavenRepositorySearch; import org.apache.archiva.indexer.search.SearchResultHit; import org.apache.archiva.indexer.search.SearchResultLimits; import org.apache.archiva.indexer.search.SearchResults; @@ -29,13 +28,10 @@ import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; - -import java.util.Arrays; -import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import javax.inject.Inject; +import java.util.Arrays; /** * @author Olivier Lamy http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchTest.java b/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchTest.java index eff589f..cb43a1a 100644 --- a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchTest.java +++ b/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchTest.java @@ -19,7 +19,11 @@ package org.apache.archiva.indexer.maven.search; * under the License. */ -import org.apache.archiva.indexer.search.*; +import org.apache.archiva.indexer.search.RepositorySearchException; +import org.apache.archiva.indexer.search.SearchFields; +import org.apache.archiva.indexer.search.SearchResultHit; +import org.apache.archiva.indexer.search.SearchResultLimits; +import org.apache.archiva.indexer.search.SearchResults; import org.apache.archiva.indexer.util.SearchUtil; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.maven.index_shaded.lucene.index.IndexUpgrader; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockRepositorySessionFactory.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockRepositorySessionFactory.java b/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockRepositorySessionFactory.java index 3f17ceb..0a8ba43 100644 --- a/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockRepositorySessionFactory.java +++ b/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockRepositorySessionFactory.java @@ -19,7 +19,12 @@ package org.apache.archiva.mock; * under the License. */ -import org.apache.archiva.metadata.repository.*; +import org.apache.archiva.metadata.repository.AbstractMetadataRepository; +import org.apache.archiva.metadata.repository.AbstractRepositorySessionFactory; +import org.apache.archiva.metadata.repository.MetadataRepository; +import org.apache.archiva.metadata.repository.MetadataResolver; +import org.apache.archiva.metadata.repository.RepositorySession; +import org.apache.archiva.metadata.repository.RepositorySessionFactory; import org.springframework.stereotype.Service; /** http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaArtifact.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaArtifact.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaArtifact.java index 75364a1..e484778 100644 --- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaArtifact.java +++ b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaArtifact.java @@ -19,8 +19,8 @@ package org.apache.archiva.model; * under the License. */ -import org.apache.commons.lang.StringUtils; import org.apache.archiva.common.utils.VersionUtil; +import org.apache.commons.lang.StringUtils; /** * ArchivaArtifact - Mutable artifact object. http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/resources/META-INF/spring-context.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/resources/META-INF/spring-context.xml index 9c12ec8..62f1254 100644 --- a/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/resources/META-INF/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/resources/META-INF/spring-context.xml @@ -21,14 +21,11 @@ <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:context="http://www.springframework.org/schema/context"; - xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context.xsd - http://www.springframework.org/schema/util - http://www.springframework.org/schema/util/spring-util.xsd"; - default-lazy-init="true"> + http://www.springframework.org/schema/context/spring-context.xsd"; + default-lazy-init="true"> <context:annotation-config/> <context:component-scan base-package="org.apache.archiva.common.plexusbridge http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ChecksumPolicyTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ChecksumPolicyTest.java b/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ChecksumPolicyTest.java index 8450744..3faad0b 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ChecksumPolicyTest.java +++ b/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ChecksumPolicyTest.java @@ -19,6 +19,7 @@ package org.apache.archiva.policies; * under the License. */ +import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.commons.io.FileUtils; import org.junit.Rule; import org.junit.Test; @@ -26,15 +27,14 @@ import org.junit.rules.TestName; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; +import javax.inject.Inject; +import javax.inject.Named; import java.io.BufferedReader; import java.io.FileReader; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Properties; -import javax.inject.Inject; -import javax.inject.Named; -import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import static org.junit.Assert.*; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ReleasePolicyTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ReleasePolicyTest.java b/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ReleasePolicyTest.java index 4d45646..adf341b 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ReleasePolicyTest.java +++ b/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ReleasePolicyTest.java @@ -20,7 +20,7 @@ package org.apache.archiva.policies; */ import junit.framework.TestCase; -import org.apache.commons.io.FileUtils; +import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -33,9 +33,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.attribute.FileTime; import java.util.Properties; -import java.util.concurrent.TimeUnit; - -import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; /** * ReleasePolicyTest http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java index a76e744..a68f01d 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java +++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java @@ -54,14 +54,12 @@ 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.RemoteRepository; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.PasswordCredentials; +import org.apache.archiva.repository.RemoteRepository; import org.apache.archiva.repository.RemoteRepositoryContent; import org.apache.archiva.repository.RepositoryContentFactory; import org.apache.archiva.repository.RepositoryCredentials; -import org.apache.archiva.repository.RepositoryException; -import org.apache.archiva.repository.RepositoryNotFoundException; import org.apache.archiva.repository.RepositoryRegistry; import org.apache.archiva.repository.metadata.MetadataTools; import org.apache.archiva.repository.metadata.RepositoryMetadataException; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java index 3445ee8..0061fa7 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java +++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java @@ -30,11 +30,11 @@ import org.apache.maven.wagon.ResourceDoesNotExistException; import org.easymock.EasyMock; import org.junit.Test; +import javax.inject.Inject; import java.io.File; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import javax.inject.Inject; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java index 9137993..cef7501 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java +++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java @@ -33,7 +33,6 @@ import org.apache.maven.wagon.authorization.AuthorizationException; import org.easymock.EasyMock; import org.junit.Test; - import java.io.File; import java.io.IOException; import java.nio.file.Files; http://git-wip-us.apache.org/repos/asf/archiva/blob/f1012523/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java index 40fa894..6978fde 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java +++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java @@ -19,14 +19,8 @@ package org.apache.archiva.proxy; * under the License. */ -import org.apache.archiva.admin.model.beans.ManagedRepository; import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin; -import org.apache.archiva.proxy.model.RepositoryProxyConnectors; -import org.apache.archiva.repository.RepositoryContentProvider; -import org.apache.archiva.repository.RepositoryRegistry; -import org.apache.archiva.repository.maven2.MavenManagedRepository; -import org.apache.commons.io.FileUtils; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.NetworkProxyConfiguration; import org.apache.archiva.configuration.ProxyConnectorConfiguration; @@ -38,7 +32,13 @@ import org.apache.archiva.policies.PropagateErrorsDownloadPolicy; import org.apache.archiva.policies.PropagateErrorsOnUpdateDownloadPolicy; import org.apache.archiva.policies.ReleasesPolicy; import org.apache.archiva.policies.SnapshotsPolicy; +import org.apache.archiva.proxy.model.RepositoryProxyConnectors; import org.apache.archiva.repository.ManagedRepositoryContent; +import org.apache.archiva.repository.RepositoryContentProvider; +import org.apache.archiva.repository.RepositoryRegistry; +import org.apache.archiva.repository.maven2.MavenManagedRepository; +import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; +import org.apache.commons.io.FileUtils; import org.assertj.core.api.Assertions; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.HttpConnectionFactory; @@ -63,9 +63,6 @@ import java.nio.charset.Charset; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Locale; - -import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import static org.junit.Assert.*;
