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 9fd5e3c989 change remaining integration tests except those with TODOs
9fd5e3c989 is described below
commit 9fd5e3c98958bdc080162195ef3c9d5d17ec58a2
Author: Robbie Gemmell <[email protected]>
AuthorDate: Fri Jul 29 11:11:00 2022 +0100
change remaining integration tests except those with TODOs
---
.../addressing/TwoWaysRemoveAddressTest.java | 9 ++++----
.../amqp/DLQAfterExpiredMessageTest.java | 2 --
.../integration/amqp/JMSClientTestSupport.java | 7 +++---
.../integration/amqp/JMSNonDestructiveTest.java | 5 ++--
.../integration/amqp/connect/BrokerInSyncTest.java | 15 ++++++------
.../integration/amqp/connect/PagedMirrorTest.java | 2 --
.../amqp/connect/QpidDispatchPeerTest.java | 5 ++--
.../amqp/connect/ValidateAMQPErrorsTest.java | 13 ++++++-----
.../integration/client/ActiveMQCrashTest.java | 7 +++---
.../tests/integration/client/AutoCreateTest.java | 7 +++---
.../integration/client/ConsumerFilterTest.java | 5 ++--
.../integration/client/ConsumerRoundRobinTest.java | 9 ++++----
.../integration/client/FailureDeadlockTest.java | 5 ++--
.../FlowControlOnIgnoreLargeMessageBodyTest.java | 27 ++++++++++------------
.../client/IncompatibleVersionTest.java | 9 ++++----
.../integration/client/InfiniteRedeliveryTest.java | 9 ++++----
.../client/InterruptedLargeMessageTest.java | 6 ++---
.../integration/client/InvalidCoreClientTest.java | 3 ---
.../tests/integration/client/LargeMessageTest.java | 11 +++++----
.../integration/client/MessageConcurrencyTest.java | 5 ++--
.../integration/client/MessageGroupingTest.java | 5 ++--
.../integration/client/MessagePriorityTest.java | 9 ++++----
.../tests/integration/client/MixRoutingTest.java | 9 --------
.../tests/integration/client/NIOvsOIOTest.java | 7 +++---
.../integration/client/SessionStopStartTest.java | 5 ++--
.../tests/integration/client/SlowConsumerTest.java | 19 +++++++--------
.../integration/client/TemporaryQueueTest.java | 7 +++---
.../integration/clientcrash/ClientCrashTest.java | 5 ++--
.../integration/clientcrash/ClientExitTest.java | 5 ++--
.../tests/integration/clientcrash/CrashClient.java | 5 ++--
.../integration/clientcrash/CrashClient2.java | 5 ++--
.../integration/clientcrash/DummyInterceptor.java | 7 +++---
.../integration/clientcrash/DummyInterceptorB.java | 7 +++---
.../integration/clientcrash/GracefulClient.java | 5 ++--
34 files changed, 133 insertions(+), 128 deletions(-)
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/TwoWaysRemoveAddressTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/TwoWaysRemoveAddressTest.java
index b3dd24cf0b..a7b78f648c 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/TwoWaysRemoveAddressTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/TwoWaysRemoveAddressTest.java
@@ -26,16 +26,17 @@ import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
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 simulating a dead lock that may happen while removing
addresses.
*/
public class TwoWaysRemoveAddressTest extends ActiveMQTestBase {
- private static Logger logger =
Logger.getLogger(TwoWaysRemoveAddressTest.class);
+ private static Logger logger =
LoggerFactory.getLogger(TwoWaysRemoveAddressTest.class);
@Test(timeout = 60_000)
public void testDeadLock() throws Throwable {
@@ -55,7 +56,7 @@ public class TwoWaysRemoveAddressTest extends
ActiveMQTestBase {
barrier.await(10, TimeUnit.SECONDS);
for (int i = 0; i < retries; i++) {
- logger.debug("Removed queue on thread 1 ::" + i);
+ logger.debug("Removed queue on thread 1 ::{}", i);
server.createQueue(new QueueConfiguration("queueName_1_" +
i).setAddress("address_1_" + i).setRoutingType(RoutingType.ANYCAST));
server.destroyQueue(SimpleString.toSimpleString("queueName_1_" + i));
}
@@ -74,7 +75,7 @@ public class TwoWaysRemoveAddressTest extends
ActiveMQTestBase {
barrier.await(10, TimeUnit.SECONDS);
for (int i = 0; i < retries; i++) {
- logger.debug("Removed queue on thread 2 ::" + i);
+ logger.debug("Removed queue on thread 2 ::{}", i);
server.createQueue(new QueueConfiguration("queueName_2_" +
i).setAddress("address_2_" + i).setRoutingType(RoutingType.ANYCAST));
server.removeAddressInfo(SimpleString.toSimpleString("address_2_" + i), null,
true);
}
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/DLQAfterExpiredMessageTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/DLQAfterExpiredMessageTest.java
index 7b0f77413a..40af692a67 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/DLQAfterExpiredMessageTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/DLQAfterExpiredMessageTest.java
@@ -37,7 +37,6 @@ import org.apache.activemq.transport.amqp.client.AmqpReceiver;
import org.apache.activemq.transport.amqp.client.AmqpSender;
import org.apache.activemq.transport.amqp.client.AmqpSession;
import org.apache.qpid.proton.amqp.Symbol;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Test;
@@ -47,7 +46,6 @@ import org.junit.Test;
* This will validate the data added to the queues.
*/
public class DLQAfterExpiredMessageTest extends AmqpClientTestSupport {
- private static final Logger log =
Logger.getLogger(DLQAfterExpiredMessageTest.class);
protected String getExpiryQueue() {
return "ActiveMQ.Expiry";
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSClientTestSupport.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSClientTestSupport.java
index 0643f6a6c6..33ec6beb31 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSClientTestSupport.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSClientTestSupport.java
@@ -26,13 +26,14 @@ import javax.jms.JMSException;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
import org.apache.qpid.jms.JmsConnectionFactory;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Before;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class JMSClientTestSupport extends AmqpClientTestSupport {
- private static final Logger logger =
Logger.getLogger(JMSClientTestSupport.class);
+ private static final Logger logger =
LoggerFactory.getLogger(JMSClientTestSupport.class);
protected LinkedList<Connection> jmsConnections = new LinkedList<>();
@@ -58,7 +59,7 @@ public abstract class JMSClientTestSupport extends
AmqpClientTestSupport {
}
}
} catch (Exception e) {
- logger.warn(e);
+ logger.warn("Exception during tearDown", e);
}
jmsConnections.clear();
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSNonDestructiveTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSNonDestructiveTest.java
index 143cce2a23..91b2d68f80 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSNonDestructiveTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSNonDestructiveTest.java
@@ -49,17 +49,18 @@ import
org.apache.activemq.artemis.core.server.impl.LastValueQueue;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.tests.util.Wait;
import org.apache.activemq.artemis.utils.RetryRule;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RunWith(Parameterized.class)
public class JMSNonDestructiveTest extends JMSClientTestSupport {
- private static final Logger logger =
Logger.getLogger(JMSNonDestructiveTest.class);
+ private static final Logger logger =
LoggerFactory.getLogger(JMSNonDestructiveTest.class);
@Rule
public RetryRule retryRule = new RetryRule(2);
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/BrokerInSyncTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/BrokerInSyncTest.java
index 3615ee1a25..7c41f4ff7f 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/BrokerInSyncTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/BrokerInSyncTest.java
@@ -55,16 +55,17 @@ import
org.apache.activemq.transport.amqp.client.AmqpMessage;
import org.apache.activemq.transport.amqp.client.AmqpReceiver;
import org.apache.activemq.transport.amqp.client.AmqpSender;
import org.apache.activemq.transport.amqp.client.AmqpSession;
-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 BrokerInSyncTest extends AmqpClientTestSupport {
protected static final int AMQP_PORT_2 = 5673;
- private static final Logger logger =
Logger.getLogger(BrokerInSyncTest.class);
+ private static final Logger logger =
LoggerFactory.getLogger(BrokerInSyncTest.class);
ActiveMQServer server_2;
@After
@@ -621,7 +622,7 @@ public class BrokerInSyncTest extends AmqpClientTestSupport
{
MessageConsumer consumerOn1 = session1.createConsumer(queue);
for (int i = 0; i < NUMBER_OF_MESSAGES * 2; i++) {
TextMessage message = (TextMessage) consumerOn1.receive(5000);
- logger.debug("### Client acking message(" + i + ") on server 1, a
message that was original sent on " + message.getStringProperty("server") + "
text = " + message.getText());
+ logger.debug("### Client acking message({}) on server 1, a message
that was original sent on {} text = {}", i,
message.getStringProperty("server"), message.getText());
Assert.assertNotNull(message);
Assert.assertEquals(i, message.getIntProperty("i"));
Assert.assertEquals("test " + i, message.getText());
@@ -631,8 +632,8 @@ public class BrokerInSyncTest extends AmqpClientTestSupport
{
boolean bothConsumed = Wait.waitFor(() -> {
long q1 = queueOnServer1.getMessageCount();
long q2 = queueOnServer2.getMessageCount();
- logger.debug("Queue on Server 1 = " + q1);
- logger.debug("Queue on Server 2 = " + q2);
+ logger.debug("Queue on Server 1 = {}", q1);
+ logger.debug("Queue on Server 2 = {}", q2);
return q1 == 0 && q2 == 0;
}, 5_000, 1000);
@@ -727,7 +728,7 @@ public class BrokerInSyncTest extends AmqpClientTestSupport
{
MessageConsumer consumerOn1 = session1.createConsumer(queue);
for (int i = 0; i < NUMBER_OF_MESSAGES; i++) {
TextMessage message = (TextMessage) consumerOn1.receive(5000);
- logger.debug("### Client acking message(" + i + ") on server 1, a
message that was original sent on " + message.getStringProperty("server") + "
text = " + message.getText());
+ logger.debug("### Client acking message({}) on server 1, a message
that was original sent on {} text = {}", i,
message.getStringProperty("server"), message.getText());
Assert.assertNotNull(message);
Assert.assertEquals(i, message.getIntProperty("i"));
Assert.assertEquals("test " + i, message.getText());
@@ -767,7 +768,7 @@ public class BrokerInSyncTest extends AmqpClientTestSupport
{
out.println("*******************************************************************************************************************************");
out.println("PrintData Server 2");
PrintData.printMessages(server_2.getConfiguration().getJournalLocation(), out,
false, false, true, false);
- logger.debug("Data Available on Servers:\n" +
stringPrintStream.toString());
+ logger.debug("Data Available on Servers:\n{}",
stringPrintStream.toString());
}
@Test
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/PagedMirrorTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/PagedMirrorTest.java
index f67d3c16dd..513044b11f 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/PagedMirrorTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/PagedMirrorTest.java
@@ -49,14 +49,12 @@ import
org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.tests.util.Wait;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class PagedMirrorTest extends ActiveMQTestBase {
- private static final Logger logger =
Logger.getLogger(PagedMirrorTest.class);
ActiveMQServer server1;
ActiveMQServer server2;
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/QpidDispatchPeerTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/QpidDispatchPeerTest.java
index fc8630b365..0dfd6a3b6e 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/QpidDispatchPeerTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/QpidDispatchPeerTest.java
@@ -38,17 +38,18 @@ import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.tests.util.Wait;
import org.apache.activemq.artemis.utils.ExecuteUtil;
import org.apache.activemq.artemis.utils.UUIDGenerator;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/** This test will only be executed if you have qdrouterd available on your
system, otherwise is ignored by an assume exception. */
public class QpidDispatchPeerTest extends AmqpClientTestSupport {
- private static final Logger logger =
Logger.getLogger(QpidDispatchPeerTest.class);
+ private static final Logger logger =
LoggerFactory.getLogger(QpidDispatchPeerTest.class);
ExecuteUtil.ProcessHolder qpidProcess;
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/ValidateAMQPErrorsTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/ValidateAMQPErrorsTest.java
index ea467e359b..dc31742586 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/ValidateAMQPErrorsTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/ValidateAMQPErrorsTest.java
@@ -64,10 +64,11 @@ import org.apache.qpid.proton.engine.Link;
import org.apache.qpid.proton.engine.Receiver;
import org.apache.qpid.proton.engine.Sender;
import org.apache.qpid.proton.engine.impl.ConnectionImpl;
-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;
import static java.util.EnumSet.of;
import static org.apache.qpid.proton.engine.EndpointState.ACTIVE;
@@ -78,7 +79,7 @@ import static
org.apache.qpid.proton.engine.EndpointState.ACTIVE;
public class ValidateAMQPErrorsTest extends AmqpClientTestSupport {
protected static final int AMQP_PORT_2 = 5673;
- private static final Logger logger =
Logger.getLogger(ValidateAMQPErrorsTest.class);
+ private static final Logger logger =
LoggerFactory.getLogger(ValidateAMQPErrorsTest.class);
protected Vertx vertx;
protected MockServer mockServer;
@@ -516,13 +517,13 @@ public class ValidateAMQPErrorsTest extends
AmqpClientTestSupport {
return;
}
if (linkOpens.incrementAndGet() != 2) {
- logger.debug("Link Opens::" + linkOpens);
- logger.debug("ServerReceiver = " + serverReceiver.getTarget());
+ logger.debug("Link Opens::{}", linkOpens);
+ logger.debug("ServerReceiver = {}", serverReceiver.getTarget());
serverReceiver.setTarget(null);
serverReceiver.handler((del, msg) -> {
refusedLinkMessageCount.incrementAndGet();
- logger.debug("Should not have got message on refused link: "
+ msg);
+ logger.debug("Should not have got message on refused link:
{}", msg);
});
serverReceiver.open();
@@ -540,7 +541,7 @@ public class ValidateAMQPErrorsTest extends
AmqpClientTestSupport {
serverReceiver.setOfferedCapabilities(new
Symbol[]{AMQPMirrorControllerSource.MIRROR_CAPABILITY});
serverReceiver.handler((del, msg) -> {
- logger.debug("prefetch = " + serverReceiver.getPrefetch() +
", Got message: " + msg);
+ logger.debug("prefetch = {}, Got message: {}",
serverReceiver.getPrefetch(), msg);
if (msg.getApplicationProperties() != null) {
Map map = msg.getApplicationProperties().getValue();
Object value = map.get("sender");
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ActiveMQCrashTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ActiveMQCrashTest.java
index 56c607faa0..2f32ce5503 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ActiveMQCrashTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ActiveMQCrashTest.java
@@ -32,17 +32,18 @@ import
org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.ActiveMQServers;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* From https://jira.jboss.org/jira/browse/HORNETQ-144
*/
public class ActiveMQCrashTest extends ActiveMQTestBase {
- private static final Logger log = Logger.getLogger(ActiveMQCrashTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(ActiveMQCrashTest.class);
public ActiveMQServer server;
@@ -98,7 +99,7 @@ public class ActiveMQCrashTest extends ActiveMQTestBase {
@Override
public boolean intercept(final Packet packet, final RemotingConnection
connection) throws ActiveMQException {
- log.debug("AckInterceptor.intercept " + packet);
+ log.debug("AckInterceptor.intercept {}", packet);
if (packet.getType() == PacketImpl.SESS_SEND) {
try {
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateTest.java
index 20cccfe08b..4f40ec665f 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateTest.java
@@ -45,14 +45,15 @@ import
org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.tests.util.RandomUtil;
import org.apache.activemq.artemis.tests.util.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 AutoCreateTest extends ActiveMQTestBase {
- private static final Logger logger = Logger.getLogger(AutoCreateTest.class);
+ private static final Logger logger =
LoggerFactory.getLogger(AutoCreateTest.class);
public final SimpleString addressA = new SimpleString("addressA");
public final SimpleString queueA = new SimpleString("queueA");
@@ -91,7 +92,7 @@ public class AutoCreateTest extends ActiveMQTestBase {
for (int i = 0; i < 50; i++) {
ConnectionFactory cf = CFUtil.createConnectionFactory("core",
"tcp://localhost:61616");
logger.debug("*******************************************************************************************************************************");
- logger.debug("run " + i);
+ logger.debug("run {}", i);
CyclicBarrier barrier = new CyclicBarrier(THREADS + 1);
CountDownLatch done = new CountDownLatch(THREADS);
Runnable consumerThread = () -> {
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerFilterTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerFilterTest.java
index b558fe9300..04259a3660 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerFilterTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerFilterTest.java
@@ -27,13 +27,14 @@ import
org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.core.server.impl.QueueImpl;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.jboss.logging.Logger;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ConsumerFilterTest extends ActiveMQTestBase {
- private static final Logger log =
Logger.getLogger(ConsumerFilterTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(ConsumerFilterTest.class);
private ActiveMQServer server;
private ClientSession session;
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerRoundRobinTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerRoundRobinTest.java
index b69bbbab06..98fa87e782 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerRoundRobinTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerRoundRobinTest.java
@@ -26,13 +26,14 @@ import
org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
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;
public class ConsumerRoundRobinTest extends ActiveMQTestBase {
- private static final Logger log =
Logger.getLogger(ConsumerRoundRobinTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(ConsumerRoundRobinTest.class);
public final SimpleString addressA = new SimpleString("addressA");
@@ -67,9 +68,9 @@ public class ConsumerRoundRobinTest extends ActiveMQTestBase {
}
int currMessage = 0;
for (int i = 0; i < numMessage / 5; i++) {
- log.debug("i is " + i);
+ log.debug("i is {}", i);
for (int j = 0; j < 5; j++) {
- log.debug("j is " + j);
+ log.debug("j is {}", j);
ClientMessage cm = consumers[j].receive(5000);
Assert.assertNotNull(cm);
Assert.assertEquals(currMessage++, cm.getBodyBuffer().readInt());
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FailureDeadlockTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FailureDeadlockTest.java
index 3e9bfeca0d..98e6af699c 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FailureDeadlockTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FailureDeadlockTest.java
@@ -31,14 +31,15 @@ import
org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.jms.client.ActiveMQSession;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class FailureDeadlockTest extends ActiveMQTestBase {
- private static final Logger log =
Logger.getLogger(FailureDeadlockTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(FailureDeadlockTest.class);
private ActiveMQServer server;
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java
index 877f095b8a..d9770f985f 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java
@@ -28,14 +28,15 @@ import javax.jms.TopicSubscriber;
import java.util.concurrent.CountDownLatch;
import org.apache.activemq.artemis.tests.util.JMSTestBase;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class FlowControlOnIgnoreLargeMessageBodyTest extends JMSTestBase {
- private static final Logger log =
Logger.getLogger(FlowControlOnIgnoreLargeMessageBodyTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(FlowControlOnIgnoreLargeMessageBodyTest.class);
private Topic topic;
@@ -106,7 +107,7 @@ public class FlowControlOnIgnoreLargeMessageBodyTest
extends JMSTestBase {
Connection connection = null;
Session session = null;
MessageProducer prod;
- log.debug("Starting producer for " + topic + " - " + getName());
+ log.debug("Starting producer for {} - {}", topic, getName());
try {
connection = cf.createConnection();
session = connection.createSession(true,
Session.SESSION_TRANSACTED);
@@ -127,10 +128,10 @@ public class FlowControlOnIgnoreLargeMessageBodyTest
extends JMSTestBase {
session.commit();
}
if (i % 100 == 0) {
- log.debug("Address " + topic + " sent " + i + " messages");
+ log.debug("Address {} sent {} messages", topic, i);
}
}
- log.debug("Ending producer for " + topic + " - " + getName() + "
messages " + sentMessages);
+ log.debug("Ending producer for {} - {} messages {}", topic,
getName(), sentMessages);
} catch (Exception e) {
error = true;
e.printStackTrace();
@@ -204,7 +205,7 @@ public class FlowControlOnIgnoreLargeMessageBodyTest
extends JMSTestBase {
Session session = null;
stopped = false;
requestForStop = false;
- instanceLog.debug("Starting consumer for " + topic + " - " +
getName());
+ instanceLog.debug("Starting consumer for {} - {}", topic, getName());
try {
connection = cf.createConnection();
@@ -222,11 +223,11 @@ public class FlowControlOnIgnoreLargeMessageBodyTest
extends JMSTestBase {
while (counter < numberOfMessages && !requestForStop && !error) {
if (counter == 0) {
- instanceLog.debug("Starting to consume for " + topic + " - "
+ getName());
+ instanceLog.debug("Starting to consume for {} - {}", topic,
getName());
}
BytesMessage msg = (BytesMessage)
subscriber.receive(receiveTimeout);
if (msg == null) {
- instanceLog.debug("Cannot get message in specified timeout:
" + topic + " - " + getName());
+ instanceLog.debug("Cannot get message in specified timeout:
{} - {}", topic, getName());
error = true;
} else {
counter++;
@@ -238,13 +239,13 @@ public class FlowControlOnIgnoreLargeMessageBodyTest
extends JMSTestBase {
session.commit();
}
if (counter % 100 == 0) {
- log.debug("## " + getName() + " " + topic + " received " +
counter);
+ log.debug("## {} {} received {}", getName(), topic, counter);
}
receivedMessages = counter;
}
session.commit();
} catch (Exception e) {
- instanceLog.debug("Exception in consumer " + getName() + " : " +
e.getMessage());
+ instanceLog.debug("Exception in consumer {} : {}", getName(),
e.getMessage());
e.printStackTrace();
} finally {
if (session != null) {
@@ -263,11 +264,7 @@ public class FlowControlOnIgnoreLargeMessageBodyTest
extends JMSTestBase {
}
}
stopped = true;
- instanceLog.debug("Stopping consumer for " + topic +
- " - " +
- getName() +
- ", received " +
- getReceivedMessages());
+ instanceLog.debug("Stopping consumer for {} - {}, received {}",
topic, getName(), getReceivedMessages());
}
public int getReceivedMessages() {
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java
index 9ff2907233..98608902cd 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java
@@ -43,17 +43,18 @@ import
org.apache.activemq.artemis.core.version.impl.VersionImpl;
import org.apache.activemq.artemis.tests.util.SpawnedTestBase;
import org.apache.activemq.artemis.utils.SpawnedVMSupport;
import org.apache.activemq.artemis.utils.VersionLoader;
-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;
import static org.apache.activemq.artemis.tests.util.RandomUtil.randomString;
public class IncompatibleVersionTest extends SpawnedTestBase {
- private static final Logger log =
Logger.getLogger(IncompatibleVersionTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(IncompatibleVersionTest.class);
private static final String WORD_START = "&*STARTED&*";
@@ -228,7 +229,7 @@ public class IncompatibleVersionTest extends
SpawnedTestBase {
System.out.println(WORD_START);
- log.debug("### server: " + startedString);
+ log.debug("### server: {}", startedString);
}
}
@@ -241,7 +242,7 @@ public class IncompatibleVersionTest extends
SpawnedTestBase {
locator = createNettyNonHALocator();
sf = locator.createSessionFactory();
ClientSession session = sf.createSession(false, true, true);
- log.debug("### client: connected. server incrementingVersion = " +
session.getVersion());
+ log.debug("### client: connected. server incrementingVersion =
{}", session.getVersion());
session.close();
} finally {
closeSessionFactory(sf);
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InfiniteRedeliveryTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InfiniteRedeliveryTest.java
index bbdb536fa6..cf2a01011b 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InfiniteRedeliveryTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InfiniteRedeliveryTest.java
@@ -46,17 +46,18 @@ import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.tests.util.ReplicatedBackupUtils;
import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
import org.apache.activemq.artemis.utils.Wait;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RunWith(value = Parameterized.class)
public class InfiniteRedeliveryTest extends ActiveMQTestBase {
- private static final Logger logger =
Logger.getLogger(InfiniteRedeliveryTest.class);
+ private static final Logger logger =
LoggerFactory.getLogger(InfiniteRedeliveryTest.class);
@Parameterized.Parameters(name = "protocol={0}, useCLI={1}")
public static Collection getParameters() {
@@ -192,12 +193,12 @@ public class InfiniteRedeliveryTest extends
ActiveMQTestBase {
}
HashMap<Integer, AtomicInteger> counts =
countJournal(liveServer.getServer().getConfiguration());
- counts.forEach((k, v) -> logger.debug(k + "=" + v));
+ counts.forEach((k, v) -> logger.debug("{}={}", k, v));
counts.forEach((k, v) -> Assert.assertTrue("Record type " + k + " has a
lot of records:" + v, v.intValue() < 20));
HashMap<Integer, AtomicInteger> backupCounts =
countJournal(backupServer.getServer().getConfiguration());
Assert.assertTrue(backupCounts.size() > 0);
- backupCounts.forEach((k, v) -> logger.debug("On Backup:" + k + "=" + v));
+ backupCounts.forEach((k, v) -> logger.debug("On Backup:{}={}", k, v));
backupCounts.forEach((k, v) -> Assert.assertTrue("Backup Record type " +
k + " has a lot of records:" + v, v.intValue() < 10));
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
index 7384a17dcc..c262cf3274 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
@@ -67,17 +67,17 @@ import
org.apache.activemq.artemis.tests.integration.largemessage.LargeMessageTe
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.ExecutorFactory;
import org.apache.activemq.artemis.utils.actors.ArtemisExecutor;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class InterruptedLargeMessageTest extends LargeMessageTestBase {
-
static final int RECEIVE_WAIT_TIME = 60000;
- private static final Logger log =
Logger.getLogger(InterruptedLargeMessageTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(InterruptedLargeMessageTest.class);
private final int LARGE_MESSAGE_SIZE =
ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE * 3;
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InvalidCoreClientTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InvalidCoreClientTest.java
index 5361d9d664..6334ad5ba6 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InvalidCoreClientTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InvalidCoreClientTest.java
@@ -45,15 +45,12 @@ import
org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.Wait;
import org.apache.activemq.artemis.utils.XidCodecSupport;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class InvalidCoreClientTest extends ActiveMQTestBase {
- private static final Logger log =
Logger.getLogger(InvalidCoreClientTest.class);
-
private final Map<String, AddressSettings> addressSettings = new
HashMap<>();
private final SimpleString atestq = new SimpleString("BasicXaTestq");
private ActiveMQServer messagingService;
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
index 0f730967e8..25968310ee 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
@@ -66,15 +66,16 @@ import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.tests.util.RandomUtil;
import org.apache.activemq.artemis.tests.util.Wait;
import org.apache.activemq.artemis.utils.collections.LinkedListIterator;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class LargeMessageTest extends LargeMessageTestBase {
- private static final Logger log = Logger.getLogger(LargeMessageTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(LargeMessageTest.class);
private static final int RECEIVE_WAIT_TIME = 10000;
@@ -97,7 +98,7 @@ public class LargeMessageTest extends LargeMessageTestBase {
@Test
public void testRollbackPartiallyConsumedBuffer() throws Exception {
for (int i = 0; i < 1; i++) {
- log.debug("#test " + i);
+ log.debug("#test {}", i);
internalTestRollbackPartiallyConsumedBuffer(false);
tearDown();
setUp();
@@ -668,7 +669,7 @@ public class LargeMessageTest extends LargeMessageTestBase {
msg.acknowledge();
Assert.assertEquals(1, msg.getDeliveryCount());
- log.debug("body buffer is " + msg.getBodyBuffer());
+ log.debug("body buffer is {}", msg.getBodyBuffer());
for (int i = 0; i < messageSize; i++) {
Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i),
msg.getBodyBuffer().readByte());
@@ -2453,7 +2454,7 @@ public class LargeMessageTest extends
LargeMessageTestBase {
msg.putIntProperty(new SimpleString("key"), i);
producer.send(msg);
- log.debug("Sent msg " + i);
+ log.debug("Sent msg {}", i);
}
session.start();
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConcurrencyTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConcurrencyTest.java
index 593a1c1d31..09879fc40f 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConcurrencyTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConcurrencyTest.java
@@ -33,13 +33,14 @@ import
org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.RandomUtil;
-import org.jboss.logging.Logger;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MessageConcurrencyTest extends ActiveMQTestBase {
- private static final Logger log =
Logger.getLogger(MessageConcurrencyTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(MessageConcurrencyTest.class);
private ActiveMQServer server;
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java
index 32108c337f..2ecf8ffa95 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java
@@ -38,15 +38,16 @@ import
org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.ActiveMQServers;
import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MessageGroupingTest extends ActiveMQTestBase {
- private static final Logger log =
Logger.getLogger(MessageGroupingTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(MessageGroupingTest.class);
private ActiveMQServer server;
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessagePriorityTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessagePriorityTest.java
index 2884770023..e9ba58fc8b 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessagePriorityTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessagePriorityTest.java
@@ -29,16 +29,15 @@ import
org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.ActiveMQServers;
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.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MessagePriorityTest extends ActiveMQTestBase {
-
- private static final Logger log =
Logger.getLogger(MessagePriorityTest.class);
-
+ private static final Logger log =
LoggerFactory.getLogger(MessagePriorityTest.class);
private ActiveMQServer server;
@@ -111,7 +110,7 @@ public class MessagePriorityTest extends ActiveMQTestBase {
for (int i = 9; i >= 0; i--) {
ClientMessage m = consumer.receive(500);
- log.debug("received msg " + m.getPriority());
+ log.debug("received msg {}", m.getPriority());
Assert.assertNotNull(m);
Assert.assertEquals(i, m.getPriority());
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MixRoutingTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MixRoutingTest.java
index 3eb60b3fd1..b90bff9a76 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MixRoutingTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MixRoutingTest.java
@@ -32,20 +32,11 @@ import
org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.tests.util.SingleServerTestBase;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Test;
public class MixRoutingTest extends SingleServerTestBase {
-
- private static final Logger log = Logger.getLogger(MixRoutingTest.class);
-
- private static final long CONNECTION_TTL = 2000;
-
-
-
-
@Override
protected ActiveMQServer createServer() throws Exception {
return createServer(false, createDefaultNettyConfig());
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java
index 60c1629afb..540be278f4 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java
@@ -41,14 +41,13 @@ import
org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.UUIDGenerator;
-import org.jboss.logging.Logger;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class NIOvsOIOTest extends ActiveMQTestBase {
- private static final Logger log = Logger.getLogger(NIOvsOIOTest.class);
-
-
+ private static final Logger log =
LoggerFactory.getLogger(NIOvsOIOTest.class);
@Test
public void testNIOPerf() throws Exception {
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionStopStartTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionStopStartTest.java
index 55e643d83d..300dca0eeb 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionStopStartTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionStopStartTest.java
@@ -30,14 +30,15 @@ import
org.apache.activemq.artemis.api.core.client.MessageHandler;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SessionStopStartTest extends ActiveMQTestBase {
- private static final Logger log =
Logger.getLogger(SessionStopStartTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(SessionStopStartTest.class);
private ActiveMQServer server;
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java
index 0f381a8d9e..db3d639c5e 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java
@@ -47,10 +47,11 @@ import
org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.tests.util.Wait;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static
org.apache.activemq.artemis.core.settings.impl.SlowConsumerThresholdMeasurementUnit.MESSAGES_PER_DAY;
import static
org.apache.activemq.artemis.core.settings.impl.SlowConsumerThresholdMeasurementUnit.MESSAGES_PER_MINUTE;
@@ -58,7 +59,7 @@ import static
org.apache.activemq.artemis.core.settings.impl.SlowConsumerThresho
public class SlowConsumerTest extends ActiveMQTestBase {
- private static final Logger logger =
Logger.getLogger(SlowConsumerTest.class);
+ private static final Logger logger =
LoggerFactory.getLogger(SlowConsumerTest.class);
private int threshold = 10;
private long checkPeriod = 1;
@@ -698,8 +699,8 @@ public class SlowConsumerTest extends ActiveMQTestBase {
consumer.stopRunning();
Assert.assertFalse(consumer.failed);
}
- logger.debug("***report messages received: " +
receivedMessages.size());
- logger.debug("***consumers left: " + consumers.size());
+ logger.debug("***report messages received: {}",
receivedMessages.size());
+ logger.debug("***consumers left: {}", consumers.size());
}
}
@@ -725,7 +726,7 @@ public class SlowConsumerTest extends ActiveMQTestBase {
if (count < messages) {
ClientMessage m = createTextMessage(session, "msg" + count);
producer.send(m);
- logger.debug("producer sent a message " + count);
+ logger.debug("producer sent a message {}", count);
} else {
this.working = false;
}
@@ -765,12 +766,12 @@ public class SlowConsumerTest extends ActiveMQTestBase {
@Override
protected void doWork(int count) throws Exception {
ClientMessage m = this.consumer.receive(1000);
- logger.debug("consumer " + id + " got m: " + m);
+ logger.debug("consumer {} got m: {}", id, m);
if (m != null) {
receivedMessages.add(m);
m.acknowledge();
session.commit();
- logger.debug(" consumer " + id + " acked " +
m.getClass().getName() + "now total received: " + receivedMessages.size());
+ logger.debug(" consumer {} acked {} now total received: {}", id,
m.getClass().getName(), receivedMessages.size());
}
}
@@ -801,7 +802,7 @@ public class SlowConsumerTest extends ActiveMQTestBase {
this.sf = sf;
this.queue = queue;
this.sleepTime = (int)
(SlowConsumerThresholdMeasurementUnit.unitOf(unit.getValue()).toMillis(1) /
rate);
- logger.debug(this.getClass() + " has sleepTime = " + sleepTime + "
which is " + TimeUnit.MILLISECONDS.toSeconds(sleepTime) + " seconds");
+ logger.debug("{} has sleepTime = {} which is {} seconds",
this.getClass(), sleepTime, TimeUnit.MILLISECONDS.toSeconds(sleepTime));
}
protected void prepareWork() throws ActiveMQException {
@@ -822,7 +823,7 @@ public class SlowConsumerTest extends ActiveMQTestBase {
while (working) {
try {
doWork(count);
- logger.debug(this.getClass().getName() + " sleeping " +
sleepTime);
+ logger.debug("{} sleeping {}", this.getClass().getName(),
sleepTime);
Thread.sleep(sleepTime);
} catch (InterruptedException e) {
// expected, nothing to be done
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
index 85dd151cbe..ccfd54443c 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
@@ -53,12 +53,13 @@ import
org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.tests.util.SingleServerTestBase;
import org.apache.activemq.artemis.tests.util.Wait;
import org.apache.activemq.artemis.utils.RandomUtil;
-import org.jboss.logging.Logger;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TemporaryQueueTest extends SingleServerTestBase {
- private static final Logger log =
Logger.getLogger(TemporaryQueueTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(TemporaryQueueTest.class);
private static final long CONNECTION_TTL = 2000;
@@ -370,7 +371,7 @@ public class TemporaryQueueTest extends
SingleServerTestBase {
latch.countDown();
if (!message.getStringProperty("color").equals(color)) {
- log.warn("Unexpected color " +
message.getStringProperty("color") + " when we were expecting " + color);
+ log.warn("Unexpected color {} when we were expecting {}",
message.getStringProperty("color"), color);
errors.incrementAndGet();
}
} catch (Exception e) {
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
index 5935922c8f..cadfdafb23 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
@@ -31,12 +31,13 @@ import
org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
import org.apache.activemq.artemis.tests.util.SpawnedVMCheck;
import org.apache.activemq.artemis.utils.SpawnedVMSupport;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A test that makes sure that an ActiveMQ Artemis server cleans up the
associated
@@ -44,7 +45,7 @@ import org.junit.Test;
*/
public class ClientCrashTest extends ClientTestBase {
- private static final Logger log = Logger.getLogger(ClientCrashTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(ClientCrashTest.class);
@Rule
public SpawnedVMCheck spawnedVMCheck = new SpawnedVMCheck();
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
index c0719bdbb1..563ae1bb80 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
@@ -25,9 +25,10 @@ import
org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.apache.activemq.artemis.utils.SpawnedVMSupport;
import org.apache.activemq.artemis.utils.RandomUtil;
-import org.jboss.logging.Logger;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A test that makes sure that an ActiveMQ Artemis client gracefully exists
after the last session is
@@ -43,7 +44,7 @@ public class ClientExitTest extends ClientTestBase {
private static final SimpleString QUEUE = new
SimpleString("ClientExitTestQueue");
- private static final Logger log = Logger.getLogger(ClientExitTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(ClientExitTest.class);
private ClientSession session;
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient.java
index dea7460dc5..b72b724c83 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient.java
@@ -25,14 +25,15 @@ import
org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
import
org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Code to be run in an external VM, via main()
*/
public class CrashClient {
- private static final Logger log = Logger.getLogger(CrashClient.class);
+ private static final Logger log =
LoggerFactory.getLogger(CrashClient.class);
public static int OK = 9;
public static int NOT_OK = 1;
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient2.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient2.java
index 838089d33c..d71f9371a3 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient2.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient2.java
@@ -25,14 +25,15 @@ import
org.apache.activemq.artemis.api.core.client.ClientSession;
import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
import
org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Code to be run in an external VM, via main()
*/
public class CrashClient2 {
- private static final Logger log = Logger.getLogger(CrashClient2.class);
+ private static final Logger log =
LoggerFactory.getLogger(CrashClient2.class);
public static final int OK = 9;
public static void main(final String[] args) throws Exception {
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptor.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptor.java
index 8c0f09b024..c3b0979e7c 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptor.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptor.java
@@ -25,11 +25,12 @@ import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.protocol.core.Packet;
import
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionReceiveMessage;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DummyInterceptor implements Interceptor {
- private static final Logger log = Logger.getLogger(DummyInterceptor.class);
+ private static final Logger log =
LoggerFactory.getLogger(DummyInterceptor.class);
boolean sendException = false;
@@ -55,7 +56,7 @@ public class DummyInterceptor implements Interceptor {
if (changeMessage) {
if (packet instanceof SessionReceiveMessage) {
SessionReceiveMessage deliver = (SessionReceiveMessage) packet;
- log.debug("msg = " + deliver.getMessage().getClass().getName());
+ log.debug("msg = {}", deliver.getMessage().getClass().getName());
deliver.getMessage().putStringProperty(new
SimpleString("DummyInterceptor"), new SimpleString("was here"));
}
}
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptorB.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptorB.java
index d8ec7c2009..53831001cf 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptorB.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptorB.java
@@ -22,11 +22,12 @@ import
org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.api.core.Interceptor;
import org.apache.activemq.artemis.core.protocol.core.Packet;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DummyInterceptorB implements Interceptor {
- private static final Logger log = Logger.getLogger(DummyInterceptorB.class);
+ private static final Logger log =
LoggerFactory.getLogger(DummyInterceptorB.class);
static AtomicInteger syncCounter = new AtomicInteger(0);
@@ -41,7 +42,7 @@ public class DummyInterceptorB implements Interceptor {
@Override
public boolean intercept(final Packet packet, final RemotingConnection
conn) throws ActiveMQException {
DummyInterceptorB.syncCounter.addAndGet(1);
- log.debug("DummyFilter packet = " + packet);
+ log.debug("DummyFilter packet = {}", packet);
return true;
}
}
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/GracefulClient.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/GracefulClient.java
index e6c4088d64..96ecbcf4fd 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/GracefulClient.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/GracefulClient.java
@@ -26,13 +26,14 @@ import
org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
import
org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Code to be run in an external VM, via main()
*/
public class GracefulClient {
- private static final Logger log = Logger.getLogger(GracefulClient.class);
+ private static final Logger log =
LoggerFactory.getLogger(GracefulClient.class);
public static void main(final String[] args) throws Exception {
