From 8a83b1bd344c90d8b4547dd730b939d40a47a3ef Mon Sep 17 00:00:00 2001 From: Ceki Gulcu Date: Tue, 29 Jun 2021 17:25:21 +0200 Subject: [PATCH] cleaning up deprecated usage --- .../src/main/java/org/apache/log4j/spi/Configurator.java | 1 - .../test/java/org/slf4j/helpers/MessageFormatterTest.java | 8 ++++---- .../java/org/slf4j/instrumentation/ToStringHelper.java | 2 +- .../src/test/java/org/slf4j/jul/InvocationTest.java | 8 ++++---- .../java/org/slf4j/jul/JDK14AdapterLoggerNameTest.java | 1 - .../src/main/java/org/apache/log4j/MDCFriend.java | 1 - .../src/test/java/org/slf4j/log4j12/MDCFriendTest.java | 1 - slf4j-nop/src/test/java/org/slf4j/nop/InvocationTest.java | 8 ++++---- .../src/test/java/org/slf4j/simple/InvocationTest.java | 8 ++++---- .../SimpleLoggerMultithreadedInitializationTest.java | 1 - 10 files changed, 17 insertions(+), 22 deletions(-) diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/spi/Configurator.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/spi/Configurator.java index abf75609..ed6cf137 100644 --- a/log4j-over-slf4j/src/main/java/org/apache/log4j/spi/Configurator.java +++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/spi/Configurator.java @@ -16,7 +16,6 @@ package org.apache.log4j.spi; -import org.apache.log4j.spi.LoggerRepository; import java.net.URL; /** diff --git a/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterTest.java b/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterTest.java index 37f98a10..34cf85a9 100755 --- a/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterTest.java +++ b/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterTest.java @@ -35,11 +35,11 @@ import static org.junit.Assert.*; */ public class MessageFormatterTest { - Integer i1 = new Integer(1); - Integer i2 = new Integer(2); - Integer i3 = new Integer(3); + Integer i1 = Integer.valueOf(1); + Integer i2 = Integer.valueOf(2); + Integer i3 = Integer.valueOf(3); Integer[] ia0 = new Integer[] { i1, i2, i3 }; - Integer[] ia1 = new Integer[] { new Integer(10), new Integer(20), new Integer(30) }; + Integer[] ia1 = new Integer[] { Integer.valueOf(10), Integer.valueOf(20), Integer.valueOf(30) }; String result; diff --git a/slf4j-ext/src/main/java/org/slf4j/instrumentation/ToStringHelper.java b/slf4j-ext/src/main/java/org/slf4j/instrumentation/ToStringHelper.java index b20f5851..c0fa2f61 100644 --- a/slf4j-ext/src/main/java/org/slf4j/instrumentation/ToStringHelper.java +++ b/slf4j-ext/src/main/java/org/slf4j/instrumentation/ToStringHelper.java @@ -84,7 +84,7 @@ public class ToStringHelper { return o.toString(); } } catch (Exception e) { - Long now = new Long(System.currentTimeMillis()); + Long now = Long.valueOf(System.currentTimeMillis()); System.err.println("Disabling exception throwing class " + objectClass.getName() + ", " + e.getMessage()); diff --git a/slf4j-jdk14/src/test/java/org/slf4j/jul/InvocationTest.java b/slf4j-jdk14/src/test/java/org/slf4j/jul/InvocationTest.java index 6ef3700f..94eeba30 100755 --- a/slf4j-jdk14/src/test/java/org/slf4j/jul/InvocationTest.java +++ b/slf4j-jdk14/src/test/java/org/slf4j/jul/InvocationTest.java @@ -82,9 +82,9 @@ public class InvocationTest { @Test public void verifyMessageFormatting() { - Integer i1 = new Integer(1); - Integer i2 = new Integer(2); - Integer i3 = new Integer(3); + Integer i1 = Integer.valueOf(1); + Integer i2 = Integer.valueOf(2); + Integer i3 = Integer.valueOf(3); Exception e = new Exception("This is a test exception."); Logger logger = LoggerFactory.getLogger("test2"); @@ -110,7 +110,7 @@ public class InvocationTest { logger.warn("Hello world 3", e); logger.error("Hello world 4."); - logger.error("Hello world {}", new Integer(3)); + logger.error("Hello world {}", Integer.valueOf(3)); logger.error("Hello world 4.", e); } diff --git a/slf4j-jdk14/src/test/java/org/slf4j/jul/JDK14AdapterLoggerNameTest.java b/slf4j-jdk14/src/test/java/org/slf4j/jul/JDK14AdapterLoggerNameTest.java index 5c29697e..dbee737f 100644 --- a/slf4j-jdk14/src/test/java/org/slf4j/jul/JDK14AdapterLoggerNameTest.java +++ b/slf4j-jdk14/src/test/java/org/slf4j/jul/JDK14AdapterLoggerNameTest.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.slf4j.jul.JDK14LoggerFactory; public class JDK14AdapterLoggerNameTest { private MockHandler mockHandler; diff --git a/slf4j-log4j12/src/main/java/org/apache/log4j/MDCFriend.java b/slf4j-log4j12/src/main/java/org/apache/log4j/MDCFriend.java index e2a038cf..769feda8 100755 --- a/slf4j-log4j12/src/main/java/org/apache/log4j/MDCFriend.java +++ b/slf4j-log4j12/src/main/java/org/apache/log4j/MDCFriend.java @@ -3,7 +3,6 @@ package org.apache.log4j; import java.lang.reflect.Field; import java.lang.reflect.Method; -import org.apache.log4j.MDC; import org.apache.log4j.helpers.ThreadLocalMap; public class MDCFriend { diff --git a/slf4j-log4j12/src/test/java/org/slf4j/log4j12/MDCFriendTest.java b/slf4j-log4j12/src/test/java/org/slf4j/log4j12/MDCFriendTest.java index bc102699..74c40b27 100755 --- a/slf4j-log4j12/src/test/java/org/slf4j/log4j12/MDCFriendTest.java +++ b/slf4j-log4j12/src/test/java/org/slf4j/log4j12/MDCFriendTest.java @@ -8,7 +8,6 @@ import java.util.Random; import org.apache.log4j.MDC; import org.apache.log4j.MDCFriend; import org.junit.Test; -import org.slf4j.log4j12.VersionUtil; public class MDCFriendTest { diff --git a/slf4j-nop/src/test/java/org/slf4j/nop/InvocationTest.java b/slf4j-nop/src/test/java/org/slf4j/nop/InvocationTest.java index 7dc5ec00..8cb7c036 100644 --- a/slf4j-nop/src/test/java/org/slf4j/nop/InvocationTest.java +++ b/slf4j-nop/src/test/java/org/slf4j/nop/InvocationTest.java @@ -49,9 +49,9 @@ public class InvocationTest { @Test public void test2() { - Integer i1 = new Integer(1); - Integer i2 = new Integer(2); - Integer i3 = new Integer(3); + Integer i1 = Integer.valueOf(1); + Integer i2 = Integer.valueOf(2); + Integer i3 = Integer.valueOf(3); Exception e = new Exception("This is a test exception."); Logger logger = LoggerFactory.getLogger("test2"); @@ -67,7 +67,7 @@ public class InvocationTest { logger.warn("Hello world 3", e); logger.error("Hello world 4."); - logger.error("Hello world {}", new Integer(3)); + logger.error("Hello world {}", Integer.valueOf(3)); logger.error("Hello world 4.", e); } diff --git a/slf4j-simple/src/test/java/org/slf4j/simple/InvocationTest.java b/slf4j-simple/src/test/java/org/slf4j/simple/InvocationTest.java index 38f69367..39d3da0e 100644 --- a/slf4j-simple/src/test/java/org/slf4j/simple/InvocationTest.java +++ b/slf4j-simple/src/test/java/org/slf4j/simple/InvocationTest.java @@ -65,9 +65,9 @@ public class InvocationTest { @Test public void test2() { - Integer i1 = new Integer(1); - Integer i2 = new Integer(2); - Integer i3 = new Integer(3); + Integer i1 = Integer.valueOf(1); + Integer i2 = Integer.valueOf(2); + Integer i3 = Integer.valueOf(3); Exception e = new Exception("This is a test exception."); Logger logger = LoggerFactory.getLogger("test2"); @@ -83,7 +83,7 @@ public class InvocationTest { logger.warn("Hello world 3", e); logger.error("Hello world 4."); - logger.error("Hello world {}", new Integer(3)); + logger.error("Hello world {}", Integer.valueOf(3)); logger.error("Hello world 4.", e); } diff --git a/slf4j-simple/src/test/java/org/slf4j/simple/SimpleLoggerMultithreadedInitializationTest.java b/slf4j-simple/src/test/java/org/slf4j/simple/SimpleLoggerMultithreadedInitializationTest.java index ff3b49bb..1d72feb4 100644 --- a/slf4j-simple/src/test/java/org/slf4j/simple/SimpleLoggerMultithreadedInitializationTest.java +++ b/slf4j-simple/src/test/java/org/slf4j/simple/SimpleLoggerMultithreadedInitializationTest.java @@ -33,7 +33,6 @@ import org.junit.After; import org.junit.Before; import org.slf4j.LoggerFactoryFriend; import org.slf4j.testHarness.MultithreadedInitializationTest; -import org.slf4j.simple.SimpleLogger; public class SimpleLoggerMultithreadedInitializationTest extends MultithreadedInitializationTest { // final static int THREAD_COUNT = 4 + Runtime.getRuntime().availableProcessors() * 2;