Index: unk/src/org/openstreetmap/josm/tools/Predicates.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/Predicates.java (revision 10833) +++ (revision ) @@ -1,141 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.tools; - -import java.util.Collection; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.regex.Pattern; - -import org.openstreetmap.josm.data.osm.OsmPrimitive; - -/** - * Utility class for creating {@link Predicate}s. - * @deprecated Use corresponding lambda expressions instead - */ -@Deprecated -public final class Predicates { - - private Predicates() { - } - - /** - * Creates a predicate that returns true every time. - * @param The type of the predicate. - * @return A predicate returning true - * @since 10040 - */ - public static Predicate alwaysTrue() { - return o -> true; - } - - /** - * Creates a predicate that returns false every time. - * @param The type of the predicate. - * @return A predicate returning false - * @since 10040 - */ - public static Predicate alwaysFalse() { - return o -> false; - } - - /** - * Returns a {@link Predicate} executing {@link Objects#equals}. - * @param type of items - * @param ref the reference object - * @return a {@link Predicate} executing {@link Objects#equals} - */ - public static Predicate equalTo(final T ref) { - return obj -> Objects.equals(obj, ref); - } - - /** - * Creates a new predicate that checks if elements are exactly of that class. - * @param The predicate type. - * @param clazz The class the elements must have. - * @return The new predicate. - * @throws IllegalArgumentException if clazz is null - */ - public static Predicate isOfClass(final Class clazz) { - CheckParameterUtil.ensureParameterNotNull(clazz, "clazz"); - return obj -> obj != null && obj.getClass() == clazz; - } - - /** - * Creates a new predicate that checks if the object is of a given class. - * @param The predicate type. - * @param clazz The class objects need to be of. - * @return The new predicate. - * @throws IllegalArgumentException if clazz is null - * @since 10286 - */ - public static Predicate isInstanceOf(final Class clazz) { - CheckParameterUtil.ensureParameterNotNull(clazz, "clazz"); - return clazz::isInstance; - } - - /** - * Returns a {@link Predicate} executing {@link Pattern#matcher(CharSequence)} and {@link java.util.regex.Matcher#matches}. - * @param pattern the pattern - * @return a {@link Predicate} executing {@link Pattern#matcher(CharSequence)} and {@link java.util.regex.Matcher#matches} - */ - public static Predicate stringMatchesPattern(final Pattern pattern) { - return string -> pattern.matcher(string).matches(); - } - - /** - * Returns a {@link Predicate} executing {@link Pattern#matcher(CharSequence)} and {@link java.util.regex.Matcher#find}. - * @param pattern the pattern - * @return a {@link Predicate} executing {@link Pattern#matcher(CharSequence)} and {@link java.util.regex.Matcher#find} - */ - public static Predicate stringContainsPattern(final Pattern pattern) { - return pattern.asPredicate(); - } - - /** - * Returns a {@link Predicate} executing {@link String#contains(CharSequence)}. - * @param pattern the pattern - * @return a {@link Predicate} executing {@link String#contains(CharSequence)} - */ - public static Predicate stringContains(final String pattern) { - return string -> string.contains(pattern); - } - - /** - * Returns a {@link Predicate} executing {@link OsmPrimitive#hasTag(String, String...)}. - * @param key the key forming the tag - * @param values one or many values forming the tag - * @return a {@link Predicate} executing {@link OsmPrimitive#hasTag(String, String...)} - */ - public static Predicate hasTag(final String key, final String... values) { - return p -> p.hasTag(key, values); - } - - /** - * Returns a {@link Predicate} executing {@link OsmPrimitive#hasKey(String)}. - * @param key the key - * @return a {@link Predicate} executing {@link OsmPrimitive#hasKey(String)} - */ - public static Predicate hasKey(final String key) { - return p -> p.hasKey(key); - } - - /** - * Returns a {@link Predicate} executing {@link Collection#contains(Object)}. - * @param type of items - * @param target collection - * @return a {@link Predicate} executing {@link Collection#contains(Object)} - */ - public static Predicate inCollection(final Collection target) { - return target::contains; - } - - /** - * Returns a {@link Predicate} testing whether objects are {@code null}. - * @param type of items - * @return a {@link Predicate} testing whether objects are {@code null} - */ - public static Predicate isNull() { - return Objects::isNull; - } - -} Index: unk/test/unit/org/openstreetmap/josm/tools/PredicatesTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/tools/PredicatesTest.java (revision 10833) +++ (revision ) @@ -1,222 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.tools; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.util.Arrays; -import java.util.Hashtable; -import java.util.List; -import java.util.Properties; -import java.util.function.Predicate; -import java.util.regex.Pattern; - -import org.junit.Rule; -import org.junit.Test; -import org.openstreetmap.josm.data.osm.Node; -import org.openstreetmap.josm.data.osm.OsmPrimitive; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - -/** - * This test tests the {@link Predicate}s created by the {@link Predicates} class. - * - * @author Michael Zangl - * @deprecated to remove when {@code Predicates} class is removed - */ -@Deprecated -public class PredicatesTest { - /** - * Some of this depends on preferences. - * @deprecated to remove when {@code Predicates} class is removed - */ - @Deprecated - @Rule - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules().preferences(); - - /** - * Test {@link Predicates#alwaysTrue()} - * @deprecated to remove when {@code Predicates} class is removed - */ - @Test - @Deprecated - public void testAlwaysTrue() { - Predicate alwaysTrue = Predicates.alwaysTrue(); - assertTrue(alwaysTrue.test(new Object())); - assertTrue(alwaysTrue.test(Boolean.TRUE)); - } - - /** - * Test {@link Predicates#alwaysFalse()} - * @deprecated to remove when {@code Predicates} class is removed - */ - @Test - @Deprecated - public void testAlwaysFalse() { - Predicate alwaysFalse = Predicates.alwaysFalse(); - assertFalse(alwaysFalse.test(new Object())); - assertFalse(alwaysFalse.test(Boolean.TRUE)); - } - - /** - * Test {@link Predicates#equalTo(Object)} - * @deprecated to remove when {@code Predicates} class is removed - */ - @Test - @Deprecated - public void testEqualTo() { - Integer testObject = Integer.valueOf(1); - Predicate equalTo = Predicates.equalTo(testObject); - assertTrue(equalTo.test(testObject)); - assertTrue(equalTo.test(Integer.valueOf(1))); - - assertFalse(equalTo.test(Integer.valueOf(2))); - assertFalse(equalTo.test(null)); - } - - /** - * Test {@link Predicates#isOfClass(Class)} - * @deprecated to remove when {@code Predicates} class is removed - */ - @Test - @Deprecated - public void testIsOfClass() { - Predicate isOfClass = Predicates.isOfClass(Hashtable.class); - assertFalse(isOfClass.test(null)); - assertFalse(isOfClass.test(new Object())); - assertFalse(isOfClass.test(new Properties())); - assertTrue(isOfClass.test(new Hashtable<>())); - } - - /** - * Test {@link Predicates#isOfClass(Class)} - * @deprecated to remove when {@code Predicates} class is removed - */ - @Test - @Deprecated - public void testIsInstanceOf() { - Predicate isInstanceOf = Predicates.isInstanceOf(Hashtable.class); - assertFalse(isInstanceOf.test(null)); - assertFalse(isInstanceOf.test(new Object())); - assertTrue(isInstanceOf.test(new Properties())); - assertTrue(isInstanceOf.test(new Hashtable<>())); - } - - /** - * Test {@link Predicates#stringMatchesPattern(java.util.regex.Pattern)} - * @deprecated to remove when {@code Predicates} class is removed - */ - @Test - @Deprecated - public void testStringMatchesPattern() { - Pattern p = Pattern.compile("ab?c"); - Predicate stringMatchesPattern = Predicates.stringMatchesPattern(p); - assertFalse(stringMatchesPattern.test("")); - assertFalse(stringMatchesPattern.test("a")); - assertFalse(stringMatchesPattern.test("xabcx")); - assertTrue(stringMatchesPattern.test("ac")); - assertTrue(stringMatchesPattern.test("abc")); - } - - /** - * Test {@link Predicates#stringContainsPattern(java.util.regex.Pattern)} - * @deprecated to remove when {@code Predicates} class is removed - */ - @Test - @Deprecated - public void testStringContainsPattern() { - Pattern p = Pattern.compile("ab?c"); - Predicate stringContainsPattern = Predicates.stringContainsPattern(p); - assertFalse(stringContainsPattern.test("")); - assertFalse(stringContainsPattern.test("a")); - assertTrue(stringContainsPattern.test("xabcx")); - assertTrue(stringContainsPattern.test("ac")); - assertTrue(stringContainsPattern.test("abc")); - assertTrue(stringContainsPattern.test("xx\nabc\nx")); - } - - /** - * Test {@link Predicates#stringContains(String)} - * @deprecated to remove when {@code Predicates} class is removed - */ - @Test - @Deprecated - public void testStringContains() { - Predicate stringContains = Predicates.stringContains("abc"); - assertFalse(stringContains.test("")); - assertFalse(stringContains.test("a")); - assertTrue(stringContains.test("xabcx")); - assertFalse(stringContains.test("ac")); - assertTrue(stringContains.test("abc")); - } - - /** - * Test {@link Predicates#hasTag(String, String...)} - * @deprecated to remove when {@code Predicates} class is removed - */ - @Test - @Deprecated - public void testHasTag() { - Predicate hasTag = Predicates.hasTag("key", "value"); - Node n1 = new Node(); - assertFalse(hasTag.test(n1)); - n1.put("Key", "x"); - assertFalse(hasTag.test(n1)); - n1.put("key", "x"); - assertFalse(hasTag.test(n1)); - n1.put("key", "value"); - assertTrue(hasTag.test(n1)); - } - - /** - * Test {@link Predicates#hasKey(String)} - * @deprecated to remove when {@code Predicates} class is removed - */ - @Test - @Deprecated - public void testHasKey() { - Predicate hasKey = Predicates.hasKey("key"); - Node n1 = new Node(); - assertFalse(hasKey.test(n1)); - n1.put("Key", "x"); - assertFalse(hasKey.test(n1)); - n1.put("key", "x"); - assertTrue(hasKey.test(n1)); - } - - /** - * Test {@link Predicates#inCollection(java.util.Collection)} - * @deprecated to remove when {@code Predicates} class is removed - */ - @Test - @Deprecated - public void testInCollection() { - List list = Arrays.asList("a", "b", "c"); - Predicate inCollection = Predicates.inCollection(list); - assertTrue(inCollection.test("a")); - assertTrue(inCollection.test("c")); - assertFalse(inCollection.test("d")); - assertFalse(inCollection.test(null)); - - List list2 = Arrays.asList("a", "b", "c", null); - Predicate inCollection2 = Predicates.inCollection(list2); - assertTrue(inCollection2.test("a")); - assertTrue(inCollection2.test("c")); - assertFalse(inCollection2.test("d")); - assertTrue(inCollection2.test(null)); - } - - /** - * Test {@link Predicates#isNull()} - * @deprecated to remove when {@code Predicates} class is removed - */ - @Test - @Deprecated - public void testIsNull() { - Predicate isNull = Predicates.isNull(); - assertTrue(isNull.test(null)); - assertFalse(isNull.test(Integer.valueOf(2))); - } -}