Author: ggregory
Date: Tue May 13 19:53:23 2014
New Revision: 1594349
URL: http://svn.apache.org/r1594349
Log:
Refactor magic string into a constant.
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/Timer.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/dumbster/smtp/SmtpRequest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/Timer.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfigTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcH2AppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcHyperSqlAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaH2AppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaHyperSqlAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManagerTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerLocationTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTestCachedThreadName.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTestUncachedThreadName.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/jackson/JacksonIssue429MyNamesTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTLSSyslogServer.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/LegacyBSDTLSSyslogInputStreamReader.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/Profiler.java
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
Tue May 13 19:53:23 2014
@@ -26,6 +26,7 @@ import java.util.Locale;
import org.apache.logging.log4j.message.ParameterizedMessageFactory;
import org.apache.logging.log4j.message.StringFormatterMessageFactory;
import org.apache.logging.log4j.message.StructuredDataMessage;
+import org.apache.logging.log4j.util.Strings;
import org.junit.Before;
import org.junit.Test;
@@ -264,9 +265,9 @@ public class LoggerTest {
@Test
public void getRootLogger() {
assertNotNull(LogManager.getRootLogger());
- assertNotNull(LogManager.getLogger(""));
+ assertNotNull(LogManager.getLogger(Strings.EMPTY));
assertNotNull(LogManager.getLogger(LogManager.ROOT_LOGGER_NAME));
- assertEquals(LogManager.getRootLogger(), LogManager.getLogger(""));
+ assertEquals(LogManager.getRootLogger(),
LogManager.getLogger(Strings.EMPTY));
assertEquals(LogManager.getRootLogger(),
LogManager.getLogger(LogManager.ROOT_LOGGER_NAME));
}
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/Timer.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/Timer.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/Timer.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/Timer.java
Tue May 13 19:53:23 2014
@@ -19,6 +19,8 @@ package org.apache.logging.log4j;
import java.io.Serializable;
import java.text.DecimalFormat;
+import org.apache.logging.log4j.util.Strings;
+
/**
*
*/
@@ -171,7 +173,7 @@ public class Timer implements Serializab
// Get remaining nanoseconds
nanoseconds = nanoseconds % NANO_PER_SECOND;
- String elapsed = "";
+ String elapsed = Strings.EMPTY;
if (hours > 0)
{
@@ -204,7 +206,7 @@ public class Timer implements Serializab
// Get remaining nanoseconds
nanoseconds = nanoseconds % NANO_PER_SECOND;
- elapsed = "";
+ elapsed = Strings.EMPTY;
if (hours > 0)
{
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java
Tue May 13 19:53:23 2014
@@ -26,6 +26,8 @@ import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.IOException;
+import org.apache.logging.log4j.util.Strings;
+
/**
* Dummy SMTP server for testing purposes.
*
@@ -167,7 +169,7 @@ public class SimpleSmtpServer implements
private List<SmtpMessage> handleTransaction(final PrintWriter out, final
BufferedReader input) throws IOException {
// Initialize the state machine
SmtpState smtpState = SmtpState.CONNECT;
- final SmtpRequest smtpRequest = new
SmtpRequest(SmtpActionType.CONNECT, "", smtpState);
+ final SmtpRequest smtpRequest = new
SmtpRequest(SmtpActionType.CONNECT, Strings.EMPTY, smtpState);
// Execute the connection request
final SmtpResponse smtpResponse = smtpRequest.execute();
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/dumbster/smtp/SmtpRequest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/dumbster/smtp/SmtpRequest.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/dumbster/smtp/SmtpRequest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/dumbster/smtp/SmtpRequest.java
Tue May 13 19:53:23 2014
@@ -17,6 +17,8 @@
package org.apache.logging.dumbster.smtp;
+import org.apache.logging.log4j.util.Strings;
+
/**
* Contains an SMTP client request. Handles state transitions using the
following state transition table.
* <PRE>
@@ -122,7 +124,7 @@ public class SmtpRequest {
}
} else if (SmtpActionType.UNRECOG == action) {
if (SmtpState.DATA_HDR == state || SmtpState.DATA_BODY ==
state) {
- response = new SmtpResponse(-1, "", this.state);
+ response = new SmtpResponse(-1, Strings.EMPTY, this.state);
} else {
response = new SmtpResponse(500, "Command not recognized",
this.state);
}
@@ -134,9 +136,9 @@ public class SmtpRequest {
}
} else if (SmtpActionType.BLANK_LINE == action) {
if (SmtpState.DATA_HDR == state) {
- response = new SmtpResponse(-1, "", SmtpState.DATA_BODY);
+ response = new SmtpResponse(-1, Strings.EMPTY,
SmtpState.DATA_BODY);
} else if (SmtpState.DATA_BODY == state) {
- response = new SmtpResponse(-1, "", this.state);
+ response = new SmtpResponse(-1, Strings.EMPTY, this.state);
} else {
response = new SmtpResponse(503, "Bad sequence of
commands: " + action, this.state);
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/Timer.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/Timer.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/Timer.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/Timer.java
Tue May 13 19:53:23 2014
@@ -173,7 +173,7 @@ public class Timer implements Serializab
// Get remaining nanoseconds
nanoseconds = nanoseconds % NANO_PER_SECOND;
- String elapsed = "";
+ String elapsed = Strings.EMPTY;
if (hours > 0)
{
@@ -206,7 +206,7 @@ public class Timer implements Serializab
// Get remaining nanoseconds
nanoseconds = nanoseconds % NANO_PER_SECOND;
- elapsed = "";
+ elapsed = Strings.EMPTY;
if (hours > 0)
{
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
Tue May 13 19:53:23 2014
@@ -186,7 +186,7 @@ public class FileAppenderTest {
final FileInputStream fis = new FileInputStream(FILENAME);
final BufferedReader is = new BufferedReader(new
InputStreamReader(fis));
int counter = 0;
- String str = "";
+ String str = Strings.EMPTY;
while (is.ready()) {
str = is.readLine();
// System.out.println(str);
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java
Tue May 13 19:53:23 2014
@@ -114,7 +114,7 @@ public class SyslogAppenderTestBase {
for (int i = 0; i < receivedMessages.size(); i++) {
String receivedMessage = receivedMessages.get(i);
String sentMessage = sentMessages.get(i);
- String suffix = "true".equalsIgnoreCase(includeNewLine) ? "\n" :
"";
+ String suffix = "true".equalsIgnoreCase(includeNewLine) ? "\n" :
Strings.EMPTY;
assertTrue("Incorrect message received: " + receivedMessage,
receivedMessage.endsWith(sentMessage + suffix) ||
receivedMessage.contains(sentMessage));
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java
Tue May 13 19:53:23 2014
@@ -197,7 +197,7 @@ public abstract class AbstractJdbcAppend
assertEquals("The logger column is not correct (1).",
logger.getName(), resultSet.getNString("logger"));
assertEquals("The message column is not correct (1).", "Factory logged
message 01.",
resultSet.getString("message"));
- assertEquals("The exception column is not correct (1).", "",
+ assertEquals("The exception column is not correct (1).", Strings.EMPTY,
IOUtils.readStringAndClose(resultSet.getNClob("exception").getCharacterStream(),
-1));
assertTrue("There should be two rows.", resultSet.next());
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfigTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfigTest.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfigTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfigTest.java
Tue May 13 19:53:23 2014
@@ -83,7 +83,7 @@ public class ColumnConfigTest {
@Test
public void testNoSettingNoConfig03() {
final ColumnConfig config =
- ColumnConfig.createColumnConfig(null, "columnName01", "", "",
"", null, null);
+ ColumnConfig.createColumnConfig(null, "columnName01",
Strings.EMPTY, Strings.EMPTY, Strings.EMPTY, null, null);
assertNull("The result should be null.", config);
}
@@ -134,7 +134,7 @@ public class ColumnConfigTest {
@Test
public void testPatternColumn02() {
final ColumnConfig config =
- ColumnConfig.createColumnConfig(null, "anotherName02", "%X{id}
%level", "", "false", "false", "true");
+ ColumnConfig.createColumnConfig(null, "anotherName02", "%X{id}
%level", Strings.EMPTY, "false", "false", "true");
assertNotNull("The result should not be null.", config);
assertEquals("The column name is not correct.", "anotherName02",
config.getColumnName());
@@ -149,7 +149,7 @@ public class ColumnConfigTest {
@Test
public void testPatternColumn03() {
final ColumnConfig config =
- ColumnConfig.createColumnConfig(null, "anotherName02", "%X{id}
%level", "", "false", "true", "false");
+ ColumnConfig.createColumnConfig(null, "anotherName02", "%X{id}
%level", Strings.EMPTY, "false", "true", "false");
assertNotNull("The result should not be null.", config);
assertEquals("The column name is not correct.", "anotherName02",
config.getColumnName());
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcH2AppenderTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcH2AppenderTest.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcH2AppenderTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcH2AppenderTest.java
Tue May 13 19:53:23 2014
@@ -25,7 +25,7 @@ import java.sql.SQLException;
*/
public class JdbcH2AppenderTest extends AbstractJdbcAppenderTest {
private static final String USER_ID = "sa";
- private static final String PASSWORD = "";
+ private static final String PASSWORD = Strings.EMPTY;
public JdbcH2AppenderTest() {
super("h2");
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcHyperSqlAppenderTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcHyperSqlAppenderTest.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcHyperSqlAppenderTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcHyperSqlAppenderTest.java
Tue May 13 19:53:23 2014
@@ -25,7 +25,7 @@ import java.sql.SQLException;
*/
public class JdbcHyperSqlAppenderTest extends AbstractJdbcAppenderTest {
private static final String USER_ID = "sa";
- private static final String PASSWORD = "";
+ private static final String PASSWORD = Strings.EMPTY;
public JdbcHyperSqlAppenderTest() {
super("hsqldb");
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaH2AppenderTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaH2AppenderTest.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaH2AppenderTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaH2AppenderTest.java
Tue May 13 19:53:23 2014
@@ -23,7 +23,7 @@ import java.sql.Statement;
public class JpaH2AppenderTest extends AbstractJpaAppenderTest {
private static final String USER_ID = "sa";
- private static final String PASSWORD = "";
+ private static final String PASSWORD = Strings.EMPTY;
public JpaH2AppenderTest() {
super("h2");
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaHyperSqlAppenderTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaHyperSqlAppenderTest.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaHyperSqlAppenderTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaHyperSqlAppenderTest.java
Tue May 13 19:53:23 2014
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertNul
public class JpaHyperSqlAppenderTest extends AbstractJpaAppenderTest {
private static final String USER_ID = "sa";
- private static final String PASSWORD = "";
+ private static final String PASSWORD = Strings.EMPTY;
public JpaHyperSqlAppenderTest() {
super("hsqldb");
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManagerTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManagerTest.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManagerTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManagerTest.java
Tue May 13 19:53:23 2014
@@ -52,7 +52,7 @@ public class RollingRandomAccessFileMana
triggerSize);
final RolloverStrategy rolloverStrategy = null;
final RollingRandomAccessFileManager manager = new
RollingRandomAccessFileManager(raf,
- file.getName(), "", os, append, flushNow,
RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE, triggerSize, time,
+ file.getName(), Strings.EMPTY, os, append, flushNow,
RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE, triggerSize, time,
triggerPolicy, rolloverStrategy, null, null);
final int size = RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE *
3;
@@ -83,7 +83,7 @@ public class RollingRandomAccessFileMana
triggerSize);
final RolloverStrategy rolloverStrategy = null;
final RollingRandomAccessFileManager manager = new
RollingRandomAccessFileManager(raf,
- file.getName(), "", os, append, flushNow,
RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE, triggerSize, time,
+ file.getName(), Strings.EMPTY, os, append, flushNow,
RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE, triggerSize, time,
triggerPolicy, rolloverStrategy, null, null);
final int size = RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE *
3 + 1;
@@ -110,7 +110,7 @@ public class RollingRandomAccessFileMana
assertNotEquals(bufferSize,
RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE);
final RolloverStrategy rolloverStrategy = null;
final RollingRandomAccessFileManager manager = new
RollingRandomAccessFileManager(raf,
- file.getName(), "", os, append, flushNow, bufferSize,
triggerSize, time,
+ file.getName(), Strings.EMPTY, os, append, flushNow,
bufferSize, triggerSize, time,
triggerPolicy, rolloverStrategy, null, null);
// check the resulting buffer size is what was requested
@@ -140,7 +140,7 @@ public class RollingRandomAccessFileMana
final RollingRandomAccessFileManager manager =
RollingRandomAccessFileManager
.getRollingRandomAccessFileManager(
//
- file.getAbsolutePath(), "", isAppend, true,
RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE,
+ file.getAbsolutePath(), Strings.EMPTY, isAppend, true,
RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE,
new SizeBasedTriggeringPolicy(Long.MAX_VALUE), //
null, null, null);
manager.write(bytes, 0, bytes.length);
@@ -164,7 +164,7 @@ public class RollingRandomAccessFileMana
final RollingRandomAccessFileManager manager =
RollingRandomAccessFileManager
.getRollingRandomAccessFileManager(
//
- file.getAbsolutePath(), "", isAppend, true,
RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE,
+ file.getAbsolutePath(), Strings.EMPTY, isAppend, true,
RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE,
new SizeBasedTriggeringPolicy(Long.MAX_VALUE), //
null, null, null);
assertTrue(manager.getFileTime() < expectedMax);
@@ -184,7 +184,7 @@ public class RollingRandomAccessFileMana
final RollingRandomAccessFileManager manager =
RollingRandomAccessFileManager
.getRollingRandomAccessFileManager(
//
- file.getAbsolutePath(), "", isAppend, true,
RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE,
+ file.getAbsolutePath(), Strings.EMPTY, isAppend, true,
RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE,
new SizeBasedTriggeringPolicy(Long.MAX_VALUE), //
null, null, null);
assertEquals(file.lastModified(), manager.getFileTime());
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerLocationTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerLocationTest.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerLocationTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerLocationTest.java
Tue May 13 19:53:23 2014
@@ -44,7 +44,7 @@ public class AsyncLoggerLocationTest {
@AfterClass
public static void afterClass() {
- System.setProperty(Constants.LOG4J_CONTEXT_SELECTOR, "");
+ System.setProperty(Constants.LOG4J_CONTEXT_SELECTOR, Strings.EMPTY);
}
@Test
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTest.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTest.java
Tue May 13 19:53:23 2014
@@ -44,7 +44,7 @@ public class AsyncLoggerTest {
@AfterClass
public static void afterClass() {
- System.setProperty(Constants.LOG4J_CONTEXT_SELECTOR, "");
+ System.setProperty(Constants.LOG4J_CONTEXT_SELECTOR, Strings.EMPTY);
}
@Test
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTestCachedThreadName.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTestCachedThreadName.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTestCachedThreadName.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTestCachedThreadName.java
Tue May 13 19:53:23 2014
@@ -44,7 +44,7 @@ public class AsyncLoggerTestCachedThread
@AfterClass
public static void afterClass() {
- System.setProperty(Constants.LOG4J_CONTEXT_SELECTOR, "");
+ System.setProperty(Constants.LOG4J_CONTEXT_SELECTOR, Strings.EMPTY);
}
@Test
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTestUncachedThreadName.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTestUncachedThreadName.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTestUncachedThreadName.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTestUncachedThreadName.java
Tue May 13 19:53:23 2014
@@ -45,7 +45,7 @@ public class AsyncLoggerTestUncachedThre
@AfterClass
public static void afterClass() {
- System.setProperty(Constants.LOG4J_CONTEXT_SELECTOR, "");
+ System.setProperty(Constants.LOG4J_CONTEXT_SELECTOR, Strings.EMPTY);
}
@Test
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java
Tue May 13 19:53:23 2014
@@ -126,7 +126,7 @@ public class ConfigurationTest {
final long random = this.random.nextLong();
logger.debug("This is test message number {}", random);
int count = 0;
- String line = "";
+ String line = Strings.EMPTY;
final BufferedReader in = new BufferedReader(new
FileReader(this.logFileName));
try {
while (in.ready()) {
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
Tue May 13 19:53:23 2014
@@ -57,7 +57,7 @@ public class Log4jLogEventTest {
@Test
public void testJavaIoSerializable() throws Exception {
- final Log4jLogEvent evt = new Log4jLogEvent("some.test", null, "",
+ final Log4jLogEvent evt = new Log4jLogEvent("some.test", null,
Strings.EMPTY,
Level.INFO, new SimpleMessage("abc"), null);
final ByteArrayOutputStream arr = new ByteArrayOutputStream();
@@ -88,7 +88,7 @@ public class Log4jLogEventTest {
final Marker marker = null;
final Throwable t = null;
final Level NULL_LEVEL = null;
- final Log4jLogEvent evt = new Log4jLogEvent("some.test", marker, "",
+ final Log4jLogEvent evt = new Log4jLogEvent("some.test", marker,
Strings.EMPTY,
NULL_LEVEL, new SimpleMessage("abc"), t);
assertEquals(Level.OFF, evt.getLevel());
}
@@ -98,7 +98,7 @@ public class Log4jLogEventTest {
final Marker marker = null;
final Throwable t = null;
final Level NULL_LEVEL = null;
- final Log4jLogEvent evt = new Log4jLogEvent("some.test", marker, "",
+ final Log4jLogEvent evt = new Log4jLogEvent("some.test", marker,
Strings.EMPTY,
NULL_LEVEL, new SimpleMessage("abc"), t);
assertEquals(FixedTimeClock.FIXED_TIME, evt.getTimeMillis());
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java
Tue May 13 19:53:23 2014
@@ -128,7 +128,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testSeparatorAsEmpty() {
- test(new String[]{"separator()"}, Integer.MAX_VALUE, "", null);
+ test(new String[]{"separator()"}, Integer.MAX_VALUE, Strings.EMPTY,
null);
}
/**
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/jackson/JacksonIssue429MyNamesTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/jackson/JacksonIssue429MyNamesTest.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/jackson/JacksonIssue429MyNamesTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/jackson/JacksonIssue429MyNamesTest.java
Tue May 13 19:53:23 2014
@@ -51,7 +51,7 @@ public class JacksonIssue429MyNamesTest
JsonToken t = jp.getCurrentToken();
// Must get an Object
if (t == JsonToken.START_OBJECT) {
- String className = "", methodName = "", fileName = "";
+ String className = Strings.EMPTY, methodName = Strings.EMPTY,
fileName = Strings.EMPTY;
int lineNumber = -1;
while ((t = jp.nextValue()) != JsonToken.END_OBJECT) {
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java
Tue May 13 19:53:23 2014
@@ -359,8 +359,8 @@ public class RFC5424LayoutTest {
}
final LoggerFields[] loggerFields = new LoggerFields[] {
- LoggerFields.createLoggerFields(new KeyValuePair[] { new
KeyValuePair("dummy", ""),
- new KeyValuePair("empty", "")}, "SD-ID", "32473",
"true"),
+ LoggerFields.createLoggerFields(new KeyValuePair[] { new
KeyValuePair("dummy", Strings.EMPTY),
+ new KeyValuePair("empty", Strings.EMPTY)}, "SD-ID",
"32473", "true"),
LoggerFields.createLoggerFields(new KeyValuePair[] { new
KeyValuePair("baz", "%C.%M"),
new KeyValuePair("baz", "%C.%M") }, "BAZ", "32473",
"false"),
LoggerFields.createLoggerFields(new KeyValuePair[] { new
KeyValuePair("bar", "%C.%M")}, null, null, "false")
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTLSSyslogServer.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTLSSyslogServer.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTLSSyslogServer.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTLSSyslogServer.java
Tue May 13 19:53:23 2014
@@ -107,7 +107,7 @@ public class MockTLSSyslogServer extends
try {
int count = 0;
while (true) {
- String message = "";
+ String message = Strings.EMPTY;
message = syslogReader.read();
messageList.add(message);
count++;
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/LegacyBSDTLSSyslogInputStreamReader.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/LegacyBSDTLSSyslogInputStreamReader.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/LegacyBSDTLSSyslogInputStreamReader.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/LegacyBSDTLSSyslogInputStreamReader.java
Tue May 13 19:53:23 2014
@@ -31,7 +31,7 @@ public class LegacyBSDTLSSyslogInputStre
@Override
public String read() throws IOException {
- String message = "";
+ String message = Strings.EMPTY;
try {
while (true) {
int b = inputStream.read();
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java
Tue May 13 19:53:23 2014
@@ -46,8 +46,8 @@ public class ExtendedThrowablePatternCon
final PrintWriter pw = new PrintWriter(sw);
parent.printStackTrace(pw);
String result = sb.toString();
- result = result.replaceAll(" ~?\\[.*\\]", "");
- final String expected = sw.toString().replaceAll("\r", "");
+ result = result.replaceAll(" ~?\\[.*\\]", Strings.EMPTY);
+ final String expected = sw.toString().replaceAll("\r", Strings.EMPTY);
assertEquals(expected, result);
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/Profiler.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/Profiler.java?rev=1594349&r1=1594348&r2=1594349&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/Profiler.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/Profiler.java
Tue May 13 19:53:23 2014
@@ -67,7 +67,7 @@ public final class Profiler {
try {
controllerClazz
.getMethod("startCPUProfiling", long.class,
String.class)
- .invoke(profiler, cpuSampling(), "");
+ .invoke(profiler, cpuSampling(), Strings.EMPTY);
}
catch (final Exception e) {
LOGGER.error("Profiler was active, but failed.", e);
