This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/new-logging by this push:
new 2a7697e05d fixup various compilations issues in more modules, and
poking to get artemis-features build to complete
2a7697e05d is described below
commit 2a7697e05d0dadcb1a4168dd7992e3cb3287b6a8
Author: Robbie Gemmell <[email protected]>
AuthorDate: Thu May 26 14:16:46 2022 +0100
fixup various compilations issues in more modules, and poking to get
artemis-features build to complete
---
artemis-commons/pom.xml | 1 +
artemis-core-client-osgi/pom.xml | 1 +
artemis-core-client/pom.xml | 1 +
artemis-jms-client-osgi/pom.xml | 1 +
artemis-protocols/artemis-amqp-protocol/pom.xml | 3 +++
artemis-protocols/artemis-mqtt-protocol/pom.xml | 2 ++
artemis-protocols/artemis-openwire-protocol/pom.xml | 1 -
artemis-protocols/artemis-stomp-protocol/pom.xml | 2 ++
artemis-server-osgi/pom.xml | 3 ++-
.../apache/activemq/artemis/osgi/ActiveMQOsgiLogger.java | 10 +++-------
artemis-server/pom.xml | 2 ++
.../activemq/artemis/component/WebServerComponent.java | 5 +++--
.../apache/activemq/artemis/component/WebTmpCleaner.java | 7 ++++---
.../tests/timing/core/journal/impl/JournalImplTestUnit.java | 7 ++++---
.../tests/timing/core/server/impl/QueueConcurrentTest.java | 9 +++++----
.../tests/timing/jms/bridge/impl/JMSBridgeImplTest.java | 9 +++++----
.../apache/activemq/artemis/tests/unit/AllClassesTest.java | 13 +++++++++----
.../unit/core/asyncio/MultiThreadAsynchronousFileTest.java | 5 +++--
.../unit/core/journal/impl/AlignedJournalImplTest.java | 9 +++++----
.../tests/unit/core/journal/impl/JournalImplTestBase.java | 5 +++--
.../tests/unit/core/journal/impl/JournalImplTestUnit.java | 7 ++++---
.../tests/unit/core/journal/impl/TimedBufferTest.java | 9 +++++----
.../tests/unit/core/message/impl/MessageImplTest.java | 7 ++++---
.../tests/unit/core/paging/impl/PagingStoreImplTest.java | 9 +++++----
.../postoffice/impl/WildcardAddressManagerUnitTest.java | 7 ++++---
.../artemis/tests/unit/core/server/impl/QueueImplTest.java | 7 ++++---
.../tests/unit/core/util/RandomUtilDistributionTest.java | 9 +++++----
.../artemis/tests/unit/logging/AssertionLoggerTest.java | 7 ++++---
.../tests/unit/ra/ActiveMQResourceAdapterConfigTest.java | 7 ++++---
.../activemq/artemis/tests/unit/util/InVMContext.java | 7 ++++---
.../activemq/artemis/tests/unit/util/InVMNamingContext.java | 7 ++++---
.../activemq/artemis/tests/unit/util/MemorySizeTest.java | 5 +++--
.../activemq/artemis/tests/unit/util/ReusableLatchTest.java | 9 +++++----
.../activemq/artemis/tests/unit/util/SoftValueMapTest.java | 13 +++++++------
34 files changed, 121 insertions(+), 85 deletions(-)
diff --git a/artemis-commons/pom.xml b/artemis-commons/pom.xml
index b0fb7bc165..398cbc2b54 100644
--- a/artemis-commons/pom.xml
+++ b/artemis-commons/pom.xml
@@ -57,6 +57,7 @@
<artifactId>artemis-log-processor</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
+ <!-- Superfluous, except for osgi manifest handling -->
<optional>true</optional>
</dependency>
<dependency>
diff --git a/artemis-core-client-osgi/pom.xml b/artemis-core-client-osgi/pom.xml
index c8f46eddd9..61a6c6b438 100644
--- a/artemis-core-client-osgi/pom.xml
+++ b/artemis-core-client-osgi/pom.xml
@@ -82,6 +82,7 @@
<Import-Package>
org.glassfish.json*;resolution:=optional,
io.netty.buffer;io.netty.*;version="[4.1,5)",
+
org.apache.activemq.artemis.logprocessor.*;resolution:=optional,
*
</Import-Package>
<_exportcontents>org.apache.activemq.artemis.*;-noimport:=true</_exportcontents>
diff --git a/artemis-core-client/pom.xml b/artemis-core-client/pom.xml
index 2ce91a031d..8c448ffd84 100644
--- a/artemis-core-client/pom.xml
+++ b/artemis-core-client/pom.xml
@@ -38,6 +38,7 @@
<artifactId>artemis-log-processor</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
+ <!-- Superfluous, except for osgi manifest handling -->
<optional>true</optional>
</dependency>
<dependency>
diff --git a/artemis-jms-client-osgi/pom.xml b/artemis-jms-client-osgi/pom.xml
index 74e95dc82e..ba0b5eacb7 100644
--- a/artemis-jms-client-osgi/pom.xml
+++ b/artemis-jms-client-osgi/pom.xml
@@ -91,6 +91,7 @@
<Import-Package>
org.glassfish.json*;resolution:=optional,
io.netty.buffer;io.netty.*;version="[4.1,5)",
+
org.apache.activemq.artemis.logprocessor.*;resolution:=optional,
*
</Import-Package>
<_exportcontents>org.apache.activemq.artemis.*;-noimport:=true</_exportcontents>
diff --git a/artemis-protocols/artemis-amqp-protocol/pom.xml
b/artemis-protocols/artemis-amqp-protocol/pom.xml
index d0ceea9de9..b1484d4b97 100644
--- a/artemis-protocols/artemis-amqp-protocol/pom.xml
+++ b/artemis-protocols/artemis-amqp-protocol/pom.xml
@@ -53,6 +53,8 @@
<artifactId>artemis-log-processor</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
+ <!-- Superfluous, except for osgi manifest handling -->
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -106,4 +108,5 @@
<scope>test</scope>
</dependency>
</dependencies>
+
</project>
diff --git a/artemis-protocols/artemis-mqtt-protocol/pom.xml
b/artemis-protocols/artemis-mqtt-protocol/pom.xml
index 7411207843..275a179430 100644
--- a/artemis-protocols/artemis-mqtt-protocol/pom.xml
+++ b/artemis-protocols/artemis-mqtt-protocol/pom.xml
@@ -38,6 +38,8 @@
<artifactId>artemis-log-processor</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
+ <!-- Superfluous, except for osgi manifest handling -->
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/artemis-protocols/artemis-openwire-protocol/pom.xml
b/artemis-protocols/artemis-openwire-protocol/pom.xml
index a6e01763b2..8d35cd887c 100644
--- a/artemis-protocols/artemis-openwire-protocol/pom.xml
+++ b/artemis-protocols/artemis-openwire-protocol/pom.xml
@@ -128,7 +128,6 @@
!javax.jmdns,
javax.jms;version="[2,3)",
com.thoughtworks.xstream.*;resolution:="optional",
-
org.apache.activemq.artemis.logprocessor.*;resolution:="optional",
*
</Import-Package>
</instructions>
diff --git a/artemis-protocols/artemis-stomp-protocol/pom.xml
b/artemis-protocols/artemis-stomp-protocol/pom.xml
index d1dce8b0d9..deea3a13f3 100644
--- a/artemis-protocols/artemis-stomp-protocol/pom.xml
+++ b/artemis-protocols/artemis-stomp-protocol/pom.xml
@@ -38,6 +38,8 @@
<artifactId>artemis-log-processor</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
+ <!-- Superfluous, except for osgi manifest handling -->
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/artemis-server-osgi/pom.xml b/artemis-server-osgi/pom.xml
index d721c00cdd..fe87434a3d 100644
--- a/artemis-server-osgi/pom.xml
+++ b/artemis-server-osgi/pom.xml
@@ -82,6 +82,8 @@
<artifactId>artemis-log-processor</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
+ <!-- Superfluous, except for osgi manifest handling -->
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -133,7 +135,6 @@
org.glassfish.json*;resolution:=optional,
org.postgresql*;resolution:=optional,
io.netty.buffer;io.netty.*;version="[4.1,5)",
-
org.apache.activemq.artemis.logprocessor.*;resolution:="optional",
*
</Import-Package>
<_exportcontents>org.apache.activemq.artemis.*;-noimport:=true</_exportcontents>
diff --git
a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ActiveMQOsgiLogger.java
b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ActiveMQOsgiLogger.java
index 8cb6468dd1..9c12a52b37 100644
---
a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ActiveMQOsgiLogger.java
+++
b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ActiveMQOsgiLogger.java
@@ -16,10 +16,10 @@
*/
package org.apache.activemq.artemis.osgi;
+import org.apache.activemq.artemis.logprocessor.CodeFactory;
import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
-import org.jboss.logging.Logger;
/**
* Logger code 58
@@ -30,10 +30,7 @@ import org.jboss.logging.Logger;
@LogBundle(projectCode = "AMQ")
public interface ActiveMQOsgiLogger {
- /**
- * * The default logger.
- */
- ActiveMQOsgiLogger LOGGER =
Logger.getMessageLogger(ActiveMQOsgiLogger.class,
ActiveMQOsgiLogger.class.getPackage().getName());
+ ActiveMQOsgiLogger LOGGER =
CodeFactory.getCodeClass(ActiveMQOsgiLogger.class,
ActiveMQOsgiLogger.class.getPackage().getName());
@LogMessage(id = 581000, value = "Broker config {} found. Tracking
protocols {}", level = LogMessage.Level.INFO)
void brokerConfigFound(String name, String protocols);
@@ -53,5 +50,4 @@ public interface ActiveMQOsgiLogger {
@LogMessage(id = 582002, value = "Error getting dataSource provider
infos.", level = LogMessage.Level.WARN)
void errorGettingDataSourceProviderInfo(@Cause Exception e);
-}
-
+}
\ No newline at end of file
diff --git a/artemis-server/pom.xml b/artemis-server/pom.xml
index 7fb2fd59d0..59505c8693 100644
--- a/artemis-server/pom.xml
+++ b/artemis-server/pom.xml
@@ -38,6 +38,8 @@
<artifactId>artemis-log-processor</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
+ <!-- Superfluous, except for osgi manifest handling -->
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git
a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
index 30cb45f6da..5dd422acd5 100644
---
a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
+++
b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
@@ -52,11 +52,12 @@ import org.eclipse.jetty.server.handler.ResourceHandler;
import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.webapp.WebAppContext;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class WebServerComponent implements ExternalComponent,
WebServerComponentMarker {
- private static final Logger logger =
Logger.getLogger(WebServerComponent.class);
+ private static final Logger logger =
LoggerFactory.getLogger(WebServerComponent.class);
public static final String DIR_ALLOWED =
"org.eclipse.jetty.servlet.Default.dirAllowed";
private Server server;
diff --git
a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebTmpCleaner.java
b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebTmpCleaner.java
index ee2b3439b5..89fced57a7 100644
---
a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebTmpCleaner.java
+++
b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebTmpCleaner.java
@@ -22,7 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.activemq.artemis.utils.SpawnedVMSupport;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class is used to remove the jar files
@@ -32,7 +33,7 @@ import org.jboss.logging.Logger;
*/
public class WebTmpCleaner {
- private static final Logger logger = Logger.getLogger(WebTmpCleaner.class);
+ private static final Logger logger =
LoggerFactory.getLogger(WebTmpCleaner.class);
public static void main(String[] filesToClean) throws Exception {
//It needs to retry a bit as we are not sure
@@ -57,7 +58,7 @@ public class WebTmpCleaner {
Thread.sleep(200);
}
if (!allCleaned) {
- logger.warn("Some files in web temp dir are not cleaned up after " +
maxRetries + " retries.");
+ logger.warn("Some files in web temp dir are not cleaned up after {}
retries.", maxRetries);
}
return allCleaned;
}
diff --git
a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/JournalImplTestUnit.java
b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/JournalImplTestUnit.java
index b8fdeaaf0d..a50e21ea7e 100644
---
a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/JournalImplTestUnit.java
+++
b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/JournalImplTestUnit.java
@@ -22,14 +22,15 @@ import
org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
import org.apache.activemq.artemis.core.journal.RecordInfo;
import org.apache.activemq.artemis.nativo.jlibaio.LibaioContext;
import
org.apache.activemq.artemis.tests.unit.core.journal.impl.JournalImplTestBase;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class JournalImplTestUnit extends JournalImplTestBase {
- private static final Logger log =
Logger.getLogger(JournalImplTestBase.class);
+ private static final Logger log =
LoggerFactory.getLogger(JournalImplTestBase.class);
@Override
@After
@@ -141,7 +142,7 @@ public abstract class JournalImplTestUnit extends
JournalImplTestBase {
}
if (count % 100 == 0) {
- JournalImplTestUnit.log.debug("Done: " + count);
+ JournalImplTestUnit.log.debug("Done: {}", count);
}
}
diff --git
a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueConcurrentTest.java
b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueConcurrentTest.java
index 02f4a9ec35..90355ba791 100644
---
a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueConcurrentTest.java
+++
b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueConcurrentTest.java
@@ -29,10 +29,11 @@ import
org.apache.activemq.artemis.core.server.impl.QueueImpl;
import
org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakeConsumer;
import
org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakeQueueFactory;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A concurrent QueueTest
@@ -41,7 +42,7 @@ import org.junit.Test;
*/
public class QueueConcurrentTest extends ActiveMQTestBase {
- private static final Logger log =
Logger.getLogger(QueueConcurrentTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(QueueConcurrentTest.class);
private FakeQueueFactory queueFactory = new FakeQueueFactory();
@@ -99,9 +100,9 @@ public class QueueConcurrentTest extends ActiveMQTestBase {
assertRefListsIdenticalRefs(sender.getReferences(),
consumer.getReferences());
- log.info("num refs: " + sender.getReferences().size());
+ log.info("num refs: {}", sender.getReferences().size());
- log.info("num toggles: " + toggler.getNumToggles());
+ log.info("num toggles: {}", toggler.getNumToggles());
}
diff --git
a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
index c1e0d03ebd..496eb03c2d 100644
---
a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
+++
b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
@@ -64,16 +64,17 @@ import
org.apache.activemq.artemis.jms.bridge.impl.JMSBridgeImpl;
import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.RandomUtil;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JMSBridgeImplTest extends ActiveMQTestBase {
- private static Logger log = Logger.getLogger(JMSBridgeImplTest.class);
+ private static Logger log =
LoggerFactory.getLogger(JMSBridgeImplTest.class);
private static final String SOURCE = RandomUtil.randomString();
@@ -430,7 +431,7 @@ public class JMSBridgeImplTest extends ActiveMQTestBase {
for (int i = 0; i < numMessages - 1; i++) {
TextMessage msg = sourceSess.createTextMessage();
producer.send(msg);
- JMSBridgeImplTest.log.info("sent message " + i);
+ log.info("sent message {}", i);
}
Thread.sleep(1000);
@@ -498,7 +499,7 @@ public class JMSBridgeImplTest extends ActiveMQTestBase {
for (int i = 0; i < numMessages; i++) {
TextMessage msg = sourceSess.createTextMessage();
producer.send(msg);
- JMSBridgeImplTest.log.info("sent message " + i);
+ log.info("sent message {}", i);
}
sourceConn.close();
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/AllClassesTest.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/AllClassesTest.java
index d831a5b181..8fa0e21497 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/AllClassesTest.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/AllClassesTest.java
@@ -20,11 +20,12 @@ package org.apache.activemq.artemis.tests.unit;
import com.google.common.collect.ImmutableSet;
import com.google.common.reflect.ClassPath;
import org.apache.activemq.artemis.tests.util.RandomUtil;
-import org.jboss.logging.Logger;
import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
@@ -37,7 +38,7 @@ import java.util.List;
@RunWith(value = Parameterized.class)
public class AllClassesTest {
- private static final Logger log = Logger.getLogger(AllClassesTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(AllClassesTest.class);
@Parameterized.Parameters(name = "classInfo={0}")
public static Collection getParameters() {
@@ -56,7 +57,9 @@ public class AllClassesTest {
parameters.add(loadedClass);
}
} catch (Throwable loadThrowable) {
- log.debug("cannot load " + classInfo.getName() + ": " +
loadThrowable);
+ if(log.isDebugEnabled()) {
+ log.debug("cannot load " + classInfo.getName() + ": " +
loadThrowable);
+ }
}
}
}
@@ -140,7 +143,9 @@ public class AllClassesTest {
try {
return targetConstructor.newInstance(initArgs.toArray());
} catch (Throwable t) {
- log.debug("Cannot construct " + targetClass.getName() + ": " + t);
+ if(log.isDebugEnabled()) {
+ log.debug("Cannot construct " + targetClass.getName() + ": " +
t);
+ }
}
}
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java
index c8f45195b5..8faf2d3b85 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java
@@ -30,11 +30,12 @@ import
org.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory;
import org.apache.activemq.artemis.nativo.jlibaio.LibaioContext;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* you need to define -Djava.library.path=${project-root}/native/src/.libs
when calling the JVM
@@ -45,7 +46,7 @@ import org.junit.Test;
*/
public class MultiThreadAsynchronousFileTest extends AIOTestBase {
- private static final Logger log =
Logger.getLogger(MultiThreadAsynchronousFileTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(MultiThreadAsynchronousFileTest.class);
@BeforeClass
public static void hasAIO() {
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
index 884760bd58..b792f22f60 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
@@ -37,14 +37,15 @@ import
org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.FakeSequen
import
org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.SimpleEncoding;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.Wait;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class AlignedJournalImplTest extends ActiveMQTestBase {
- private static final Logger log =
Logger.getLogger(AlignedJournalImplTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(AlignedJournalImplTest.class);
private static final LoaderCallback dummyLoader = new LoaderCallback() {
@@ -373,7 +374,7 @@ public class AlignedJournalImplTest extends
ActiveMQTestBase {
// forgotten (interrupted by a reload).
Assert.fail("Supposed to throw exception");
} catch (Exception e) {
- log.warn(e);
+ log.warn(e.getMessage(), e);
}
setupAndLoadJournal(JOURNAL_SIZE, 100);
@@ -1325,7 +1326,7 @@ public class AlignedJournalImplTest extends
ActiveMQTestBase {
public void failedTransaction(final long transactionID,
final List<RecordInfo> records,
final List<RecordInfo> recordsToDelete)
{
- log.debug("records.length = " + records.size());
+ log.debug("records.length = {}", records.size());
incompleteTransactions.add(transactionID);
}
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java
index fe0fb0adbe..0be6ee0c52 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java
@@ -44,10 +44,11 @@ import
org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.ReusableLatch;
import org.apache.activemq.artemis.utils.SimpleFutureImpl;
import org.apache.activemq.artemis.utils.collections.SparseArrayLinkedList;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class JournalImplTestBase extends ActiveMQTestBase {
@@ -65,7 +66,7 @@ public abstract class JournalImplTestBase extends
ActiveMQTestBase {
}
}
- private static final Logger log =
Logger.getLogger(JournalImplTestBase.class);
+ private static final Logger log =
LoggerFactory.getLogger(JournalImplTestBase.class);
protected List<RecordInfo> records = new LinkedList<>();
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java
index 4b55756727..d2494d7783 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java
@@ -32,14 +32,15 @@ import
org.apache.activemq.artemis.core.journal.impl.JournalImpl;
import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
import
org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.SimpleEncoding;
import org.apache.activemq.artemis.utils.RandomUtil;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
public abstract class JournalImplTestUnit extends JournalImplTestBase {
- private static final Logger log =
Logger.getLogger(JournalImplTestUnit.class);
+ private static final Logger log =
LoggerFactory.getLogger(JournalImplTestUnit.class);
@Override
@After
@@ -733,7 +734,7 @@ public abstract class JournalImplTestUnit extends
JournalImplTestBase {
int addRecordsPerFile = calculateRecordsPerFile(10 * 1024,
journal.getAlignment(), JournalImpl.SIZE_ADD_RECORD + 1 + recordLength);
- log.debug(JournalImpl.SIZE_ADD_RECORD + 1 + recordLength);
+ log.debug(String.valueOf(JournalImpl.SIZE_ADD_RECORD + 1 +
recordLength));
// Fills exactly 10 files
int initialNumberOfAddRecords = addRecordsPerFile * 10;
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java
index 14f667c6b9..0c156724be 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java
@@ -34,12 +34,13 @@ import
org.apache.activemq.artemis.core.journal.EncodingSupport;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.Env;
import org.apache.activemq.artemis.utils.ReusableLatch;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TimedBufferTest extends ActiveMQTestBase {
- private static final Logger log = Logger.getLogger(TimedBufferTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(TimedBufferTest.class);
private static final int ONE_SECOND_IN_NANOS = 1000000000; // in nanoseconds
@@ -383,7 +384,7 @@ public class TimedBufferTest extends ActiveMQTestBase {
assert observer.flushesDone() == 2;
//it is much more than what is expected!!if it will fail it means
that the timed IOPS = 1/(timeout + blockingDeviceFlushTime)!!!!!!
//while it has to be IOPS = 1/timeout
- log.debug("elapsed time: " + elapsedTime + " with timeout: " +
timeout);
+ log.debug("elapsed time: {} with timeout: {}", elapsedTime, timeout);
final long maxExpected = timeout + deviceTime;
Assert.assertTrue("elapsed = " + elapsedTime + " max expected = " +
maxExpected, elapsedTime <= maxExpected);
} finally {
@@ -424,7 +425,7 @@ public class TimedBufferTest extends ActiveMQTestBase {
assert observer.flushesDone() == 2;
//it is much more than what is expected!!if it will fail it means
that the timed IOPS = 1/(timeout + blockingDeviceFlushTime)!!!!!!
//while it has to be IOPS = 1/timeout
- log.debug("elapsed time: " + elapsedTime + " with timeout: " +
timeout);
+ log.debug("elapsed time: {} with timeout: {}", elapsedTime, timeout);
final long maxExpected = timeout + deviceTime;
Assert.assertTrue("elapsed = " + elapsedTime + " max expected = " +
maxExpected, elapsedTime <= maxExpected);
} finally {
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java
index 5b93c816ae..ca520075cc 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java
@@ -41,12 +41,13 @@ import org.apache.activemq.artemis.utils.RandomUtil;
import org.apache.activemq.artemis.utils.UUID;
import org.apache.activemq.artemis.utils.UUIDGenerator;
import org.apache.activemq.artemis.utils.Wait;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MessageImplTest extends ActiveMQTestBase {
- private static final Logger log = Logger.getLogger(MessageImplTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(MessageImplTest.class);
@Test
public void getSetAttributes() {
@@ -240,7 +241,7 @@ public class MessageImplTest extends ActiveMQTestBase {
public void testMessageCopyIssue() throws Exception {
for (long i = 0; i < 300; i++) {
if (i % 10 == 0)
- log.debug("#test " + i);
+ log.debug("#test {}", i);
internalMessageCopy();
}
}
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingStoreImplTest.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingStoreImplTest.java
index 0e43558dab..46413ff3e1 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingStoreImplTest.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingStoreImplTest.java
@@ -71,17 +71,18 @@ import org.apache.activemq.artemis.utils.ExecutorFactory;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.apache.activemq.artemis.utils.Wait;
import org.apache.activemq.artemis.utils.actors.ArtemisExecutor;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.activemq.artemis.logs.AssertionLoggerHandler.findText;
public class PagingStoreImplTest extends ActiveMQTestBase {
- private static final Logger log =
Logger.getLogger(PagingStoreImplTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(PagingStoreImplTest.class);
static {
MessagePersister.registerPersister(CoreMessagePersister.getInstance());
@@ -486,7 +487,7 @@ public class PagingStoreImplTest extends ActiveMQTestBase {
for (int pageNr = 0; pageNr < 2; pageNr++) {
Page page = store.depage();
- log.debug("numberOfPages = " + store.getNumberOfPages());
+ log.debug("numberOfPages = {}", store.getNumberOfPages());
page.open(true);
@@ -902,7 +903,7 @@ public class PagingStoreImplTest extends ActiveMQTestBase {
page.close(false, false);
page.delete(null);
} else {
- log.debug("Depaged!!!! numerOfMessages = " + msgsRead + "
of " + NUMBER_OF_MESSAGES);
+ log.debug("Depaged!!!! numerOfMessages = {} of {}",
msgsRead, NUMBER_OF_MESSAGES);
Thread.sleep(500);
}
}
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
index 3195d8e516..dc81d48de0 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
@@ -41,15 +41,16 @@ import
org.apache.activemq.artemis.core.server.RoutingContext;
import
org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType;
import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This test is replicating the behaviour from
https://issues.jboss.org/browse/HORNETQ-988.
*/
public class WildcardAddressManagerUnitTest extends ActiveMQTestBase {
- private static final Logger log =
Logger.getLogger(WildcardAddressManagerUnitTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(WildcardAddressManagerUnitTest.class);
@Test
public void testUnitOnWildCardFailingScenario() throws Exception {
@@ -484,7 +485,7 @@ public class WildcardAddressManagerUnitTest extends
ActiveMQTestBase {
@Override
public void route(Message message, RoutingContext context) throws
Exception {
- log.debug("routing message: " + message);
+ log.debug("routing message: {}", message);
}
@Override
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java
index 97b9a8b6bf..d5e2b15a21 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java
@@ -56,14 +56,15 @@ import
org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
import org.apache.activemq.artemis.utils.FutureLatch;
import org.apache.activemq.artemis.utils.actors.ArtemisExecutor;
import org.apache.activemq.artemis.utils.collections.LinkedListIterator;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class QueueImplTest extends ActiveMQTestBase {
- private static final Logger log = Logger.getLogger(QueueImplTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(QueueImplTest.class);
// The tests
----------------------------------------------------------------
@@ -233,7 +234,7 @@ public class QueueImplTest extends ActiveMQTestBase {
float rate = (float) getRate.invoke(queue, null);
Assert.assertTrue(rate <= 10.0f);
- log.debug("Rate: " + rate);
+ log.debug("Rate: {}", rate);
}
@Test
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/util/RandomUtilDistributionTest.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/util/RandomUtilDistributionTest.java
index 3cd9cc9ae7..00a21f4955 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/util/RandomUtilDistributionTest.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/util/RandomUtilDistributionTest.java
@@ -22,16 +22,17 @@ import java.util.HashSet;
import org.apache.activemq.artemis.tests.util.SpawnedVMCheck;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.apache.activemq.artemis.utils.SpawnedVMSupport;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This test will start many parallel VMs, to make sure each VM would generate
a good distribution of random numbers
*/
public class RandomUtilDistributionTest {
- private static final Logger log =
Logger.getLogger(RandomUtilDistributionTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(RandomUtilDistributionTest.class);
@Rule
public SpawnedVMCheck check = new SpawnedVMCheck();
@@ -69,7 +70,7 @@ public class RandomUtilDistributionTest {
// Be careful removing it (make sure you know what you're doing in case
you do so)
int minimumExpected = (int) ((iterations * numberOfStarts) * 0.80);
- log.debug("values = " + value + ", minimum expected = " +
minimumExpected);
+ log.debug("values = {}, minimum expected = {}", value, minimumExpected);
Assert.assertTrue("The Random distribution is pretty bad. Many tries
have returned duplicated randoms. Number of different values=" + value + ",
minimum expected = " + minimumExpected, value >= minimumExpected);
}
@@ -90,7 +91,7 @@ public class RandomUtilDistributionTest {
valueSet.add(process[i].exitValue());
}
- log.debug("Generated " + valueSet.size() + " randoms out of " +
numberOfTries + " tries");
+ log.debug("Generated {} randoms out of {} tries", valueSet.size(),
numberOfTries);
return valueSet.size();
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/logging/AssertionLoggerTest.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/logging/AssertionLoggerTest.java
index 5dcfb1bc99..8d4a967cff 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/logging/AssertionLoggerTest.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/logging/AssertionLoggerTest.java
@@ -22,11 +22,12 @@ import
org.apache.activemq.artemis.logs.AssertionLoggerHandler;
import
org.apache.activemq.artemis.protocol.amqp.broker.ActiveMQProtonRemotingConnection;
import
org.apache.activemq.artemis.protocol.amqp.logger.ActiveMQAMQPProtocolLogger;
import org.apache.activemq.artemis.tests.util.RandomUtil;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This will validate the AssertionLoggerHandler is working as expected.
@@ -61,9 +62,9 @@ public class AssertionLoggerTest {
Assert.assertTrue(AssertionLoggerHandler.findText("AMQ111002"));
}
- private void validateLogging(Class clazz) {
+ private void validateLogging(Class<?> clazz) {
String randomLogging = RandomUtil.randomString();
- Logger logging = Logger.getLogger(clazz);
+ Logger logging = LoggerFactory.getLogger(clazz);
logging.warn(randomLogging);
Assert.assertTrue(AssertionLoggerHandler.findText(randomLogging));
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java
index 1d20c1628a..0b8652293b 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java
@@ -26,8 +26,9 @@ import java.util.Map;
import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.jboss.logging.Logger;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -40,7 +41,7 @@ import org.xml.sax.InputSource;
* add a description for each new property added and try and put it in the
config some where appropriate.
*/
public class ActiveMQResourceAdapterConfigTest extends ActiveMQTestBase {
- private static final Logger log =
Logger.getLogger(ActiveMQResourceAdapterConfigTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(ActiveMQResourceAdapterConfigTest.class);
private static String config = "" +
"<config-property>\n" +
@@ -476,7 +477,7 @@ public class ActiveMQResourceAdapterConfigTest extends
ActiveMQTestBase {
newConfig.append(" \"
<config-property-value></config-property-value>\" + \n");
newConfig.append(" \" </config-property>\" + \n");
}
- log.debug(newConfig);
+ log.debug(newConfig.toString());
fail("methods not shown please see previous and add");
}
}
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMContext.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMContext.java
index 0fa57c4334..93f469358f 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMContext.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMContext.java
@@ -36,11 +36,12 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class InVMContext implements Context, Serializable {
- private static final Logger log = Logger.getLogger(InVMContext.class);
+ private static final Logger log =
LoggerFactory.getLogger(InVMContext.class);
private static final long serialVersionUID = 385743957345L;
@@ -286,7 +287,7 @@ public class InVMContext implements Context, Serializable {
}
private void internalBind(String name, final Object obj, final boolean
rebind) throws NamingException {
- log.debug("Binding " + name + " obj " + obj + " rebind " + rebind);
+ log.debug("Binding {} obj {} rebind {}", name, obj, rebind);
name = trimSlashes(name);
int i = name.lastIndexOf("/");
InVMContext c = this;
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMNamingContext.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMNamingContext.java
index 65b4baf2f0..439445bd74 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMNamingContext.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMNamingContext.java
@@ -36,11 +36,12 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class InVMNamingContext implements Context, Serializable {
- private static final Logger log = Logger.getLogger(InVMNamingContext.class);
+ private static final Logger log =
LoggerFactory.getLogger(InVMNamingContext.class);
private static final long serialVersionUID = 385743957345L;
@@ -286,7 +287,7 @@ public class InVMNamingContext implements Context,
Serializable {
}
private void internalBind(String name, final Object obj, final boolean
rebind) throws NamingException {
- log.debug("Binding " + name + " obj " + obj + " rebind " + rebind);
+ log.debug("Binding {} obj {} rebind {}", name, obj, rebind);
name = trimSlashes(name);
int i = name.lastIndexOf("/");
InVMNamingContext c = this;
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/MemorySizeTest.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/MemorySizeTest.java
index 591ce1fec5..c72b88408f 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/MemorySizeTest.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/MemorySizeTest.java
@@ -19,12 +19,13 @@ package org.apache.activemq.artemis.tests.unit.util;
import org.apache.activemq.artemis.core.message.impl.CoreMessage;
import org.apache.activemq.artemis.core.server.impl.MessageReferenceImpl;
import org.apache.activemq.artemis.utils.MemorySize;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MemorySizeTest extends Assert {
- private static final Logger log = Logger.getLogger(MemorySizeTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(MemorySizeTest.class);
@Test
public void testObjectSizes() throws Exception {
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ReusableLatchTest.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ReusableLatchTest.java
index 1a812027bb..9d33de4351 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ReusableLatchTest.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ReusableLatchTest.java
@@ -20,13 +20,14 @@ import java.util.concurrent.CountDownLatch;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.ReusableLatch;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ReusableLatchTest extends ActiveMQTestBase {
- private static final Logger log = Logger.getLogger(ReusableLatchTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(ReusableLatchTest.class);
@Test
public void testLatchWithParameterizedDown() throws Exception {
@@ -87,7 +88,7 @@ public class ReusableLatchTest extends ActiveMQTestBase {
log.error("Latch timed out");
}
} catch (Exception e) {
- log.error(e);
+ log.error(e.getMessage(), e);
}
waiting = false;
}
@@ -235,7 +236,7 @@ public class ReusableLatchTest extends ActiveMQTestBase {
log.error("Latch timed out!", new Exception("trace"));
}
} catch (Exception e) {
- log.error(e);
+ log.error(e.getMessage(), e);
this.e = e;
}
waiting = false;
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java
index 531f14cea9..823be6b9ba 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java
@@ -18,11 +18,12 @@ package org.apache.activemq.artemis.tests.unit.util;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.SoftValueLongObjectHashMap;
-import org.jboss.logging.Logger;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SoftValueMapTest extends ActiveMQTestBase {
- private static final Logger log = Logger.getLogger(SoftValueMapTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(SoftValueMapTest.class);
@@ -44,9 +45,9 @@ public class SoftValueMapTest extends ActiveMQTestBase {
assertTrue(softCache.size() < MAX_ELEMENTS);
- log.debug("SoftCache.size " + softCache.size());
+ log.debug("SoftCache.size {}", softCache.size());
- log.debug("Soft cache has " + softCache.size() + " elements");
+ log.debug("Soft cache has {} elements", softCache.size());
}
@Test
@@ -82,9 +83,9 @@ public class SoftValueMapTest extends ActiveMQTestBase {
// this is the next one, so it should go
assertNull(softCache.get(101L));
- log.debug("SoftCache.size " + softCache.size());
+ log.debug("SoftCache.size {}", softCache.size());
- log.debug("Soft cache has " + softCache.size() + " elements");
+ log.debug("Soft cache has {} elements", softCache.size());
}
@Test
