Siphalor/tweed5-commons-logging
1
0
Fork 0
Code Activity

Use switch instead of cascading if-else

Browse Source
This commit is contained in:
Gary Gregory
2024-06-30 08:19:07 -04:00
parent 61c261037d
commit faa9e1e2f2
1 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/main/java/org/apache/commons/logging/impl/SimpleLog.java
View File

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