[commons-beanutils] branch master updated: Merge conditions using the same blocks.

[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 cfb7579  Merge conditions using the same blocks.
cfb7579 is described below

commit cfb7579254843c3f42ddb8ca2d5e7a0af2b15dc7
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed Jun 17 11:25:12 2020 -0400

    Merge conditions using the same blocks.
---
 src/main/java/org/apache/commons/beanutils2/DynaProperty.java       | 4 +---
 src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java       | 6 +-----
 .../org/apache/commons/beanutils2/expression/DefaultResolver.java   | 4 +---
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/apache/commons/beanutils2/DynaProperty.java 
b/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
index 7434570..2519e00 100644
--- a/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
+++ b/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
@@ -166,9 +166,7 @@ public class DynaProperty implements Serializable {
 
         if (type == null) {
             return false;
-        } else if (type.isArray()) {
-            return true;
-        } else if (List.class.isAssignableFrom(type)) {
+        } else if (type.isArray() || List.class.isAssignableFrom(type)) {
             return true;
         } else {
             return false;
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java 
b/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
index 4bcd4e9..8789685 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
@@ -746,11 +746,7 @@ public class LazyDynaBean implements DynaBean, 
Serializable {
         // Create the mapped object
         Object mappedProperty = null;
 
-        if (type == null) {
-
-            mappedProperty = defaultMappedProperty(name);
-
-        } else if (type.isInterface()) {
+        if ((type == null) || type.isInterface()) {
 
             mappedProperty = defaultMappedProperty(name);
 
diff --git 
a/src/main/java/org/apache/commons/beanutils2/expression/DefaultResolver.java 
b/src/main/java/org/apache/commons/beanutils2/expression/DefaultResolver.java
index 745d0c4..32e30d8 100644
--- 
a/src/main/java/org/apache/commons/beanutils2/expression/DefaultResolver.java
+++ 
b/src/main/java/org/apache/commons/beanutils2/expression/DefaultResolver.java
@@ -146,9 +146,7 @@ public class DefaultResolver implements Resolver {
         }
         for (int i = 0; i < expression.length(); i++) {
             final char c = expression.charAt(i);
-            if (c == NESTED) {
-                return expression.substring(0, i);
-            } else if (c == MAPPED_START || c == INDEXED_START) {
+            if ((c == NESTED) || (c == MAPPED_START || c == INDEXED_START)) {
                 return expression.substring(0, i);
             }
         }