fix unit test, ArtifactIndexingTask has now a new field onlyUpdate to prevent full...

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

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
index 19a66eb06039bc64d72605c3c0b78155d6a7b16d..ad047ff24be4e625fba6485b44952ebbc235448e 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
@@ -112,11 +112,9 @@ public class ArchivaIndexingTaskExecutor
             if ( ArtifactIndexingTask.Action.FINISH.equals( indexingTask.getAction() )
                 && indexingTask.isExecuteOnEntireRepo() )
             {
-                // TODO update or not !!
-                // olamy currently do the full scan
                 try
                 {
-                    nexusIndexer.scan( context, null, false );
+                    nexusIndexer.scan( context, null, indexingTask.isOnlyUpdate() );
                 }
                 catch ( IOException e )
                 {

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
index 688d465f9a97701c418ad1ddbd0a7e0624ed1682..8302f89a79c060002ee0c7fc869b9e06a19c7a2e 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
@@ -51,6 +51,11 @@ public class ArtifactIndexingTask
 
     private boolean executeOnEntireRepo = true;
 
+    /**
+     * @since 1.4
+     */
+    private boolean onlyUpdate = false;
+
     public ArtifactIndexingTask( ManagedRepositoryConfiguration repository, File resourceFile, Action action,
                                  IndexingContext context )
     {
@@ -67,6 +72,13 @@ public class ArtifactIndexingTask
         this.executeOnEntireRepo = executeOnEntireRepo;
     }
 
+    public ArtifactIndexingTask( ManagedRepositoryConfiguration repository, File resourceFile, Action action,
+                                 IndexingContext context, boolean executeOnEntireRepo, boolean onlyUpdate )
+    {
+        this( repository, resourceFile, action, context, executeOnEntireRepo );
+        this.onlyUpdate = onlyUpdate;
+    }
+
     public boolean isExecuteOnEntireRepo()
     {
         return executeOnEntireRepo;
@@ -92,13 +104,6 @@ public class ArtifactIndexingTask
         return action;
     }
 
-    @Override
-    public String toString()
-    {
-        return "ArtifactIndexingTask [action=" + action + ", repositoryId=" + repository.getId() + ", resourceFile="
-            + resourceFile + "]";
-    }
-
     public ManagedRepositoryConfiguration getRepository()
     {
         return repository;
@@ -109,6 +114,16 @@ public class ArtifactIndexingTask
         return context;
     }
 
+    public boolean isOnlyUpdate()
+    {
+        return onlyUpdate;
+    }
+
+    public void setOnlyUpdate( boolean onlyUpdate )
+    {
+        this.onlyUpdate = onlyUpdate;
+    }
+
     @Override
     public int hashCode()
     {
@@ -158,6 +173,23 @@ public class ArtifactIndexingTask
         return true;
     }
 
+
+    @Override
+    public String toString()
+    {
+        return "ArtifactIndexingTask [action=" + action + ", repositoryId=" + repository.getId() + ", resourceFile="
+            + resourceFile + "]";
+    }
+
+    /**
+     * FIXME remove this static somewhere else !
+     * @param repository
+     * @param indexer
+     * @param indexCreators
+     * @return
+     * @throws IOException
+     * @throws UnsupportedExistingLuceneIndexException
+     */
     public static IndexingContext createContext( ManagedRepositoryConfiguration repository, NexusIndexer indexer,
                                                  List<? extends IndexCreator> indexCreators )
         throws IOException, UnsupportedExistingLuceneIndexException

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
index 23f26580375521976f056659e41400ef7f8fb638..3b8da8e5d091bcc5d64095f04d929c77155aeba0 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
@@ -278,12 +278,15 @@ public class ArchivaIndexingTaskExecutorTest
         ArtifactIndexingTask task =
             new ArtifactIndexingTask( repositoryConfig, artifactFile, ArtifactIndexingTask.Action.ADD,
                                       getIndexingContext() );
+        task.setExecuteOnEntireRepo( false );
 
         indexingExecutor.executeTask( task );
 
         task = new ArtifactIndexingTask( repositoryConfig, artifactFile, ArtifactIndexingTask.Action.FINISH,
                                          getIndexingContext() );
 
+        task.setExecuteOnEntireRepo( false );
+
         indexingExecutor.executeTask( task );
 
         assertTrue( new File( repositoryConfig.getLocation(), ".indexer" ).exists() );
@@ -303,14 +306,14 @@ public class ArchivaIndexingTaskExecutorTest
         FlatSearchRequest request = new FlatSearchRequest( q, getIndexingContext() );
         FlatSearchResponse response = indexer.searchFlat( request );
 
-        assertEquals( 1, response.getTotalHits() );
-
         Set<ArtifactInfo> results = response.getResults();
 
-        ArtifactInfo artifactInfo = (ArtifactInfo) results.iterator().next();
+        ArtifactInfo artifactInfo = results.iterator().next();
         assertEquals( "org.apache.archiva", artifactInfo.groupId );
         assertEquals( "archiva-index-methods-jar-test", artifactInfo.artifactId );
         assertEquals( "test-repo", artifactInfo.repository );
+
+        assertEquals( 1, response.getTotalHits() );
     }
 
     private void unzipIndex( String indexDir, String destDir )