[MRM-1330] update DuplicateArtifactsConsumer to the session-based API

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

diff --git a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
index 5ba9abb12464b5c39741463bda831b8063a8b2f5..ee77dcd9625c35630f3dcb4318e97108c71a4597 100644 (file)
--- a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
+++ b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
@@ -24,6 +24,8 @@ import org.apache.archiva.checksum.ChecksummedFile;
 import org.apache.archiva.metadata.model.ArtifactMetadata;
 import org.apache.archiva.metadata.repository.MetadataRepository;
 import org.apache.archiva.metadata.repository.MetadataRepositoryException;
+import org.apache.archiva.metadata.repository.RepositorySession;
+import org.apache.archiva.metadata.repository.RepositorySessionFactory;
 import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator;
 import org.apache.archiva.reports.RepositoryProblemFacet;
 import org.apache.commons.collections.CollectionUtils;
@@ -84,17 +86,19 @@ public class DuplicateArtifactsConsumer
      */
     private FileTypes filetypes;
 
+    /**
+     * FIXME: can be of other types
+     *
+     * @plexus.requirement
+     */
+    private RepositorySessionFactory repositorySessionFactory;
+
     private List<String> includes = new ArrayList<String>();
 
     private File repositoryDir;
 
     private String repoId;
 
-    /**
-     * @plexus.requirement
-     */
-    private MetadataRepository metadataRepository;
-
     /**
      * FIXME: needs to be selected based on the repository in question
      *
@@ -102,6 +106,8 @@ public class DuplicateArtifactsConsumer
      */
     private RepositoryPathTranslator pathTranslator;
 
+    private RepositorySession repositorySession;
+
     public String getId()
     {
         return id;
@@ -132,6 +138,7 @@ public class DuplicateArtifactsConsumer
     {
         repoId = repo.getId();
         this.repositoryDir = new File( repo.getLocation() );
+        repositorySession = repositorySessionFactory.createSession();
     }
 
     public void beginScan( ManagedRepositoryConfiguration repo, Date whenGathered, boolean executeOnEntireRepo )
@@ -160,6 +167,8 @@ public class DuplicateArtifactsConsumer
             throw new ConsumerException( e.getMessage(), e );
         }
 
+        MetadataRepository metadataRepository = repositorySession.getRepository();
+
         List<ArtifactMetadata> results;
         try
         {
@@ -233,7 +242,7 @@ public class DuplicateArtifactsConsumer
 
     public void completeScan()
     {
-        // nothing to do
+        repositorySession.close();
     }
 
     public void completeScan( boolean executeOnEntireRepo )

diff --git a/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java b/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java
index a69223a01889db719e3e751d2681aa729f0bcf24..5dedab00b18712550ac0710bee52a9263182b29b 100644 (file)
--- a/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java
+++ b/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java
@@ -22,6 +22,8 @@ package org.apache.archiva.reports.consumers;
 import org.apache.archiva.metadata.model.ArtifactMetadata;
 import org.apache.archiva.metadata.model.MetadataFacet;
 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.metadata.repository.storage.RepositoryPathTranslator;
 import org.apache.archiva.reports.RepositoryProblemFacet;
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
@@ -76,7 +78,13 @@ public class DuplicateArtifactsConsumerTest
         config.setId( TEST_REPO );
         config.setLocation( getTestFile( "target/test-repository" ).getAbsolutePath() );
 
-        metadataRepository = (MetadataRepository) lookup( MetadataRepository.class );
+        metadataRepository = mock( MetadataRepository.class );
+
+        RepositorySession session = mock( RepositorySession.class );
+        when( session.getRepository() ).thenReturn( metadataRepository );
+
+        RepositorySessionFactory factory = (RepositorySessionFactory) lookup( RepositorySessionFactory.class );
+        when( factory.createSession() ).thenReturn( session );
 
         pathTranslator = (RepositoryPathTranslator) lookup( RepositoryPathTranslator.class, "maven2" );
         when( pathTranslator.getArtifactForPath( TEST_REPO, TEST_FILE ) ).thenReturn( TEST_METADATA );

diff --git a/archiva-modules/plugins/problem-reports/src/test/resources/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest-context.xml b/archiva-modules/plugins/problem-reports/src/test/resources/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest-context.xml
index 0aafa268095a1032e2ab97ba93eb14fd96cf093f..8265901cdc8aadf0ba35d4554fb1756363e8e132 100644 (file)
--- a/archiva-modules/plugins/problem-reports/src/test/resources/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest-context.xml
+++ b/archiva-modules/plugins/problem-reports/src/test/resources/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest-context.xml
@@ -21,9 +21,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-  <bean id="metadataRepositoryFactory" class="org.apache.archiva.reports.consumers.MockitoFactory"
-        name="metadataRepository">
-    <constructor-arg value="org.apache.archiva.metadata.repository.MetadataRepository"/>
+  <bean id="repositorySessionFactoryFactory" class="org.apache.archiva.reports.consumers.MockitoFactory"
+        name="repositorySessionFactory">
+    <constructor-arg value="org.apache.archiva.metadata.repository.RepositorySessionFactory"/>
   </bean>
   <bean id="repositoryPathTranslatorFactory" class="org.apache.archiva.reports.consumers.MockitoFactory"
         name="repositoryPathTranslator#maven2">