replace PluginFilter with guava predicate

This commit is contained in:
Sebastian Sdorra
2014-04-13 15:17:14 +02:00
parent 3d211c8fca
commit b900aa29f8
13 changed files with 55 additions and 94 deletions

View File

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

View File

@@ -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);
}

View File

@@ -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

View File

@@ -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;
}