svn commit: r1594252 - in /logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core: Logger.java pattern/HighlightConverter.java pattern/ThrowablePatternConverter.java

[ggregory]

Author: ggregory
Date: Tue May 13 15:38:17 2014
New Revision: 1594252

URL: http://svn.apache.org/r1594252
Log:
Refactor magic strings into a constant.

Modified:
    
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
    
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
    
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java

Modified: 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java?rev=1594252&r1=1594251&r2=1594252&view=diff
==============================================================================
--- 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
 (original)
+++ 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
 Tue May 13 15:38:17 2014
@@ -30,6 +30,7 @@ import org.apache.logging.log4j.message.
 import org.apache.logging.log4j.message.MessageFactory;
 import org.apache.logging.log4j.message.SimpleMessage;
 import org.apache.logging.log4j.spi.AbstractLoggerProvider;
+import org.apache.logging.log4j.util.Strings;
 
 /**
  * @doubt All the isEnabled methods could be pushed into a filter interface.  
Not sure of the utility of having
@@ -97,7 +98,7 @@ public class Logger extends AbstractLogg
 
     @Override
     public void logMessage(final String fqcn, final Level level, final Marker 
marker, final Message message, final Throwable t) {
-        final Message msg = message == null ? new SimpleMessage("") : message;
+        final Message msg = message == null ? new SimpleMessage(Strings.EMPTY) 
: message;
         config.config.getConfigurationMonitor().checkConfiguration();
         config.loggerConfig.log(getName(), fqcn, marker, level, msg, t);
     }
@@ -347,7 +348,7 @@ public class Logger extends AbstractLogg
      */
     @Override
     public String toString() {
-        final String nameLevel = "" + getName() + ':' + getLevel();
+        final String nameLevel = Strings.EMPTY + getName() + ':' + getLevel();
         if (context == null) {
             return nameLevel;
         }

Modified: 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java?rev=1594252&r1=1594251&r2=1594252&view=diff
==============================================================================
--- 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
 (original)
+++ 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
 Tue May 13 15:38:17 2014
@@ -27,6 +27,7 @@ import org.apache.logging.log4j.core.Log
 import org.apache.logging.log4j.core.config.Configuration;
 import org.apache.logging.log4j.core.config.plugins.Plugin;
 import org.apache.logging.log4j.core.layout.PatternLayout;
+import org.apache.logging.log4j.util.Strings;
 
 /**
  * Highlight pattern converter. Formats the result of a pattern using a color 
appropriate for the Level in the LogEvent.
@@ -132,7 +133,7 @@ public final class HighlightConverter ex
             return DEFAULT_STYLES;
         }
         // Feels like a hack. Should String[] options change to a 
Map<String,String>?
-        String string = options[1].replaceAll(PatternParser.NO_CONSOLE_NO_ANSI 
+ "=(true|false)", "");
+        String string = options[1].replaceAll(PatternParser.NO_CONSOLE_NO_ANSI 
+ "=(true|false)", Strings.EMPTY);
         //
         final Map<String, String> styles = AnsiEscape.createMap(string, new 
String[] {STYLE_KEY});
         final Map<Level, String> levelStyles = new HashMap<Level, 
String>(DEFAULT_STYLES);

Modified: 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java?rev=1594252&r1=1594251&r2=1594252&view=diff
==============================================================================
--- 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
 (original)
+++ 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
 Tue May 13 15:38:17 2014
@@ -23,6 +23,7 @@ import org.apache.logging.log4j.core.Log
 import org.apache.logging.log4j.core.config.plugins.Plugin;
 import org.apache.logging.log4j.core.helpers.Constants;
 import org.apache.logging.log4j.core.impl.ThrowableFormatOptions;
+import org.apache.logging.log4j.util.Strings;
 
 
 /**
@@ -103,7 +104,7 @@ public class ThrowablePatternConverter e
         }
 
         if (t != null && throwingMethod != null) {
-            String toAppend = "";
+            String toAppend = Strings.EMPTY;
 
             if (ThrowableFormatOptions.CLASS_NAME.equalsIgnoreCase(rawOption)) 
{
                 toAppend = throwingMethod.getClassName();