You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/06/10 09:01:54 UTC
logging-log4j2 git commit: [LOG4J2-1017] Update Java platform from
Java 6 to 7. Reuse stock Java 7 method. Use Java 7 String switch.
Repository: logging-log4j2
Updated Branches:
refs/heads/master cd717915d -> 83ae01319
[LOG4J2-1017] Update Java platform from Java 6 to 7. Reuse stock Java 7
method. Use Java 7 String switch.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/83ae0131
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/83ae0131
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/83ae0131
Branch: refs/heads/master
Commit: 83ae0131949c36ab8b4ba26a6281326d32d91b8a
Parents: cd71791
Author: Gary Gregory <ga...@gmail.com>
Authored: Wed Jun 10 00:01:50 2015 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Wed Jun 10 00:01:50 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/core/lookup/JavaLookup.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/83ae0131/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JavaLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JavaLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JavaLookup.java
index a433f33..08e3885 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JavaLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JavaLookup.java
@@ -99,20 +99,21 @@ public class JavaLookup extends AbstractLookup {
*/
@Override
public String lookup(final LogEvent event, final String key) {
- // TODO Use a Java 7 switch
- if ("version".equals(key)) {
+ switch (key) {
+ case "version":
return "Java version " + getSystemProperty("java.version");
- } else if ("runtime".equals(key)) {
+ case "runtime":
return getRuntime();
- } else if ("vm".equals(key)) {
+ case "vm":
return getVirtualMachine();
- } else if ("os".equals(key)) {
+ case "os":
return getOperatingSystem();
- } else if ("hw".equals(key)) {
+ case "hw":
return getHardware();
- } else if ("locale".equals(key)) {
+ case "locale":
return getLocale();
+ default:
+ throw new IllegalArgumentException(key);
}
- throw new IllegalArgumentException(key);
}
}