simplify inject of bean list

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1160293 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/KnownRepositoryContentConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/KnownRepositoryContentConsumer.java
index b73209ec595a44f3e5ec7e27b5555c0392e16765..66d98459f57096c2fec341447bc6f3cff5daca4f 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/KnownRepositoryContentConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/KnownRepositoryContentConsumer.java
@@ -27,5 +27,5 @@ package org.apache.maven.archiva.consumers;
 public interface KnownRepositoryContentConsumer
     extends RepositoryContentConsumer
 {
-
+    // no op
 }

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
index 0f1a999754f62915544d4737b535164678ebb758..b52fc4eeb0c488d286e12a6f5b25bb9e8ab978b1 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
@@ -107,12 +107,13 @@ public class RepositoryPurgeConsumer
 
     private boolean deleteReleasedSnapshots;
 
-    @Inject
-    private ApplicationContext applicationContext;
+    //@Inject
+    //private ApplicationContext applicationContext;
 
     /**
      * plexus.requirement role="org.apache.archiva.repository.events.RepositoryListener"
      */
+    @Inject
     private List<RepositoryListener> listeners = Collections.emptyList();
 
     /**
@@ -250,8 +251,8 @@ public class RepositoryPurgeConsumer
     @PostConstruct
     public void initialize()
     {
-        this.listeners =
-            new ArrayList<RepositoryListener>( applicationContext.getBeansOfType( RepositoryListener.class ).values() );
+        //this.listeners =
+        //    new ArrayList<RepositoryListener>( applicationContext.getBeansOfType( RepositoryListener.class ).values() );
         configuration.addChangeListener( this );
 
         initIncludes();

diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
index ec50428190a80097454b8f241e25dd0391333583..84782aef1383cfa3178627b6efeb8ddb3f8c1ea8 100644 (file)
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
@@ -116,22 +116,25 @@ public class DefaultRepositoryProxyConnectors
     @Named( value = "metadataTools#default" )
     private MetadataTools metadataTools;
 
-    @Inject
-    private ApplicationContext applicationContext;
+    //@Inject
+    //private ApplicationContext applicationContext;
 
     /**
      * plexus.requirement role="org.apache.maven.archiva.policies.PreDownloadPolicy"
      */
+    @Inject
     private Map<String, PreDownloadPolicy> preDownloadPolicies;
 
     /**
      * plexus.requirement role="org.apache.maven.archiva.policies.PostDownloadPolicy"
      */
+    @Inject
     private Map<String, PostDownloadPolicy> postDownloadPolicies;
 
     /**
      * plexus.requirement role="org.apache.maven.archiva.policies.DownloadErrorPolicy"
      */
+    @Inject
     private Map<String, DownloadErrorPolicy> downloadErrorPolicies;
 
     /**
@@ -162,9 +165,9 @@ public class DefaultRepositoryProxyConnectors
     {
         initConnectorsAndNetworkProxies();
         archivaConfiguration.addChangeListener( this );
-        this.postDownloadPolicies = applicationContext.getBeansOfType( PostDownloadPolicy.class );
-        this.preDownloadPolicies = applicationContext.getBeansOfType( PreDownloadPolicy.class );
-        this.downloadErrorPolicies = applicationContext.getBeansOfType( DownloadErrorPolicy.class );
+        //this.postDownloadPolicies = applicationContext.getBeansOfType( PostDownloadPolicy.class );
+        //his.preDownloadPolicies = applicationContext.getBeansOfType( PreDownloadPolicy.class );
+        //this.downloadErrorPolicies = applicationContext.getBeansOfType( DownloadErrorPolicy.class );
     }
 
     @SuppressWarnings( "unchecked" )

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java
index 8c685a72cbfee0f4af9a04cc87e563990d788380..a8556c9cc1f4da513d91d7b986ac55a727691162 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java
@@ -62,16 +62,17 @@ public abstract class AbstractDefaultRepositoryContent
     /**
      * plexus.requirement role="org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider"
      */
-    protected List<? extends ArtifactMappingProvider> artifactMappingProviders;
-
     @Inject
-    protected ApplicationContext applicationContext;
+    protected List<ArtifactMappingProvider> artifactMappingProviders;
+
+    //@Inject
+    //protected ApplicationContext applicationContext;
 
     @PostConstruct
     protected void initialize()
     {
-        artifactMappingProviders = new ArrayList<ArtifactMappingProvider>(
-            applicationContext.getBeansOfType( ArtifactMappingProvider.class ).values() );
+        //artifactMappingProviders = new ArrayList<ArtifactMappingProvider>(
+        //    applicationContext.getBeansOfType( ArtifactMappingProvider.class ).values() );
     }
 
     public ArtifactReference toArtifactReference( String path )

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractActionSupport.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractActionSupport.java
index 1c95e2c645774a3405603505fa31455b50a202a4..add5607e30349564f3ee112b9128cf74263afa4d 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractActionSupport.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractActionSupport.java
@@ -58,6 +58,7 @@ public abstract class AbstractActionSupport
     /**\r
      * plexus.requirement role="org.apache.archiva.audit.AuditListener"\r
      */\r
