From cff48b4a3ccd960516bf36159680a1443f7b4349 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Tue, 21 May 2019 14:13:03 +0200 Subject: [PATCH] [Fix] Remove unnecessary class Predicate.java --- .../main/java/li/strolch/utils/Predicate.java | 119 ------------------ .../li/strolch/utils/ThrowingPredicate.java | 2 + 2 files changed, 2 insertions(+), 119 deletions(-) delete mode 100644 li.strolch.utils/src/main/java/li/strolch/utils/Predicate.java diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/Predicate.java b/li.strolch.utils/src/main/java/li/strolch/utils/Predicate.java deleted file mode 100644 index 50776d011..000000000 --- a/li.strolch.utils/src/main/java/li/strolch/utils/Predicate.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. - * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - */ -package li.strolch.utils; - -import java.util.Objects; - -/** - * Represents a predicate (boolean-valued function) of one argument. - * - *

This is a functional interface - * whose functional method is {@link #test(Object)}. - * - * @param the type of the input to the predicate - * - * @since 1.8 - */ -@FunctionalInterface -public interface Predicate { - - /** - * Evaluates this predicate on the given argument. - * - * @param t the input argument - * @return {@code true} if the input argument matches the predicate, - * otherwise {@code false} - */ - boolean test(T t); - - /** - * Returns a composed predicate that represents a short-circuiting logical - * AND of this predicate and another. When evaluating the composed - * predicate, if this predicate is {@code false}, then the {@code other} - * predicate is not evaluated. - * - *

Any exceptions thrown during evaluation of either predicate are relayed - * to the caller; if evaluation of this predicate throws an exception, the - * {@code other} predicate will not be evaluated. - * - * @param other a predicate that will be logically-ANDed with this - * predicate - * @return a composed predicate that represents the short-circuiting logical - * AND of this predicate and the {@code other} predicate - * @throws NullPointerException if other is null - */ - default Predicate and(Predicate other) { - Objects.requireNonNull(other); - return (t) -> test(t) && other.test(t); - } - - /** - * Returns a predicate that represents the logical negation of this - * predicate. - * - * @return a predicate that represents the logical negation of this - * predicate - */ - default Predicate negate() { - return (t) -> !test(t); - } - - /** - * Returns a composed predicate that represents a short-circuiting logical - * OR of this predicate and another. When evaluating the composed - * predicate, if this predicate is {@code true}, then the {@code other} - * predicate is not evaluated. - * - *

Any exceptions thrown during evaluation of either predicate are relayed - * to the caller; if evaluation of this predicate throws an exception, the - * {@code other} predicate will not be evaluated. - * - * @param other a predicate that will be logically-ORed with this - * predicate - * @return a composed predicate that represents the short-circuiting logical - * OR of this predicate and the {@code other} predicate - * @throws NullPointerException if other is null - */ - default Predicate or(Predicate other) { - Objects.requireNonNull(other); - return (t) -> test(t) || other.test(t); - } - - /** - * Returns a predicate that tests if two arguments are equal according - * to {@link Objects#equals(Object, Object)}. - * - * @param the type of arguments to the predicate - * @param targetRef the object reference with which to compare for equality, - * which may be {@code null} - * @return a predicate that tests if two arguments are equal according - * to {@link Objects#equals(Object, Object)} - */ - static Predicate isEqual(Object targetRef) { - return (null == targetRef) - ? Objects::isNull - : object -> targetRef.equals(object); - } -} diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/ThrowingPredicate.java b/li.strolch.utils/src/main/java/li/strolch/utils/ThrowingPredicate.java index 55ef0415c..d3c7c1d0d 100644 --- a/li.strolch.utils/src/main/java/li/strolch/utils/ThrowingPredicate.java +++ b/li.strolch.utils/src/main/java/li/strolch/utils/ThrowingPredicate.java @@ -1,5 +1,7 @@ package li.strolch.utils; +import java.util.function.Predicate; + @FunctionalInterface public interface ThrowingPredicate extends Predicate {