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
commit 05470962cad6b3d84b94cc8c60b2889136c81b51 Author: Robbie Gemmell <[email protected]> AuthorDate: Thu May 26 17:53:46 2022 +0100 update various tests to fix compilation --- .../apache/activemq/artemis/tests/util/ActiveMQTestBase.java | 1 - .../tests/integration/amqp/AmqpIngressTimestampTest.java | 2 +- .../tests/integration/client/ExpireTestOnRestartTest.java | 2 +- .../cluster/failover/MultipleServerFailoverTestBase.java | 6 ++++-- .../artemis/tests/integration/jms/client/MessageTest.java | 12 ++++++------ .../integration/jms/client/MoveMessageDuplicateIDTest.java | 4 ++-- .../tests/integration/jms/client/NewQueueRequestorTest.java | 2 +- .../tests/integration/management/QueueControlTest.java | 2 +- .../tests/integration/openwire/SimpleOpenWireTest.java | 2 +- .../artemis/tests/integration/stomp/v11/ExtraStompTest.java | 4 ++-- .../artemis/tests/integration/stomp/v11/StompV11Test.java | 2 +- 11 files changed, 20 insertions(+), 19 deletions(-) diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java index 55b8c204b4..90aeefe259 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java @@ -116,7 +116,6 @@ import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactor import org.apache.activemq.artemis.core.replication.ReplicationEndpoint; import org.apache.activemq.artemis.core.server.ActiveMQComponent; import org.apache.activemq.artemis.core.server.ActiveMQServer; -import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.core.server.JournalType; import org.apache.activemq.artemis.core.server.MessageReference; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpIngressTimestampTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpIngressTimestampTest.java index 798aa32c45..76d357565f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpIngressTimestampTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpIngressTimestampTest.java @@ -107,7 +107,7 @@ public class AmqpIngressTimestampTest extends AmqpClientTestSupport { receiver.flow(1); AmqpMessage receive = receiver.receive(5, TimeUnit.SECONDS); assertNotNull(receive); - instanceLog.info(receive); + instanceLog.info("{}", receive); Object ingressTimestampHeader = receive.getMessageAnnotation(AMQPMessageSupport.X_OPT_INGRESS_TIME); assertNotNull(ingressTimestampHeader); assertTrue(ingressTimestampHeader instanceof Long); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpireTestOnRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpireTestOnRestartTest.java index 2d6499a42d..ffba61d8f8 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpireTestOnRestartTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpireTestOnRestartTest.java @@ -120,7 +120,7 @@ public class ExpireTestOnRestartTest extends ActiveMQTestBase { int extras = 0; ClientMessage msg; while ((msg = cons.receiveImmediate()) != null) { - instanceLog.debug(msg); + instanceLog.debug("{}", msg); extras++; } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java index 703f23295d..23dd22fdf0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java @@ -37,7 +37,6 @@ import org.apache.activemq.artemis.core.config.ha.ReplicationPrimaryPolicyConfig import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration; import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration; import org.apache.activemq.artemis.core.server.ActiveMQServer; -import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; import org.apache.activemq.artemis.core.server.NodeManager; import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.quorum.file.FileBasedPrimitiveManager; @@ -48,9 +47,12 @@ import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils; import org.junit.Before; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class MultipleServerFailoverTestBase extends ActiveMQTestBase { + private static final Logger logger = LoggerFactory.getLogger(MultipleServerFailoverTestBase.class); private DistributedPrimitiveManagerConfiguration pluggableQuorumConfiguration = null; private DistributedPrimitiveManagerConfiguration getOrCreatePluggableQuorumConfiguration() { @@ -271,7 +273,7 @@ public abstract class MultipleServerFailoverTestBase extends ActiveMQTestBase { } protected boolean waitForDistribution(SimpleString address, ActiveMQServer server, int messageCount) throws Exception { - ActiveMQServerLogger.LOGGER.debug("waiting for distribution of messages on server " + server); + logger.debug("waiting for distribution of messages on server {}", server); Queue q = (Queue) server.getPostOffice().getBinding(address).getBindable(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java index cf24290838..0cbc7c7cac 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java @@ -214,35 +214,35 @@ public class MessageTest extends JMSTestBase { Assert.assertNull(message.getObjectProperty(MessageTest.propName3)); try { - instanceLog.debug(message.getIntProperty(MessageTest.propName1)); + instanceLog.debug("{}", message.getIntProperty(MessageTest.propName1)); Assert.fail("Should throw exception"); } catch (NumberFormatException e) { // Ok } try { - instanceLog.debug(message.getShortProperty(MessageTest.propName1)); + instanceLog.debug("{}", message.getShortProperty(MessageTest.propName1)); } catch (NumberFormatException e) { // Ok } try { - instanceLog.debug(message.getByteProperty(MessageTest.propName1)); + instanceLog.debug("{}", message.getByteProperty(MessageTest.propName1)); } catch (NumberFormatException e) { // Ok } Assert.assertEquals(false, message.getBooleanProperty(MessageTest.propName1)); try { - instanceLog.debug(message.getLongProperty(MessageTest.propName1)); + instanceLog.debug("{}", message.getLongProperty(MessageTest.propName1)); } catch (NumberFormatException e) { // Ok } try { - instanceLog.debug(message.getFloatProperty(MessageTest.propName1)); + instanceLog.debug("{}", message.getFloatProperty(MessageTest.propName1)); } catch (NullPointerException e) { // Ok } try { - instanceLog.debug(message.getDoubleProperty(MessageTest.propName1)); + instanceLog.debug("{}", message.getDoubleProperty(MessageTest.propName1)); } catch (NullPointerException e) { // Ok } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MoveMessageDuplicateIDTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MoveMessageDuplicateIDTest.java index 6f4b22c00f..64b24c8c44 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MoveMessageDuplicateIDTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MoveMessageDuplicateIDTest.java @@ -118,7 +118,7 @@ public class MoveMessageDuplicateIDTest extends JMSTestBase { createQueue("DLQ"); Queue dlqServerQueue = server.locateQueue("DLQ"); - org.wildfly.common.Assert.assertNotNull(dlqServerQueue); + Assert.assertNotNull(dlqServerQueue); Topic topic = createTopic("test-topic"); AddressControl control = ManagementControlHelper.createAddressControl(new SimpleString(topic.getTopicName()), mbeanServer); @@ -162,7 +162,7 @@ public class MoveMessageDuplicateIDTest extends JMSTestBase { createQueue("JUNKYARD"); Queue junkQueue = server.locateQueue("JUNKYARD"); - org.wildfly.common.Assert.assertNotNull(junkQueue); + Assert.assertNotNull(junkQueue); javax.jms.Queue queue1 = createQueue("q1"); javax.jms.Queue queue2 = createQueue("q2"); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java index 60b69815e2..52f68d5fa5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java @@ -84,7 +84,7 @@ public class NewQueueRequestorTest extends JMSTestBase { Message m2 = sess.createTextMessage("This is the response"); sender.send(queue, m2); } catch (JMSException e) { - instanceLog.error(e); + instanceLog.error(e.getMessage(), e); } } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java index 271d711126..ca28df16d5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java @@ -3768,7 +3768,7 @@ public class QueueControlTest extends ManagementTestBase { consumer.setMessageHandler(new MessageHandler() { @Override public void onMessage(ClientMessage message) { - instanceLog.debug(message); + instanceLog.debug("{}", message); } }); session.start(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java index 3ccc8fee2b..17eb10c2ab 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java @@ -1515,7 +1515,7 @@ public class SimpleOpenWireTest extends BasicOpenWireTest { break; } else { duplicatedMessages = true; - instanceLog.warn("received in duplicate:" + txt.getText()); + instanceLog.warn("received in duplicate:{}", txt.getText()); } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/ExtraStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/ExtraStompTest.java index 2a78cd3068..d345f48257 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/ExtraStompTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/ExtraStompTest.java @@ -198,10 +198,10 @@ public class ExtraStompTest extends StompTestBase { // receive but don't ack frame = conn.receiveFrame(10000); - instanceLog.debug(frame); + instanceLog.debug("{}", frame); frame = conn.receiveFrame(10000); - instanceLog.debug(frame); + instanceLog.debug("{}", frame); unsubscribe(conn, "a-sub"); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java index 749e2a5217..4a2d6b9b4d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java @@ -1394,7 +1394,7 @@ public class StompV11Test extends StompTestBase { sendJmsMessage(text); ClientStompFrame frame = conn.receiveFrame(); - instanceLog.debug(frame); + instanceLog.debug("{}", frame); Assert.assertTrue(frame.getCommand().equals(Stomp.Responses.MESSAGE)); Assert.assertNotNull(frame.getHeader(Stomp.Headers.Message.DESTINATION)); Assert.assertTrue(frame.getBody().equals(text));
