[commons-beanutils] branch master updated: [BEANUTILS-527] Convert from Collections4 to java.util.function #8.

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git


The following commit(s) were added to refs/heads/master by this push:
     new 2f2406d  [BEANUTILS-527] Convert from Collections4 to 
java.util.function #8.
2f2406d is described below

commit 2f2406d37474d8e6244f21a5e9ec38b11c608239
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Sun Oct 20 17:44:21 2019 -0400

    [BEANUTILS-527] Convert from Collections4 to java.util.function #8.
    
    Use generics.
---
 .../java/org/apache/commons/beanutils2/BeanPredicate.java    | 12 ++++++------
 .../org/apache/commons/beanutils2/BeanPredicateTestCase.java |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java 
b/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java
index 335d208..e5c7d51 100644
--- a/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java
+++ b/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java
@@ -29,14 +29,14 @@ import org.apache.commons.logging.LogFactory;
  * </p>
  *
  */
-public class BeanPredicate implements Predicate<Object> {
+public class BeanPredicate<T> implements Predicate<T> {
 
     private final Log log = LogFactory.getLog(this.getClass());
 
     /** Name of the property whose value will be predicated */
     private String propertyName;
     /** <code>Predicate</code> to be applied to the property value */
-    private Predicate<Object> predicate;
+    private Predicate<T> predicate;
 
     /**
      * Constructs a <code>BeanPredicate</code> that applies the given
@@ -46,7 +46,7 @@ public class BeanPredicate implements Predicate<Object> {
      * @param predicate the <code>Predicate</code> to be applied,
      * not null
      */
-    public BeanPredicate(final String propertyName, final Predicate predicate) 
{
+    public BeanPredicate(final String propertyName, final Predicate<T> 
predicate) {
         this.propertyName = propertyName;
         this.predicate = predicate;
     }
@@ -64,7 +64,7 @@ public class BeanPredicate implements Predicate<Object> {
         boolean evaluation = false;
 
         try {
-            final Object propValue = PropertyUtils.getProperty( object, 
propertyName );
+            final T propValue = (T) PropertyUtils.getProperty(object, 
propertyName);
             evaluation = predicate.test(propValue);
         } catch (final IllegalArgumentException e) {
             final String errorMsg = "Problem during evaluation.";
@@ -110,7 +110,7 @@ public class BeanPredicate implements Predicate<Object> {
      * during {@link #evaluate}.
      * @return <code>Predicate</code>, not null
      */
-    public Predicate<Object> getPredicate() {
+    public Predicate<T> getPredicate() {
         return predicate;
     }
 
@@ -119,7 +119,7 @@ public class BeanPredicate implements Predicate<Object> {
      * during {@link #test(Object)}.
      * @param predicate <code>Predicate</code>, not null
      */
-    public void setPredicate(final Predicate<Object> predicate) {
+    public void setPredicate(final Predicate<T> predicate) {
         this.predicate = predicate;
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils2/BeanPredicateTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/BeanPredicateTestCase.java
index 1b1ebb8..0972174 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanPredicateTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanPredicateTestCase.java
@@ -33,28 +33,28 @@ public class BeanPredicateTestCase extends TestCase {
 
     public void testEqual() {
         Predicate<String> p = (s) -> s.equals("foo");
-        final BeanPredicate predicate = new BeanPredicate("stringProperty", p);
+        final BeanPredicate<String> predicate = new 
BeanPredicate<>("stringProperty", p);
         assertTrue(predicate.test(new TestBean("foo")));
         assertTrue(!predicate.test(new TestBean("bar")));
     }
 
     public void testNotEqual() {
         Predicate<String> p = (s) -> !s.equals("foo");
-        final BeanPredicate predicate = new BeanPredicate("stringProperty", p);
+        final BeanPredicate<String> predicate = new 
BeanPredicate<>("stringProperty", p);
         assertTrue(!predicate.test(new TestBean("foo")));
         assertTrue(predicate.test(new TestBean("bar")));
     }
 
     public void testInstanceOf() {
         Predicate<String> p = (s) -> (s instanceof String);
-        final BeanPredicate predicate = new BeanPredicate("stringProperty", p);
+        final BeanPredicate<String> predicate = new 
BeanPredicate<>("stringProperty", p);
         assertTrue(predicate.test(new TestBean("foo")));
         assertTrue(predicate.test(new TestBean("bar")));
     }
 
     public void testNull() {
         Predicate<String> p = (s) -> s == null;
-        final BeanPredicate predicate = new BeanPredicate("stringProperty", p);
+        final BeanPredicate<String> predicate = new 
BeanPredicate<>("stringProperty", p);
         final String nullString = null;
         assertTrue(predicate.test(new TestBean(nullString)));
         assertTrue(!predicate.test(new TestBean("bar")));