logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject logging-log4j2 git commit: Clean up.
Date Wed, 07 Nov 2018 02:47:58 GMT
Repository: logging-log4j2
Updated Branches:
  refs/heads/release-2.x bd8ac0c2a -> 484b3b325


Clean up.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/484b3b32
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/484b3b32
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/484b3b32

Branch: refs/heads/release-2.x
Commit: 484b3b32564bf35080dd15233be695ed471e563c
Parents: bd8ac0c
Author: Gary Gregory <garydgregory@gmail.com>
Authored: Tue Nov 6 19:47:55 2018 -0700
Committer: Gary Gregory <garydgregory@gmail.com>
Committed: Tue Nov 6 19:47:55 2018 -0700

----------------------------------------------------------------------
 .../org/apache/logging/log4j/cassandra/CassandraManager.java   | 6 ------
 .../log4j/core/appender/db/AbstractDatabaseManager.java        | 4 +++-
 .../log4j/core/appender/db/jdbc/JdbcDatabaseManager.java       | 6 ------
 .../log4j/core/appender/nosql/NoSqlDatabaseManager.java        | 6 ------
 .../log4j/core/appender/db/AbstractDatabaseManagerTest.java    | 6 ------
 .../logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java | 6 ------
 6 files changed, 3 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/484b3b32/log4j-cassandra/src/main/java/org/apache/logging/log4j/cassandra/CassandraManager.java
----------------------------------------------------------------------
diff --git a/log4j-cassandra/src/main/java/org/apache/logging/log4j/cassandra/CassandraManager.java
b/log4j-cassandra/src/main/java/org/apache/logging/log4j/cassandra/CassandraManager.java
index 391857b..210679b 100644
--- a/log4j-cassandra/src/main/java/org/apache/logging/log4j/cassandra/CassandraManager.java
+++ b/log4j-cassandra/src/main/java/org/apache/logging/log4j/cassandra/CassandraManager.java
@@ -87,12 +87,6 @@ public class CassandraManager extends AbstractDatabaseManager {
         // a Session automatically manages connections for us
     }
 
-    @Deprecated
-    @Override
-    protected void writeInternal(final LogEvent event) {
-        writeInternal(event, null);
-    }
-
     @Override
     protected void writeInternal(final LogEvent event, final Serializable serializable) {
         for (int i = 0; i < columnMappings.size(); i++) {

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/484b3b32/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
index f3b0ac4..ac94bbf 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
@@ -273,7 +273,9 @@ public abstract class AbstractDatabaseManager extends AbstractManager
implements
      * @deprecated Use {@link #writeInternal(LogEvent, Serializable)}.
      */
     @Deprecated
-    protected abstract void writeInternal(LogEvent event);
+    protected void writeInternal(LogEvent event) {
+        writeInternal(event, null);
+    }
 
     /**
      * Performs the actual writing of the event in an implementation-specific way. This method
is called immediately

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/484b3b32/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
index bf4e5a0..19045cf 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
@@ -509,12 +509,6 @@ public final class JdbcDatabaseManager extends AbstractDatabaseManager
{
         // empty
     }
 
-    @Deprecated
-    @Override
-    protected void writeInternal(final LogEvent event) {
-        writeInternal(event, null);
-    }
-
     @Override
     protected void writeInternal(final LogEvent event, final Serializable serializable) {
         StringReader reader = null;

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/484b3b32/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlDatabaseManager.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlDatabaseManager.java
index a0a3877..0d72aba 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlDatabaseManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlDatabaseManager.java
@@ -69,12 +69,6 @@ public final class NoSqlDatabaseManager<W> extends AbstractDatabaseManager
{
         }
     }
 
-    @Deprecated
-    @Override
-    protected void writeInternal(final LogEvent event) {
-        writeInternal(event, null);
-    }
-
     @Override
     protected void writeInternal(final LogEvent event, final Serializable serializable) {
         if (!this.isRunning() || this.connection == null || this.connection.isClosed()) {

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/484b3b32/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
index c042032..65a2180 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
@@ -239,12 +239,6 @@ public class AbstractDatabaseManagerTest {
             // noop
         }
 
-        @Deprecated
-        @Override
-        protected void writeInternal(final LogEvent event) {
-            // noop
-        }
-
         @Override
         protected void writeInternal(final LogEvent event, final Serializable serializable)
{
             // noop

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/484b3b32/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
b/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
index 081f760..88a4ad2 100644
--- a/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
+++ b/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
@@ -84,12 +84,6 @@ public final class JpaDatabaseManager extends AbstractDatabaseManager {
         }
     }
 
-    @Deprecated
-    @Override
-    protected void writeInternal(final LogEvent event) {
-        writeInternal(event, null);
-    }
-
     @Override
     protected void writeInternal(final LogEvent event, final Serializable serializable) {
         if (!this.isRunning() || this.entityManagerFactory == null || this.entityManager
== null


Mime
View raw message