replace PluginFilter with guava predicate

scm-core/src/main/java/sonia/scm/plugin/PluginConditionFailedException.java

@@ -86,5 +86,5 @@ public final class PluginConditionFailedException extends PluginException
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
-  private PluginCondition condition;
+  private final PluginCondition condition;
 }

scm-core/src/main/java/sonia/scm/plugin/PluginFilter.java

@@ -1,52 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.plugin;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-public interface PluginFilter
-{
-
-  /**
-   * Method description
-   *
-   *
-   * @param plugin
-   *
-   * @return
-   */
-  public boolean accept(PluginInformation plugin);
-}

scm-core/src/main/java/sonia/scm/plugin/PluginManager.java

@@ -35,6 +35,7 @@ package sonia.scm.plugin;
 
 //~--- JDK imports ------------------------------------------------------------
 
+import com.google.common.base.Predicate;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -108,7 +109,7 @@ public interface PluginManager
    *
    * @return
    */
-  public Collection<PluginInformation> get(PluginFilter filter);
+  public Collection<PluginInformation> get(Predicate<PluginInformation> filter);
 
   /**
    * Method description

scm-core/src/main/java/sonia/scm/plugin/StatePluginPredicate.java

@@ -33,11 +33,15 @@
 
 package sonia.scm.plugin;
 
+//~--- non-JDK imports --------------------------------------------------------
+
+import com.google.common.base.Predicate;
+
 /**
  *
  * @author Sebastian Sdorra
  */
-public class StatePluginFilter implements PluginFilter
+public class StatePluginPredicate implements Predicate<PluginInformation>
 {
 
   /**
@@ -46,7 +50,7 @@ public class StatePluginFilter implements PluginFilter
    *
    * @param state
    */
-  public StatePluginFilter(PluginState state)
+  public StatePluginPredicate(PluginState state)
   {
     this.state = state;
   }
@@ -62,7 +66,7 @@ public class StatePluginFilter implements PluginFilter
    * @return
    */
   @Override
-  public boolean accept(PluginInformation plugin)
+  public boolean apply(PluginInformation plugin)
   {
     return state == plugin.getState();
   }
@@ -70,5 +74,5 @@ public class StatePluginFilter implements PluginFilter
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
-  private PluginState state;
+  private final PluginState state;
 }

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 predicate
-   * @param filter
    *
    * @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();

scm-webapp/src/main/java/sonia/scm/api/rest/resources/PluginResource.java

@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
 
 import sonia.scm.api.rest.RestActionResult;
 import sonia.scm.api.rest.RestActionUploadResult;
-import sonia.scm.plugin.OverviewPluginFilter;
+import sonia.scm.plugin.OverviewPluginPredicate;
 import sonia.scm.plugin.PluginConditionFailedException;
 import sonia.scm.plugin.PluginInformation;
 import sonia.scm.plugin.PluginInformationComparator;
@@ -331,7 +331,7 @@ public class PluginResource
   {
     //J-
     List<PluginInformation> plugins = Lists.newArrayList(
-      pluginManager.get(OverviewPluginFilter.INSTANCE)
+      pluginManager.get(OverviewPluginPredicate.INSTANCE)
     );
     //J+
 

scm-webapp/src/main/java/sonia/scm/plugin/AetherPluginHandler.java

@@ -317,7 +317,7 @@ public class AetherPluginHandler
   {
     List<Dependency> dependencies = Lists.newArrayList();
     Collection<PluginInformation> installed =
-      pluginManager.get(new StatePluginFilter(PluginState.INSTALLED));
+      pluginManager.get(new StatePluginPredicate(PluginState.INSTALLED));
 
     if (installed != null)
     {

scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java

@@ -35,9 +35,9 @@ package sonia.scm.plugin;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import sonia.scm.version.Version;
 import com.github.legman.Subscribe;
 
+import com.google.common.base.Predicate;
 import com.google.common.collect.Sets;
 import com.google.common.io.Files;
 import com.google.inject.Inject;
@@ -61,6 +61,7 @@ import sonia.scm.util.IOUtil;
 import sonia.scm.util.SecurityUtil;
 import sonia.scm.util.SystemUtil;
 import sonia.scm.util.Util;
+import sonia.scm.version.Version;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -106,8 +107,8 @@ public class DefaultPluginManager implements PluginManager
   private static final boolean REMOTE_PLUGINS_ENABLED = false;
 
   /** Field description */
-  public static final PluginFilter FILTER_UPDATES =
+  public static final Predicate<PluginInformation> FILTER_UPDATES =
-    new StatePluginFilter(PluginState.UPDATE_AVAILABLE);
+    new StatePluginPredicate(PluginState.UPDATE_AVAILABLE);
 
   //~--- constructors ---------------------------------------------------------
 
@@ -384,20 +385,20 @@ public class DefaultPluginManager implements PluginManager
    * Method description
    *
    *
-   * @param filter
+   * @param predicate
    *
    * @return
    */
   @Override
-  public Set<PluginInformation> get(PluginFilter filter)
+  public Set<PluginInformation> get(Predicate<PluginInformation> predicate)
   {
-    AssertUtil.assertIsNotNull(filter);
+    AssertUtil.assertIsNotNull(predicate);
     SecurityUtil.assertIsAdmin();
 
     Set<PluginInformation> infoSet = new HashSet<PluginInformation>();
 
-    filter(infoSet, getInstalled(), filter);
+    filter(infoSet, getInstalled(), predicate);
-    filter(infoSet, getPluginCenter().getPlugins(), filter);
+    filter(infoSet, getPluginCenter().getPlugins(), predicate);
 
     return infoSet;
   }
@@ -514,14 +515,15 @@ public class DefaultPluginManager implements PluginManager
    *
    * @param target
    * @param source
-   * @param filter
+   * @param predicate
    */
   private void filter(Set<PluginInformation> target,
-    Collection<PluginInformation> source, PluginFilter filter)
+    Collection<PluginInformation> source,
+    Predicate<PluginInformation> predicate)
   {
     for (PluginInformation info : source)
     {
-      if (filter.accept(info))
+      if (predicate.apply(info))
       {
         target.add(info);
       }

scm-webapp/src/main/java/sonia/scm/plugin/OverviewPluginPredicate.java

@@ -33,16 +33,18 @@
 
 package sonia.scm.plugin;
 
+import com.google.common.base.Predicate;
+
 /**
  *
  * @author Sebastian Sdorra
  */
-public class OverviewPluginFilter implements PluginFilter
+public class OverviewPluginPredicate implements Predicate<PluginInformation>
 {
 
   /** Field description */
-  public static final OverviewPluginFilter INSTANCE =
+  public static final OverviewPluginPredicate INSTANCE =
-    new OverviewPluginFilter();
+    new OverviewPluginPredicate();
 
   //~--- methods --------------------------------------------------------------
 
@@ -55,7 +57,7 @@ public class OverviewPluginFilter implements PluginFilter
    * @return
    */
   @Override
-  public boolean accept(PluginInformation plugin)
+  public boolean apply(PluginInformation plugin)
   {
     return plugin.getState() != PluginState.NEWER_VERSION_INSTALLED;
   }