replace PluginFilter with guava predicate

scm-plugin-backend/src/main/java/sonia/scm/plugin/DefaultPluginBackend.java

@@ -35,6 +35,7 @@ package sonia.scm.plugin;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.google.common.base.Predicate;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
@@ -92,8 +93,6 @@ public class DefaultPluginBackend extends AbstractPluginBackend
    * Constructs ...
    *
    *
-   *
-   * @param baseDirectory
    * @param configuration
    */
   @Inject
@@ -221,19 +220,19 @@ public class DefaultPluginBackend extends AbstractPluginBackend
    * Method description
    *
    *
-   * @param filter
+   * @param predicate
    *
    * @return
    */
   @Override
-  public List<PluginInformation> getPlugins(PluginFilter filter)
+  public List<PluginInformation> getPlugins(Predicate<PluginInformation> predicate)
   {
     List<PluginInformation> filteredPlugins =
       new ArrayList<PluginInformation>();
 
     for (PluginInformation plugin : pluginStore)
     {
-      if (filter.accept(plugin))
+      if (predicate.apply(plugin))
       {
         filteredPlugins.add(plugin);
       }

scm-plugin-backend/src/main/java/sonia/scm/plugin/PluginBackend.java

@@ -33,6 +33,10 @@
 
 package sonia.scm.plugin;
 
+//~--- non-JDK imports --------------------------------------------------------
+
+import com.google.common.base.Predicate;
+
 //~--- JDK imports ------------------------------------------------------------
 
 import java.io.File;
@@ -53,7 +57,7 @@ public interface PluginBackend
    *
    *
    * @param listener
-   * 
+   *
    * @since 2.0.0
    */
   public void addListener(PluginBackendListener listener);
@@ -63,7 +67,7 @@ public interface PluginBackend
    *
    *
    * @param listeners
-   * 
+   *
    * @since 2.0.0
    */
   public void addListeners(Collection<PluginBackendListener> listeners);
@@ -107,7 +111,7 @@ public interface PluginBackend
    *
    *
    * @param listener
-   * 
+   *
    * @since 2.0.0
    */
   public void removeListener(PluginBackendListener listener);
@@ -133,12 +137,12 @@ public interface PluginBackend
   /**
    * Method description
    *
-   *
-   * @param filter
+   * @param predicate
    *
    * @return
    */
-  public List<PluginInformation> getPlugins(PluginFilter filter);
+  public List<PluginInformation> getPlugins(
+    Predicate<PluginInformation> predicate);
 
   /**
    * Method description

scm-plugin-backend/src/main/java/sonia/scm/plugin/PluginUtil.java

@@ -35,6 +35,7 @@ package sonia.scm.plugin;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.google.common.base.Predicate;
 import sonia.scm.util.LinkTextParser;
 import sonia.scm.util.Util;
 
@@ -191,10 +192,10 @@ public final class PluginUtil
     PluginBackend backend, final String groupId, final String artifactId)
   {
     List<PluginInformation> pluginVersions =
-      backend.getPlugins(new PluginFilter()
+      backend.getPlugins(new Predicate<PluginInformation>()
     {
       @Override
-      public boolean accept(PluginInformation plugin)
+      public boolean apply(PluginInformation plugin)
       {
         return groupId.equals(plugin.getGroupId())
           && artifactId.equals(plugin.getArtifactId());

scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/api/DefaultPluginPredicate.java

@@ -35,15 +35,15 @@ package sonia.scm.plugin.rest.api;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.google.common.base.Predicate;
 import sonia.scm.plugin.PluginCondition;
-import sonia.scm.plugin.PluginFilter;
 import sonia.scm.plugin.PluginInformation;
 
 /**
  *
  * @author Sebastian Sdorra
  */
-public class DefaultPluginFilter implements PluginFilter
+public class DefaultPluginPredicate implements Predicate<PluginInformation>
 {
 
   /** Field description */
@@ -60,7 +60,7 @@ public class DefaultPluginFilter implements PluginFilter
    * @param arch
    * @param snapshot
    */
-  public DefaultPluginFilter(String version, String os, String arch,
+  public DefaultPluginPredicate(String version, String os, String arch,
     boolean snapshot)
   {
     this.version = version;
@@ -80,7 +80,7 @@ public class DefaultPluginFilter implements PluginFilter
    * @return
    */
   @Override
-  public boolean accept(PluginInformation plugin)
+  public boolean apply(PluginInformation plugin)
   {
     PluginCondition condition = plugin.getCondition();
 

scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/api/PluginResource.java

@@ -174,7 +174,7 @@ public class PluginResource implements PluginBackendListener
       }
 
       List<PluginInformation> plugins =
-        backend.getPlugins(new DefaultPluginFilter(version, os, arch,
+        backend.getPlugins(new DefaultPluginPredicate(version, os, arch,
           snapshot));
 
       pc = new PluginCenter();