[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 4d52121  [BEANUTILS-527] Convert from Collections4 to 
java.util.function #8.
4d52121 is described below

commit 4d521211e09dbc278660171f26fdd629295e1318
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Sun Oct 20 17:33:22 2019 -0400

    [BEANUTILS-527] Convert from Collections4 to java.util.function #8.
---
 src/changes/changes.xml                                  |  3 +++
 .../org/apache/commons/beanutils2/BeanPredicate.java     |  2 +-
 .../apache/commons/beanutils2/BeanPredicateTestCase.java | 16 ++++++++--------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index d5fb5b7..815c427 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -63,6 +63,9 @@
       <action issue="BEANUTILS-522" dev="ggregory" type="update" due-to="Gary 
Gregory">
         Update Apache Commons Collections from 4.3 to 4.4.
       </action>
+      <action issue="BEANUTILS-527" dev="ggregory" type="update" 
due-to="Melloware, Matt Sicker, Gary Gregory">
+        Convert Collections4 to java.util.function #8.
+      </action>
     </release>
 
     <release version="1.9.4" date="2019-08-13" description="The primary reason 
for this release is a bugfix for
diff --git a/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java 
b/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java
index 934cf5e..9246959 100644
--- a/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java
+++ b/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java
@@ -128,7 +128,7 @@ public class BeanPredicate implements Predicate<Object> {
 
     /**
      * Sets the <code>Predicate</code> to be applied to the value of the named 
property
-     * during {@link #evaluate(Object)}.
+     * during {@link #test(Object)}.
      * @param predicate <code>Predicate</code>, not null
      */
     public void setPredicate(final Predicate<Object> predicate) {
diff --git 
a/src/test/java/org/apache/commons/beanutils2/BeanPredicateTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/BeanPredicateTestCase.java
index e361195..1b1ebb8 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanPredicateTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanPredicateTestCase.java
@@ -34,30 +34,30 @@ public class BeanPredicateTestCase extends TestCase {
     public void testEqual() {
         Predicate<String> p = (s) -> s.equals("foo");
         final BeanPredicate predicate = new BeanPredicate("stringProperty", p);
-        assertTrue(predicate.evaluate(new TestBean("foo")));
-        assertTrue(!predicate.evaluate(new TestBean("bar")));
+        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);
-        assertTrue(!predicate.evaluate(new TestBean("foo")));
-        assertTrue(predicate.evaluate(new TestBean("bar")));
+        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);
-        assertTrue(predicate.evaluate(new TestBean("foo")));
-        assertTrue(predicate.evaluate(new TestBean("bar")));
+        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 String nullString = null;
-        assertTrue(predicate.evaluate(new TestBean(nullString)));
-        assertTrue(!predicate.evaluate(new TestBean("bar")));
+        assertTrue(predicate.test(new TestBean(nullString)));
+        assertTrue(!predicate.test(new TestBean("bar")));
     }
 
 }