(commons-logging) branch master updated: Use switch instead of cascading if-else

[gg...@apache.org]

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-logging.git


The following commit(s) were added to refs/heads/master by this push:
     new faa9e1e  Use switch instead of cascading if-else
faa9e1e is described below

commit faa9e1e2f2fd09edb106fa24f40120a21f40f550
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jun 30 08:19:07 2024 -0400

    Use switch instead of cascading if-else
---
 .../org/apache/commons/logging/impl/SimpleLog.java | 52 ++++++++++++++--------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/apache/commons/logging/impl/SimpleLog.java b/src/main/java/org/apache/commons/logging/impl/SimpleLog.java
index be9ad09..f12a66c 100644
--- a/src/main/java/org/apache/commons/logging/impl/SimpleLog.java
+++ b/src/main/java/org/apache/commons/logging/impl/SimpleLog.java
@@ -27,6 +27,7 @@ import java.security.PrivilegedAction;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Properties;
 
@@ -247,32 +248,45 @@ public class SimpleLog implements Log, Serializable {
         // Set log level from properties
         String level = getStringProperty(systemPrefix + "log." + logName);
         int i = String.valueOf(name).lastIndexOf(".");
-        while (null == level && i > -1) {
+        while (level == null && i > -1) {
             name = name.substring(0, i);
             level = getStringProperty(systemPrefix + "log." + name);
             i = String.valueOf(name).lastIndexOf(".");
         }
 
-        if (null == level) {
+        if (level == null) {
             level = getStringProperty(systemPrefix + "defaultlog");
         }
-
-        if ("all".equalsIgnoreCase(level)) {
-            setLevel(LOG_LEVEL_ALL);
-        } else if ("trace".equalsIgnoreCase(level)) {
-            setLevel(LOG_LEVEL_TRACE);
-        } else if ("debug".equalsIgnoreCase(level)) {
-            setLevel(LOG_LEVEL_DEBUG);
-        } else if ("info".equalsIgnoreCase(level)) {
-            setLevel(LOG_LEVEL_INFO);
-        } else if ("warn".equalsIgnoreCase(level)) {
-            setLevel(LOG_LEVEL_WARN);
-        } else if ("error".equalsIgnoreCase(level)) {
-            setLevel(LOG_LEVEL_ERROR);
-        } else if ("fatal".equalsIgnoreCase(level)) {
-            setLevel(LOG_LEVEL_FATAL);
-        } else if ("off".equalsIgnoreCase(level)) {
-            setLevel(LOG_LEVEL_OFF);
+        if (level != null) {
+            level = level.toLowerCase(Locale.ROOT);
+        }
+        if (level != null) {
+            switch (level) {
+            case "all":
+                setLevel(LOG_LEVEL_ALL);
+                break;
+            case "trace":
+                setLevel(LOG_LEVEL_TRACE);
+                break;
+            case "debug":
+                setLevel(LOG_LEVEL_DEBUG);
+                break;
+            case "info":
+                setLevel(LOG_LEVEL_INFO);
+                break;
+            case "warn":
+                setLevel(LOG_LEVEL_WARN);
+                break;
+            case "error":
+                setLevel(LOG_LEVEL_ERROR);
+                break;
+            case "fatal":
+                setLevel(LOG_LEVEL_FATAL);
+                break;
+            case "off":
+                setLevel(LOG_LEVEL_OFF);
+                break;
+            }
         }
     }