logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1395170 - in /logging/log4j/log4j2/trunk: api/src/main/java/org/apache/logging/log4j/message/ core/src/main/java/org/apache/logging/log4j/core/filter/ core/src/main/java/org/apache/logging/log4j/core/layout/ log4j12-api/src/test/java/org/a...
Date Sat, 06 Oct 2012 20:58:10 GMT
Author: ggregory
Date: Sat Oct  6 20:58:09 2012
New Revision: 1395170

URL: http://svn.apache.org/viewvc?rev=1395170&view=rev
Log:
Renamed Message.getMessageFormat() to getFormat().

Modified:
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/Message.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
    logging/log4j/log4j2/trunk/log4j12-api/src/test/java/org/apache/log4j/LoggerTest.java

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MapMessage.java?rev=1395170&r1=1395169&r2=1395170&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
(original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
Sat Oct  6 20:58:09 2012
@@ -79,7 +79,7 @@ public class MapMessage implements Multi
      * Return the message.
      * @return the message.
      */
-    public String getMessageFormat() {
+    public String getFormat() {
         return "";
     }
 

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/Message.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/Message.java?rev=1395170&r1=1395169&r2=1395170&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/Message.java
(original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/Message.java
Sat Oct  6 20:58:09 2012
@@ -56,7 +56,7 @@ public interface Message extends Seriali
      * method will return. A Formatter is inappropriate as this is very specific to the Message
      * implementation so it isn't clear to me how having a Formatter separate from the Message
would be cleaner.
      */
-    String getMessageFormat();
+    String getFormat();
 
     /**
      * Returns parameter values, if any.

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java?rev=1395170&r1=1395169&r2=1395170&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java
(original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java
Sat Oct  6 20:58:09 2012
@@ -53,7 +53,7 @@ public class ObjectMessage implements Me
      * Returns the object formatted using its toString method.
      * @return the String representation of the object.
      */
-    public String getMessageFormat() {
+    public String getFormat() {
         return obj.toString();
     }
 

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java?rev=1395170&r1=1395169&r2=1395170&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
(original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
Sat Oct  6 20:58:09 2012
@@ -175,7 +175,7 @@ public class ParameterizedMessage implem
      * Returns the message pattern.
      * @return the message pattern.
      */
-    public String getMessageFormat() {
+    public String getFormat() {
         return messagePattern;
     }
 

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java?rev=1395170&r1=1395169&r2=1395170&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java
(original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java
Sat Oct  6 20:58:09 2012
@@ -53,7 +53,7 @@ public class SimpleMessage implements Me
      * Return the message.
      * @return the message.
      */
-    public String getMessageFormat() {
+    public String getFormat() {
         return message;
     }
 

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java?rev=1395170&r1=1395169&r2=1395170&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java
(original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java
Sat Oct  6 20:58:09 2012
@@ -62,7 +62,7 @@ public class StringFormattedMessage impl
      * Returns the message pattern.
      * @return the message pattern.
      */
-    public String getMessageFormat() {
+    public String getFormat() {
         return messagePattern;
     }
 

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java?rev=1395170&r1=1395169&r2=1395170&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
(original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
Sat Oct  6 20:58:09 2012
@@ -175,7 +175,7 @@ public class StructuredDataMessage exten
      * @return the message.
      */
     @Override
-    public String getMessageFormat() {
+    public String getFormat() {
         return message;
     }
 
@@ -252,7 +252,7 @@ public class StructuredDataMessage exten
         appendMap(sb);
         sb.append("]");
         if (full) {
-            String msg = getMessageFormat();
+            String msg = getFormat();
             if (msg != null) {
                 sb.append(" ").append(msg);
             }

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java?rev=1395170&r1=1395169&r2=1395170&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
(original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
Sat Oct  6 20:58:09 2012
@@ -102,7 +102,7 @@ public class ThreadDumpMessage implement
      * Returns the title.
      * @return the title.
      */
-    public String getMessageFormat() {
+    public String getFormat() {
         return title == null ? "" : title;
     }
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java?rev=1395170&r1=1395169&r2=1395170&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
Sat Oct  6 20:58:09 2012
@@ -60,13 +60,13 @@ public final class RegexFilter extends F
 
     @Override
     public Result filter(Logger logger, Level level, Marker marker, Message msg, Throwable
t) {
-        String text = useRawMessage ? msg.getMessageFormat() : msg.getFormattedMessage();
+        String text = useRawMessage ? msg.getFormat() : msg.getFormattedMessage();
         return filter(text);
     }
 
     @Override
     public Result filter(LogEvent event) {
-        String text = useRawMessage ? event.getMessage().getMessageFormat() : event.getMessage().getFormattedMessage();
+        String text = useRawMessage ? event.getMessage().getFormat() : event.getMessage().getFormattedMessage();
         return filter(text);
     }
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java?rev=1395170&r1=1395169&r2=1395170&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
Sat Oct  6 20:58:09 2012
@@ -190,7 +190,7 @@ public final class RFC5424Layout extends
                 Map map = data.getData();
                 id = data.getId();
                 formatStructuredElement(id, map, buf, noopChecker);
-                text = data.getMessageFormat();
+                text = data.getFormat();
             } else {
                 text = msg.getFormattedMessage();
             }

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/test/java/org/apache/log4j/LoggerTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/test/java/org/apache/log4j/LoggerTest.java?rev=1395170&r1=1395169&r2=1395170&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/test/java/org/apache/log4j/LoggerTest.java
(original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/test/java/org/apache/log4j/LoggerTest.java
Sat Oct  6 20:58:09 2012
@@ -390,7 +390,7 @@ public class LoggerTest {
         assertEquals(1, msgs.size());
         LogEvent event = (LogEvent) msgs.get(0);
         assertEquals(org.apache.logging.log4j.Level.TRACE, event.getLevel());
-        assertEquals("Message 1", event.getMessage().getMessageFormat());
+        assertEquals("Message 1", event.getMessage().getFormat());
     }
 
     /**



Mime
View raw message