Author: ggregory
Date: Tue May 13 15:28:09 2014
New Revision: 1594245
URL: http://svn.apache.org/r1594245
Log:
Refactor magic strings into a constant.
Added:
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
(with props)
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java?rev=1594245&r1=1594244&r2=1594245&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
Tue May 13 15:28:09 2014
@@ -30,6 +30,7 @@ import org.apache.logging.log4j.spi.Prov
import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.util.PropertiesUtil;
import org.apache.logging.log4j.util.ProviderUtil;
+import org.apache.logging.log4j.util.Strings;
/**
* The anchor point for the logging system.
@@ -45,7 +46,7 @@ public class LogManager {
/**
* The name of the root Logger.
*/
- public static final String ROOT_LOGGER_NAME = "";
+ public static final String ROOT_LOGGER_NAME = Strings.EMPTY;
/**
* Scans the classpath to find all logging implementation. Currently, only
one will
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java?rev=1594245&r1=1594244&r2=1594245&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
Tue May 13 15:28:09 2014
@@ -22,6 +22,7 @@ import java.util.SortedMap;
import java.util.TreeMap;
import org.apache.logging.log4j.util.EnglishEnums;
+import org.apache.logging.log4j.util.Strings;
/**
* Represents a Message that consists of a Map.
@@ -84,7 +85,7 @@ public class MapMessage implements Multi
*/
@Override
public String getFormat() {
- return "";
+ return Strings.EMPTY;
}
/**
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java?rev=1594245&r1=1594244&r2=1594245&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
Tue May 13 15:28:09 2014
@@ -26,6 +26,8 @@ import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
+import org.apache.logging.log4j.util.Strings;
+
/**
* Captures information about all running Threads.
*/
@@ -58,13 +60,13 @@ public class ThreadDumpMessage implement
* @param title The title.
*/
public ThreadDumpMessage(final String title) {
- this.title = title == null ? "" : title;
+ this.title = title == null ? Strings.EMPTY : title;
threads = FACTORY.createThreadInfo();
}
private ThreadDumpMessage(final String formattedMsg, final String title) {
this.formattedMessage = formattedMsg;
- this.title = title == null ? "" : title;
+ this.title = title == null ? Strings.EMPTY : title;
}
@Override
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java?rev=1594245&r1=1594244&r2=1594245&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java
Tue May 13 15:28:09 2014
@@ -23,6 +23,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
+import org.apache.logging.log4j.util.Strings;
+
/**
* A copy-on-write thread-safe variant of {@code
org.apache.logging.log4j.spi.ThreadContextStack} in which all mutative
operations (add,
* pop, and so on) are implemented by making a fresh copy of the underlying
list.
@@ -177,7 +179,7 @@ public class DefaultThreadContextStack i
@Override
public String pop() {
if (!useStack) {
- return "";
+ return Strings.EMPTY;
}
final List<String> list = stack.get();
if (list == null || list.size() == 0) {
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java?rev=1594245&r1=1594244&r2=1594245&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java
Tue May 13 15:28:09 2014
@@ -35,6 +35,7 @@ import org.apache.logging.log4j.message.
import org.apache.logging.log4j.simple.SimpleLogger;
import org.apache.logging.log4j.spi.AbstractLoggerProvider;
import org.apache.logging.log4j.util.PropertiesUtil;
+import org.apache.logging.log4j.util.Strings;
/**
* Mechanism to record events that occur in the logging system.
@@ -70,7 +71,7 @@ public final class StatusLogger extends
private int listenersLevel;
private StatusLogger() {
- this.logger = new SimpleLogger("StatusLogger", Level.ERROR, false,
true, false, false, "", null, PROPS,
+ this.logger = new SimpleLogger("StatusLogger", Level.ERROR, false,
true, false, false, Strings.EMPTY, null, PROPS,
System.err);
this.listenersLevel = Level.toLevel(DEFAULT_STATUS_LEVEL,
Level.WARN).intLevel();
}
Added:
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java?rev=1594245&view=auto
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
(added)
+++
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
Tue May 13 15:28:09 2014
@@ -0,0 +1,12 @@
+package org.apache.logging.log4j.util;
+
+/**
+ * <em>Consider this class private.</em>
+ */
+public class Strings {
+
+ /**
+ * The empty string.
+ */
+ public static final String EMPTY = "";
+}
Propchange:
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
------------------------------------------------------------------------------
svn:keywords = Id
