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 2014/05/13 21:49:18 UTC
svn commit: r1594348 - in /logging/log4j/log4j2/trunk:
log4j-1.2-api/src/main/java/org/apache/log4j/
log4j-api/src/main/java/org/apache/logging/log4j/message/
log4j-core/src/main/java/org/apache/logging/log4j/core/config/
log4j-core/src/main/java/org/a...
Author: ggregory
Date: Tue May 13 19:49:18 2014
New Revision: 1594348
URL: http://svn.apache.org/r1594348
Log:
Refactor magic string into a constant.
Modified:
logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/Level.java
logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/LogManager.java
logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/PatternLayout.java
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NameUtil.java
logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java
logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/dto/Constraint.java
logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/util/NamingUtils.java
Modified: logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/Level.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/Level.java?rev=1594348&r1=1594347&r2=1594348&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/Level.java (original)
+++ logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/Level.java Tue May 13 19:49:18 2014
@@ -22,6 +22,8 @@ import java.io.ObjectOutputStream;
import java.io.ObjectStreamException;
import java.io.Serializable;
+import org.apache.logging.log4j.util.Strings;
+
/**
* Defines the minimum set of levels recognized by the system, that is
* <code>OFF</code>, <code>FATAL</code>, <code>ERROR</code>,
@@ -221,7 +223,7 @@ public class Level extends Priority impl
syslogEquivalent = s.readInt();
levelStr = s.readUTF();
if (levelStr == null) {
- levelStr = "";
+ levelStr = Strings.EMPTY;
}
}
Modified: logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/LogManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/LogManager.java?rev=1594348&r1=1594347&r2=1594348&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/LogManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/LogManager.java Tue May 13 19:49:18 2014
@@ -24,6 +24,7 @@ import org.apache.log4j.spi.LoggerFactor
import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.spi.RepositorySelector;
import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.util.Strings;
/**
*
@@ -66,7 +67,7 @@ public final class LogManager {
}
public static Logger getRootLogger() {
- return (Logger) Category.getInstance((LoggerContext) PrivateManager.getContext(), "");
+ return (Logger) Category.getInstance((LoggerContext) PrivateManager.getContext(), Strings.EMPTY);
}
public static Logger getLogger(final String name) {
Modified: logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/PatternLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/PatternLayout.java?rev=1594348&r1=1594347&r2=1594348&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/PatternLayout.java (original)
+++ logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/PatternLayout.java Tue May 13 19:49:18 2014
@@ -17,6 +17,7 @@
package org.apache.log4j;
import org.apache.log4j.spi.LoggingEvent;
+import org.apache.logging.log4j.util.Strings;
/**
*
@@ -29,7 +30,7 @@ public class PatternLayout extends Layou
@Override
public String format(final LoggingEvent event) {
- return "";
+ return Strings.EMPTY;
}
@Override
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=1594348&r1=1594347&r2=1594348&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 19:49:18 2014
@@ -107,7 +107,7 @@ public class ThreadDumpMessage implement
*/
@Override
public String getFormat() {
- return title == null ? "" : title;
+ return title == null ? Strings.EMPTY : title;
}
/**
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java?rev=1594348&r1=1594347&r2=1594348&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java Tue May 13 19:49:18 2014
@@ -103,7 +103,7 @@ public class LoggerConfig extends Abstra
public LoggerConfig() {
this.logEventFactory = LOG_EVENT_FACTORY;
this.level = Level.ERROR;
- this.name = "";
+ this.name = Strings.EMPTY;
this.properties = null;
this.config = null;
}
@@ -474,7 +474,7 @@ public class LoggerConfig extends Abstra
levelName);
level = Level.ERROR;
}
- final String name = loggerName.equals("root") ? "" : loggerName;
+ final String name = loggerName.equals("root") ? Strings.EMPTY : loggerName;
final boolean additive = Booleans.parseBoolean(additivity, true);
return new LoggerConfig(name, appenderRefs, filter, level, additive,
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java?rev=1594348&r1=1594347&r2=1594348&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java Tue May 13 19:49:18 2014
@@ -171,7 +171,7 @@ public final class PatternParser {
pc = (LogEventPatternConverter) converter;
handlesThrowable |= pc.handlesThrowable();
} else {
- pc = new LiteralPatternConverter(config, "");
+ pc = new LiteralPatternConverter(config, Strings.EMPTY);
}
FormattingInfo field;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NameUtil.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NameUtil.java?rev=1594348&r1=1594347&r2=1594348&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NameUtil.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NameUtil.java Tue May 13 19:49:18 2014
@@ -18,6 +18,8 @@ package org.apache.logging.log4j.core.ut
import java.security.MessageDigest;
+import org.apache.logging.log4j.util.Strings;
+
/**
*
*/
@@ -33,7 +35,7 @@ public final class NameUtil {
return null;
}
final int i = name.lastIndexOf('.');
- return i > 0 ? name.substring(0, i) : "";
+ return i > 0 ? name.substring(0, i) : Strings.EMPTY;
}
public static String md5(final String string) {
Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java?rev=1594348&r1=1594347&r2=1594348&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java Tue May 13 19:49:18 2014
@@ -95,7 +95,7 @@ public class FlumeEmbeddedManager extend
}
sb.append(']');
} else {
- String sep = "";
+ String sep = Strings.EMPTY;
sb.append(name).append('-');
final StringBuilder props = new StringBuilder();
for (final Property prop : properties) {
@@ -213,7 +213,7 @@ public class FlumeEmbeddedManager extend
}
final StringBuilder sb = new StringBuilder();
- String leading = "";
+ String leading = Strings.EMPTY;
int priority = agents.length;
for (int i = 0; i < priority; ++i) {
sb.append(leading).append("agent").append(i);
Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java?rev=1594348&r1=1594347&r2=1594348&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java (original)
+++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java Tue May 13 19:49:18 2014
@@ -37,6 +37,7 @@ import org.apache.logging.log4j.message.
import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.message.StructuredDataId;
import org.apache.logging.log4j.message.StructuredDataMessage;
+import org.apache.logging.log4j.util.Strings;
/**
* Class that is both a Flume and Log4j Event.
@@ -49,9 +50,9 @@ public class FlumeEvent extends SimpleEv
*/
private static final long serialVersionUID = -8988674608627854140L;
- private static final String DEFAULT_MDC_PREFIX = "";
+ private static final String DEFAULT_MDC_PREFIX = Strings.EMPTY;
- private static final String DEFAULT_EVENT_PREFIX = "";
+ private static final String DEFAULT_EVENT_PREFIX = Strings.EMPTY;
private static final String EVENT_TYPE = "eventType";
Modified: logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/dto/Constraint.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/dto/Constraint.java?rev=1594348&r1=1594347&r2=1594348&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/dto/Constraint.java (original)
+++ logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/dto/Constraint.java Tue May 13 19:49:18 2014
@@ -21,13 +21,15 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.apache.logging.log4j.util.Strings;
+
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
public @interface Constraint {
boolean required() default false;
- String pattern() default "";
+ String pattern() default Strings.EMPTY;
int minLength() default -1;
Modified: logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/util/NamingUtils.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/util/NamingUtils.java?rev=1594348&r1=1594347&r2=1594348&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/util/NamingUtils.java (original)
+++ logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/util/NamingUtils.java Tue May 13 19:49:18 2014
@@ -16,6 +16,8 @@
*/
package org.apache.logging.log4j.samples.util;
+import org.apache.logging.log4j.util.Strings;
+
public class NamingUtils {
public static String getPackageName(final String className) {
@@ -27,7 +29,7 @@ public class NamingUtils {
}
public static String getMethodShortName(final String name) {
- return name.replaceFirst("(get|set|is|has)", "");
+ return name.replaceFirst("(get|set|is|has)", Strings.EMPTY);
}
public static String upperFirst(final String name) {
@@ -62,11 +64,11 @@ public class NamingUtils {
}
public static String getClassName(final String className) {
- return upperFirst(className.replaceAll("[^a-zA-Z0-9_]+", ""));
+ return upperFirst(className.replaceAll("[^a-zA-Z0-9_]+", Strings.EMPTY));
}
public static String getFieldName(final String fieldName) {
- return fieldName.replaceAll("[^a-zA-Z0-9_]+", "");
+ return fieldName.replaceAll("[^a-zA-Z0-9_]+", Strings.EMPTY);
}
public static String methodCaseName(final String variable) {