(commons-configuration) 03/03: No need to nest, simplify flow

[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-configuration.git

commit 4938df066196d5bc5ef2e4324affc8ae5b065a6f
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Apr 7 09:29:04 2025 -0400

    No need to nest, simplify flow
---
 .../configuration2/convert/PropertyConverter.java  | 42 ++++++++++++++--------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
 
b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
index aa99230f..fefdcc6e 100644
--- 
a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
+++ 
b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
@@ -139,35 +139,49 @@ public final class PropertyConverter {
                 return toBigDecimal(value);
             }
             return toNumber(value, cls);
-        } else if (Date.class.equals(cls)) {
+        }
+        if (Date.class.equals(cls)) {
             return toDate(value, convHandler.getDateFormat());
-        } else if (Calendar.class.equals(cls)) {
+        }
+        if (Calendar.class.equals(cls)) {
             return toCalendar(value, convHandler.getDateFormat());
-        } else if (File.class.equals(cls)) {
+        }
+        if (File.class.equals(cls)) {
             return toFile(value);
-        } else if (Path.class.equals(cls)) {
+        }
+        if (Path.class.equals(cls)) {
             return toPath(value);
-        } else if (URI.class.equals(cls)) {
+        }
+        if (URI.class.equals(cls)) {
             return toURI(value);
-        } else if (URL.class.equals(cls)) {
+        }
+        if (URL.class.equals(cls)) {
             return toURL(value);
-        } else if (Pattern.class.equals(cls)) {
+        }
+        if (Pattern.class.equals(cls)) {
             return toPattern(value);
-        } else if (Locale.class.equals(cls)) {
+        }
+        if (Locale.class.equals(cls)) {
             return toLocale(value);
-        } else if (cls.isEnum()) {
+        }
+        if (cls.isEnum()) {
             return convertToEnum(cls, value);
-        } else if (Color.class.equals(cls)) {
+        }
+        if (Color.class.equals(cls)) {
             return toColor(value);
-        } else if (cls.getName().equals(INTERNET_ADDRESS_CLASSNAME_JAVAX)) {
+        }
+        if (cls.getName().equals(INTERNET_ADDRESS_CLASSNAME_JAVAX)) {
             // javamail-1.* With javax.mail.* namespace.
             return toInternetAddress(value, INTERNET_ADDRESS_CLASSNAME_JAVAX);
-        } else if (cls.getName().equals(INTERNET_ADDRESS_CLASSNAME_JAKARTA)) {
+        }
+        if (cls.getName().equals(INTERNET_ADDRESS_CLASSNAME_JAKARTA)) {
             // javamail-2.0+, with jakarta.mail.* namespace.
             return toInternetAddress(value, 
INTERNET_ADDRESS_CLASSNAME_JAKARTA);
-        } else if (InetAddress.class.isAssignableFrom(cls)) {
+        }
+        if (InetAddress.class.isAssignableFrom(cls)) {
             return toInetAddress(value);
-        } else if (Duration.class.equals(cls)) {
+        }
+        if (Duration.class.equals(cls)) {
             return toDuration(value);
         }