remove one-use predicate

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

diff --git a/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java b/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
index b93e88cd7a881f2057ced22c0858e55fb3e70b90..cfca77d824d430a60acec4758482a9086082ce20 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
+++ b/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
@@ -19,8 +19,14 @@ package org.apache.maven.archiva.scheduled;
  * under the License.
  */
 
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 import org.apache.archiva.repository.scanner.RepositoryScanStatistics;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.maven.archiva.common.ArchivaException;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.ConfigurationEvent;
@@ -31,7 +37,6 @@ import org.apache.maven.archiva.database.constraints.MostRecentRepositoryScanSta
 import org.apache.maven.archiva.scheduled.tasks.ArchivaTask;
 import org.apache.maven.archiva.scheduled.tasks.DatabaseTask;
 import org.apache.maven.archiva.scheduled.tasks.RepositoryTask;
-import org.apache.maven.archiva.scheduled.tasks.RepositoryTaskSelectionPredicate;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.StartingException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.StoppingException;
@@ -48,12 +53,6 @@ import org.quartz.SchedulerException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 /**
  * Default implementation of a scheduling component for archiva.
  *
@@ -345,7 +344,19 @@ public class DefaultArchivaTaskScheduler
             throw new ArchivaException( "Unable to get repository scanning queue:" + e.getMessage(), e );
         }
 
-        return CollectionUtils.exists( queue, new RepositoryTaskSelectionPredicate( repositoryId ) );
+        for ( Task t : queue )
+        {
+            if ( t instanceof RepositoryTask )
+            {
+                RepositoryTask task = (RepositoryTask) t;
+                if ( StringUtils.equals( repositoryId, task.getRepositoryId() ) )
+                {
+                    return true;
+                }
+            }
+        }
+        
+        return false;
     }
 
     public boolean isProcessingDatabaseTask()

diff --git a/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/RepositoryTaskSelectionPredicate.java b/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/RepositoryTaskSelectionPredicate.java
deleted file mode 100644 (file)
index 8c76f87..0000000
--- a/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/RepositoryTaskSelectionPredicate.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.apache.maven.archiva.scheduled.tasks;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.lang.StringUtils;
-
-/**
- * RepositoryTaskSelectionPredicate 
- *
- * @version $Id$
- */
-public class RepositoryTaskSelectionPredicate
-    implements Predicate
-{
-    private String repoid;
-
-    public RepositoryTaskSelectionPredicate( String repositoryId )
-    {
-        this.repoid = repositoryId;
-    }
-
-    public boolean evaluate( Object object )
-    {
-        boolean satisfies = false;
-
-        if ( object instanceof RepositoryTask )
-        {
-            RepositoryTask task = (RepositoryTask) object;
-            return StringUtils.equals( repoid, task.getRepositoryId() );
-        }
-
-        return satisfies;
-    }
-
-}