]> source.dussan.org Git - archiva.git/commitdiff
remove unused package, reduce annotations (value= or locations=)
authorEric Barboni <skygo@apache.org>
Thu, 17 Apr 2014 23:45:16 +0000 (01:45 +0200)
committerEric Barboni <skygo@apache.org>
Thu, 17 Apr 2014 23:45:16 +0000 (01:45 +0200)
21 files changed:
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractLegacyRepositoryContentTestCase.java
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedLegacyRepositoryContentTest.java
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedReleaseTest.java
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedSnapshotTest.java
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteLegacyRepositoryContentTest.java
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/legacy/LegacyPathParserTest.java
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/ArtifactExtensionMappingTest.java
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/DefaultPathParserTest.java
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java

index f3c3c55fce6d66f996e87939126527181bcba7d2..b9ba411efc4c41e4107a666966de1a788a91e68a 100644 (file)
@@ -52,7 +52,7 @@ public class MockRepoAdmin
     implements RemoteRepositoryAdmin, ManagedRepositoryAdmin, ProxyConnectorAdmin, NetworkProxyAdmin
 {
     @Inject
-    @Named (value = "archivaConfiguration#test")
+    @Named ( "archivaConfiguration#test" )
     private ArchivaConfiguration archivaConfiguration;
 
     @Override
index d05cad4411cfeb75a742ee8a034efacad14dba26..c277434d84668c1eadf13bb41881132a368288af 100644 (file)
@@ -40,12 +40,12 @@ import java.util.Collections;
 import java.util.List;
 
 @RunWith( ArchivaSpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
+@ContextConfiguration( { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
 public class DependencyTreeBuilderTestMaven3
     extends TestCase
 {
     @Inject
-    @Named( value = "dependencyTreeBuilder#maven3" )
+    @Named( "dependencyTreeBuilder#maven3" )
     private Maven3DependencyTreeBuilder builder;
 
     @Inject
@@ -61,7 +61,7 @@ public class DependencyTreeBuilderTestMaven3
 
 
     @Inject
-    @Named( value = "archivaConfiguration#test" )
+    @Named( "archivaConfiguration#test" )
     ArchivaConfiguration config;
 
     @Before
index fb425badcc7ffe7e81888fad0211a04a7798b3ac..0967e225f2fc1e173d0dab63fe9aed0960c9a115 100644 (file)
@@ -22,11 +22,8 @@ package org.apache.archiva.metadata.repository.storage.maven2;
 import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.repository.AbstractRepositoryLayerTestCase;
 import org.apache.archiva.repository.layout.LayoutException;
-import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
 import org.apache.commons.lang.StringUtils;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
 
 import static org.junit.Assert.*;
 
index f00aef424a230a98af9ddc9767d258a2a64d415b..379c28def083d15caa090fc2c59fcb7cd2073de8 100644 (file)
@@ -33,7 +33,7 @@ import static org.junit.Assert.*;
  * AbstractLegacyRepositoryContentTestCase
  */
 @RunWith ( ArchivaSpringJUnit4ClassRunner.class )
-@ContextConfiguration ( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-no-mock-conf.xml" } )
+@ContextConfiguration ( { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-no-mock-conf.xml" } )
 public abstract class AbstractLegacyRepositoryContentTestCase
     extends AbstractRepositoryLayerTestCase
 {
index 0b921b0d76791ff935e839298fdf6d5cfb39fef0..6c0033e53ab9b13f1e9cf01a7faa4f0ff02cbf67 100644 (file)
@@ -29,11 +29,8 @@ import org.apache.archiva.model.ProjectReference;
 import org.apache.archiva.model.VersionedReference;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.layout.LayoutException;
-import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -54,14 +51,14 @@ public class ManagedDefaultRepositoryContentTest
     extends AbstractDefaultRepositoryContentTestCase
 {
     @Inject
-    @Named ( value = "managedRepositoryContent#default" )
+    @Named ( "managedRepositoryContent#default" )
     private ManagedRepositoryContent repoContent;
 
     @Inject
     FileTypes fileTypes;
 
     @Inject
-    @Named ( value = "archivaConfiguration#default" )
+    @Named ( "archivaConfiguration#default" )
     ArchivaConfiguration archivaConfiguration;
 
     @Before
index 3bdbea0f7377d08afa2c333261e5207618116aa9..ad52ab31caeeb8217c30f038b5b597b05ff84484 100644 (file)
@@ -26,11 +26,8 @@ import org.apache.archiva.model.ProjectReference;
 import org.apache.archiva.model.VersionedReference;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.layout.LayoutException;
-import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -51,7 +48,7 @@ public class ManagedLegacyRepositoryContentTest
     extends AbstractLegacyRepositoryContentTestCase
 {
     @Inject
-    @Named( value = "managedRepositoryContent#legacy" )
+    @Named( "managedRepositoryContent#legacy" )
     private ManagedRepositoryContent repoContent;
 
     @Before
index e7538de36db22218eb9a9d0a1d5255863f7a9346..dcc05ea119243c41ebc671bf7e9ecfae15bd0f0f 100644 (file)
@@ -58,14 +58,14 @@ import static org.mockito.Mockito.when;
 
 
 @RunWith ( ArchivaSpringJUnit4ClassRunner.class )
-@ContextConfiguration ( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
+@ContextConfiguration ( { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
 public class Maven2RepositoryMetadataResolverMRM1411RepoGroupTest
     extends TestCase
 {
     private static final Filter<String> ALL = new AllFilter<String>();
 
     @Inject
-    @Named (value = "repositoryStorage#maven2")
+    @Named ( "repositoryStorage#maven2")
     private Maven2RepositoryStorage storage;
 
     private static final String TEST_REPO_ID = "test";
@@ -93,7 +93,7 @@ public class Maven2RepositoryMetadataResolverMRM1411RepoGroupTest
     private static final String EMPTY_SHA1 = "da39a3ee5e6b4b0d3255bfef95601890afd80709";
 
     @Inject
-    @Named (value = "archivaConfiguration#default")
+    @Named ( "archivaConfiguration#default" )
     private ArchivaConfiguration configuration;
 
     private WagonFactory wagonFactory;
index 43aed4be43da97415e94578ef4d556620e8c6fe3..0b2f65071c419afab551b2ffe380e06ebf3e3f93 100644 (file)
@@ -58,14 +58,14 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 @RunWith ( ArchivaSpringJUnit4ClassRunner.class )
-@ContextConfiguration ( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
+@ContextConfiguration ( { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
 public class Maven2RepositoryMetadataResolverMRM1411Test
     extends TestCase
 {
     private static final Filter<String> ALL = new AllFilter<String>();
 
     @Inject
-    @Named (value = "repositoryStorage#maven2")
+    @Named ( "repositoryStorage#maven2")
     private Maven2RepositoryStorage storage;
 
     private static final String TEST_REPO_ID = "test";
@@ -89,7 +89,7 @@ public class Maven2RepositoryMetadataResolverMRM1411Test
     private static final String EMPTY_SHA1 = "da39a3ee5e6b4b0d3255bfef95601890afd80709";
 
     @Inject
-    @Named (value = "archivaConfiguration#default")
+    @Named ( "archivaConfiguration#default" )
     private ArchivaConfiguration configuration;
 
     private WagonFactory wagonFactory;
index c0ebe5ef45f778138f90171afa02de7730c33bb0..c2549acd0de7eb07291d5e0ac3e2e97f1155af06 100644 (file)
@@ -38,7 +38,7 @@ public class Maven2RepositoryMetadataResolverManagedReleaseTest
     private static final Filter<String> ALL = new AllFilter<String>();
 
     @Inject
-    @Named (value = "repositoryStorage#maven2")
+    @Named ( "repositoryStorage#maven2")
     private Maven2RepositoryStorage storage;
 
     private static final String TEST_REPO_ID = "test";
index 0cbb7a79cb75f21c0656de8429eb74e909096892..dbbe8e895cd04a81aa54479ddadd1389563abf04 100644 (file)
@@ -24,11 +24,8 @@ import org.apache.archiva.metadata.repository.filter.AllFilter;
 import org.apache.archiva.metadata.repository.filter.Filter;
 import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest;
 import org.apache.archiva.metadata.repository.storage.RepositoryStorageRuntimeException;
-import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -39,7 +36,7 @@ public class Maven2RepositoryMetadataResolverManagedSnapshotTest
     private static final Filter<String> ALL = new AllFilter<String>();
 
     @Inject
-    @Named (value = "repositoryStorage#maven2")
+    @Named ( "repositoryStorage#maven2")
     private Maven2RepositoryStorage storage;
 
     private static final String TEST_REPO_ID = "test";
index 9cf722813e0ce4679d73e5956b42a0f71c844cfc..f23e2d62a81ba17e92197dfb34f8d4e46cdb57ab 100644 (file)
@@ -63,14 +63,14 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 @RunWith ( ArchivaSpringJUnit4ClassRunner.class )
-@ContextConfiguration ( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
+@ContextConfiguration ( { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
 public class Maven2RepositoryMetadataResolverTest
     extends TestCase
 {
     private static final Filter<String> ALL = new AllFilter<String>();
 
     @Inject
-    @Named (value = "repositoryStorage#maven2")
+    @Named ( "repositoryStorage#maven2" )
     private Maven2RepositoryStorage storage;
 
     private static final String TEST_REPO_ID = "test";
@@ -94,7 +94,7 @@ public class Maven2RepositoryMetadataResolverTest
     private static final String EMPTY_SHA1 = "da39a3ee5e6b4b0d3255bfef95601890afd80709";
 
     @Inject
-    @Named ( value = "archivaConfiguration#default" )
+    @Named ( "archivaConfiguration#default" )
     protected ArchivaConfiguration configuration;
 
     private WagonFactory wagonFactory;
index 4ef36d4af560132fa2159382c242ed6d7b85bc85..fee341018dfa22beee8596c75a7e6c92b2e20b4d 100644 (file)
@@ -86,7 +86,7 @@ public class MockWagon
     }
 
     @Override
-    public List getFileList( String s )
+    public List<String> getFileList( String s )
         throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
     {
         return null;
index be5f77b1c962203dca3b68f74cd22a7bb31db642..2145ebc028e827f334fd67e460c0a6ee2433650b 100644 (file)
@@ -23,10 +23,7 @@ import org.apache.archiva.admin.model.beans.RemoteRepository;
 import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.repository.RemoteRepositoryContent;
 import org.apache.archiva.repository.layout.LayoutException;
-import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
 import org.junit.Before;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -38,7 +35,7 @@ public class RemoteDefaultRepositoryContentTest
     extends AbstractDefaultRepositoryContentTestCase
 {
     @Inject
-    @Named ( value = "remoteRepositoryContent#default" )
+    @Named ( "remoteRepositoryContent#default" )
     private RemoteRepositoryContent repoContent;
 
     @Before
index 8cd826b05682ad407b7fc7fe0ad8fabd25d5f94c..2a5e647445cb4f92f1212beced594206007bce04 100644 (file)
@@ -37,7 +37,7 @@ public class RemoteLegacyRepositoryContentTest
     extends AbstractLegacyRepositoryContentTestCase
 {
     @Inject
-    @Named( value = "remoteRepositoryContent#legacy" )
+    @Named( "remoteRepositoryContent#legacy" )
     private RemoteRepositoryContent repoContent;
 
     @Before
index ec52fb4be5b11a83624e3895ce8548136af1e9fb..94bfe47a0ae5dd0992757d0a6dbf5c57626f9ada 100644 (file)
@@ -37,7 +37,7 @@ import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
  *
  */
 @RunWith( ArchivaSpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-no-mock-conf.xml" } )
+@ContextConfiguration( { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-no-mock-conf.xml" } )
 public abstract class AbstractRepositoryLayerTestCase
 {
     @Rule
index 1e587c92fef28ff943f41f09028407bcd6ceb17b..4b3eb5da1e49926bc45ee2f40994b19aff172c5c 100644 (file)
@@ -41,13 +41,13 @@ import static org.junit.Assert.*;
  *
  */
 @RunWith ( ArchivaSpringJUnit4ClassRunner.class )
-@ContextConfiguration ( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-no-mock-conf.xml" } )
+@ContextConfiguration ( { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-no-mock-conf.xml" } )
 public class LegacyPathParserTest
 {
     private LegacyPathParser parser;
 
     @Inject
-    @Named( value = "archivaConfiguration#default" )
+    @Named( "archivaConfiguration#default" )
     ArchivaConfiguration config;
 
     /**
index c854da048ac4621340fbb876e6c7cfe7d1e0c439..ae72a66fb20b7bba8ce06c31ff16760117e8acd0 100644 (file)
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertFalse;
  *
  */
 @RunWith ( ArchivaSpringJUnit4ClassRunner.class )
-@ContextConfiguration ( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
+@ContextConfiguration ( { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
 public class ArtifactExtensionMappingTest
 {
     private RepositoryPathTranslator pathTranslator = new Maven2RepositoryPathTranslator(
index b376c0b917bc1d75ce6da158e4167a1135a060ee..74b2c0df89b3c2c8f4378c90260ca9bf6f64138e 100644 (file)
@@ -38,7 +38,7 @@ import static org.junit.Assert.*;
  *
  */
 @RunWith ( ArchivaSpringJUnit4ClassRunner.class )
-@ContextConfiguration ( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
+@ContextConfiguration ( { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
 public class DefaultPathParserTest
 {
     private PathParser parser = new DefaultPathParser();
index 2206b9f80ab033264d9e3a956cbe4064593f69d1..cb5bd5533826c2f7d46bd532aececd86dcc60115 100644 (file)
@@ -45,7 +45,7 @@ import static org.junit.Assert.*;
  */
 @RunWith ( ArchivaSpringJUnit4ClassRunner.class )
 @ContextConfiguration (
-    locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-repo-request-test.xml" } )
+    { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-repo-request-test.xml" } )
 public class RepositoryRequestTest
 {
 
@@ -53,7 +53,7 @@ public class RepositoryRequestTest
     protected ApplicationContext applicationContext;
 
     @Inject
-    @Named ( value = "archivaConfiguration#repo-request-test" )
+    @Named ( "archivaConfiguration#repo-request-test" )
     private ArchivaConfiguration archivaConfiguration;
 
     private RepositoryRequest repoRequest;
index 858bb866f2025b4bae5e8a28345ad6645121356d..ee52f5f65e088a5d51b144e6a4e94b0a3ff78433 100644 (file)
@@ -34,11 +34,11 @@ import javax.inject.Named;
  * @author Olivier Lamy
  */
 @RunWith( ArchivaSpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml" } )
+@ContextConfiguration( { "classpath*:/META-INF/spring-context.xml" } )
 public class Maven2RepositoryStorageTest
 {
     @Inject
-    @Named( value = "repositoryStorage#maven2" )
+    @Named( "repositoryStorage#maven2" )
     RepositoryStorage repositoryStorage;
 
     @Test
index f7876cd86d0dcb2d20177c7bd6d7a10f9d4a9131..5bb87cea6c384d8f33f81c9c4b028a168ce073c7 100644 (file)
@@ -58,16 +58,16 @@ import static org.junit.Assert.*;
  * MetadataToolsTest
  */
 @ContextConfiguration (
-    locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-metadata-tools-test.xml" } )
+    { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-metadata-tools-test.xml" } )
 public class MetadataToolsTest
     extends AbstractRepositoryLayerTestCase
 {
     @Inject
-    @Named ( value = "metadataTools#test" )
+    @Named ( "metadataTools#test" )
     private MetadataTools tools;
 
     @Inject
-    @Named ( value = "archivaConfiguration#mock" )
+    @Named ( "archivaConfiguration#mock" )
     protected MockConfiguration config;
 
     @Test