You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/02/18 17:11:33 UTC
logging-log4j2 git commit: LOG4J2-1255 remove unnecessary
AbstractMessage class
Repository: logging-log4j2
Updated Branches:
refs/heads/master c32116f0a -> 7c9542dcc
LOG4J2-1255 remove unnecessary AbstractMessage class
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7c9542dc
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7c9542dc
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7c9542dc
Branch: refs/heads/master
Commit: 7c9542dcc6be5138920c1388d726850fb639a0b3
Parents: c32116f
Author: rpopma <rp...@apache.org>
Authored: Fri Feb 19 01:11:33 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Fri Feb 19 01:11:33 2016 +0900
----------------------------------------------------------------------
.../logging/log4j/message/AbstractMessage.java | 37 --------------------
.../log4j/message/AbstractMessageFactory.java | 14 ++++----
.../logging/log4j/message/JsonMessage.java | 4 +--
3 files changed, 9 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7c9542dc/log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessage.java
deleted file mode 100644
index 3981515..0000000
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessage.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.message;
-
-/**
- * Common services for Message implementors.
- *
- * @since 2.6
- */
-public abstract class AbstractMessage implements Message {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * Converts this message to it's formatted message String.
- *
- * @return this message as formatted message String.
- */
- @Override
- public String toString() {
- return getFormattedMessage();
- }
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7c9542dc/log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java
index f343111..5e2c357 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java
@@ -47,8 +47,8 @@ public abstract class AbstractMessageFactory implements MessageFactory, Serializ
private final String entryText;
private final String exitText;
-
- private static class AbstractFlowMessage extends AbstractMessage implements FlowMessage {
+
+ private static class AbstractFlowMessage implements FlowMessage {
private static final long serialVersionUID = 1L;
private final Message message;
@@ -146,7 +146,7 @@ public abstract class AbstractMessageFactory implements MessageFactory, Serializ
return formattedMessage + ": " + result;
}
}
-
+
private static final long serialVersionUID = 1L;
/**
@@ -176,7 +176,7 @@ public abstract class AbstractMessageFactory implements MessageFactory, Serializ
public EntryMessage newEntryMessage(final Message message) {
return new SimpleEntryMessage(entryText, message);
}
-
+
/*
* (non-Javadoc)
*
@@ -186,7 +186,7 @@ public abstract class AbstractMessageFactory implements MessageFactory, Serializ
public ExitMessage newExitMessage(final EntryMessage message) {
return new SimpleExitMessage(exitText, message);
}
-
+
/*
* (non-Javadoc)
*
@@ -196,7 +196,7 @@ public abstract class AbstractMessageFactory implements MessageFactory, Serializ
public ExitMessage newExitMessage(final Object object, final EntryMessage message) {
return new SimpleExitMessage(exitText, object, message);
}
-
+
/*
* (non-Javadoc)
*
@@ -206,7 +206,7 @@ public abstract class AbstractMessageFactory implements MessageFactory, Serializ
public ExitMessage newExitMessage(final Object object, final Message message) {
return new SimpleExitMessage(exitText, object, message);
}
-
+
/*
* (non-Javadoc)
*
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7c9542dc/log4j-api/src/test/java/org/apache/logging/log4j/message/JsonMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/JsonMessage.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/JsonMessage.java
index b0294b6..7d228b8 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/message/JsonMessage.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/JsonMessage.java
@@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
/**
* Converts an Object to a JSON String.
*/
-public class JsonMessage extends AbstractMessage {
+public class JsonMessage implements Message {
private static final long serialVersionUID = 1L;
private static final ObjectMapper mapper = new ObjectMapper();
@@ -32,7 +32,7 @@ public class JsonMessage extends AbstractMessage {
/**
* Constructs a JsonMessage.
- *
+ *
* @param object the Object to serialize.
*/
public JsonMessage(final Object object) {