Author: ggregory
Date: Fri May 9 16:00:07 2014
New Revision: 1593567
URL: http://svn.apache.org/r1593567
Log:
Rename org.apache.logging.log4j.core.LogEvent.getFQCN() to getLoggerFQCN() to
match using “Logger” in getLoggerName(), otherwise get the FQCN of what? Not
the event, the logger _of_ the event, hence this change.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractLogEventWrapperEntity.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/BasicLogEventEntity.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.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/db/jpa/TestBaseEntity.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicyTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/TestRewritePolicy.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/lookup/DateLookupTest.java
logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java?rev=1593567&r1=1593566&r2=1593567&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
Fri May 9 16:00:07 2014
@@ -49,7 +49,7 @@ public interface LogEvent extends Serial
*
* @return The fully qualified class name of the caller.
*/
- String getFQCN();
+ String getLoggerFQCN();
/**
* Gets the level.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractLogEventWrapperEntity.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractLogEventWrapperEntity.java?rev=1593567&r1=1593566&r2=1593567&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractLogEventWrapperEntity.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractLogEventWrapperEntity.java
Fri May 9 16:00:07 2014
@@ -211,7 +211,7 @@ public abstract class AbstractLogEventWr
* @param fqcn Ignored.
*/
@SuppressWarnings("unused")
- public void setFQCN(final String fqcn) {
+ public void setLoggerFQCN(final String fqcn) {
// this entity is write-only
}
@@ -307,7 +307,7 @@ public abstract class AbstractLogEventWr
}
@Override
- public String getFQCN() {
+ public String getLoggerFQCN() {
return null;
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/BasicLogEventEntity.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/BasicLogEventEntity.java?rev=1593567&r1=1593566&r2=1593567&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/BasicLogEventEntity.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/BasicLogEventEntity.java
Fri May 9 16:00:07 2014
@@ -211,7 +211,7 @@ public abstract class BasicLogEventEntit
*/
@Override
@Basic
- public String getFQCN() {
- return this.getWrappedEvent().getFQCN();
+ public String getLoggerFQCN() {
+ return this.getWrappedEvent().getLoggerFQCN();
}
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java?rev=1593567&r1=1593566&r2=1593567&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
Fri May 9 16:00:07 2014
@@ -80,11 +80,11 @@ public final class MapRewritePolicy impl
final MapMessage message = ((MapMessage) msg).newInstance(newMap);
if (source instanceof Log4jLogEvent) {
Log4jLogEvent event = (Log4jLogEvent) source;
- return Log4jLogEvent.createEvent(event.getLoggerName(),
event.getMarker(), event.getFQCN(),
+ return Log4jLogEvent.createEvent(event.getLoggerName(),
event.getMarker(), event.getLoggerFQCN(),
event.getLevel(), message, event.getThrownProxy(),
event.getContextMap(), event.getContextStack(),
event.getThreadName(), event.getSource(),
event.getTimeMillis());
}
- return new Log4jLogEvent(source.getLoggerName(), source.getMarker(),
source.getFQCN(), source.getLevel(),
+ return new Log4jLogEvent(source.getLoggerName(), source.getMarker(),
source.getLoggerFQCN(), source.getLevel(),
message, source.getThrown(), source.getContextMap(),
source.getContextStack(), source.getThreadName(),
source.getSource(), source.getTimeMillis());
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java?rev=1593567&r1=1593566&r2=1593567&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
Fri May 9 16:00:07 2014
@@ -70,7 +70,7 @@ public final class PropertiesRewritePoli
config.getStrSubstitutor().replace(prop.getValue()) :
prop.getValue());
}
- return new Log4jLogEvent(source.getLoggerName(), source.getMarker(),
source.getFQCN(), source.getLevel(),
+ return new Log4jLogEvent(source.getLoggerName(), source.getMarker(),
source.getLoggerFQCN(), source.getLevel(),
source.getMessage(), source.getThrown(), props,
source.getContextStack(), source.getThreadName(),
source.getSource(), source.getTimeMillis());
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java?rev=1593567&r1=1593566&r2=1593567&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
Fri May 9 16:00:07 2014
@@ -137,7 +137,7 @@ public class RingBufferLogEvent implemen
}
@Override
- public String getFQCN() {
+ public String getLoggerFQCN() {
return fqcn;
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java?rev=1593567&r1=1593566&r2=1593567&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
Fri May 9 16:00:07 2014
@@ -271,7 +271,7 @@ public class Log4jLogEvent implements Lo
* @return the fully qualified class name of the class that is performing
logging.
*/
@Override
- public String getFQCN() {
+ public String getLoggerFQCN() {
return fqcnOfLogger;
}
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=1593567&r1=1593566&r2=1593567&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
Fri May 9 16:00:07 2014
@@ -44,7 +44,7 @@ public class JpaH2AppenderTest extends A
statement.executeUpdate("CREATE TABLE jpaBasicLogEntry ( " +
"id INTEGER IDENTITY, timemillis BIGINT, level NVARCHAR(10),
loggerName NVARCHAR(255), " +
"message NVARCHAR(1024), thrown NVARCHAR(1048576),
contextMapJson NVARCHAR(1048576)," +
- "fqcn NVARCHAR(1024), contextStack NVARCHAR(1048576), marker
NVARCHAR(255), source NVARCHAR(2048)," +
+ "loggerFQCN NVARCHAR(1024), contextStack NVARCHAR(1048576),
marker NVARCHAR(255), source NVARCHAR(2048)," +
"threadName NVARCHAR(255)" +
" )");
statement.close();
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=1593567&r1=1593566&r2=1593567&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
Fri May 9 16:00:07 2014
@@ -49,7 +49,7 @@ public class JpaHyperSqlAppenderTest ext
statement.executeUpdate("CREATE TABLE jpaBasicLogEntry ( " +
"id INTEGER IDENTITY, timemillis BIGINT, level VARCHAR(10),
loggerName VARCHAR(255), " +
"message VARCHAR(1024), thrown VARCHAR(1048576),
contextMapJson VARCHAR(1048576)," +
- "fqcn VARCHAR(1024), contextStack VARCHAR(1048576), marker
VARCHAR(255), source VARCHAR(2048)," +
+ "loggerFQCN VARCHAR(1024), contextStack VARCHAR(1048576),
marker VARCHAR(255), source VARCHAR(2048)," +
"threadName VARCHAR(255)" +
" )");
statement.close();
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java?rev=1593567&r1=1593566&r2=1593567&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java
Fri May 9 16:00:07 2014
@@ -142,7 +142,7 @@ public class TestBaseEntity extends Abst
@Override
@Transient
- public String getFQCN() {
- return this.getWrappedEvent().getFQCN();
+ public String getLoggerFQCN() {
+ return this.getWrappedEvent().getLoggerFQCN();
}
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicyTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicyTest.java?rev=1593567&r1=1593566&r2=1593567&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicyTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicyTest.java
Fri May 9 16:00:07 2014
@@ -138,7 +138,7 @@ public class MapRewritePolicyTest {
// Ensure that everything but the Mapped Data is still the same
Assert.assertEquals("LoggerName changed", orig.getLoggerName(),
changed.getLoggerName());
Assert.assertEquals("Marker changed", orig.getMarker(),
changed.getMarker());
- Assert.assertEquals("FQCN changed", orig.getFQCN(), changed.getFQCN());
+ Assert.assertEquals("FQCN changed", orig.getLoggerFQCN(),
changed.getLoggerFQCN());
Assert.assertEquals("Level changed", orig.getLevel(),
changed.getLevel());
Assert.assertEquals("Throwable changed", orig.getThrown() == null //
? null //
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/TestRewritePolicy.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/TestRewritePolicy.java?rev=1593567&r1=1593566&r2=1593567&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/TestRewritePolicy.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/TestRewritePolicy.java
Fri May 9 16:00:07 2014
@@ -30,7 +30,7 @@ public class TestRewritePolicy implement
@Override
public LogEvent rewrite(final LogEvent source) {
- return new Log4jLogEvent(source.getLoggerName(), source.getMarker(),
source.getFQCN(), source.getLevel(),
+ return new Log4jLogEvent(source.getLoggerName(), source.getMarker(),
source.getLoggerFQCN(), source.getLevel(),
source.getMessage(), source.getThrown(), source.getContextMap(),
source.getContextStack(),
source.getThreadName(), source.getSource(),
source.getTimeMillis());
}
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=1593567&r1=1593566&r2=1593567&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
Fri May 9 16:00:07 2014
@@ -69,7 +69,7 @@ public class Log4jLogEventTest {
final Log4jLogEvent evt2 = (Log4jLogEvent) in.readObject();
assertEquals(evt.getTimeMillis(), evt2.getTimeMillis());
- assertEquals(evt.getFQCN(), evt2.getFQCN());
+ assertEquals(evt.getLoggerFQCN(), evt2.getLoggerFQCN());
assertEquals(evt.getLevel(), evt2.getLevel());
assertEquals(evt.getLoggerName(), evt2.getLoggerName());
assertEquals(evt.getMarker(), evt2.getMarker());
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/DateLookupTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/DateLookupTest.java?rev=1593567&r1=1593566&r2=1593567&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/DateLookupTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/DateLookupTest.java
Fri May 9 16:00:07 2014
@@ -102,7 +102,7 @@ public class DateLookupTest {
}
@Override
- public String getFQCN() {
+ public String getLoggerFQCN() {
return null;
}
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=1593567&r1=1593566&r2=1593567&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
Fri May 9 16:00:07 2014
@@ -198,8 +198,8 @@ public class FlumeEvent extends SimpleEv
* @return the FQCN String.
*/
@Override
- public String getFQCN() {
- return event.getFQCN();
+ public String getLoggerFQCN() {
+ return event.getLoggerFQCN();
}
/**
