From 9214c65371dded64f0a8068e7b877f97d50a024f Mon Sep 17 00:00:00 2001
From: Gary Gregory <garydgregory@gmail.com>
Date: Wed, 17 Jun 2020 11:05:04 -0400
Subject: [PATCH] Merge conditions using the same blocks.

---
 .../java/org/apache/commons/lang3/StringUtils.java |  4 +---
 .../commons/lang3/event/EventListenerSupport.java  |  4 +---
 .../apache/commons/lang3/reflect/MethodUtils.java  | 14 ++++----------
 .../org/apache/commons/lang3/text/WordUtils.java   |  5 +----
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java
index 507cba02e..ec9f6160c 100644
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -8879,9 +8879,7 @@ public static String swapCase(final String str) {
         for (int i = 0; i < strLen; ) {
             final int oldCodepoint = str.codePointAt(i);
             final int newCodePoint;
-            if (Character.isUpperCase(oldCodepoint)) {
-                newCodePoint = Character.toLowerCase(oldCodepoint);
-            } else if (Character.isTitleCase(oldCodepoint)) {
+            if (Character.isUpperCase(oldCodepoint) || Character.isTitleCase(oldCodepoint)) {
                 newCodePoint = Character.toLowerCase(oldCodepoint);
             } else if (Character.isLowerCase(oldCodepoint)) {
                 newCodePoint = Character.toUpperCase(oldCodepoint);
diff --git a/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java b/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
index 499032d1d..bd7951921 100644
--- a/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
+++ b/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
@@ -195,9 +195,7 @@ public void addListener(final L listener) {
      */
     public void addListener(final L listener, final boolean allowDuplicate) {
         Validate.notNull(listener, "Listener object cannot be null.");
-        if (allowDuplicate) {
-            listeners.add(listener);
-        } else if (!listeners.contains(listener)) {
+        if (allowDuplicate || !listeners.contains(listener)) {
             listeners.add(listener);
         }
     }
diff --git a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
index 63260e8df..125bba373 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
@@ -757,10 +757,8 @@ public static Method getMatchingMethod(final Class<?> cls, final String methodNa
                 return method;
             } else if (methodName.equals(method.getName()) &&
                     ClassUtils.isAssignable(parameterTypes, method.getParameterTypes(), true)) {
-                if (inexactMatch == null) {
-                    inexactMatch = method;
-                } else if (distance(parameterTypes, method.getParameterTypes())
-                        < distance(parameterTypes, inexactMatch.getParameterTypes())) {
+                if ((inexactMatch == null) || (distance(parameterTypes, method.getParameterTypes())
+                        < distance(parameterTypes, inexactMatch.getParameterTypes()))) {
                     inexactMatch = method;
                 }
             }
@@ -1007,14 +1005,10 @@ private static List<Class<?>> getAllSuperclassesAndInterfaces(final Class<?> cls
             Class<?> acls;
             if (interfaceIndex >= allInterfaces.size()) {
                 acls = allSuperclasses.get(superClassIndex++);
-            } else if (superClassIndex >= allSuperclasses.size()) {
+            } else if ((superClassIndex >= allSuperclasses.size()) || (interfaceIndex < superClassIndex) || !(superClassIndex < interfaceIndex)) {
                 acls = allInterfaces.get(interfaceIndex++);
-            } else if (interfaceIndex < superClassIndex) {
-                acls = allInterfaces.get(interfaceIndex++);
-            } else if (superClassIndex < interfaceIndex) {
-                acls = allSuperclasses.get(superClassIndex++);
             } else {
-                acls = allInterfaces.get(interfaceIndex++);
+                acls = allSuperclasses.get(superClassIndex++);
             }
             allSuperClassesAndInterfaces.add(acls);
         }
diff --git a/src/main/java/org/apache/commons/lang3/text/WordUtils.java b/src/main/java/org/apache/commons/lang3/text/WordUtils.java
index ee1249e1e..5eb9eadb1 100644
--- a/src/main/java/org/apache/commons/lang3/text/WordUtils.java
+++ b/src/main/java/org/apache/commons/lang3/text/WordUtils.java
@@ -582,10 +582,7 @@ public static String swapCase(final String str) {
 
         for (int i = 0; i < buffer.length; i++) {
             final char ch = buffer[i];
-            if (Character.isUpperCase(ch)) {
-                buffer[i] = Character.toLowerCase(ch);
-                whitespace = false;
-            } else if (Character.isTitleCase(ch)) {
+            if (Character.isUpperCase(ch) || Character.isTitleCase(ch)) {
                 buffer[i] = Character.toLowerCase(ch);
                 whitespace = false;
             } else if (Character.isLowerCase(ch)) {