+    @Inject\r
     private List<AuditListener> auditListeners = new ArrayList<AuditListener>();\r
 \r
     /**\r
@@ -75,8 +76,7 @@ public abstract class AbstractActionSupport
     @PostConstruct\r
     public void initialize()\r
     {\r
-        // TODO some caching here\r
-        this.auditListeners = Lists.newArrayList( applicationContext.getBeansOfType( AuditListener.class ).values() );\r
+        // no op\r
     }\r
 \r
     @SuppressWarnings( "unchecked" )\r

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
index dc619c21234ca9a15d3480b6d5d22fc155f3e7a1..e370066ec4bb06feefbbeefbb20ff2965f056e19 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
@@ -125,6 +125,7 @@ public class DeleteArtifactAction
     /**
      * plexus.requirement role="org.apache.archiva.repository.events.RepositoryListener"
      */
+    @Inject
     private List<RepositoryListener> listeners;
 
     private ChecksumAlgorithm[] algorithms = new ChecksumAlgorithm[]{ ChecksumAlgorithm.SHA1, ChecksumAlgorithm.MD5 };
@@ -133,7 +134,6 @@ public class DeleteArtifactAction
     public void initialize()
     {
         super.initialize();
-        listeners = Lists.newArrayList( applicationContext.getBeansOfType( RepositoryListener.class ).values() );
     }
 
     public String getGroupId()

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
index b0eeed5fd9f59ce4ed027664f7468d38287ad48b..280c9837687268c07b36c340884f24b2911e0097 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
@@ -110,6 +110,7 @@ public class ArchivaDavResourceFactory
     /**
      * plexus.requirement role="org.apache.archiva.audit.AuditListener"
      */
+    @Inject
     private List<AuditListener> auditListeners = new ArrayList<AuditListener>();
 
     /**
@@ -145,7 +146,6 @@ public class ArchivaDavResourceFactory
     /**
      * plexus.requirement
      */
-    //Inject
     private ArchivaConfiguration archivaConfiguration;
 
     /**
@@ -169,21 +169,16 @@ public class ArchivaDavResourceFactory
     /**
      * plexus.requirement
      */
-    //Inject
     private ChecksumFile checksum;
 
     /**
      * plexus.requirement role-hint="sha1"
      */
-    //Inject
-    //Named( value = "digester#sha1" )
     private Digester digestSha1;
 
     /**
      * plexus.requirement role-hint="md5";
      */
-    //Inject
-    //Named( value = "digester#md5" )
     private Digester digestMd5;
 
     /**
@@ -193,7 +188,6 @@ public class ArchivaDavResourceFactory
     @Named( value = "archivaTaskScheduler#repository" )
     private RepositoryArchivaTaskScheduler scheduler;
 
-    //Inject
     private ApplicationContext applicationContext;
 
     @Inject
@@ -209,8 +203,6 @@ public class ArchivaDavResourceFactory
         this.digestSha1 = plexusSisuBridge.lookup( Digester.class, "sha1" );
 
         repositoryRequest = new RepositoryRequest( new LegacyPathParser( archivaConfiguration ) );
-        this.auditListeners =
-            new ArrayList<AuditListener>( applicationContext.getBeansOfType( AuditListener.class ).values() );
     }
 
     @PostConstruct

diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
index 27940a9f08272f48780ccf3ea5131bb24c32dafb..e6fb6888e40b7cd859a7dc97c23e7ac14bd83168 100644 (file)
--- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
@@ -82,17 +82,18 @@ public class DefaultMetadataResolver
     /**
      * plexus.requirement role="org.apache.archiva.repository.events.RepositoryListener"
      */
+    @Inject
     private List<RepositoryListener> listeners;
 
 
-    @Inject
-    private ApplicationContext applicationContext;
+    //@Inject
+    //private ApplicationContext applicationContext;
 
     @PostConstruct
     private void initialize()
     {
-        listeners =
-            new ArrayList<RepositoryListener>( applicationContext.getBeansOfType( RepositoryListener.class ).values() );
+        //listeners =
+        //    new ArrayList<RepositoryListener>( applicationContext.getBeansOfType( RepositoryListener.class ).values() );
     }
 
     public ProjectVersionMetadata resolveProjectVersion( RepositorySession session, String repoId, String namespace,

diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
index 4ed4c08250f27445764a1de7d66dfa229856ab4b..c1bb5cc2bac18ff59514e7da527bd6024063a5c7 100644 (file)
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
@@ -46,13 +46,14 @@ public class Maven2RepositoryPathTranslator
 
     private static final Pattern TIMESTAMP_PATTERN = Pattern.compile( "([0-9]{8}.[0-9]{6})-([0-9]+).*" );
 
-    @Inject
-    private ApplicationContext applicationContext;
+    //@Inject
+    //private ApplicationContext applicationContext;
 
     /**
      * plexus.requirement role="org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider"
      * see #initialize
      */
+    @Inject
     private List<ArtifactMappingProvider> artifactMappingProviders;
 
     public Maven2RepositoryPathTranslator()
@@ -63,8 +64,9 @@ public class Maven2RepositoryPathTranslator
     @PostConstruct
     public void initialize()
     {
-        artifactMappingProviders = new ArrayList<ArtifactMappingProvider>(
-            applicationContext.getBeansOfType( ArtifactMappingProvider.class ).values() );
+
+        //artifactMappingProviders = new ArrayList<ArtifactMappingProvider>(
+        //    applicationContext.getBeansOfType( ArtifactMappingProvider.class ).values() );
 
     }