You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2022/10/10 07:55:03 UTC
[activemq-artemis] branch main updated: ARTEMIS-4020: Remove string appends and various isXEnabled logger checks (add some where useful)
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 617269319a ARTEMIS-4020: Remove string appends and various isXEnabled logger checks (add some where useful)
617269319a is described below
commit 617269319a7e6cbe98ae981743d2af24632e730c
Author: Timothy Bish <ta...@gmail.com>
AuthorDate: Fri Oct 7 15:37:13 2022 -0400
ARTEMIS-4020: Remove string appends and various isXEnabled logger checks (add some where useful)
Logger statements should use formatting syntax and let the normal framework checks take care of
checking if a logger is enabled instead of string concats and isXEnabled logger checks except
in cases there is known expense to the specifc logging message/arg preparation or passing.
Changes from myself and Robbie Gemmell.
Co-authored-by: Robbie Gemmell <ro...@apache.org>
---
.../cli/commands/tools/xml/XMLMessageImporter.java | 9 +-
.../cli/commands/tools/xml/XmlDataImporter.java | 36 +-
.../artemis/core/server/NetworkHealthCheck.java | 13 +-
.../apache/activemq/artemis/utils/ByteUtil.java | 4 +-
.../artemis/utils/DefaultSensitiveStringCodec.java | 4 +-
.../apache/activemq/artemis/utils/UTF8Util.java | 4 +-
.../activemq/artemis/utils/UUIDGenerator.java | 4 +-
.../artemis/utils/actors/ProcessorBase.java | 2 +-
.../artemis/utils/actors/ThresholdActor.java | 8 +-
.../utils/collections/ConcurrentLongHashSet.java | 2 +-
.../artemis/utils/critical/CriticalMeasure.java | 8 +-
.../FluentPropertyBeanIntrospectorWithIgnores.java | 4 +-
.../utils/DefaultSensitiveStringCodecTest.java | 6 +-
.../utils/actors/OrderedExecutorSanityTest.java | 2 +-
.../critical/MultiThreadCriticalMeasureTest.java | 4 +-
.../api/core/ChannelBroadcastEndpointFactory.java | 2 +-
.../artemis/api/core/JGroupsBroadcastEndpoint.java | 18 +-
.../artemis/api/core/jgroups/JChannelManager.java | 7 +-
.../artemis/api/core/jgroups/JChannelWrapper.java | 27 +-
.../artemis/api/core/jgroups/JGroupsReceiver.java | 7 +-
.../client/impl/AbstractProducerCreditsImpl.java | 1 +
.../core/client/impl/ClientConsumerImpl.java | 91 ++---
.../core/client/impl/ClientProducerImpl.java | 4 +-
.../core/client/impl/ClientSessionFactoryImpl.java | 76 ++--
.../core/client/impl/ClientSessionImpl.java | 34 +-
.../core/client/impl/ServerLocatorImpl.java | 34 +-
.../artemis/core/client/impl/Topology.java | 63 ++--
.../artemis/core/cluster/DiscoveryGroup.java | 41 +-
.../artemis/core/message/impl/CoreMessage.java | 8 +-
.../core/impl/ActiveMQClientProtocolManager.java | 4 +-
.../protocol/core/impl/ActiveMQSessionContext.java | 4 +-
.../core/protocol/core/impl/ChannelImpl.java | 49 ++-
.../protocol/core/impl/RemotingConnectionImpl.java | 6 +-
.../artemis/core/remoting/CertificateUtil.java | 7 +-
.../core/remoting/impl/netty/NettyConnection.java | 13 +-
.../core/remoting/impl/netty/NettyConnector.java | 26 +-
.../activemq/artemis/utils/AutoCreateUtil.java | 2 +-
.../org/apache/activemq/artemis/utils/XMLUtil.java | 2 +-
...nnectorTransportConfigurationParserURITest.java | 2 +-
.../jdbc/store/file/JDBCSequentialFile.java | 7 +-
.../file/JDBCSequentialFileFactoryDriver.java | 4 +-
.../jdbc/store/journal/JDBCJournalImpl.java | 98 ++---
.../artemis/jms/bridge/impl/JMSBridgeImpl.java | 265 ++++---------
.../artemis/core/io/AbstractSequentialFile.java | 2 +-
.../core/io/AbstractSequentialFileFactory.java | 5 -
.../artemis/core/io/aio/AIOSequentialFile.java | 20 +-
.../core/io/aio/AIOSequentialFileFactory.java | 14 +-
.../artemis/core/io/buffer/TimedBuffer.java | 2 +-
.../artemis/core/io/mapped/MappedFile.java | 2 +-
.../artemis/core/io/nio/NIOSequentialFile.java | 5 +-
.../activemq/artemis/core/io/util/FileIOUtil.java | 4 +-
.../core/journal/impl/JournalCompactor.java | 53 ++-
.../core/journal/impl/JournalFilesRepository.java | 44 +--
.../artemis/core/journal/impl/JournalImpl.java | 246 ++++--------
.../core/journal/impl/JournalTransaction.java | 5 +-
.../amqp/broker/AMQPConnectionCallback.java | 4 +-
.../protocol/amqp/broker/AMQPSessionCallback.java | 2 +-
.../amqp/client/ProtonClientConnectionManager.java | 4 +-
.../amqp/connect/AMQPBrokerConnection.java | 23 +-
.../amqp/connect/AMQPBrokerConnectionManager.java | 5 +-
.../connect/mirror/AMQPMirrorControllerSource.java | 51 +--
.../connect/mirror/AMQPMirrorControllerTarget.java | 46 ++-
.../amqp/proton/AMQPConnectionContext.java | 2 +-
.../amqp/proton/ProtonServerSenderContext.java | 5 +-
.../amqp/proton/handler/ProtonHandler.java | 7 +-
.../protocol/amqp/converter/TestConversions.java | 10 +-
.../core/protocol/mqtt/MQTTPublishManager.java | 10 +-
.../core/protocol/openwire/OpenWireConnection.java | 38 +-
.../artemis/ra/ActiveMQRABytesMessage.java | 88 ++---
.../ra/ActiveMQRAConnectionFactoryImpl.java | 117 ++----
.../artemis/ra/ActiveMQRAConnectionManager.java | 12 +-
.../artemis/ra/ActiveMQRAConnectionMetaData.java | 32 +-
.../ra/ActiveMQRAConnectionRequestInfo.java | 57 +--
.../activemq/artemis/ra/ActiveMQRACredential.java | 38 +-
.../artemis/ra/ActiveMQRALocalTransaction.java | 16 +-
.../artemis/ra/ActiveMQRAMCFProperties.java | 28 +-
.../artemis/ra/ActiveMQRAManagedConnection.java | 118 ++----
.../ra/ActiveMQRAManagedConnectionFactory.java | 102 ++---
.../activemq/artemis/ra/ActiveMQRAMapMessage.java | 83 ++--
.../activemq/artemis/ra/ActiveMQRAMessage.java | 185 +++------
.../artemis/ra/ActiveMQRAMessageConsumer.java | 58 +--
.../artemis/ra/ActiveMQRAMessageListener.java | 8 +-
.../artemis/ra/ActiveMQRAMessageProducer.java | 111 ++----
.../activemq/artemis/ra/ActiveMQRAMetaData.java | 20 +-
.../artemis/ra/ActiveMQRAObjectMessage.java | 12 +-
.../activemq/artemis/ra/ActiveMQRAProperties.java | 28 +-
.../artemis/ra/ActiveMQRAQueueReceiver.java | 8 +-
.../activemq/artemis/ra/ActiveMQRAQueueSender.java | 29 +-
.../activemq/artemis/ra/ActiveMQRASession.java | 341 +++++------------
.../artemis/ra/ActiveMQRASessionFactoryImpl.java | 161 ++------
.../artemis/ra/ActiveMQRAStreamMessage.java | 78 ++--
.../activemq/artemis/ra/ActiveMQRATextMessage.java | 12 +-
.../artemis/ra/ActiveMQRATopicPublisher.java | 54 +--
.../artemis/ra/ActiveMQRATopicSubscriber.java | 12 +-
.../activemq/artemis/ra/ActiveMQRAXAResource.java | 34 +-
.../artemis/ra/ActiveMQResourceAdapter.java | 416 ++++++---------------
.../artemis/ra/ConnectionFactoryProperties.java | 320 +++++++---------
.../artemis/ra/inflow/ActiveMQActivation.java | 65 ++--
.../artemis/ra/inflow/ActiveMQActivationSpec.java | 150 ++------
.../artemis/ra/inflow/ActiveMQMessageHandler.java | 35 +-
.../artemis/ra/recovery/RecoveryManager.java | 6 +-
.../core/config/impl/ConfigurationImpl.java | 6 +-
.../core/config/impl/LegacyJMSConfiguration.java | 2 +-
.../deployers/impl/FileConfigurationParser.java | 8 +-
.../artemis/core/filter/impl/FilterImpl.java | 8 +-
.../management/impl/ActiveMQServerControlImpl.java | 4 +-
.../core/paging/cursor/PagedReferenceImpl.java | 4 +-
.../paging/cursor/impl/PageCursorProviderImpl.java | 40 +-
.../cursor/impl/PageSubscriptionCounterImpl.java | 3 +-
.../paging/cursor/impl/PageSubscriptionImpl.java | 44 ++-
.../activemq/artemis/core/paging/impl/Page.java | 2 +-
.../artemis/core/paging/impl/PageCache.java | 4 +-
.../core/paging/impl/PageTransactionInfoImpl.java | 25 +-
.../core/paging/impl/PagingManagerImpl.java | 12 +-
.../artemis/core/paging/impl/PagingStoreImpl.java | 14 +-
.../journal/AbstractJournalStorageManager.java | 7 +-
.../impl/journal/BatchingIDGenerator.java | 2 +-
.../impl/journal/JournalStorageManager.java | 6 +-
.../core/persistence/impl/journal/LargeBody.java | 2 +-
.../impl/journal/LargeServerMessageInSync.java | 14 +-
.../artemis/core/postoffice/impl/BindingsImpl.java | 17 +-
.../postoffice/impl/InMemoryDuplicateIDCache.java | 5 +-
.../core/postoffice/impl/LocalQueueBinding.java | 12 +-
.../impl/PersistentDuplicateIDCache.java | 8 +-
.../core/postoffice/impl/PostOfficeImpl.java | 30 +-
.../core/postoffice/impl/SimpleAddressManager.java | 2 +-
.../protocol/core/ServerSessionPacketHandler.java | 22 +-
.../protocol/core/impl/ActiveMQPacketHandler.java | 2 +-
.../protocol/core/impl/CoreProtocolManager.java | 2 +-
.../artemis/core/registry/JndiBindingRegistry.java | 1 -
.../core/remoting/impl/invm/InVMAcceptor.java | 5 -
.../core/remoting/impl/invm/InVMConnection.java | 11 +-
.../core/remoting/impl/invm/InVMConnector.java | 2 +-
.../remoting/server/impl/RemotingServiceImpl.java | 33 +-
.../core/replication/ReplicatedJournal.java | 44 +--
.../core/replication/ReplicationEndpoint.java | 85 ++---
.../core/replication/ReplicationManager.java | 8 +-
.../core/security/impl/SecurityStoreImpl.java | 8 +-
.../artemis/core/server/MemoryManager.java | 25 +-
.../artemis/core/server/cluster/BackupManager.java | 17 +-
.../core/server/cluster/ClusterController.java | 19 +-
.../core/server/cluster/ClusterManager.java | 15 +-
.../core/server/cluster/impl/BridgeImpl.java | 112 +++---
.../cluster/impl/ClusterConnectionBridge.java | 30 +-
.../server/cluster/impl/ClusterConnectionImpl.java | 94 ++---
.../cluster/impl/RemoteQueueBindingImpl.java | 2 +-
.../federation/AbstractFederationStream.java | 5 -
.../core/server/federation/FederatedAbstract.java | 5 -
.../federation/FederatedQueueConsumerImpl.java | 4 -
.../server/federation/FederationDownstream.java | 5 -
.../server/federation/queue/FederatedQueue.java | 5 -
.../core/server/files/FileStoreMonitor.java | 2 +-
.../server/group/impl/LocalGroupingHandler.java | 12 +-
.../core/server/impl/ActiveMQServerImpl.java | 44 +--
.../impl/AnyLiveNodeLocatorForScaleDown.java | 3 +-
.../artemis/core/server/impl/DivertImpl.java | 2 +-
.../core/server/impl/FileLockNodeManager.java | 38 +-
.../artemis/core/server/impl/LastValueQueue.java | 4 -
.../impl/LegacyLDAPSecuritySettingPlugin.java | 86 ++---
.../core/server/impl/LiveOnlyActivation.java | 2 +-
.../impl/NamedLiveNodeLocatorForScaleDown.java | 3 +-
.../core/server/impl/PostOfficeJournalLoader.java | 15 +-
.../artemis/core/server/impl/QueueImpl.java | 158 ++++----
.../artemis/core/server/impl/QueueManagerImpl.java | 12 +-
.../artemis/core/server/impl/RefsOperation.java | 5 +-
.../artemis/core/server/impl/ReplicationError.java | 8 +-
.../core/server/impl/RoutingContextImpl.java | 5 -
.../artemis/core/server/impl/ScaleDownHandler.java | 34 +-
.../server/impl/ScheduledDeliveryHandlerImpl.java | 20 +-
.../core/server/impl/ServerConsumerImpl.java | 102 ++---
.../core/server/impl/ServerSessionImpl.java | 70 ++--
.../server/impl/SharedNothingBackupActivation.java | 65 ++--
.../server/impl/SharedNothingLiveActivation.java | 12 +-
.../server/impl/SharedStoreBackupActivation.java | 4 +-
.../server/impl/SharedStoreLiveActivation.java | 9 +-
.../server/impl/TransientQueueManagerImpl.java | 4 +-
.../server/management/ArtemisMBeanServerGuard.java | 2 +-
.../server/management/ManagementConnector.java | 2 +-
.../management/impl/ManagementServiceImpl.java | 35 +-
.../core/server/metrics/MetricsManager.java | 8 +-
.../impl/BrokerMessageAuthorizationPlugin.java | 4 +-
.../plugin/impl/LoggingActiveMQServerPlugin.java | 14 +-
.../impl/NotificationActiveMQServerPlugin.java | 8 +-
.../core/server/reload/ReloadManagerImpl.java | 2 +-
.../artemis/core/server/replay/ReplayManager.java | 23 +-
.../core/server/routing/ConnectionRouter.java | 24 +-
.../server/routing/ConnectionRouterManager.java | 2 +-
.../core/server/routing/caches/LocalCache.java | 2 +-
.../routing/policies/LeastConnectionsPolicy.java | 14 +-
.../core/server/routing/pools/AbstractPool.java | 2 +-
.../core/server/routing/targets/TargetMonitor.java | 20 +-
.../impl/HierarchicalObjectRepository.java | 2 +-
.../core/transaction/impl/TransactionImpl.java | 38 +-
.../spi/core/protocol/MessagePersister.java | 2 +-
.../security/ActiveMQBasicSecurityManager.java | 11 +-
.../core/security/ActiveMQJAASSecurityManager.java | 10 +-
.../jaas/AbstractPrincipalLoginModule.java | 4 +-
.../core/security/jaas/CertificateLoginModule.java | 2 +-
.../jaas/ExternalCertificateLoginModule.java | 5 +-
.../spi/core/security/jaas/GuestLoginModule.java | 6 +-
.../spi/core/security/jaas/InVMLoginModule.java | 4 +-
.../spi/core/security/jaas/LDAPLoginModule.java | 48 +--
.../jaas/PrincipalConversionLoginModule.java | 9 +-
.../spi/core/security/jaas/PropertiesLoader.java | 2 +-
.../core/security/jaas/PropertiesLoginModule.java | 4 +-
.../core/security/jaas/ReloadableProperties.java | 6 +-
.../core/config/impl/ConfigurationImplTest.java | 4 +-
.../security/jaas/JAASSecurityManagerTest.java | 2 +-
.../jaas/TextFileCertificateLoginModuleTest.java | 5 +-
.../core/server/files/FileStoreMonitorTest.java | 6 +-
.../server/impl/ScheduledDeliveryHandlerTest.java | 2 +-
.../core/security/jaas/LDAPLoginModuleTest.java | 2 +-
.../activemq/artemis/tests/util/NoFilesBehind.java | 5 -
.../artemis/tests/util/NoProcessFilesBehind.java | 5 -
.../xa/recovery/ActiveMQXAResourceRecovery.java | 20 +-
.../xa/recovery/ActiveMQXAResourceWrapper.java | 68 +---
.../apache/activemq/artemis/utils/RetryRule.java | 8 +-
.../artemis/utils/ThreadLeakCheckRule.java | 4 +-
.../org/apache/activemq/artemis/utils/Wait.java | 2 +-
.../activemq/artemis/jms/example/PerfBase.java | 40 +-
.../activemq/artemis/jms/example/PerfListener.java | 4 -
.../activemq/artemis/jms/example/PerfSender.java | 4 -
.../artemis/jms/soak/example/SoakBase.java | 34 +-
.../artemis/jms/soak/example/SoakReceiver.java | 8 +-
.../artemis/jms/soak/example/SoakSender.java | 7 +-
.../apache/activemq/ActiveMQMessageAuditTest.java | 8 +-
.../transport/amqp/client/util/IdGenerator.java | 2 +-
.../activemq/transport/netty/NettyWSTransport.java | 2 +-
.../tests/integration/addressing/AnycastTest.java | 6 +-
.../integration/addressing/MulticastTest.java | 6 +-
.../integration/amqp/AmqpDLQReceiverTest.java | 16 +-
.../amqp/AmqpFullyQualifiedNameTest.java | 4 +-
.../integration/amqp/AmqpLargeMessageTest.java | 8 +-
.../integration/amqp/AmqpMaxFrameSizeTest.java | 2 +-
.../amqp/AmqpPresettledReceiverTest.java | 12 +-
.../integration/amqp/AmqpReceiverDrainTest.java | 2 +-
.../amqp/AmqpReceiverWithFiltersTest.java | 2 +-
.../integration/amqp/AmqpSendReceiveTest.java | 4 +-
.../tests/integration/amqp/AmqpSessionTest.java | 2 +-
.../integration/amqp/AmqpTransactionTest.java | 22 +-
.../integration/amqp/JMSMessageConsumerTest.java | 6 +-
.../integration/amqp/JMSMessageTypesTest.java | 24 +-
.../integration/amqp/JMSNonDestructiveTest.java | 8 +-
.../tests/integration/amqp/JMSSaslGssapiTest.java | 2 +-
.../amqp/JMSTemporaryDestinationTest.java | 4 +-
.../tests/integration/amqp/JMSTransactionTest.java | 6 +-
.../integration/amqp/QueueAutoCreationTest.java | 8 +-
.../tests/integration/amqp/TopicDurableTests.java | 16 +-
.../amqp/connect/QpidDispatchPeerTest.java | 4 +-
.../amqp/connect/ValidateAMQPErrorsTest.java | 6 +-
.../integration/amqp/interop/AmqpCoreTest.java | 4 +-
.../largemessages/InterruptedAMQPLargeMessage.java | 4 +-
.../amqp/paging/AmqpMaxReadPagingTest.java | 2 +-
.../tests/integration/cli/AddressCommandTest.java | 4 +-
.../tests/integration/cli/QueueCommandTest.java | 4 +-
.../tests/integration/client/AcknowledgeTest.java | 3 +-
.../client/AutoCreateJmsDestinationTest.java | 4 +-
.../tests/integration/client/BlockingSendTest.java | 2 +-
.../integration/client/ConsumerFilterTest.java | 2 +-
.../integration/client/ConsumerStuckTest.java | 19 +-
.../tests/integration/client/ConsumerTest.java | 14 +-
.../integration/client/ExpiryLargeMessageTest.java | 6 +-
.../integration/client/FullQualifiedQueueTest.java | 12 +-
.../tests/integration/client/HangConsumerTest.java | 4 +-
.../client/InterruptedLargeMessageTest.java | 6 +-
.../client/JMSPagingFileDeleteTest.java | 14 +-
.../client/MultipleThreadFilterOneTest.java | 2 +-
.../tests/integration/client/NIOvsOIOTest.java | 6 -
.../client/ProducerFlowControlTest.java | 2 +-
.../tests/integration/client/ProducerTest.java | 2 +-
.../client/SelfExpandingBufferTest.java | 8 +-
.../tests/integration/client/SendAckFailTest.java | 6 +-
.../integration/clientcrash/DummyInterceptor.java | 2 +-
.../ProtocolsMessageLoadBalancingTest.java | 4 +-
.../cluster/distribution/ClusterTestBase.java | 19 +-
.../distribution/ClusteredGroupingTest.java | 8 +-
.../cluster/failover/AsynchronousFailoverTest.java | 7 +-
.../failover/ClusterWithBackupFailoverTest.java | 4 +-
.../cluster/failover/FailoverListenerTest.java | 6 +-
.../failover/MultipleBackupsFailoverTestBase.java | 2 +-
.../failover/NetworkFailureFailoverTest.java | 18 +-
.../failover/ReplicatedDistributionTest.java | 4 +-
.../SingleLiveMultipleBackupsFailoverTest.java | 8 +-
.../MultiThreadRandomReattachTestBase.java | 4 +-
.../integration/cluster/reattach/ReattachTest.java | 2 +-
.../cluster/restart/ClusterRestartTest.java | 10 +-
.../crossprotocol/MessageIDMultiProtocolTest.java | 4 +-
.../RequestReplyMultiProtocolTest.java | 4 +-
.../tests/integration/discovery/DiscoveryTest.java | 4 +-
.../tests/integration/divert/DivertTest.java | 4 +-
.../integration/interceptors/InterceptorTest.java | 8 +-
.../integration/jms/client/CreateQueueTest.java | 2 +-
.../jms/cluster/JMSFailoverListenerTest.java | 2 +-
.../jms/cluster/MultipleThreadsOpeningTest.java | 4 +-
.../integration/jms/consumer/JmsConsumerTest.java | 6 +-
.../jms/largemessage/JMSLargeMessageTest.java | 4 +-
.../jms/server/JMSServerStartStopTest.java | 2 +-
.../management/ManagementHelperTest.java | 4 +-
.../artemis/tests/integration/mqtt/MQTTTest.java | 26 +-
.../integration/openwire/FQQNOpenWireTest.java | 2 +-
.../openwire/amq/JmsTopicSendReceiveTest.java | 2 -
.../integration/paging/MaxMessagesPagingTest.java | 6 +-
.../tests/integration/paging/PagingTest.java | 40 +-
.../paging/PagingWithFailoverAndCountersTest.java | 4 +-
.../artemis/tests/integration/server/LVQTest.java | 2 +-
.../integration/server/ScaleDownRemoveSFTest.java | 2 +-
.../tests/integration/stomp/FQQNStompTest.java | 4 +-
.../artemis/tests/integration/stomp/StompTest.java | 2 +-
.../stomp/StompWithLargeMessagesTest.java | 4 +-
.../tests/integration/stomp/v11/StompV11Test.java | 48 +--
.../tests/integration/stomp/v12/StompV12Test.java | 46 +--
.../artemis/jms/tests/AcknowledgementTest.java | 44 +--
.../artemis/jms/tests/ActiveMQServerTestCase.java | 2 +-
.../jms/tests/AutoAckMessageListenerTest.java | 2 +-
.../artemis/jms/tests/MessageConsumerTest.java | 20 +-
.../jms/tests/message/JMSExpirationHeaderTest.java | 8 +-
.../artemis/jms/tests/message/MessageBodyTest.java | 2 +-
.../jms/tests/message/MessageHeaderTest.java | 2 +-
.../message/foreign/ForeignBytesMessageTest.java | 2 +-
.../message/foreign/ForeignMapMessageTest.java | 2 +-
.../tests/message/foreign/ForeignMessageTest.java | 2 +-
.../message/foreign/ForeignObjectMessageTest.java | 2 +-
.../message/foreign/ForeignStreamMessageTest.java | 2 +-
.../artemis/jms/tests/selector/SelectorTest.java | 14 +-
.../artemis/jms/tests/tools/ServerManagement.java | 9 +-
.../jms/tests/tools/container/InVMContext.java | 2 +-
.../InVMInitialContextFactoryBuilder.java | 9 +-
.../jms/tests/tools/container/LocalTestServer.java | 2 +-
.../artemis/jms/tests/util/ProxyAssertSupport.java | 68 ++--
.../artemis/common/testjndi/TestContext.java | 2 +-
.../integration/karaf/ArtemisFeatureTest.java | 8 +-
.../tests/smoke/dnsswitch/DNSSwitchTest.java | 2 +-
.../quorum/PluggableQuorumSinglePairTest.java | 2 +-
.../paging/MultipleConsumersPageStressTest.java | 6 +-
.../core/journal/impl/JournalImplTestUnit.java | 4 +-
.../artemis/tests/unit/AllClassesTest.java | 12 +-
.../asyncio/MultiThreadAsynchronousFileTest.java | 24 +-
.../core/journal/impl/AlignedJournalImplTest.java | 12 +-
.../core/journal/impl/FileFactoryTestBase.java | 2 +-
.../core/journal/impl/JournalImplTestBase.java | 16 +-
.../core/journal/impl/JournalImplTestUnit.java | 27 +-
.../impl/SequentialFileFactoryTestBase.java | 2 +-
.../impl/fakes/FakeSequentialFileFactory.java | 4 +-
.../artemis/tests/unit/util/MemorySizeTest.java | 4 +-
344 files changed, 2767 insertions(+), 4761 deletions(-)
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XMLMessageImporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XMLMessageImporter.java
index f7e250ca34..132915378b 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XMLMessageImporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XMLMessageImporter.java
@@ -250,14 +250,11 @@ public class XMLMessageImporter {
}
}
reader.next();
- if (logger.isDebugEnabled()) {
- logger.debug("XMLStreamReader impl: " + reader);
- }
+ logger.debug("XMLStreamReader impl: {}", reader);
+
if (isLarge) {
tempFileName = File.createTempFile("largeMessage", ".tmp");
- if (logger.isDebugEnabled()) {
- logger.debug("Creating temp file " + tempFileName + " for large message.");
- }
+ logger.debug("Creating temp file {} for large message.", tempFileName);
try (OutputStream out = new BufferedOutputStream(new FileOutputStream(tempFileName))) {
getMessageBodyBytes(bytes -> out.write(bytes), (message.toCore().getType() == Message.TEXT_TYPE) && decodeTextMessage);
}
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
index 8abf94be39..34768977f1 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
@@ -248,9 +248,7 @@ public final class XmlDataImporter extends ActionAbstract {
}
try {
while (reader.hasNext()) {
- if (logger.isDebugEnabled()) {
- logger.debug("EVENT:[" + reader.getLocation().getLineNumber() + "][" + reader.getLocation().getColumnNumber() + "] ");
- }
+ logger.debug("EVENT:[{}][{}] ", reader.getLocation().getLineNumber(), reader.getLocation().getColumnNumber());
if (reader.getEventType() == XMLStreamConstants.START_ELEMENT) {
if (XmlDataConstants.OLD_BINDING.equals(reader.getLocalName())) {
oldBinding(); // export from 1.x
@@ -315,17 +313,13 @@ public final class XmlDataImporter extends ActionAbstract {
ClientMessage managementMessage = managementSession.createMessage(false);
ManagementHelper.putAttribute(managementMessage, ResourceNames.QUEUE + queue, "ID");
managementSession.start();
- if (debugLog) {
- logger.debug("Requesting ID for: " + queue);
- }
+ logger.debug("Requesting ID for: {}", queue);
ClientMessage reply = requestor.request(managementMessage);
Number idObject = (Number) ManagementHelper.getResult(reply);
queueID = idObject.longValue();
}
- if (debugLog) {
- logger.debug("ID for " + queue + " is: " + queueID);
- }
+ logger.debug("ID for {} is: {}", queue, queueID);
queueIDs.put(queue, queueID); // store it so we don't have to look it up every time
}
@@ -425,13 +419,9 @@ public final class XmlDataImporter extends ActionAbstract {
if (!queueQuery.isExists()) {
session.createQueue(new QueueConfiguration(queueName).setAddress(address).setRoutingType(routingType).setFilterString(filter));
- if (logger.isDebugEnabled()) {
- logger.debug("Binding queue(name=" + queueName + ", address=" + address + ", filter=" + filter + ")");
- }
+ logger.debug("Binding queue(name={}, address={}, filter={})", queueName, address, filter);
} else {
- if (logger.isDebugEnabled()) {
- logger.debug("Binding " + queueName + " already exists so won't re-bind.");
- }
+ logger.debug("Binding {} already exists so won't re-bind.", queueName);
}
}
@@ -467,13 +457,9 @@ public final class XmlDataImporter extends ActionAbstract {
if (!queueQuery.isExists()) {
session.createQueue(new QueueConfiguration(queueName).setAddress(address).setRoutingType(RoutingType.valueOf(routingType)).setFilterString(filter));
- if (logger.isDebugEnabled()) {
- logger.debug("Binding queue(name=" + queueName + ", address=" + address + ", filter=" + filter + ")");
- }
+ logger.debug("Binding queue(name={}, address={}, filter={})", queueName, address, filter);
} else {
- if (logger.isDebugEnabled()) {
- logger.debug("Binding " + queueName + " already exists so won't re-bind.");
- }
+ logger.debug("Binding {} already exists so won't re-bind.", queueName);
}
addressMap.put(queueName, address);
@@ -503,13 +489,9 @@ public final class XmlDataImporter extends ActionAbstract {
set.add(RoutingType.valueOf(routingType));
}
session.createAddress(SimpleString.toSimpleString(addressName), set, false);
- if (logger.isDebugEnabled()) {
- logger.debug("Binding address(name=" + addressName + ", routingTypes=" + routingTypes + ")");
- }
+ logger.debug("Binding address(name={}, routingTypes={})", addressName, routingTypes);
} else {
- if (logger.isDebugEnabled()) {
- logger.debug("Binding " + addressName + " already exists so won't re-bind.");
- }
+ logger.debug("Binding {} already exists so won't re-bind.", addressName);
}
}
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java
index 4cfe11636f..b21ebeba06 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java
@@ -359,9 +359,7 @@ public class NetworkHealthCheck extends ActiveMQScheduledComponent {
public boolean check(InetAddress address) throws IOException, InterruptedException {
if (!hasCustomPingCommand() && isReachable(address)) {
- if (logger.isTraceEnabled()) {
- logger.trace(address + " OK");
- }
+ logger.trace("{} OK", address);
return true;
} else {
return purePing(address);
@@ -376,9 +374,7 @@ public class NetworkHealthCheck extends ActiveMQScheduledComponent {
long timeout = Math.max(1, TimeUnit.MILLISECONDS.toSeconds(networkTimeout));
// it did not work with a simple isReachable, it could be because there's no root access, so we will try ping executable
- if (logger.isTraceEnabled()) {
- logger.trace("purePing on canonical address " + address.getCanonicalHostName());
- }
+ logger.trace("purePing on canonical address {}", address.getCanonicalHostName());
ProcessBuilder processBuilder;
if (address instanceof Inet6Address) {
processBuilder = buildProcess(ipv6Command, timeout, address.getCanonicalHostName());
@@ -398,10 +394,7 @@ public class NetworkHealthCheck extends ActiveMQScheduledComponent {
private ProcessBuilder buildProcess(String expressionCommand, long timeout, String host) {
String command = String.format(expressionCommand, timeout, host);
- if (logger.isDebugEnabled()) {
- logger.debug("executing ping:: " + command);
- }
-
+ logger.debug("executing ping:: {}", command);
ProcessBuilder builder = new ProcessBuilder(command.split(" "));
return builder;
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
index 10a301699f..b9e7741258 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
@@ -65,9 +65,9 @@ public class ByteUtil {
try {
if (info) {
- logger.info(message + "\n" + ByteUtil.formatGroup(ByteUtil.bytesToHex(frame), 8, 16));
+ logger.info("{}\n{}", message, ByteUtil.formatGroup(ByteUtil.bytesToHex(frame), 8, 16));
} else {
- logger.trace(message + "\n" + ByteUtil.formatGroup(ByteUtil.bytesToHex(frame), 8, 16));
+ logger.trace("{}\n{}", message, ByteUtil.formatGroup(ByteUtil.bytesToHex(frame), 8, 16));
}
} catch (Exception e) {
logger.warn(e.getMessage(), e);
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java
index 8b7d106765..a135e14337 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java
@@ -143,7 +143,7 @@ public class DefaultSensitiveStringCodec implements SensitiveDataCodec<String> {
} else {
key = System.getProperty(KEY_SYSTEM_PROPERTY);
if (key != null && key.trim().length() > 0) {
- logger.trace("Set key from system property " + KEY_SYSTEM_PROPERTY);
+ logger.trace("Set key from system property {}", KEY_SYSTEM_PROPERTY);
updateKey(key);
}
}
@@ -199,7 +199,7 @@ public class DefaultSensitiveStringCodec implements SensitiveDataCodec<String> {
try {
return Objects.equals(storedValue, encode(String.valueOf(inputValue)));
} catch (Exception e) {
- logger.debug("Exception on verifying: " + e);
+ logger.debug("Exception on verifying:", e);
return false;
}
}
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java
index 2a3feb380b..87a929c277 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java
@@ -91,7 +91,7 @@ public final class UTF8Util {
if (logger.isTraceEnabled()) {
// This message is too verbose for debug, that's why we are using trace here
- logger.trace("Saving string with utfSize=" + len + " stringSize=" + stringLength);
+ logger.trace("Saving string with utfSize={} stringSize={}", len, stringLength);
}
if (out.hasArray()) {
@@ -189,7 +189,7 @@ public final class UTF8Util {
if (logger.isTraceEnabled()) {
// This message is too verbose for debug, that's why we are using trace here
- logger.trace("Reading string with utfSize=" + size);
+ logger.trace("Reading string with utfSize={}", size);
}
if (PlatformDependent.hasUnsafe() && input.byteBuf() != null && input.byteBuf().hasMemoryAddress()) {
final ByteBuf byteBuf = input.byteBuf();
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
index 951253921e..767abb65c0 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
@@ -127,7 +127,7 @@ public final class UUIDGenerator {
dummy[0] |= (byte) 0x01;
if (logger.isDebugEnabled()) {
- logger.debug("using dummy address " + UUIDGenerator.asString(dummy));
+ logger.debug("using dummy address {}", UUIDGenerator.asString(dummy));
}
return dummy;
}
@@ -158,7 +158,7 @@ public final class UUIDGenerator {
byte[] address = findFirstMatchingHardwareAddress(ifaces);
if (address != null) {
if (logger.isDebugEnabled()) {
- logger.debug("using hardware address " + UUIDGenerator.asString(address));
+ logger.debug("using hardware address {}", UUIDGenerator.asString(address));
}
return address;
}
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ProcessorBase.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ProcessorBase.java
index d4772ba56b..2699064097 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ProcessorBase.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ProcessorBase.java
@@ -203,7 +203,7 @@ public abstract class ProcessorBase<T> extends HandlerBase {
private static void logAddOnShutdown() {
if (logger.isDebugEnabled()) {
- logger.debug("Ordered executor has been gently shutdown at", new Exception("debug"));
+ logger.debug("Ordered executor has been gently shutdown at {}", new Exception("debug"));
}
}
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ThresholdActor.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ThresholdActor.java
index 84b2026e5d..09fc24cbd9 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ThresholdActor.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ThresholdActor.java
@@ -70,8 +70,8 @@ public class ThresholdActor<T> extends ProcessorBase<Object> {
} finally {
if (estimateSize > 0) {
SIZE_UPDATER.getAndAdd(this, -estimateSize);
- } else if (logger.isDebugEnabled()) {
- logger.debug("element " + theTask + " returned an invalid size over the Actor during release");
+ } else {
+ logger.debug("element {} returned an invalid size over the Actor during release", theTask);
}
}
}
@@ -83,8 +83,8 @@ public class ThresholdActor<T> extends ProcessorBase<Object> {
if (size > maxSize) {
flush();
}
- } else if (logger.isDebugEnabled()) {
- logger.debug("element " + message + " returned an invalid size over the Actor");
+ } else {
+ logger.debug("element {} returned an invalid size over the Actor", message);
}
task(message);
}
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSet.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSet.java
index ec26b7437b..f81f154a93 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSet.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSet.java
@@ -437,7 +437,7 @@ public class ConcurrentLongHashSet {
static boolean moreThanZero(long n) {
if (n < 0L) {
- logger.warn("Keys and values must be >= 0, while it was " + n + ", entry will be ignored", new Exception("invalid record " + n));
+ logger.warn("Keys and values must be >= 0, while it was {}, entry will be ignored", n, new Exception("invalid record " + n));
return false;
} else {
return true;
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalMeasure.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalMeasure.java
index 209f1d9d9f..d289eac4a3 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalMeasure.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalMeasure.java
@@ -110,8 +110,8 @@ public class CriticalMeasure {
if (analyzer != null) {
long nanoTimeout = analyzer.getTimeoutNanoSeconds();
if (checkExpiration(nanoTimeout, false)) {
- logger.trace("Path " + id + " on component " + getComponentName() + " is taking too long, leaving at", new Exception("left"));
- logger.trace("Path " + id + " on component " + getComponentName() + " is taking too long, entered at", traceEnter);
+ logger.trace("Path {} on component {} is taking too long, leaving at {}", id, getComponentName(), new Exception("left"));
+ logger.trace("Path {} on component {} is taking too long, entered at", id, getComponentName(), traceEnter);
}
}
traceEnter = null;
@@ -137,9 +137,9 @@ public class CriticalMeasure {
Exception lastTraceEnter = this.traceEnter;
if (lastTraceEnter != null) {
- logger.warn("Component " + getComponentName() + " is expired on path " + id, lastTraceEnter);
+ logger.warn("Component {} is expired on path {}", getComponentName(), id, lastTraceEnter);
} else {
- logger.warn("Component " + getComponentName() + " is expired on path " + id);
+ logger.warn("Component {} is expired on path {}", getComponentName(), id);
}
if (reset) {
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/FluentPropertyBeanIntrospectorWithIgnores.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/FluentPropertyBeanIntrospectorWithIgnores.java
index 105bfff1b4..ca0b99b0a9 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/FluentPropertyBeanIntrospectorWithIgnores.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/FluentPropertyBeanIntrospectorWithIgnores.java
@@ -37,7 +37,7 @@ public class FluentPropertyBeanIntrospectorWithIgnores extends FluentPropertyBea
private static ConcurrentHashSet<Pair<String, String>> ignores = new ConcurrentHashSet<>();
public static void addIgnore(String className, String propertyName) {
- logger.trace("Adding ignore on " + className + "/" + propertyName);
+ logger.trace("Adding ignore on {}/{}", className, propertyName);
ignores.add(new Pair<>(className, propertyName));
}
@@ -53,7 +53,7 @@ public class FluentPropertyBeanIntrospectorWithIgnores extends FluentPropertyBea
PropertyDescriptor pd = icontext.getPropertyDescriptor(propertyName);
if (isIgnored(icontext.getTargetClass().getName(), m.getName())) {
- logger.trace(m.getName() + " Ignored for " + icontext.getTargetClass().getName());
+ logger.trace("{} Ignored for {}", m.getName(), icontext.getTargetClass().getName());
continue;
}
try {
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java
index 6eadadd9cb..a9ba3e6089 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java
@@ -54,7 +54,7 @@ public class DefaultSensitiveStringCodecTest {
String plainText = "some_password";
String maskedText = codec.encode(plainText);
- log.debug("encoded value: " + maskedText);
+ log.debug("encoded value: {}", maskedText);
if (algorithm.equals(DefaultSensitiveStringCodec.ONE_WAY)) {
//one way can't decode
@@ -65,7 +65,7 @@ public class DefaultSensitiveStringCodecTest {
}
} else {
String decoded = codec.decode(maskedText);
- log.debug("encoded value: " + maskedText);
+ log.debug("encoded value: {}", maskedText);
assertEquals("decoded result not match: " + decoded, decoded, plainText);
}
@@ -91,7 +91,7 @@ public class DefaultSensitiveStringCodecTest {
String plainText = "some_password";
String maskedText = codec.encode(plainText);
- log.debug("encoded value: " + maskedText);
+ log.debug("encoded value: {}", maskedText);
assertTrue(codec.verify(plainText.toCharArray(), maskedText));
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/actors/OrderedExecutorSanityTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/actors/OrderedExecutorSanityTest.java
index c269298426..5efb8e0581 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/actors/OrderedExecutorSanityTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/actors/OrderedExecutorSanityTest.java
@@ -179,7 +179,7 @@ public class OrderedExecutorSanityTest {
long elapsed = (end - start);
- log.info("execution " + i + " in " + TimeUnit.NANOSECONDS.toMillis(elapsed) + " milliseconds");
+ log.info("execution {} in {} milliseconds", i, TimeUnit.NANOSECONDS.toMillis(elapsed));
}
} finally {
executorService.shutdown();
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/critical/MultiThreadCriticalMeasureTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/critical/MultiThreadCriticalMeasureTest.java
index 6603f581e7..63f664c429 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/critical/MultiThreadCriticalMeasureTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/critical/MultiThreadCriticalMeasureTest.java
@@ -52,9 +52,9 @@ public class MultiThreadCriticalMeasureTest {
Runnable runnable = () -> {
try {
- logger.debug("Thread " + Thread.currentThread().getName() + " waiting to Start");
+ logger.debug("Thread {} waiting to Start", Thread.currentThread().getName());
barrier.await();
- logger.debug("Thread " + Thread.currentThread().getName() + " Started");
+ logger.debug("Thread {} Started", Thread.currentThread().getName());
while (running.get()) {
if (!load.get()) {
// 1st barrier will let the unit test do its job
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ChannelBroadcastEndpointFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ChannelBroadcastEndpointFactory.java
index 56e3ddfe6f..175bacfa6c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ChannelBroadcastEndpointFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ChannelBroadcastEndpointFactory.java
@@ -45,7 +45,7 @@ public class ChannelBroadcastEndpointFactory implements BroadcastEndpointFactory
private ChannelBroadcastEndpointFactory(JChannelManager manager, JChannel channel, String channelName) {
if (logger.isTraceEnabled()) {
- logger.trace("new ChannelBroadcastEndpointFactory(" + manager + ", " + channel + ", " + channelName, new Exception("trace"));
+ logger.trace("new ChannelBroadcastEndpointFactory({}, {}, {})", manager, channel, channelName, new Exception("trace"));
}
this.manager = manager;
this.channel = channel;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
index af9c9747de..75ce007240 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
@@ -52,8 +52,10 @@ public abstract class JGroupsBroadcastEndpoint implements BroadcastEndpoint {
@Override
public void broadcast(final byte[] data) throws Exception {
- if (logger.isTraceEnabled())
- logger.trace("Broadcasting: BroadCastOpened=" + broadcastOpened + ", channelOPen=" + channel.getChannel().isOpen());
+ if (logger.isTraceEnabled()) {
+ logger.trace("Broadcasting: BroadCastOpened={}, channelOPen={}", broadcastOpened, channel.getChannel().isOpen());
+ }
+
if (broadcastOpened) {
org.jgroups.Message msg = new org.jgroups.BytesMessage();
@@ -65,8 +67,10 @@ public abstract class JGroupsBroadcastEndpoint implements BroadcastEndpoint {
@Override
public byte[] receiveBroadcast() throws Exception {
- if (logger.isTraceEnabled())
- logger.trace("Receiving Broadcast: clientOpened=" + clientOpened + ", channelOPen=" + channel.getChannel().isOpen());
+ if (logger.isTraceEnabled()) {
+ logger.trace("Receiving Broadcast: clientOpened={}, channelOPen={}", clientOpened, channel.getChannel().isOpen());
+ }
+
if (clientOpened) {
return receiver.receiveBroadcast();
} else {
@@ -76,8 +80,10 @@ public abstract class JGroupsBroadcastEndpoint implements BroadcastEndpoint {
@Override
public byte[] receiveBroadcast(long time, TimeUnit unit) throws Exception {
- if (logger.isTraceEnabled())
- logger.trace("Receiving Broadcast2: clientOpened=" + clientOpened + ", channelOPen=" + channel.getChannel().isOpen());
+ if (logger.isTraceEnabled()) {
+ logger.trace("Receiving Broadcast2: clientOpened={}, channelOPen={}", clientOpened, channel.getChannel().isOpen());
+ }
+
if (clientOpened) {
return receiver.receiveBroadcast(time, unit);
} else {
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelManager.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelManager.java
index 9d4195fb1b..fe2c4e043b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelManager.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelManager.java
@@ -75,12 +75,11 @@ public class JChannelManager {
if (wrapper == null) {
wrapper = new JChannelWrapper(this, channelName, endpoint.createChannel());
channels.put(channelName, wrapper);
- if (logger.isTraceEnabled())
- logger.trace("Put Channel " + channelName);
+ logger.trace("Put Channel {}", channelName);
return wrapper;
}
- if (logger.isTraceEnabled())
- logger.trace("Add Ref Count " + channelName);
+ logger.trace("Add Ref Count {}", channelName);
+
return wrapper.addRef();
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java
index e93dbe7da0..c8e151255d 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java
@@ -50,7 +50,7 @@ public class JChannelWrapper {
this.manager = manager;
if (logger.isTraceEnabled() && channel.getReceiver() != null) {
- logger.trace(this + "The channel already had a receiver previously!!!! == " + channel.getReceiver(), new Exception("trace"));
+ logger.trace("{} The channel already had a receiver previously!!!! == {}", this, channel.getReceiver(), new Exception("trace"));
}
//we always add this for the first ref count
@@ -64,7 +64,7 @@ public class JChannelWrapper {
@Override
public void receive(org.jgroups.Message msg) {
if (logger.isTraceEnabled()) {
- logger.trace(this + ":: Wrapper received " + msg + " on channel " + channelName);
+ logger.trace("{}:: Wrapper received {} on channel {}", this, msg, channelName);
}
synchronized (receivers) {
for (JGroupsReceiver r : receivers) {
@@ -86,7 +86,7 @@ public class JChannelWrapper {
public synchronized void close(boolean closeWrappedChannel) {
refCount--;
if (logger.isTraceEnabled())
- logger.trace(this + "::RefCount-- " + refCount + " on channel " + channelName, new Exception("Trace"));
+ logger.trace("{}::RefCount-- {} on channel {}", this, refCount, channelName, new Exception("Trace"));
if (refCount == 0) {
if (closeWrappedChannel) {
closeChannel();
@@ -99,14 +99,14 @@ public class JChannelWrapper {
connected = false;
channel.setReceiver(null);
if (logger.isTraceEnabled()) {
- logger.trace(this + "::Closing Channel: " + channelName, new Exception("Trace"));
+ logger.trace("{}::Closing Channel: {}", this, channelName, new Exception("Trace"));
}
channel.close();
}
public void removeReceiver(JGroupsReceiver receiver) {
if (logger.isTraceEnabled())
- logger.trace(this + "::removeReceiver: " + receiver + " on " + channelName, new Exception("Trace"));
+ logger.trace("{}::removeReceiver: {} on {}", this, receiver, channelName, new Exception("Trace"));
synchronized (receivers) {
receivers.remove(receiver);
}
@@ -114,7 +114,7 @@ public class JChannelWrapper {
public synchronized void connect() throws Exception {
if (logger.isTraceEnabled()) {
- logger.trace(this + ":: Connecting " + channelName, new Exception("Trace"));
+ logger.trace("{}:: Connecting {}", this, channelName, new Exception("Trace"));
}
// It is important to check this otherwise we could reconnect an already connected channel
@@ -131,15 +131,17 @@ public class JChannelWrapper {
public void addReceiver(JGroupsReceiver jGroupsReceiver) {
synchronized (receivers) {
- if (logger.isTraceEnabled())
- logger.trace(this + "::Add Receiver: " + jGroupsReceiver + " on " + channelName);
+ if (logger.isTraceEnabled()) {
+ logger.trace("{}::Add Receiver: {} on {}", this, jGroupsReceiver, channelName);
+ }
receivers.add(jGroupsReceiver);
}
}
public void send(org.jgroups.Message msg) throws Exception {
- if (logger.isTraceEnabled())
- logger.trace(this + "::Sending JGroups Message: Open=" + channel.isOpen() + " on channel " + channelName + " msg=" + msg);
+ if (logger.isTraceEnabled()) {
+ logger.trace("{}::Sending JGroups Message: Open={} on channel {} msg={}", this, channel.isOpen(), channelName, msg);
+ }
if (!manager.isLoopbackMessages()) {
msg.setFlag(Message.TransientFlag.DONT_LOOPBACK);
}
@@ -148,8 +150,9 @@ public class JChannelWrapper {
public JChannelWrapper addRef() {
this.refCount++;
- if (logger.isTraceEnabled())
- logger.trace(this + "::RefCount++ = " + refCount + " on channel " + channelName);
+ if (logger.isTraceEnabled()) {
+ logger.trace("{}::RefCount++ = {} on channel {}", this, refCount, channelName);
+ }
return this;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JGroupsReceiver.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JGroupsReceiver.java
index 3c1a22a0b3..f31acfa82e 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JGroupsReceiver.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JGroupsReceiver.java
@@ -38,8 +38,7 @@ public class JGroupsReceiver implements Receiver {
@Override
public void receive(org.jgroups.Message msg) {
- if (logger.isTraceEnabled())
- logger.trace("sending message " + msg);
+ logger.trace("sending message {}", msg);
dequeue.add(msg.getArray());
}
@@ -54,9 +53,9 @@ public class JGroupsReceiver implements Receiver {
private void logBytes(String methodName, byte[] bytes) {
if (bytes != null) {
- logger.trace(methodName + "::" + bytes.length + " bytes");
+ logger.trace("{}::{} bytes", methodName, bytes.length);
} else {
- logger.trace(methodName + ":: no bytes");
+ logger.trace("{}:: no bytes", methodName);
}
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AbstractProducerCreditsImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AbstractProducerCreditsImpl.java
index 12d3e3ebdc..2e341fa9b3 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AbstractProducerCreditsImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AbstractProducerCreditsImpl.java
@@ -89,6 +89,7 @@ public abstract class AbstractProducerCreditsImpl implements ClientProducerCredi
if (logger.isDebugEnabled()) {
logger.debug("AfterAcquire {} credits on address {}", credits, address);
}
+
synchronized (this) {
pendingCredits -= credits;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java
index f27ce80390..87b26f24c1 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java
@@ -180,7 +180,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
this.flowControlExecutor = flowControlExecutor;
if (logger.isTraceEnabled()) {
- logger.trace(this + ":: being created at", new Exception("trace"));
+ logger.trace("{}:: being created at", this, new Exception("trace"));
}
}
@@ -194,14 +194,14 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
private ClientMessage receive(final long timeout, final boolean forcingDelivery) throws ActiveMQException {
if (logger.isTraceEnabled()) {
- logger.trace(this + "::receive(" + timeout + ", " + forcingDelivery + ")");
+ logger.trace("{}::receive({}, {})", this, timeout, forcingDelivery);
}
checkClosed();
if (largeMessageReceived != null) {
if (logger.isTraceEnabled()) {
- logger.trace(this + "::receive(" + timeout + ", " + forcingDelivery + ") -> discard LargeMessage body for " + largeMessageReceived);
+ logger.trace("{}::receive({}, {}) -> discard LargeMessage body for {}", this, timeout, forcingDelivery, largeMessageReceived);
}
// Check if there are pending packets to be received
largeMessageReceived.discardBody();
@@ -214,14 +214,14 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
if (handler != null) {
if (logger.isTraceEnabled()) {
- logger.trace(this + "::receive(" + timeout + ", " + forcingDelivery + ") -> throwing messageHandlerSet");
+ logger.trace("{}::receive({}, {}) -> throwing messageHandlerSet", this, timeout, forcingDelivery);
}
throw ActiveMQClientMessageBundle.BUNDLE.messageHandlerSet();
}
if (clientWindowSize == 0) {
if (logger.isTraceEnabled()) {
- logger.trace(this + "::receive(" + timeout + ", " + forcingDelivery + ") -> start slowConsumer");
+ logger.trace("{}::receive({}, {}) -> start slowConsumer", this, timeout, forcingDelivery);
}
startSlowConsumer();
}
@@ -280,7 +280,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
if (failedOver) {
if (m == null) {
if (logger.isTraceEnabled()) {
- logger.trace(this + "::receive(" + timeout + ", " + forcingDelivery + ") -> m == null and failover");
+ logger.trace("{}::receive({}, {}) -> m == null and failover", this, timeout, forcingDelivery);
}
// if failed over and the buffer is null, we reset the state and try it again
@@ -290,16 +290,14 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
continue;
} else {
if (logger.isTraceEnabled()) {
- logger.trace(this + "::receive(" + timeout + ", " + forcingDelivery + ") -> failedOver, but m != null, being " + m);
+ logger.trace("{}::receive({}, {}) -> failedOver, but m != null, being {}", this, timeout, forcingDelivery, m);
}
failedOver = false;
}
}
if (callForceDelivery) {
- if (logger.isTraceEnabled()) {
- logger.trace(this + "::Forcing delivery");
- }
+ logger.trace("{}::Forcing delivery", this);
// JBPAPP-6030 - Calling forceDelivery outside of the lock to avoid distributed dead locks
sessionContext.forceDelivery(this, forceDeliveryCount.getAndIncrement());
callForceDelivery = false;
@@ -318,16 +316,11 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
if (forcingDelivery && deliveryForced && seq == forceDeliveryCount.get() - 1) {
// forced delivery messages are discarded, nothing has been delivered by the queue
resetIfSlowConsumer();
-
- if (logger.isTraceEnabled()) {
- logger.trace(this + "::There was nothing on the queue, leaving it now:: returning null");
- }
+ logger.trace("{}::There was nothing on the queue, leaving it now:: returning null", this);
return null;
} else {
- if (logger.isTraceEnabled()) {
- logger.trace(this + "::Ignored force delivery answer as it belonged to another call");
- }
+ logger.trace("{}::Ignored force delivery answer as it belonged to another call", this);
// Ignore the message
continue;
}
@@ -357,15 +350,11 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
largeMessageReceived = m;
}
- if (logger.isTraceEnabled()) {
- logger.trace(this + "::Returning " + m);
- }
+ logger.trace("{}::Returning {}", this, m);
return m;
} else {
- if (logger.isTraceEnabled()) {
- logger.trace(this + "::Returning null");
- }
+ logger.trace("{}::Returning null", this);
resetIfSlowConsumer();
return null;
}
@@ -377,22 +366,17 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
@Override
public ClientMessage receive(final long timeout) throws ActiveMQException {
-
- if (logger.isTraceEnabled()) {
- logger.trace(this + ":: receive(" + timeout + ")");
- }
+ logger.trace("{}:: receive({})", this, timeout);
ClientMessage msg = receive(timeout, false);
if (msg == null && !closed) {
if (logger.isTraceEnabled()) {
- logger.trace(this + ":: receive(" + timeout + ") -> null, trying again with receive(0)");
+ logger.trace("{}:: receive({}) -> null, trying again with receive(0)", this, timeout);
}
msg = receive(0, true);
}
- if (logger.isTraceEnabled()) {
- logger.trace(this + ":: returning " + msg);
- }
+ logger.trace("{}:: returning {}", this, msg);
return msg;
}
@@ -513,9 +497,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
@Override
public void clearAtFailover() {
- if (logger.isTraceEnabled()) {
- logger.trace(this + "::ClearAtFailover");
- }
+ logger.trace("{}::ClearAtFailover", this);
clearBuffer();
// failover will issue a start later
@@ -699,7 +681,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
}
if (currentLargeMessageController == null) {
if (logger.isTraceEnabled()) {
- logger.trace(this + "::Sending back credits for largeController = null " + flowControlSize);
+ logger.trace("{}::Sending back credits for largeController = null {}", this, flowControlSize);
}
flowControl(flowControlSize, false);
} else {
@@ -777,18 +759,14 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
ackBytes += message.getEncodeSize();
if (logger.isTraceEnabled()) {
- logger.trace(this + "::acknowledge ackBytes=" + ackBytes + " and ackBatchSize=" + ackBatchSize + ", encodeSize=" + message.getEncodeSize());
+ logger.trace("{}::acknowledge ackBytes={} and ackBatchSize={}, encodeSize={}", this, ackBytes, ackBatchSize, message.getEncodeSize());
}
if (ackBytes >= ackBatchSize) {
- if (logger.isTraceEnabled()) {
- logger.trace(this + ":: acknowledge acking " + cmi);
- }
+ logger.trace("{}:: acknowledge acking {}", this, cmi);
doAck(cmi);
} else {
- if (logger.isTraceEnabled()) {
- logger.trace(this + ":: acknowledge setting lastAckedMessage = " + cmi);
- }
+ logger.trace("{}:: acknowledge setting lastAckedMessage = {}", this, cmi);
lastAckedMessage = cmi;
}
}
@@ -806,9 +784,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
@Override
public void flushAcks() throws ActiveMQException {
if (lastAckedMessage != null) {
- if (logger.isTraceEnabled()) {
- logger.trace(this + "::FlushACK acking lastMessage::" + lastAckedMessage);
- }
+ logger.trace("{}::FlushACK acking lastMessage::{}", this, lastAckedMessage);
doAck(lastAckedMessage);
}
}
@@ -827,7 +803,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
if (creditsToSend >= clientWindowSize) {
if (clientWindowSize == 0 && discountSlowConsumer) {
if (logger.isTraceEnabled()) {
- logger.trace(this + "::FlowControl::Sending " + creditsToSend + " -1, for slow consumer");
+ logger.trace("{}::FlowControl::Sending {}-1, for slow consumer", this, creditsToSend);
}
// sending the credits - 1 initially send to fire the slow consumer, or the slow consumer would be
@@ -841,7 +817,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
}
} else {
if (logger.isDebugEnabled()) {
- logger.debug("Sending " + messageBytes + " from flow-control");
+ logger.debug("Sending {} from flow-control", messageBytes);
}
final int credits = creditsToSend;
@@ -860,9 +836,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
* Sending an initial credit for slow consumers
*/
private void startSlowConsumer() {
- if (logger.isTraceEnabled()) {
- logger.trace(this + "::Sending 1 credit to start delivering of one message to slow consumer");
- }
+ logger.trace("{}::Sending 1 credit to start delivering of one message to slow consumer", this);
sendCredits(1);
try {
// We use an executor here to guarantee the messages will arrive in order.
@@ -903,10 +877,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
}
private void queueExecutor() {
- if (logger.isTraceEnabled()) {
- logger.trace(this + "::Adding Runner on Executor for delivery");
- }
-
+ logger.trace("{}::Adding Runner on Executor for delivery", this);
sessionExecutor.execute(runner);
}
@@ -993,9 +964,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
flowControlBeforeConsumption(message);
if (!expired) {
- if (logger.isTraceEnabled()) {
- logger.trace(this + "::Calling handler.onMessage");
- }
+ logger.trace("{}::Calling handler.onMessage", this);
final ClassLoader originalLoader = safeInstallContextClassLoader();
onMessageThread = Thread.currentThread();
@@ -1011,9 +980,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
onMessageThread = null;
}
- if (logger.isTraceEnabled()) {
- logger.trace(this + "::Handler.onMessage done");
- }
+ logger.trace("{}::Handler.onMessage done", this);
if (message.isLargeMessage()) {
message.discardBody();
@@ -1133,9 +1100,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
lastAckedMessage = null;
- if (logger.isTraceEnabled()) {
- logger.trace(this + "::Acking message " + message);
- }
+ logger.trace("{}::Acking message {}", this, message);
session.acknowledge(this, message);
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
index d18c0916e8..a4e4a7eb99 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
@@ -142,9 +142,7 @@ public class ClientProducerImpl implements ClientProducerInternal {
doSend(address1, message, handler);
if (handler != null && !session.isConfirmationWindowEnabled()) {
- if (logger.isDebugEnabled()) {
- logger.debug("Handler was used on producing messages towards address " + address1 + " however there is no confirmationWindowEnabled");
- }
+ logger.debug("Handler was used on producing messages towards address {} however there is no confirmationWindowEnabled", address1);
// if there is no confirmation enabled, we will at least call the handler after the sent is done
session.scheduleConfirmation(handler, message);
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
index 35484b7bb5..2a5c5d4030 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
@@ -287,17 +287,12 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
if (localConnector.isEquivalent(live.getParams()) && backUp != null && !localConnector.isEquivalent(backUp.getParams())
// check if a server is trying to set its cluster connector config as backup connector config
&& !(serverLocator.getClusterTransportConfiguration() != null && serverLocator.getClusterTransportConfiguration().isSameParams(backUp))) {
- if (logger.isDebugEnabled()) {
- logger.debug("Setting up backup config = " + backUp + " for live = " + live);
- }
+ logger.debug("Setting up backup config = {} for live = {}", backUp, live);
backupConnectorConfig = backUp;
} else {
if (logger.isDebugEnabled()) {
- logger.debug("ClientSessionFactoryImpl received backup update for live/backup pair = " + live +
- " / " +
- backUp +
- " but it didn't belong to " +
- currentConnectorConfig);
+ logger.debug("ClientSessionFactoryImpl received backup update for live/backup pair = {} / {} but it didn't belong to {}",
+ live, backUp, currentConnectorConfig);
}
}
}
@@ -583,8 +578,8 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
return;
}
- if (ClientSessionFactoryImpl.logger.isTraceEnabled()) {
- logger.trace("Client Connection failed, calling failure listeners and trying to reconnect, reconnectAttempts=" + reconnectAttempts);
+ if (logger.isTraceEnabled()) {
+ logger.trace("Client Connection failed, calling failure listeners and trying to reconnect, reconnectAttempts={}", reconnectAttempts);
}
callFailoverListeners(FailoverEventType.FAILURE_DETECTED);
@@ -847,11 +842,8 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
if (!clientProtocolManager.isAlive())
return;
if (logger.isTraceEnabled()) {
- logger.trace("getConnectionWithRetry::" + reconnectAttempts +
- " with retryInterval = " +
- retryInterval +
- " multiplier = " +
- retryIntervalMultiplier, new Exception("trace"));
+ logger.trace("getConnectionWithRetry::{} with retryInterval = {} multiplier = {}",
+ reconnectAttempts, retryInterval, retryIntervalMultiplier, new Exception("trace"));
}
long interval = retryInterval;
@@ -860,7 +852,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
while (clientProtocolManager.isAlive()) {
if (logger.isDebugEnabled()) {
- logger.debug("Trying reconnection attempt " + count + "/" + reconnectAttempts);
+ logger.debug("Trying reconnection attempt {}/{}", count, reconnectAttempts);
}
if (getConnection() != null) {
@@ -868,9 +860,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
// transferring old connection version into the new connection
((CoreRemotingConnection)connection).setChannelVersion(((CoreRemotingConnection)oldConnection).getChannelVersion());
}
- if (logger.isDebugEnabled()) {
- logger.debug("Reconnection successful");
- }
+ logger.debug("Reconnection successful");
return;
} else {
// Failed to get connection
@@ -886,8 +876,8 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
return;
}
- if (ClientSessionFactoryImpl.logger.isTraceEnabled()) {
- ClientSessionFactoryImpl.logger.trace("Waiting " + interval + " milliseconds before next retry. RetryInterval=" + retryInterval + " and multiplier=" + retryIntervalMultiplier);
+ if (logger.isTraceEnabled()) {
+ logger.trace("Waiting {} milliseconds before next retry. RetryInterval={} and multiplier={}", interval, retryInterval, retryIntervalMultiplier);
}
if (waitForRetry(interval))
@@ -1001,13 +991,13 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
if (serverLocator.getTopology() != null) {
if (connection != null) {
- if (ClientSessionFactoryImpl.logger.isTraceEnabled()) {
- logger.trace(this + "::Subscribing Topology");
- }
+ logger.trace("{}::Subscribing Topology", this);
clientProtocolManager.sendSubscribeTopology(serverLocator.isClusterConnection());
}
} else {
- logger.debug("serverLocator@" + System.identityHashCode(serverLocator + " had no topology"));
+ if (logger.isDebugEnabled()) {
+ logger.debug("serverLocator@{} had no topology", System.identityHashCode(serverLocator));
+ }
}
return connection;
@@ -1115,9 +1105,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
Connection transportConnection = connector.createConnection();
if (transportConnection == null) {
- if (logger.isDebugEnabled()) {
- logger.debug("Connector towards " + connector + " failed");
- }
+ logger.debug("Connector towards {} failed", connector);
try {
connector.close();
@@ -1216,8 +1204,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
transportConnectorConfig.getFactoryClassName());
if (logger.isDebugEnabled()) {
- logger.debug("Trying to connect with connectorFactory=" + transportConnectorFactory
- + " and " + name + "ConnectorConfig: " + transportConnectorConfig);
+ logger.debug("Trying to connect with connectorFactory={} and {}ConnectorConfig: {}", transportConnectorFactory, name, transportConnectorConfig);
}
Connector transportConnector = createConnector(transportConnectorFactory, transportConnectorConfig);
@@ -1225,9 +1212,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
Connection transportConnection = openTransportConnection(transportConnector);
if (transportConnection != null) {
- if (logger.isDebugEnabled()) {
- logger.debug("Connected with the " + name + "ConnectorConfig=" + transportConnectorConfig);
- }
+ logger.debug("Connected with the {}ConnectorConfig={}", name, transportConnectorConfig);
connector = transportConnector;
connectorFactory = transportConnectorFactory;
@@ -1390,9 +1375,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
Connection transportConnection = createTransportConnection();
if (transportConnection == null) {
- if (ClientSessionFactoryImpl.logger.isTraceEnabled()) {
- logger.trace("Neither backup or live were active, will just give up now");
- }
+ logger.trace("Neither backup or live were active, will just give up now");
return null;
}
@@ -1402,9 +1385,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
schedulePing();
- if (logger.isTraceEnabled()) {
- logger.trace("returning " + newConnection);
- }
+ logger.trace("returning {}", newConnection);
return newConnection;
}
@@ -1433,13 +1414,8 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
public void nodeDisconnected(RemotingConnection conn, String nodeID, DisconnectReason reason, String targetNodeID, TransportConfiguration tagetConnector) {
if (logger.isTraceEnabled()) {
- logger.trace("Disconnect being called on client:" +
- " server locator = " +
- serverLocator +
- " notifying node " +
- nodeID +
- " as down with reason " +
- reason, new Exception("trace"));
+ logger.trace("Disconnect being called on client: server locator = {} notifying node {} as down with reason {}",
+ serverLocator, nodeID, reason, new Exception("trace"));
}
serverLocator.notifyNodeDown(System.currentTimeMillis(), nodeID);
@@ -1451,11 +1427,11 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
if (topologyMember != null) {
if (topologyMember.getConnector().getB() != null) {
backupConnectorConfig = topologyMember.getConnector().getB();
- } else if (logger.isDebugEnabled()) {
- logger.debug("The topology member " + nodeID + " with connector " + tagetConnector + " has no backup");
+ } else {
+ logger.debug("The topology member {} with connector {} has no backup", nodeID, tagetConnector);
}
- } else if (logger.isDebugEnabled()) {
- logger.debug("The topology member " + nodeID + " with connector " + tagetConnector + " not found");
+ } else {
+ logger.debug("The topology member {} with connector {} not found", nodeID, tagetConnector);
}
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
index 09c0fa75dc..dbafef1e03 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
@@ -946,9 +946,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
public void commit(boolean block) throws ActiveMQException {
checkClosed();
- if (logger.isTraceEnabled()) {
- logger.trace("Sending commit");
- }
+ logger.trace("Sending commit");
/*
* we have failed over since any work was done so we should rollback
@@ -1004,8 +1002,9 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
public void rollback(final boolean isLastMessageAsDelivered, final boolean waitConsumers) throws ActiveMQException {
if (logger.isTraceEnabled()) {
- logger.trace("calling rollback(isLastMessageAsDelivered=" + isLastMessageAsDelivered + ")");
+ logger.trace("calling rollback(isLastMessageAsDelivered={})", isLastMessageAsDelivered);
}
+
checkClosed();
// We do a "JMS style" rollback where the session is stopped, and the buffer is cancelled back
@@ -1204,8 +1203,9 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
}
checkClosed();
+
if (logger.isDebugEnabled()) {
- logger.debug("client ack messageID = " + message.getMessageID());
+ logger.debug("client ack messageID = {}", message.getMessageID());
}
startCall();
@@ -1326,13 +1326,11 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
@Override
public void close() throws ActiveMQException {
if (closed) {
- logger.debug("Session was already closed, giving up now, this=" + this);
+ logger.debug("Session was already closed, giving up now, this={}", this);
return;
}
- if (logger.isDebugEnabled()) {
- logger.debug("Calling close on session " + this);
- }
+ logger.debug("Calling close on session {}", this);
try {
closeChildren();
@@ -1605,7 +1603,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
@Override
public void commit(final Xid xid, final boolean onePhase) throws XAException {
if (logger.isTraceEnabled()) {
- logger.trace("call commit(xid=" + convert(xid));
+ logger.trace("call commit(xid={}", convert(xid));
}
checkXA();
@@ -1632,11 +1630,11 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
XAException xaException;
if (onePhase) {
- logger.debug("Throwing oneFase RMFAIL on xid=" + xid, t);
+ logger.debug("Throwing oneFase RMFAIL on xid={}", xid, t);
//we must return XA_RMFAIL
xaException = new XAException(XAException.XAER_RMFAIL);
} else {
- logger.debug("Throwing twoFase Retry on xid=" + xid, t);
+ logger.debug("Throwing twoFase Retry on xid={}", xid, t);
// Any error on commit -> RETRY
// We can't rollback a Prepared TX for definition
xaException = new XAException(XAException.XA_RETRY);
@@ -1652,7 +1650,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
@Override
public void end(final Xid xid, final int flags) throws XAException {
if (logger.isTraceEnabled()) {
- logger.trace("Calling end:: " + convert(xid) + ", flags=" + convertTXFlag(flags));
+ logger.trace("Calling end:: {}, flags={}", convert(xid), convertTXFlag(flags));
}
checkXA();
@@ -1778,7 +1776,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
public int prepare(final Xid xid) throws XAException {
checkXA();
if (logger.isTraceEnabled()) {
- logger.trace("Calling prepare:: " + convert(xid));
+ logger.trace("Calling prepare:: {}", convert(xid));
}
if (rollbackOnly) {
@@ -1858,7 +1856,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
checkXA();
if (logger.isTraceEnabled()) {
- logger.trace("Calling rollback:: " + convert(xid));
+ logger.trace("Calling rollback:: {}", convert(xid));
}
try {
@@ -1907,7 +1905,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
@Override
public void start(final Xid xid, final int flags) throws XAException {
if (logger.isTraceEnabled()) {
- logger.trace("Calling start:: " + convert(xid) + " clientXID=" + xid + " flags = " + convertTXFlag(flags));
+ logger.trace("Calling start:: {} clientXID={} flags = {}", convert(xid), xid, convertTXFlag(flags));
}
checkXA();
@@ -2079,9 +2077,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
}
private void doCleanup(boolean failingOver) {
- if (logger.isDebugEnabled()) {
- logger.debug("calling cleanup on " + this);
- }
+ logger.debug("calling cleanup on {}", this);
synchronized (this) {
closed = true;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
index 03e6b533fe..127a3ea0f4 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
@@ -438,17 +438,13 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
synchronized (this) {
if (usedTopology != null && config.useTopologyForLoadBalancing && !useInitConnector) {
- if (logger.isTraceEnabled()) {
- logger.trace("Selecting connector from topology.");
- }
+ logger.trace("Selecting connector from topology.");
int pos = loadBalancingPolicy.select(usedTopology.length);
Pair<TransportConfiguration, TransportConfiguration> pair = usedTopology[pos];
return pair;
} else {
- if (logger.isTraceEnabled()) {
- logger.trace("Selecting connector from initial connectors.");
- }
+ logger.trace("Selecting connector from initial connectors.");
int pos = loadBalancingPolicy.select(initialConnectors.length);
@@ -573,7 +569,7 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
TopologyMember topologyMember = topology.getMember(nodeID);
if (logger.isTraceEnabled()) {
- logger.trace("Creating connection factory towards " + nodeID + " = " + topologyMember + ", topology=" + topology.describe());
+ logger.trace("Creating connection factory towards {} = {}, topology={}", nodeID, topologyMember, topology.describe());
}
if (topologyMember == null) {
@@ -1320,9 +1316,7 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
private void doClose(final boolean sendClose) {
synchronized (stateGuard) {
if (state == STATE.CLOSED) {
- if (logger.isDebugEnabled()) {
- logger.debug(this + " is already closed when calling closed");
- }
+ logger.debug("{} is already closed when calling closed", this);
return;
}
@@ -1427,7 +1421,7 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
}
if (logger.isTraceEnabled()) {
- logger.trace("nodeDown " + this + " nodeID=" + nodeID + " as being down", new Exception("trace"));
+ logger.trace("nodeDown {} nodeID={} as being down", this, nodeID, new Exception("trace"));
}
topology.removeMember(eventTime, nodeID);
@@ -1458,7 +1452,7 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
final Pair<TransportConfiguration, TransportConfiguration> connectorPair,
final boolean last) {
if (logger.isTraceEnabled()) {
- logger.trace("NodeUp " + this + "::nodeID=" + nodeID + ", connectorPair=" + connectorPair, new Exception("trace"));
+ logger.trace("NodeUp {}::nodeID={}, connectorPair={}", this, nodeID, connectorPair, new Exception("trace"));
}
TopologyMemberImpl member = new TopologyMemberImpl(nodeID, backupGroupName, scaleDownGroupName, connectorPair.getA(), connectorPair.getB());
@@ -1674,9 +1668,7 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
while (!isClosed()) {
retryNumber++;
for (Connector conn : connectors) {
- if (logger.isTraceEnabled()) {
- logger.trace(this + "::Submitting connect towards " + conn);
- }
+ logger.trace("{}::Submitting connect towards {}", this, conn);
ClientSessionFactory csf = conn.tryConnect();
@@ -1710,11 +1702,7 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
});
if (logger.isTraceEnabled()) {
- logger.trace("Returning " + csf +
- " after " +
- retryNumber +
- " retries on StaticConnector " +
- ServerLocatorImpl.this);
+ logger.trace("Returning {} after {} retries on StaticConnector {}", csf, retryNumber, ServerLocatorImpl.this);
}
return csf;
@@ -1787,9 +1775,7 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
}
public ClientSessionFactory tryConnect() throws ActiveMQException {
- if (logger.isDebugEnabled()) {
- logger.trace(this + "::Trying to connect to " + factory);
- }
+ logger.trace("{}::Trying to connect to {}", this, factory);
try {
ClientSessionFactoryInternal factoryToUse = factory;
if (factoryToUse != null) {
@@ -1803,7 +1789,7 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
}
return factoryToUse;
} catch (ActiveMQException e) {
- logger.trace(this + "::Exception on establish connector initial connection", e);
+ logger.trace("{}::Exception on establish connector initial connection", this, e);
return null;
}
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java
index 032704db9d..d53439f577 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java
@@ -90,7 +90,7 @@ public final class Topology {
manager = null;
}
if (logger.isTraceEnabled()) {
- logger.trace("Topology@" + Integer.toHexString(System.identityHashCode(this)) + " CREATE", new Exception("trace"));
+ logger.trace("Topology@{} CREATE", Integer.toHexString(System.identityHashCode(this)), new Exception("trace"));
}
}
@@ -108,7 +108,7 @@ public final class Topology {
public void addClusterTopologyListener(final ClusterTopologyListener listener) {
if (logger.isTraceEnabled()) {
- logger.trace(this + "::Adding topology listener " + listener, new Exception("Trace"));
+ logger.trace("{}::Adding topology listener {}", this, listener, new Exception("Trace"));
}
synchronized (topologyListeners) {
topologyListeners.add(listener);
@@ -118,7 +118,7 @@ public final class Topology {
public void removeClusterTopologyListener(final ClusterTopologyListener listener) {
if (logger.isTraceEnabled()) {
- logger.trace(this + "::Removing topology listener " + listener, new Exception("Trace"));
+ logger.trace("{}::Removing topology listener {}", this, listener, new Exception("Trace"));
}
synchronized (topologyListeners) {
topologyListeners.remove(listener);
@@ -131,7 +131,7 @@ public final class Topology {
public void updateAsLive(final String nodeId, final TopologyMemberImpl memberInput) {
synchronized (this) {
if (logger.isDebugEnabled()) {
- logger.debug(this + "::node " + nodeId + "=" + memberInput);
+ logger.debug("{}::node {}={}", this, nodeId, memberInput);
}
memberInput.setUniqueEventID(System.currentTimeMillis());
topology.remove(nodeId);
@@ -161,14 +161,14 @@ public final class Topology {
public TopologyMemberImpl updateBackup(final TopologyMemberImpl memberInput) {
final String nodeId = memberInput.getNodeId();
if (logger.isTraceEnabled()) {
- logger.trace(this + "::updateBackup::" + nodeId + ", memberInput=" + memberInput);
+ logger.trace("{}::updateBackup::{}, memberInput={}", this, nodeId, memberInput);
}
synchronized (this) {
TopologyMemberImpl currentMember = getMember(nodeId);
if (currentMember == null) {
if (logger.isTraceEnabled()) {
- logger.trace("There's no live to be updated on backup update, node=" + nodeId + " memberInput=" + memberInput, new Exception("trace"));
+ logger.trace("There's no live to be updated on backup update, node={} memberInput={}", nodeId, memberInput, new Exception("trace"));
}
currentMember = memberInput;
@@ -196,12 +196,10 @@ public final class Topology {
Long deleteTme = getMapDelete().get(nodeId);
if (deleteTme != null && uniqueEventID != 0 && uniqueEventID < deleteTme) {
- logger.debug("Update uniqueEvent=" + uniqueEventID +
- ", nodeId=" +
- nodeId +
- ", memberInput=" +
- memberInput +
- " being rejected as there was a delete done after that");
+ if (logger.isDebugEnabled()) {
+ logger.debug("Update uniqueEvent={}, nodeId={}, memberInput={} being rejected as there was a delete done after that",
+ uniqueEventID, nodeId, memberInput);
+ }
return false;
}
@@ -215,7 +213,7 @@ public final class Topology {
if (currentMember == null) {
if (logger.isTraceEnabled()) {
- logger.trace(this + "::NewMemberAdd nodeId=" + nodeId + " member = " + memberInput, new Exception("trace"));
+ logger.trace("{}::NewMemberAdd nodeId={} member = {}", this, nodeId, memberInput, new Exception("trace"));
}
memberInput.setUniqueEventID(uniqueEventID);
topology.put(nodeId, memberInput);
@@ -234,9 +232,8 @@ public final class Topology {
}
if (logger.isTraceEnabled()) {
- logger.trace(this + "::updated currentMember=nodeID=" + nodeId + ", currentMember=" +
- currentMember + ", memberInput=" + memberInput + "newMember=" +
- newMember, new Exception("trace"));
+ logger.trace("{}::updated currentMember=nodeID={}, currentMember={}, memberInput={} newMember={}",
+ this, nodeId, currentMember, memberInput, newMember, new Exception("trace"));
}
if (uniqueEventID > currentMember.getUniqueEventID()) {
@@ -270,7 +267,7 @@ public final class Topology {
final ArrayList<ClusterTopologyListener> copy = copyListeners();
if (logger.isTraceEnabled()) {
- logger.trace(this + "::prepare to send " + nodeId + " to " + copy.size() + " elements");
+ logger.trace("{}::prepare to send {} to {} elements", this, nodeId, copy.size());
}
if (copy.size() > 0) {
@@ -279,12 +276,8 @@ public final class Topology {
public void run() {
for (ClusterTopologyListener listener : copy) {
if (logger.isTraceEnabled()) {
- logger.trace(Topology.this + " informing " +
- listener +
- " about node up = " +
- nodeId +
- " connector = " +
- memberToSend.getConnector());
+ logger.trace("{} informing {} about node up = {} connector = {}",
+ Topology.this, listener, nodeId, memberToSend.getConnector());
}
try {
@@ -322,7 +315,7 @@ public final class Topology {
member = topology.get(nodeId);
if (member != null) {
if (member.getUniqueEventID() > uniqueEventID) {
- logger.debug("The removeMember was issued before the node " + nodeId + " was started, ignoring call");
+ logger.debug("The removeMember was issued before the node {} was started, ignoring call", nodeId);
member = null;
} else {
getMapDelete().put(nodeId, uniqueEventID);
@@ -332,13 +325,8 @@ public final class Topology {
}
if (logger.isTraceEnabled()) {
- logger.trace("removeMember " + this +
- " removing nodeID=" +
- nodeId +
- ", result=" +
- member +
- ", size = " +
- topology.size(), new Exception("trace"));
+ logger.trace("removeMember {} removing nodeID={}, result={}, size = {}",
+ this, nodeId, member, topology.size(), new Exception("trace"));
}
if (member != null) {
@@ -349,7 +337,7 @@ public final class Topology {
public void run() {
for (ClusterTopologyListener listener : copy) {
if (logger.isTraceEnabled()) {
- logger.trace(this + " informing " + listener + " about node down = " + nodeId);
+ logger.trace("{} informing {} about node down = {}", this, listener, nodeId);
}
try {
listener.nodeDown(uniqueEventID, nodeId);
@@ -364,9 +352,7 @@ public final class Topology {
}
public synchronized void sendTopology(final ClusterTopologyListener listener) {
- if (logger.isDebugEnabled()) {
- logger.debug(this + " is sending topology to " + listener);
- }
+ logger.debug("{} is sending topology to {}", this, listener);
executor.execute(new Runnable() {
@Override
@@ -381,12 +367,7 @@ public final class Topology {
for (Map.Entry<String, TopologyMemberImpl> entry : copy.entrySet()) {
if (logger.isDebugEnabled()) {
- logger.debug(Topology.this + " sending " +
- entry.getKey() +
- " / " +
- entry.getValue().getConnector() +
- " to " +
- listener);
+ logger.debug("{} sending {} / {} to {}", Topology.this, entry.getKey(), entry.getValue().getConnector(), listener);
}
listener.nodeUP(entry.getValue(), ++count == copy.size());
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java
index e0342a4b4b..b7bb3d133d 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java
@@ -108,7 +108,7 @@ public final class DiscoveryGroup implements ActiveMQComponent {
return;
}
- if (logger.isDebugEnabled()) logger.debug("Starting Discovery Group for " + name);
+ logger.debug("Starting Discovery Group for {}", name);
endpoint.openClient();
@@ -123,7 +123,7 @@ public final class DiscoveryGroup implements ActiveMQComponent {
thread = tfactory.newThread(new DiscoveryRunnable());
- if (logger.isDebugEnabled()) logger.debug("Starting daemon thread");
+ logger.debug("Starting daemon thread");
thread.start();
@@ -169,9 +169,7 @@ public final class DiscoveryGroup implements ActiveMQComponent {
try {
endpoint.close(false);
- if (logger.isDebugEnabled()) {
- logger.debug("endpoing closed");
- }
+ logger.debug("endpoing closed");
} catch (Exception e1) {
ActiveMQClientLogger.LOGGER.errorStoppingDiscoveryBroadcastEndpoint(endpoint, e1);
}
@@ -279,14 +277,12 @@ public final class DiscoveryGroup implements ActiveMQComponent {
ActiveMQClientLogger.LOGGER.unexpectedNullDataReceived();
}
- if (logger.isDebugEnabled()) {
- logger.debug("Received broadcast data as null");
- }
+ logger.debug("Received broadcast data as null");
break;
}
if (logger.isDebugEnabled()) {
- logger.debug("receiving " + data.length);
+ logger.debug("receiving {}", data.length);
}
} catch (Exception e) {
if (!started) {
@@ -306,9 +302,7 @@ public final class DiscoveryGroup implements ActiveMQComponent {
if (nodeID.equals(originatingNodeID)) {
- if (logger.isDebugEnabled()) {
- logger.debug("ignoring original NodeID" + originatingNodeID + " receivedID = " + nodeID);
- }
+ logger.debug("ignoring original NodeID{} receivedID = {}", originatingNodeID, nodeID);
if (checkExpiration()) {
callListeners();
}
@@ -316,9 +310,7 @@ public final class DiscoveryGroup implements ActiveMQComponent {
continue;
}
- if (logger.isDebugEnabled()) {
- logger.debug("Received nodeID " + nodeID + " with originatingID = " + originatingNodeID);
- }
+ logger.debug("Received nodeID{} with originatingID = {}", nodeID, originatingNodeID);
int size = buffer.readInt();
@@ -336,9 +328,9 @@ public final class DiscoveryGroup implements ActiveMQComponent {
if (logger.isDebugEnabled()) {
- logger.debug("Received " + entriesRead.length + " discovery entry elements");
+ logger.debug("Received {} discovery entry elements", entriesRead.length);
for (DiscoveryEntry entryDisco : entriesRead) {
- logger.debug("" + entryDisco);
+ logger.debug("{}", entryDisco);
}
}
@@ -353,7 +345,7 @@ public final class DiscoveryGroup implements ActiveMQComponent {
changed = changed || checkExpiration();
if (logger.isDebugEnabled()) {
- logger.debug("changed = " + changed);
+ logger.debug("changed = {}", changed);
}
}
//only call the listeners if we have changed
@@ -365,18 +357,13 @@ public final class DiscoveryGroup implements ActiveMQComponent {
logger.trace("{}", connector);
}
}
- if (logger.isDebugEnabled()) {
- logger.debug("Calling listeners");
- }
+ logger.debug("Calling listeners");
callListeners();
}
synchronized (waitLock) {
received = true;
-
- if (logger.isDebugEnabled()) {
- logger.debug("Calling notifyAll");
- }
+ logger.debug("Calling notifyAll");
waitLock.notifyAll();
}
} catch (Throwable e) {
@@ -422,9 +409,7 @@ public final class DiscoveryGroup implements ActiveMQComponent {
Map.Entry<String, DiscoveryEntry> entry = iter.next();
if (entry.getValue().getLastUpdate() + timeout <= now) {
- if (logger.isTraceEnabled()) {
- logger.trace("Timed out node on discovery:" + entry.getValue());
- }
+ logger.trace("Timed out node on discovery:{}", entry.getValue());
iter.remove();
changed = true;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
index 9a7c8c5008..cd47eb625d 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
@@ -625,16 +625,16 @@ public class CoreMessage extends RefCountMessage implements ICoreMessage {
private RuntimeException onCheckPropertiesError(Throwable e) {
// This is not an expected error, hence no specific logger created
- logger.warn("Could not decode properties for CoreMessage[messageID=" + messageID + ",durable=" + durable + ",userID=" + userID + ",priority=" + priority +
- ", timestamp=" + timestamp + ",expiration=" + expiration + ",address=" + address + ", propertiesLocation=" + propertiesLocation, e);
+ logger.warn("Could not decode properties for CoreMessage[messageID={},durable={},userID={},priority={}, timestamp={},expiration={},address={}, propertiesLocation={}",
+ messageID, durable, userID, priority, timestamp, expiration, address, propertiesLocation, e);
final ByteBuf buffer = this.buffer;
if (buffer != null) {
//risky: a racy modification to buffer indexes could break this duplicate operation
final ByteBuf duplicatebuffer = buffer.duplicate();
duplicatebuffer.readerIndex(0);
- logger.warn("Failed message has messageID=" + messageID + " and the following buffer:\n" + ByteBufUtil.prettyHexDump(duplicatebuffer));
+ logger.warn("Failed message has messageID={} and the following buffer:\n{}", messageID, ByteBufUtil.prettyHexDump(duplicatebuffer));
} else {
- logger.warn("Failed message has messageID=" + messageID + " and the buffer was null");
+ logger.warn("Failed message has messageID={} and the buffer was null", messageID);
}
return new RuntimeException(e.getMessage(), e);
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
index 0e375d4c6e..1e960fb7a5 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
@@ -529,9 +529,7 @@ public class ActiveMQClientProtocolManager implements ClientProtocolManager {
}
if (topMessage.isExit()) {
- if (logger.isDebugEnabled()) {
- logger.debug("Notifying " + topMessage.getNodeID() + " going down");
- }
+ logger.debug("Notifying {} going down", topMessage.getNodeID());
if (topologyResponseHandler != null) {
topologyResponseHandler.notifyNodeDown(eventUID, topMessage.getNodeID());
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
index f5bf232a96..0cc1013f6b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
@@ -498,7 +498,7 @@ public class ActiveMQSessionContext extends SessionContext {
}
if (logger.isTraceEnabled()) {
- logger.trace("finished commit on " + ClientSessionImpl.convert(xid) + " with response = " + response);
+ logger.trace("finished commit on {} with response = {}", ClientSessionImpl.convert(xid), response);
}
}
@@ -662,7 +662,7 @@ public class ActiveMQSessionContext extends SessionContext {
buffer.append(",");
}
}
- logger.trace("xaScan returning " + xidArray.length + " xids = [" + buffer.toString() + "]");
+ logger.trace("xaScan returning {} xids = [{}]", xidArray.length, buffer.toString());
}
return xidArray;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
index d89d3f6b1c..d7fa20df9b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
@@ -261,7 +261,8 @@ public final class ChannelImpl implements Channel {
}
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + (connection == null ? "NULL" : connection.getID()) + " Sending packet nonblocking " + packet + " on channelID=" + id);
+ logger.trace("RemotingConnectionID={} Sending packet nonblocking {} on channelID={}",
+ (connection == null ? "NULL" : connection.getID()), packet, id);
}
ActiveMQBuffer buffer = packet.encode(connection);
@@ -287,7 +288,7 @@ public final class ChannelImpl implements Channel {
}
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + (connection == null ? "NULL" : connection.getID()) + " Writing buffer for channelID=" + id);
+ logger.trace("RemotingConnectionID={} Writing buffer for channelID={}", (connection == null ? "NULL" : connection.getID()), id);
}
//We do this outside the lock as ResponseCache is threadsafe and allows responses to come in,
@@ -378,7 +379,8 @@ public final class ChannelImpl implements Channel {
}
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + (connection == null ? "NULL" : connection.getID()) + " Sending packet nonblocking " + packet + " on channelID=" + id);
+ logger.trace("RemotingConnectionID={} Sending packet nonblocking {} on channelID={}",
+ (connection == null ? "NULL" : connection.getID()), packet, id);
}
ActiveMQBuffer buffer = packet.encode(connection);
@@ -404,7 +406,7 @@ public final class ChannelImpl implements Channel {
}
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + (connection == null ? "NULL" : connection.getID()) + " Writing buffer for channelID=" + id);
+ logger.trace("RemotingConnectionID={} Writing buffer for channelID={}", (connection == null ? "NULL" : connection.getID()), id);
}
checkReconnectID(reconnectID);
@@ -461,7 +463,7 @@ public final class ChannelImpl implements Channel {
if (interceptionResult != null) {
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + (connection == null ? "NULL" : connection.getID()) + " interceptionResult=" + interceptionResult);
+ logger.trace("RemotingConnectionID={} interceptionResult={}", (connection == null ? "NULL" : connection.getID()), interceptionResult);
}
// if we don't throw an exception here the client might not unblock
throw ActiveMQClientMessageBundle.BUNDLE.interceptorRejectedPacket(interceptionResult);
@@ -469,14 +471,14 @@ public final class ChannelImpl implements Channel {
if (closed) {
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + (connection == null ? "NULL" : connection.getID()) + " closed.");
+ logger.trace("RemotingConnectionID={} closed.", (connection == null ? "NULL" : connection.getID()));
}
throw ActiveMQClientMessageBundle.BUNDLE.connectionDestroyed();
}
if (connection.getBlockingCallTimeout() == -1) {
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + (connection == null ? "NULL" : connection.getID()) + " Cannot do a blocking call timeout on a server side connection");
+ logger.trace("RemotingConnectionID={} Cannot do a blocking call timeout on a server side connection", (connection == null ? "NULL" : connection.getID()));
}
throw new IllegalStateException("Cannot do a blocking call timeout on a server side connection");
}
@@ -506,7 +508,7 @@ public final class ChannelImpl implements Channel {
checkReconnectID(reconnectID);
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + (connection == null ? "NULL" : connection.getID()) + " Sending blocking " + packet);
+ logger.trace("RemotingConnectionID={} Sending blocking {}", (connection == null ? "NULL" : connection.getID()), packet);
}
connection.getTransportConnection().write(buffer, false, false);
@@ -603,7 +605,7 @@ public final class ChannelImpl implements Channel {
if (confWindowSize < 0) {
final String msg = "You can't set confirmationHandler on a connection with confirmation-window-size < 0." + " Look at the documentation for more information.";
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + (connection == null ? "NULL" : connection.getID()) + " " + msg);
+ logger.trace("RemotingConnectionID={} {}", (connection == null ? "NULL" : connection.getID()), msg);
}
throw new IllegalStateException(msg);
}
@@ -615,7 +617,7 @@ public final class ChannelImpl implements Channel {
if (confWindowSize < 0) {
final String msg = "You can't set responseHandler on a connection with confirmation-window-size < 0." + " Look at the documentation for more information.";
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + (connection == null ? "NULL" : connection.getID()) + " " + msg);
+ logger.trace("RemotingConnectionID={} {}", (connection == null ? "NULL" : connection.getID()), msg);
}
throw new IllegalStateException(msg);
}
@@ -625,7 +627,7 @@ public final class ChannelImpl implements Channel {
@Override
public void setHandler(final ChannelHandler handler) {
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + (connection == null ? "NULL" : connection.getID()) + " Setting handler on " + this + " as " + handler);
+ logger.trace("RemotingConnectionID={} Setting handler on {} as {}", (connection == null ? "NULL" : connection.getID()), this, handler);
}
this.handler = handler;
@@ -673,7 +675,9 @@ public final class ChannelImpl implements Channel {
connection.removeChannel(id);
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + (connection == null ? "NULL" : connection.getID()) + " transferConnection to new RemotingConnectionID=" + (newConnection == null ? "NULL" : newConnection.getID()));
+ logger.trace("RemotingConnectionID={} transferConnection to new RemotingConnectionID={}",
+ (connection == null ? "NULL" : connection.getID()),
+ (newConnection == null ? "NULL" : newConnection.getID()));
}
// And switch it
@@ -690,7 +694,7 @@ public final class ChannelImpl implements Channel {
public void replayCommands(final int otherLastConfirmedCommandID) {
if (resendCache != null) {
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + (connection == null ? "NULL" : connection.getID()) + " Replaying commands on channelID=" + id);
+ logger.trace("RemotingConnectionID={} Replaying commands on channelID={}", (connection == null ? "NULL" : connection.getID()), id);
}
clearUpTo(otherLastConfirmedCommandID);
@@ -708,7 +712,7 @@ public final class ChannelImpl implements Channel {
@Override
public void lock() {
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + (connection == null ? "NULL" : connection.getID()) + " lock channel " + this);
+ logger.trace("RemotingConnectionID={} lock channel {}", (connection == null ? "NULL" : connection.getID()), this);
}
lock.lock();
@@ -722,7 +726,7 @@ public final class ChannelImpl implements Channel {
@Override
public void unlock() {
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + (connection == null ? "NULL" : connection.getID()) + " unlock channel " + this);
+ logger.trace("RemotingConnectionID={} unlock channel {}", (connection == null ? "NULL" : connection.getID()), this);
}
lock.lock();
@@ -749,7 +753,8 @@ public final class ChannelImpl implements Channel {
confirmed.setChannelID(id);
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + (connection == null ? "NULL" : connection.getID()) + " ChannelImpl::flushConfirmation flushing confirmation " + confirmed);
+ logger.trace("RemotingConnectionID={} ChannelImpl::flushConfirmation flushing confirmation {}",
+ (connection == null ? "NULL" : connection.getID()), confirmed);
}
doWrite(confirmed);
@@ -768,7 +773,8 @@ public final class ChannelImpl implements Channel {
lastConfirmedCommandID.incrementAndGet();
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + (connection == null ? "NULL" : connection.getID()) + " ChannelImpl::confirming packet " + packet + " last commandID=" + lastConfirmedCommandID);
+ logger.trace("RemotingConnectionID={} ChannelImpl::confirming packet {} last commandID={}",
+ (connection == null ? "NULL" : connection.getID()), packet, lastConfirmedCommandID);
}
receivedBytes += packet.getPacketSize();
@@ -840,7 +846,8 @@ public final class ChannelImpl implements Channel {
resendCache.add(packet);
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + (connection == null ? "NULL" : connection.getID()) + " ChannelImpl::addResendPacket adding packet " + packet + " stored commandID=" + firstStoredCommandID + " possible commandIDr=" + (firstStoredCommandID + resendCache.size()));
+ logger.trace("RemotingConnectionID={} ChannelImpl::addResendPacket adding packet {} stored commandID={} possible commandIDr={}",
+ (connection == null ? "NULL" : connection.getID()), packet, firstStoredCommandID, (firstStoredCommandID + resendCache.size()));
}
}
@@ -848,7 +855,8 @@ public final class ChannelImpl implements Channel {
final int numberToClear = 1 + lastReceivedCommandID - firstStoredCommandID;
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + (connection == null ? "NULL" : connection.getID()) + " ChannelImpl::clearUpTo lastReceived commandID=" + lastReceivedCommandID + " first commandID=" + firstStoredCommandID + " number to clear " + numberToClear);
+ logger.trace("RemotingConnectionID={} ChannelImpl::clearUpTo lastReceived commandID={} first commandID={} number to clear {}",
+ (connection == null ? "NULL" : connection.getID()), lastReceivedCommandID, firstStoredCommandID, numberToClear);
}
for (int i = 0; i < numberToClear; i++) {
@@ -861,7 +869,8 @@ public final class ChannelImpl implements Channel {
}
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + connection.getID() + " ChannelImpl::clearUpTo confirming " + packet + " towards " + commandConfirmationHandler);
+ logger.trace("RemotingConnectionID={} ChannelImpl::clearUpTo confirming {} towards {}",
+ connection.getID(), packet, commandConfirmationHandler);
}
if (commandConfirmationHandler != null) {
commandConfirmationHandler.commandConfirmed(packet);
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java
index 6065dd561f..ea007b6691 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java
@@ -132,9 +132,7 @@ public class RemotingConnectionImpl extends AbstractRemotingConnection implement
transportConnection.setProtocolConnection(this);
- if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionImpl created: " + this);
- }
+ logger.trace("RemotingConnectionImpl created: {}", this);
}
// RemotingConnection implementation
@@ -380,7 +378,7 @@ public class RemotingConnectionImpl extends AbstractRemotingConnection implement
final Packet packet = packetDecoder.decode(buffer, this);
if (logger.isTraceEnabled()) {
- logger.trace("RemotingConnectionID=" + getID() + " handling packet " + packet);
+ logger.trace("RemotingConnectionID={} handling packet {}", getID(), packet);
}
doBufferReceived(packet);
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/CertificateUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/CertificateUtil.java
index db90c409ff..a29c0ace72 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/CertificateUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/CertificateUtil.java
@@ -119,14 +119,13 @@ public class CertificateUtil {
x509Certs[i] = (X509Certificate) CertificateFactory
.getInstance("X.509").generateCertificate(new ByteArrayInputStream(plainCerts[i].getEncoded()));
} catch (Exception ex) {
- if (logger.isTraceEnabled()) {
- logger.trace("Failed to convert SSL cert", ex);
- }
+ logger.trace("Failed to convert SSL cert", ex);
return null;
}
}
+
if (logger.isTraceEnabled()) {
- logger.trace("Cert #" + i + " = " + x509Certs[i]);
+ logger.trace("Cert #{} = {}", i, x509Certs[i]);
}
}
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
index b1ce0a4203..b12a57a6a1 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
@@ -246,7 +246,8 @@ public class NettyConnection implements Connection {
} catch (OutOfMemoryError oom) {
final long totalPendingWriteBytes = batchBufferSize(this.channel);
// I'm not using the ActiveMQLogger framework here, as I wanted the class name to be very specific here
- logger.warn("Trying to allocate " + size + " bytes, System is throwing OutOfMemoryError on NettyConnection " + this + ", there are currently " + "pendingWrites: [NETTY] -> " + totalPendingWriteBytes + " causes: " + oom.getMessage(), oom);
+ logger.warn("Trying to allocate {} bytes, System is throwing OutOfMemoryError on NettyConnection {}, there are currently pendingWrites: [NETTY] -> {} causes: {}",
+ size, this, totalPendingWriteBytes, oom.getMessage(), oom);
throw oom;
}
}
@@ -309,12 +310,10 @@ public class NettyConnection implements Connection {
if (Env.isTestEnv()) {
// this will only show when inside the testsuite.
// we may great the log for FAILURE
- logger.warn("FAILURE! The code is using blockUntilWritable inside a Netty worker, which would block. " + "The code will probably need fixing!", new Exception("trace"));
+ logger.warn("FAILURE! The code is using blockUntilWritable inside a Netty worker, which would block. The code will probably need fixing!", new Exception("trace"));
}
- if (logger.isDebugEnabled()) {
- logger.debug("Calling blockUntilWritable using a thread where it's not allowed");
- }
+ logger.debug("Calling blockUntilWritable using a thread where it's not allowed");
}
return channel.isWritable();
} else {
@@ -382,9 +381,7 @@ public class NettyConnection implements Connection {
if (!channel.eventLoop().inEventLoop()) {
waitFor(promise, DEFAULT_WAIT_MILLIS);
} else {
- if (logger.isDebugEnabled()) {
- logger.debug("Calling write with flush from a thread where it's not allowed");
- }
+ logger.debug("Calling write with flush from a thread where it's not allowed");
}
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
index 130066a9de..d8458523c8 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
@@ -523,7 +523,7 @@ public class NettyConnector extends AbstractConnector {
}
connectorType = EPOLL_CONNECTOR_TYPE;
channelClazz = EpollSocketChannel.class;
- logger.debug("Connector " + this + " using native epoll");
+ logger.debug("Connector {} using native epoll", this);
} else if (useKQueue && CheckDependencies.isKQueueAvailable()) {
if (useGlobalWorkerPool) {
group = SharedEventLoopGroup.getInstance((threadFactory -> new KQueueEventLoopGroup(remotingThreads, threadFactory)));
@@ -532,7 +532,7 @@ public class NettyConnector extends AbstractConnector {
}
connectorType = KQUEUE_CONNECTOR_TYPE;
channelClazz = KQueueSocketChannel.class;
- logger.debug("Connector " + this + " using native kqueue");
+ logger.debug("Connector {} using native kqueue", this);
} else {
if (useGlobalWorkerPool) {
channelClazz = NioSocketChannel.class;
@@ -543,7 +543,7 @@ public class NettyConnector extends AbstractConnector {
}
connectorType = NIO_CONNECTOR_TYPE;
channelClazz = NioSocketChannel.class;
- logger.debug("Connector + " + this + " using nio");
+ logger.debug("Connector {} using nio", this);
}
// if we are a servlet wrap the socketChannelFactory
@@ -642,7 +642,7 @@ public class NettyConnector extends AbstractConnector {
channel.pipeline().addLast(proxyHandler);
- logger.debug("Using a SOCKS proxy at " + proxyHost + ":" + proxyPort);
+ logger.debug("Using a SOCKS proxy at {}:{}", proxyHost, proxyPort);
if (proxyRemoteDNS) {
bootstrap.resolver(NoopAddressResolverGroup.INSTANCE);
@@ -848,7 +848,7 @@ public class NettyConnector extends AbstractConnector {
remoteDestination = new InetSocketAddress(IPV6Util.stripBracketsAndZoneID(host), port);
}
- logger.debug("Remote destination: " + remoteDestination);
+ logger.debug("Remote destination: {}", remoteDestination);
ChannelFuture future;
//port 0 does not work so only use local address if set
@@ -1014,9 +1014,8 @@ public class NettyConnector extends AbstractConnector {
*/
@Override
public void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("Received msg=" + msg);
- }
+ logger.debug("Received msg={}", msg);
+
if (msg instanceof HttpResponse) {
HttpResponse response = (HttpResponse) msg;
if (response.status().code() == HttpResponseStatus.SWITCHING_PROTOCOLS.code() && response.headers().get(HttpHeaderNames.UPGRADE).equals(ACTIVEMQ_REMOTING)) {
@@ -1279,11 +1278,13 @@ public class NettyConnector extends AbstractConnector {
String host = ConfigurationHelper.getStringProperty(TransportConstants.HOST_PROP_NAME, TransportConstants.DEFAULT_HOST, configuration);
int port = ConfigurationHelper.getIntProperty(TransportConstants.PORT_PROP_NAME, TransportConstants.DEFAULT_PORT, configuration);
- if (port != this.port)
+ if (port != this.port) {
return false;
+ }
- if (host.equals(this.host))
+ if (host.equals(this.host)) {
return true;
+ }
//The host may be an alias. We need to compare raw IP address.
boolean result = false;
@@ -1292,7 +1293,10 @@ public class NettyConnector extends AbstractConnector {
InetAddress inetAddr2 = InetAddress.getByName(this.host);
String ip1 = inetAddr1.getHostAddress();
String ip2 = inetAddr2.getHostAddress();
- logger.debug(this + " host 1: " + host + " ip address: " + ip1 + " host 2: " + this.host + " ip address: " + ip2);
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("{} host 1: {} ip address: {} host 2: {} ip address: {}", this, host, ip1, this.host, ip2);
+ }
result = ip1.equals(ip2);
} catch (UnknownHostException e) {
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/AutoCreateUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/AutoCreateUtil.java
index 7e9375e81b..33b2003352 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/AutoCreateUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/AutoCreateUtil.java
@@ -51,7 +51,7 @@ public class AutoCreateUtil {
.setAddress(destAddress);
setRequiredQueueConfigurationIfNotSet(queueConfiguration,response, RoutingType.ANYCAST, selectorString, true);
session.createQueue(queueConfiguration);
- logger.debug("The queue " + destAddress + " was created automatically");
+ logger.debug("The queue {} was created automatically", destAddress);
} catch (ActiveMQQueueExistsException e) {
// The queue was created by another client/admin between the query check and send create queue packet
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
index 707ee88127..f28b83a902 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
@@ -287,7 +287,7 @@ public final class XMLUtil {
sysProp = val;
}
// interesting choice to replace with val == "" with no match!
- logger.debug("replacing " + subString + " with " + sysProp);
+ logger.debug("replacing {} with {}", subString, sysProp);
xml = xml.replace(subString, sysProp);
}
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/uri/ConnectorTransportConfigurationParserURITest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/uri/ConnectorTransportConfigurationParserURITest.java
index 15826a3f2c..8d82fbb577 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/uri/ConnectorTransportConfigurationParserURITest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/uri/ConnectorTransportConfigurationParserURITest.java
@@ -39,7 +39,7 @@ public class ConnectorTransportConfigurationParserURITest {
System.out.println(transportURI);
List<TransportConfiguration> objects = parser.newObject(transportURI, "test");
if (logger.isInfoEnabled()) {
- objects.forEach((t) -> logger.info("transportConfig:" + t.toString()));
+ objects.forEach(t -> logger.info("transportConfig: {}", t));
}
Assert.assertEquals(3, objects.size());
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java
index ac0ca98fd6..4b03f91779 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java
@@ -169,7 +169,7 @@ public class JDBCSequentialFile implements SequentialFile {
int noBytes = dbDriver.writeToFile(this, data, append);
seek(append ? writePosition + noBytes : noBytes);
if (logger.isTraceEnabled()) {
- logger.trace("Write: ID: " + this.getId() + " FileName: " + this.getFileName() + size());
+ logger.trace("Write: ID: {} FileName: {}{}", getId(), getFileName(), size());
}
if (callback != null)
callback.done();
@@ -371,10 +371,7 @@ public class JDBCSequentialFile implements SequentialFile {
JDBCSequentialFile clone = (JDBCSequentialFile) cloneFile;
try {
synchronized (writeLock) {
- if (logger.isTraceEnabled()) {
- logger.trace("JDBC Copying File. From: " + this + " To: " + cloneFile);
- }
-
+ logger.trace("JDBC Copying File. From: {} To: {}", this, cloneFile);
clone.open();
dbDriver.copyFileData(this, clone);
clone.setWritePosition(writePosition);
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
index f1b9c2accd..4c1bccafc7 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
@@ -164,7 +164,9 @@ public class JDBCSequentialFileFactoryDriver extends AbstractJDBCDriver {
if (blob != null) {
file.setWritePosition(blob.length());
} else {
- logger.trace("No Blob found for file: " + file.getFileName() + " " + file.getId());
+ if (logger.isTraceEnabled()) {
+ logger.trace("No Blob found for file: {} {}", file.getFileName(), file.getId());
+ }
}
}
connection.commit();
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
index 6e9927141c..88782dad6c 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
@@ -221,10 +221,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
for (JDBCJournalRecord record : recordRef) {
- if (logger.isTraceEnabled()) {
- logger.trace("sync::preparing JDBC statement for " + record);
- }
-
+ logger.trace("sync::preparing JDBC statement for {}", record);
switch (record.getRecordType()) {
case JDBCJournalRecord.DELETE_RECORD:
@@ -261,9 +258,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
deleteJournalTxRecords.executeBatch();
connection.commit();
- if (logger.isTraceEnabled()) {
- logger.trace("JDBC commit worked");
- }
+ logger.trace("JDBC commit worked");
if (cleanupTxRecords(deletedRecords, committedTransactions, deleteJournalTxRecords)) {
deleteJournalTxRecords.executeBatch();
@@ -285,9 +280,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
failed.set(true);
criticalIOErrorListener.onIOException(e, "Critical IO Error. Failed to process JDBC Record statements", null);
- if (logger.isTraceEnabled()) {
- logger.trace("Rolling back Transaction, just in case");
- }
+ logger.trace("Rolling back Transaction, just in case");
if (recordRef != null) {
executeCallbacks(recordRef, false);
@@ -334,7 +327,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
public void run() {
for (JDBCJournalRecord record : records) {
if (logger.isTraceEnabled()) {
- logger.trace("Calling callback " + record + " with success = " + success);
+ logger.trace("Calling callback {} with success = {}", record, success);
}
record.complete(success);
}
@@ -367,9 +360,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
// better to be safe ;)
checkStatus();
- if (logger.isTraceEnabled()) {
- logger.trace("appendRecord " + record);
- }
+ logger.trace("appendRecord {}", record);
record.storeLineUp();
if (!started) {
@@ -401,7 +392,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
private synchronized void addTxRecord(JDBCJournalRecord record) throws Exception {
if (logger.isTraceEnabled()) {
- logger.trace("addTxRecord " + record + ", started=" + started + ", failed=" + failed);
+ logger.trace("addTxRecord {}, started={}, failed={}", record, started, failed);
}
checkStatus();
@@ -434,12 +425,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setRecord(record);
r.setSync(sync);
-
- if (logger.isTraceEnabled()) {
- logger.trace("appendAddRecord bytes[] " + r);
- }
-
-
+ logger.trace("appendAddRecord bytes[] {}", r);
appendRecord(r);
}
@@ -451,10 +437,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setRecord(persister, record);
r.setSync(sync);
- if (logger.isTraceEnabled()) {
- logger.trace("appendAddRecord (encoding) " + r + " with record = " + record);
- }
-
+ logger.trace("appendAddRecord (encoding) {} with record = {}", r, record);
appendRecord(r);
}
@@ -474,10 +457,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setSync(sync);
r.setIoCompletion(completionCallback);
- if (logger.isTraceEnabled()) {
- logger.trace("appendAddRecord (completionCallback & encoding) " + r + " with record = " + record);
- }
-
+ logger.trace("appendAddRecord (completionCallback & encoding) {} with record = {}", r, record);
appendRecord(r);
}
@@ -491,10 +471,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setRecord(record);
r.setSync(sync);
- if (logger.isTraceEnabled()) {
- logger.trace("appendUpdateRecord (bytes)) " + r);
- }
-
+ logger.trace("appendUpdateRecord (bytes)) {}", r);
appendRecord(r);
}
@@ -511,10 +488,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setRecord(persister, record);
r.setSync(sync);
- if (logger.isTraceEnabled()) {
- logger.trace("appendUpdateRecord (encoding)) " + r + " with record " + record);
- }
-
+ logger.trace("appendUpdateRecord (encoding)) {} with record {}", r, record);
appendRecord(r);
}
@@ -539,10 +513,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setSync(sync);
r.setIoCompletion(completionCallback);
- if (logger.isTraceEnabled()) {
- logger.trace("appendUpdateRecord (encoding & completioncallback)) " + r + " with record " + record);
- }
-
+ logger.trace("appendUpdateRecord (encoding & completioncallback)) {} with record {}", r, record);
appendRecord(r);
}
@@ -569,7 +540,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setSync(sync);
if (logger.isTraceEnabled()) {
- logger.trace("appendDeleteRecord id=" + id + " sync=" + sync);
+ logger.trace("appendDeleteRecord id={} sync={}", id, sync);
}
appendRecord(r);
@@ -589,10 +560,9 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setIoCompletion(completionCallback);
if (logger.isTraceEnabled()) {
- logger.trace("appendDeleteRecord id=" + id + " sync=" + sync + " with completionCallback");
+ logger.trace("appendDeleteRecord id={} sync={} with completionCallback", id, sync);
}
-
appendRecord(r);
}
@@ -612,10 +582,8 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
appendRecord(r);
if (logger.isTraceEnabled()) {
- logger.trace("appendAddRecordTransactional txID=" + txID + " id=" + id + " using bytes[] r=" + r);
+ logger.trace("appendAddRecordTransactional txID={} id={} using bytes[] r={}", txID, id, r);
}
-
-
}
@Override
@@ -630,10 +598,9 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setTxId(txID);
if (logger.isTraceEnabled()) {
- logger.trace("appendAddRecordTransactional txID=" + txID + " id=" + id + " using encoding=" + record + " and r=" + r);
+ logger.trace("appendAddRecordTransactional txID={} id={} using encoding={} and r={}", txID, id, record, r);
}
-
appendRecord(r);
}
@@ -647,10 +614,9 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setTxId(txID);
if (logger.isTraceEnabled()) {
- logger.trace("appendUpdateRecordTransactional txID=" + txID + " id=" + id + " using bytes and r=" + r);
+ logger.trace("appendUpdateRecordTransactional txID={} id={} using bytes and r={}", txID, id, r);
}
-
appendRecord(r);
}
@@ -666,7 +632,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setTxId(txID);
if (logger.isTraceEnabled()) {
- logger.trace("appendUpdateRecordTransactional txID=" + txID + " id=" + id + " using encoding=" + record + " and r=" + r);
+ logger.trace("appendUpdateRecordTransactional txID={} id={} using encoding={} and r={}", txID, id, record, r);
}
appendRecord(r);
@@ -681,7 +647,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setTxId(txID);
if (logger.isTraceEnabled()) {
- logger.trace("appendDeleteRecordTransactional txID=" + txID + " id=" + id + " using bytes and r=" + r);
+ logger.trace("appendDeleteRecordTransactional txID={} id={} using bytes and r={}", txID, id, r);
}
appendRecord(r);
@@ -696,10 +662,9 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setTxId(txID);
if (logger.isTraceEnabled()) {
- logger.trace("appendDeleteRecordTransactional txID=" + txID + " id=" + id + " using encoding=" + record + " and r=" + r);
+ logger.trace("appendDeleteRecordTransactional txID={} id={} using encoding={} and r={}", txID, id, record, r);
}
-
appendRecord(r);
}
@@ -711,7 +676,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setTxId(txID);
if (logger.isTraceEnabled()) {
- logger.trace("appendDeleteRecordTransactional txID=" + txID + " id=" + id);
+ logger.trace("appendDeleteRecordTransactional txID={} id={}", txID, id);
}
appendRecord(r);
@@ -726,10 +691,9 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setSync(sync);
if (logger.isTraceEnabled()) {
- logger.trace("appendCommitRecord txID=" + txID + " sync=" + sync);
+ logger.trace("appendCommitRecord txID={} sync={}", txID, sync);
}
-
appendRecord(r);
}
@@ -743,7 +707,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setIoCompletion(callback);
if (logger.isTraceEnabled()) {
- logger.trace("appendCommitRecord txID=" + txID + " callback=" + callback);
+ logger.trace("appendCommitRecord txID={} callback={}", txID, callback);
}
appendRecord(r);
@@ -763,7 +727,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setSync(sync);
if (logger.isTraceEnabled()) {
- logger.trace("appendCommitRecord txID=" + txID + " using callback, lineup=" + lineUpContext);
+ logger.trace("appendCommitRecord txID={} using callback, lineup={}", txID, lineUpContext);
}
appendRecord(r);
@@ -779,10 +743,9 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setSync(sync);
if (logger.isTraceEnabled()) {
- logger.trace("appendPrepareRecord txID=" + txID + " using sync=" + sync);
+ logger.trace("appendPrepareRecord txID={} using sync={}", txID, sync);
}
-
appendRecord(r);
}
@@ -801,10 +764,9 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setIoCompletion(callback);
if (logger.isTraceEnabled()) {
- logger.trace("appendPrepareRecord txID=" + txID + " using callback, sync=" + sync);
+ logger.trace("appendPrepareRecord txID={} using callback, sync={}", txID, sync);
}
-
appendRecord(r);
}
@@ -818,10 +780,9 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setSync(sync);
if (logger.isTraceEnabled()) {
- logger.trace("appendPrepareRecord txID=" + txID + " transactionData, sync=" + sync);
+ logger.trace("appendPrepareRecord txID={} transactionData, sync={}", txID, sync);
}
-
appendRecord(r);
}
@@ -834,7 +795,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setSync(sync);
if (logger.isTraceEnabled()) {
- logger.trace("appendRollbackRecord txID=" + txID + " sync=" + sync);
+ logger.trace("appendRollbackRecord txID={} sync={}", txID, sync);
}
appendRecord(r);
@@ -850,10 +811,9 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
r.setIoCompletion(callback);
if (logger.isTraceEnabled()) {
- logger.trace("appendRollbackRecord txID=" + txID + " sync=" + sync + " using callback");
+ logger.trace("appendRollbackRecord txID={} sync={} using callback", txID, sync);
}
-
appendRecord(r);
}
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
index bda6521506..af72e4cc0f 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
@@ -318,7 +318,7 @@ public final class JMSBridgeImpl implements JMSBridge {
this.objectName = ObjectName.getInstance(objectName);
StandardMBean mbean = new StandardMBean(controlBean, JMSBridgeControl.class);
mbeanServer.registerMBean(mbean, this.objectName);
- logger.debug("Registered JMSBridge instance as: " + this.objectName.getCanonicalName());
+ logger.debug("Registered JMSBridge instance as: {}", this.objectName.getCanonicalName());
} catch (Exception e) {
throw new IllegalStateException("Failed to register JMSBridge MBean", e);
}
@@ -327,9 +327,7 @@ public final class JMSBridgeImpl implements JMSBridge {
}
}
- if (logger.isTraceEnabled()) {
- logger.trace("Created " + this);
- }
+ logger.trace("Created {}", this);
}
@Override
@@ -363,9 +361,7 @@ public final class JMSBridgeImpl implements JMSBridge {
return;
}
- if (logger.isTraceEnabled()) {
- logger.trace("Starting " + this);
- }
+ logger.trace("Starting {}", this);
// bridge has been stopped and is restarted
if (executor.isShutdown()) {
@@ -426,9 +422,7 @@ public final class JMSBridgeImpl implements JMSBridge {
started = true;
if (maxBatchTime != -1) {
- if (logger.isTraceEnabled()) {
- logger.trace("Starting time checker thread");
- }
+ logger.trace("Starting time checker thread");
batchExpiryTime = System.currentTimeMillis() + maxBatchTime;
@@ -436,9 +430,7 @@ public final class JMSBridgeImpl implements JMSBridge {
batchTimeCheckerTask = executor.submit(new BatchTimeChecker());
- if (logger.isTraceEnabled()) {
- logger.trace("Started time checker thread");
- }
+ logger.trace("Started time checker thread");
} else {
batchTimeCheckerFinished = null;
@@ -450,9 +442,7 @@ public final class JMSBridgeImpl implements JMSBridge {
sourceReceiverTask = executor.submit(new SourceReceiver());
- if (logger.isTraceEnabled()) {
- logger.trace("Started " + this);
- }
+ logger.trace("Started {}", this);
}
private void initPasswords() throws ActiveMQException {
@@ -515,9 +505,7 @@ public final class JMSBridgeImpl implements JMSBridge {
}
synchronized (this) {
- if (logger.isTraceEnabled()) {
- logger.trace("Stopping " + this);
- }
+ logger.trace("Stopping {}", this);
Connection sourceConn = this.sourceConn;
if (!connectedSource && sourceConn != null) {
try {
@@ -577,9 +565,7 @@ public final class JMSBridgeImpl implements JMSBridge {
if (tx != null) {
// Terminate any transaction
- if (logger.isTraceEnabled()) {
- logger.trace("Rolling back remaining tx");
- }
+ logger.trace("Rolling back remaining tx");
try {
stopSessionFailover();
@@ -588,14 +574,10 @@ public final class JMSBridgeImpl implements JMSBridge {
tx.rollback();
abortedMessageCount += messages.size();
} catch (Exception ignore) {
- if (logger.isTraceEnabled()) {
- logger.trace("Failed to rollback", ignore);
- }
+ logger.trace("Failed to rollback", ignore);
}
- if (logger.isTraceEnabled()) {
- logger.trace("Rolled back remaining tx");
- }
+ logger.trace("Rolled back remaining tx");
} catch (Throwable t) {
logger.trace("Failed stopSessionFailover", t);
}
@@ -624,9 +606,7 @@ public final class JMSBridgeImpl implements JMSBridge {
messages.clear();
}
- if (logger.isTraceEnabled()) {
- logger.trace("Stopped " + this);
- }
+ logger.trace("Stopped {}", this);
} finally {
if (isFailureHandler) {
executor.shutdownNow();
@@ -684,9 +664,7 @@ public final class JMSBridgeImpl implements JMSBridge {
@Override
public synchronized void pause() throws Exception {
- if (logger.isTraceEnabled()) {
- logger.trace("Pausing " + this);
- }
+ logger.trace("Pausing {}", this);
synchronized (lock) {
paused = true;
@@ -694,16 +672,12 @@ public final class JMSBridgeImpl implements JMSBridge {
sourceConn.stop();
}
- if (logger.isTraceEnabled()) {
- logger.trace("Paused " + this);
- }
+ logger.trace("Paused {}", this);
}
@Override
public synchronized void resume() throws Exception {
- if (logger.isTraceEnabled()) {
- logger.trace("Resuming " + this);
- }
+ logger.trace("Resuming {}", this);
synchronized (lock) {
paused = false;
@@ -711,9 +685,7 @@ public final class JMSBridgeImpl implements JMSBridge {
sourceConn.start();
}
- if (logger.isTraceEnabled()) {
- logger.trace("Resumed " + this);
- }
+ logger.trace("Resumed {}", this);
}
@Override
@@ -998,9 +970,7 @@ public final class JMSBridgeImpl implements JMSBridge {
}
private void enlistResources(final Transaction tx) throws Exception {
- if (logger.isTraceEnabled()) {
- logger.trace("Enlisting resources in tx");
- }
+ logger.trace("Enlisting resources in tx");
XAResource resSource = ((XASession) sourceSession).getXAResource();
@@ -1010,24 +980,18 @@ public final class JMSBridgeImpl implements JMSBridge {
tx.enlistResource(resDest);
- if (logger.isTraceEnabled()) {
- logger.trace("Enlisted resources in tx");
- }
+ logger.trace("Enlisted resources in tx");
}
private void delistResources(final Transaction tx) {
- if (logger.isTraceEnabled()) {
- logger.trace("Delisting resources from tx");
- }
+ logger.trace("Delisting resources from tx");
XAResource resSource = ((XASession) sourceSession).getXAResource();
try {
tx.delistResource(resSource, XAResource.TMSUCCESS);
} catch (Exception e) {
- if (logger.isTraceEnabled()) {
- logger.trace("Failed to delist source resource", e);
- }
+ logger.trace("Failed to delist source resource", e);
}
XAResource resDest = ((XASession) targetSession).getXAResource();
@@ -1035,20 +999,14 @@ public final class JMSBridgeImpl implements JMSBridge {
try {
tx.delistResource(resDest, XAResource.TMSUCCESS);
} catch (Exception e) {
- if (logger.isTraceEnabled()) {
- logger.trace("Failed to delist target resource", e);
- }
+ logger.trace("Failed to delist target resource", e);
}
- if (logger.isTraceEnabled()) {
- logger.trace("Delisted resources from tx");
- }
+ logger.trace("Delisted resources from tx");
}
private Transaction startTx() throws Exception {
- if (logger.isTraceEnabled()) {
- logger.trace("Starting JTA transaction");
- }
+ logger.trace("Starting JTA transaction");
if (tm == null) {
tm = ServiceUtils.getTransactionManager();
@@ -1067,9 +1025,7 @@ public final class JMSBridgeImpl implements JMSBridge {
tm.suspend();
- if (logger.isTraceEnabled()) {
- logger.trace("Started JTA transaction");
- }
+ logger.trace("Started JTA transaction");
return tx;
}
@@ -1096,26 +1052,18 @@ public final class JMSBridgeImpl implements JMSBridge {
if (username == null) {
if (isXA) {
- if (logger.isTraceEnabled()) {
- logger.trace("Creating an XA connection");
- }
+ logger.trace("Creating an XA connection");
conn = ((XAConnectionFactory) cf).createXAConnection();
} else {
- if (logger.isTraceEnabled()) {
- logger.trace("Creating a non XA connection");
- }
+ logger.trace("Creating a non XA connection");
conn = ((ConnectionFactory) cf).createConnection();
}
} else {
if (isXA) {
- if (logger.isTraceEnabled()) {
- logger.trace("Creating an XA connection");
- }
+ logger.trace("Creating an XA connection");
conn = ((XAConnectionFactory) cf).createXAConnection(username, password);
} else {
- if (logger.isTraceEnabled()) {
- logger.trace("Creating a non XA connection");
- }
+ logger.trace("Creating a non XA connection");
conn = ((ConnectionFactory) cf).createConnection(username, password);
}
}
@@ -1218,16 +1166,12 @@ public final class JMSBridgeImpl implements JMSBridge {
// QoS = ONCE_AND_ONLY_ONCE
if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) {
// Create an XASession for consuming from the source
- if (logger.isTraceEnabled()) {
- logger.trace("Creating XA source session");
- }
+ logger.trace("Creating XA source session");
sourceConn = createConnection(sourceUsername, sourcePassword, sourceCff, clientID, true, true);
sourceSession = ((XAConnection) sourceConn).createXASession();
} else { // QoS = DUPLICATES_OK || AT_MOST_ONCE
- if (logger.isTraceEnabled()) {
- logger.trace("Creating non XA source session");
- }
+ logger.trace("Creating non XA source session");
sourceConn = createConnection(sourceUsername, sourcePassword, sourceCff, clientID, false, true);
if (qualityOfServiceMode == QualityOfServiceMode.AT_MOST_ONCE && maxBatchSize == 1) {
@@ -1262,9 +1206,7 @@ public final class JMSBridgeImpl implements JMSBridge {
} else { // bridging across different servers
// QoS = ONCE_AND_ONLY_ONCE
if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) {
- if (logger.isTraceEnabled()) {
- logger.trace("Creating XA dest session");
- }
+ logger.trace("Creating XA dest session");
// Create an XA session for sending to the destination
@@ -1272,9 +1214,7 @@ public final class JMSBridgeImpl implements JMSBridge {
targetSession = ((XAConnection) targetConn).createXASession();
} else { // QoS = DUPLICATES_OK || AT_MOST_ONCE
- if (logger.isTraceEnabled()) {
- logger.trace("Creating non XA dest session");
- }
+ logger.trace("Creating non XA dest session");
// Create a standard session for sending to the target
@@ -1289,9 +1229,7 @@ public final class JMSBridgeImpl implements JMSBridge {
}
if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) {
- if (logger.isTraceEnabled()) {
- logger.trace("Starting JTA transaction");
- }
+ logger.trace("Starting JTA transaction");
tx = startTx();
@@ -1321,9 +1259,7 @@ public final class JMSBridgeImpl implements JMSBridge {
try {
sourceConn.stop();
} catch (Throwable ignore) {
- if (logger.isTraceEnabled()) {
- logger.trace("Failed to stop source connection", ignore);
- }
+ logger.trace("Failed to stop source connection", ignore);
}
}
@@ -1331,18 +1267,14 @@ public final class JMSBridgeImpl implements JMSBridge {
try {
delistResources(tx);
} catch (Throwable ignore) {
- if (logger.isTraceEnabled()) {
- logger.trace("Failed to delist resources", ignore);
- }
+ logger.trace("Failed to delist resources", ignore);
}
try {
// Terminate the tx
tx.rollback();
abortedMessageCount += messages.size();
} catch (Throwable ignore) {
- if (logger.isTraceEnabled()) {
- logger.trace("Failed to rollback", ignore);
- }
+ logger.trace("Failed to rollback", ignore);
}
}
@@ -1351,9 +1283,7 @@ public final class JMSBridgeImpl implements JMSBridge {
try {
sourceConn.close();
} catch (Throwable ignore) {
- if (logger.isTraceEnabled()) {
- logger.trace("Failed to close source connection", ignore);
- }
+ logger.trace("Failed to close source connection", ignore);
}
}
try {
@@ -1361,9 +1291,7 @@ public final class JMSBridgeImpl implements JMSBridge {
targetConn.close();
}
} catch (Throwable ignore) {
- if (logger.isTraceEnabled()) {
- logger.trace("Failed to close target connection", ignore);
- }
+ logger.trace("Failed to close target connection", ignore);
}
}
@@ -1381,9 +1309,7 @@ public final class JMSBridgeImpl implements JMSBridge {
}
private boolean setupJMSObjectsWithRetry() {
- if (logger.isTraceEnabled()) {
- logger.trace("Setting up connections");
- }
+ logger.trace("Setting up connections");
int count = 0;
@@ -1414,14 +1340,12 @@ public final class JMSBridgeImpl implements JMSBridge {
private void sendBatch() {
if (logger.isTraceEnabled()) {
- logger.trace("Sending batch of " + messages.size() + " messages");
+ logger.trace("Sending batch of {} messages", messages.size());
}
if (paused) {
// Don't send now
- if (logger.isTraceEnabled()) {
- logger.trace("Paused, so not sending now");
- }
+ logger.trace("Paused, so not sending now");
return;
}
@@ -1440,15 +1364,11 @@ public final class JMSBridgeImpl implements JMSBridge {
if (qualityOfServiceMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE || (qualityOfServiceMode == QualityOfServiceMode.AT_MOST_ONCE && maxBatchSize > 1)) {
// We client ack before sending
- if (logger.isTraceEnabled()) {
- logger.trace("Client acking source session");
- }
+ logger.trace("Client acking source session");
messages.getLast().acknowledge();
- if (logger.isTraceEnabled()) {
- logger.trace("Client acked source session");
- }
+ logger.trace("Client acked source session");
}
boolean exHappened;
@@ -1467,15 +1387,11 @@ public final class JMSBridgeImpl implements JMSBridge {
if (maxBatchSize > 1) {
// The sending session is transacted - we need to commit it
- if (logger.isTraceEnabled()) {
- logger.trace("Committing target session");
- }
+ logger.trace("Committing target session");
targetSession.commit();
- if (logger.isTraceEnabled()) {
- logger.trace("Committed target session");
- }
+ logger.trace("Committed target session");
}
if (qualityOfServiceMode == QualityOfServiceMode.DUPLICATES_OK) {
@@ -1484,15 +1400,11 @@ public final class JMSBridgeImpl implements JMSBridge {
// Note we could actually use Session.DUPS_OK_ACKNOWLEDGE here
// For a slightly less strong delivery guarantee
- if (logger.isTraceEnabled()) {
- logger.trace("Client acking source session");
- }
+ logger.trace("Client acking source session");
messages.getLast().acknowledge();
- if (logger.isTraceEnabled()) {
- logger.trace("Client acked source session");
- }
+ logger.trace("Client acked source session");
}
} catch (Exception e) {
if (!stopping) {
@@ -1523,15 +1435,11 @@ public final class JMSBridgeImpl implements JMSBridge {
// Commit the JTA transaction and start another
delistResources(tx);
- if (logger.isTraceEnabled()) {
- logger.trace("Committing JTA transaction");
- }
+ logger.trace("Committing JTA transaction");
tx.commit();
- if (logger.isTraceEnabled()) {
- logger.trace("Committed JTA transaction");
- }
+ logger.trace("Committed JTA transaction");
} catch (Exception e) {
try {
// we call this just in case there is a failure other than failover
@@ -1573,9 +1481,7 @@ public final class JMSBridgeImpl implements JMSBridge {
sourceSession.commit();
- if (logger.isTraceEnabled()) {
- logger.trace("Committed source session");
- }
+ logger.trace("Committed source session");
} catch (Exception e) {
ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(bridgeName, e);
@@ -1607,9 +1513,7 @@ public final class JMSBridgeImpl implements JMSBridge {
addMessageIDInHeader(msg);
}
- if (logger.isTraceEnabled()) {
- logger.trace("Sending message " + msg);
- }
+ logger.trace("Sending message {}", msg);
// Make sure the correct time to live gets propagated
@@ -1626,9 +1530,7 @@ public final class JMSBridgeImpl implements JMSBridge {
targetProducer.send(targetDestination, msg, msg.getJMSDeliveryMode(), msg.getJMSPriority(), timeToLive);
messageCount++;
- if (logger.isTraceEnabled()) {
- logger.trace("Sent message " + msg);
- }
+ logger.trace("Sent message {}", msg);
}
}
@@ -1657,9 +1559,7 @@ public final class JMSBridgeImpl implements JMSBridge {
// Each bridge (if there are more than one) in the chain can concatenate the message id
// So in the case of multiple bridges having routed the message this can be used in a multi-hop
// distributed request/response
- if (logger.isTraceEnabled()) {
- logger.trace("Adding old message id in Message header");
- }
+ logger.trace("Adding old message id in Message header");
JMSBridgeImpl.copyProperties(msg);
@@ -1787,7 +1687,7 @@ public final class JMSBridgeImpl implements JMSBridge {
}
} catch (JMSException jmse) {
if (logger.isTraceEnabled()) {
- logger.trace(this + " exception while receiving a message", jmse);
+ logger.trace("{} exception while receiving a message", this, jmse);
}
}
@@ -1795,9 +1695,7 @@ public final class JMSBridgeImpl implements JMSBridge {
try {
lock.wait(500);
} catch (InterruptedException e) {
- if (logger.isTraceEnabled()) {
- logger.trace(this + " thread was interrupted");
- }
+ logger.trace("{} thread was interrupted", this);
if (stopping) {
return;
}
@@ -1806,28 +1704,22 @@ public final class JMSBridgeImpl implements JMSBridge {
continue;
}
- if (logger.isTraceEnabled()) {
- logger.trace(this + " received message " + msg);
- }
+ logger.trace("{} received message {}", this, msg);
messages.add(msg);
batchExpiryTime = System.currentTimeMillis() + maxBatchTime;
if (logger.isTraceEnabled()) {
- logger.trace(this + " rescheduled batchExpiryTime to " + batchExpiryTime);
+ logger.trace("{} rescheduled batchExpiryTime to {}", this, batchExpiryTime);
}
if (maxBatchSize != -1 && messages.size() >= maxBatchSize) {
- if (logger.isTraceEnabled()) {
- logger.trace(this + " maxBatchSize has been reached so sending batch");
- }
+ logger.trace("{} maxBatchSize has been reached so sending batch", this);
sendBatch();
- if (logger.isTraceEnabled()) {
- logger.trace(this + " sent batch");
- }
+ logger.trace("{} sent batch", this);
}
}
}
@@ -1875,9 +1767,7 @@ public final class JMSBridgeImpl implements JMSBridge {
@Override
public void run() {
- if (logger.isTraceEnabled()) {
- logger.trace("Failure handler running");
- }
+ logger.trace("Failure handler running");
// Clear the messages
messages.clear();
@@ -1943,9 +1833,7 @@ public final class JMSBridgeImpl implements JMSBridge {
@Override
public void run() {
- if (logger.isTraceEnabled()) {
- logger.trace(this + " running");
- }
+ logger.trace("{} running", this);
final CountDownLatch completed = batchTimeCheckerFinished;
try {
@@ -1954,21 +1842,15 @@ public final class JMSBridgeImpl implements JMSBridge {
long toWait = batchExpiryTime - System.currentTimeMillis();
if (toWait <= 0) {
- if (logger.isTraceEnabled()) {
- logger.trace(this + " waited enough");
- }
+ logger.trace("{} waited enough", this);
synchronized (lock) {
if (!failed && !messages.isEmpty()) {
- if (logger.isTraceEnabled()) {
- logger.trace(this + " got some messages so sending batch");
- }
+ logger.trace("{} got some messages so sending batch", this);
sendBatch();
- if (logger.isTraceEnabled()) {
- logger.trace(this + " sent batch");
- }
+ logger.trace("{} sent batch", this);
}
}
@@ -1976,18 +1858,15 @@ public final class JMSBridgeImpl implements JMSBridge {
} else {
try {
if (logger.isTraceEnabled()) {
- logger.trace(this + " waiting for " + toWait);
+ logger.trace("{} waiting for {}", this, toWait);
}
lock.wait(toWait);
- if (logger.isTraceEnabled()) {
- logger.trace(this + " woke up");
- }
+ logger.trace("{} woke up", this);
} catch (InterruptedException e) {
- if (logger.isTraceEnabled()) {
- logger.trace(this + " thread was interrupted");
- }
+ logger.trace("{} thread was interrupted", this);
+
if (stopping) {
return;
}
@@ -2033,9 +1912,7 @@ public final class JMSBridgeImpl implements JMSBridge {
}
if (failed) {
// The failure has already been detected and is being handled
- if (logger.isTraceEnabled()) {
- logger.trace("Failure recovery already in progress");
- }
+ logger.trace("Failure recovery already in progress");
} else {
boolean shouldHandleFailure = true;
if (ha) {
@@ -2060,7 +1937,7 @@ public final class JMSBridgeImpl implements JMSBridge {
registry = sl.iterator().next();
}
} catch (Throwable e) {
- logger.debug("unable to load recovery registry " + locatorClasse, e);
+ logger.debug("unable to load recovery registry {}", locatorClasse, e);
}
if (registry != null) {
break;
@@ -2068,7 +1945,7 @@ public final class JMSBridgeImpl implements JMSBridge {
}
if (registry != null) {
- logger.debug("Recovery Registry located = " + registry);
+ logger.debug("Recovery Registry located = {}", registry);
}
}
}
@@ -2145,7 +2022,7 @@ public final class JMSBridgeImpl implements JMSBridge {
if (timedOut) {
//timeout, presumably failover failed.
- logger.debug("Timed out waiting for failover completion " + this);
+ logger.debug("Timed out waiting for failover completion {}", this);
return false;
}
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFile.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFile.java
index ba970de2a6..790f0bf672 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFile.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFile.java
@@ -109,7 +109,7 @@ public abstract class AbstractSequentialFile implements SequentialFile {
@Override
public void copyTo(SequentialFile newFileName) throws Exception {
try {
- logger.debug("Copying " + this + " as " + newFileName);
+ logger.debug("Copying {} as {}", this, newFileName);
if (!newFileName.isOpen()) {
newFileName.open();
}
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFileFactory.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFileFactory.java
index 3781bbee99..7efd8bfe89 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFileFactory.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFileFactory.java
@@ -35,17 +35,12 @@ import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
import org.apache.activemq.artemis.utils.critical.CriticalAnalyzer;
import org.apache.activemq.artemis.utils.critical.EmptyCriticalAnalyzer;
-import org.slf4j.LoggerFactory;
-import java.lang.invoke.MethodHandles;
-import org.slf4j.Logger;
/**
* An abstract SequentialFileFactory containing basic functionality for both AIO and NIO SequentialFactories
*/
public abstract class AbstractSequentialFileFactory implements SequentialFileFactory {
- private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
// Timeout used to wait executors to shutdown
protected static final int EXECUTOR_TIMEOUT = 60;
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFile.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFile.java
index 33f92c6d99..422ce0774d 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFile.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFile.java
@@ -117,7 +117,7 @@ public class AIOSequentialFile extends AbstractSequentialFile {
aioFile.close();
} catch (Throwable e) {
// an exception here would means a double
- logger.debug("Exeption while closing file - " + e.getMessage(), e);
+ logger.debug("Exeption while closing file", e);
} finally {
aioFile = null;
aioFactory.afterClose();
@@ -126,9 +126,7 @@ public class AIOSequentialFile extends AbstractSequentialFile {
@Override
public synchronized void fill(final int size) throws Exception {
- if (logger.isTraceEnabled()) {
- logger.trace("Filling file: " + getFileName());
- }
+ logger.trace("Filling file: {}", getFileName());
checkOpened();
aioFile.fill(aioFactory.getAlignment(), size);
@@ -149,14 +147,12 @@ public class AIOSequentialFile extends AbstractSequentialFile {
}
opened = true;
- if (logger.isTraceEnabled()) {
- logger.trace("Opening file: " + getFileName());
- }
+ logger.trace("Opening file: {}", getFileName());
try {
aioFile = aioFactory.libaioContext.openFile(getFile(), factory.isDatasync());
} catch (IOException e) {
- logger.error("Error opening file: " + getFileName());
+ logger.error("Error opening file: {}", getFileName());
factory.onIOError(e, e.getMessage(), this);
throw new ActiveMQNativeIOError(e.getMessage(), e);
}
@@ -181,7 +177,7 @@ public class AIOSequentialFile extends AbstractSequentialFile {
// Sending it through the callback would make it released
aioFile.read(positionToRead, bytesToRead, bytes, getCallback(callback, null));
} catch (IOException e) {
- logger.error("IOError reading file: " + getFileName(), e);
+ logger.error("IOError reading file: {}", getFileName(), e);
factory.onIOError(e, e.getMessage(), this);
throw new ActiveMQNativeIOError(e.getMessage(), e);
}
@@ -203,7 +199,7 @@ public class AIOSequentialFile extends AbstractSequentialFile {
@Override
public void writeDirect(final ByteBuffer bytes, final boolean sync) throws Exception {
if (logger.isTraceEnabled()) {
- logger.trace("Write Direct, Sync: " + sync + " File: " + getFileName());
+ logger.trace("Write Direct, Sync: {} File: {}", sync, getFileName());
}
if (sync) {
@@ -219,9 +215,7 @@ public class AIOSequentialFile extends AbstractSequentialFile {
@Override
public void blockingWriteDirect(ByteBuffer bytes,boolean sync, boolean releaseBuffer) throws Exception {
- if (logger.isTraceEnabled()) {
- logger.trace("Write Direct, Sync: true File: " + getFileName());
- }
+ logger.trace("Write Direct, Sync: true File: {}", getFileName());
final SimpleWaitIOCallback completion = new SimpleWaitIOCallback();
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFileFactory.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFileFactory.java
index 3395505c3d..6056c6264a 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFileFactory.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFileFactory.java
@@ -58,7 +58,7 @@ public final class AIOSequentialFileFactory extends AbstractSequentialFileFactor
if (DISABLED) {
// This is only used in tests, hence I'm not creating a Logger for this
- logger.info(AIOSequentialFileFactory.class.getName() + ".DISABLED = true");
+ logger.info("{}.DISABLED = true", AIOSequentialFileFactory.class.getName());
}
}
@@ -111,9 +111,7 @@ public final class AIOSequentialFileFactory extends AbstractSequentialFileFactor
}
final int adjustedMaxIO = Math.max(2, maxIO);
callbackPool = PlatformDependent.hasUnsafe() ? new MpmcArrayQueue<>(adjustedMaxIO) : new MpmcAtomicArrayQueue<>(adjustedMaxIO);
- if (logger.isTraceEnabled()) {
- logger.trace("New AIO File Created");
- }
+ logger.trace("New AIO File Created");
}
public AIOSequentialCallback getCallback() {
@@ -394,9 +392,10 @@ public final class AIOSequentialFileFactory extends AbstractSequentialFileFactor
@Override
public void onError(int errno, String message) {
- if (logger.isDebugEnabled()) {
- logger.trace("AIO on error issued. Error(code: " + errno + " msg: " + message + ")");
+ if (logger.isTraceEnabled()) {
+ logger.trace("AIO on error issued. Error(code: {} msg: {})", errno, message);
}
+
this.error = true;
this.errorCode = errno;
this.errorMessage = message;
@@ -481,8 +480,7 @@ public final class AIOSequentialFileFactory extends AbstractSequentialFileFactor
// just to cleanup this
if (bufferSize > 0 && System.currentTimeMillis() - bufferReuseLastTime > 10000) {
if (logger.isTraceEnabled()) {
- logger.trace("Clearing reuse buffers queue with " + reuseBuffersQueue.size() +
- " elements");
+ logger.trace("Clearing reuse buffers queue with {} elements", reuseBuffersQueue.size());
}
bufferReuseLastTime = System.currentTimeMillis();
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/buffer/TimedBuffer.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/buffer/TimedBuffer.java
index 2f6c676fba..4aa69aeb23 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/buffer/TimedBuffer.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/buffer/TimedBuffer.java
@@ -504,7 +504,7 @@ public final class TimedBuffer extends CriticalComponentImpl {
} catch (Exception e) {
useSleep = false;
// I don't think we need to individualize a logger code here, this is unlikely to happen anyways
- logger.warn(e.getMessage() + ", disabling sleep on TimedBuffer, using spin now", e);
+ logger.warn("{}, disabling sleep on TimedBuffer, using spin now", e.getMessage(), e);
}
return useSleep;
}
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/MappedFile.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/MappedFile.java
index 3873078f1b..b7a11642fb 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/MappedFile.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/MappedFile.java
@@ -64,7 +64,7 @@ final class MappedFile implements AutoCloseable {
length = (int) channel.size();
if (length != capacity && length != 0) {
if (logger.isDebugEnabled()) {
- logger.debug("Adjusting capacity to " + length + " while it was " + capacity + " on file " + file);
+ logger.debug("Adjusting capacity to {} while it was {} on file {}", length, capacity, file);
}
capacity = length;
}
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java
index b45f0e13d4..0a8b2ebb47 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java
@@ -451,9 +451,8 @@ public class NIOSequentialFile extends AbstractSequentialFile {
@Override
public void copyTo(SequentialFile dstFile) throws IOException {
- if (logger.isDebugEnabled()) {
- logger.debug("Copying " + this + " as " + dstFile);
- }
+ logger.debug("Copying {} as {}", this, dstFile);
+
if (isOpen()) {
throw new IllegalStateException("File opened!");
}
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/util/FileIOUtil.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/util/FileIOUtil.java
index c703d10867..9614024097 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/util/FileIOUtil.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/util/FileIOUtil.java
@@ -52,7 +52,7 @@ public class FileIOUtil {
int bytesRead = from.read(buffer);
if (logger.isTraceEnabled()) {
- logger.trace("appending " + bytesRead + " bytes on " + to.getFileName());
+ logger.trace("appending {} bytes on {}", bytesRead, to.getFileName());
}
if (bytesRead > 0) {
@@ -60,7 +60,7 @@ public class FileIOUtil {
}
if (bytesRead < buffer.capacity()) {
- logger.trace("Interrupting reading as the whole thing was sent on " + to.getFileName());
+ logger.trace("Interrupting reading as the whole thing was sent on {}", to.getFileName());
break;
}
}
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalCompactor.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalCompactor.java
index 605f5d0f8b..1e4ea2e8dd 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalCompactor.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalCompactor.java
@@ -96,15 +96,16 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
*/
public void addPendingTransaction(final long transactionID, final long[] ids) {
if (logger.isTraceEnabled()) {
- logger.trace("addPendingTransaction::tx=" + transactionID + ", ids=" + Arrays.toString(ids));
+ logger.trace("addPendingTransaction::tx={}, ids={}", transactionID, Arrays.toString(ids));
}
pendingTransactions.put(transactionID, new PendingTransaction(ids));
}
public void addCommandCommit(final JournalTransaction liveTransaction, final JournalFile currentFile) {
if (logger.isTraceEnabled()) {
- logger.trace("addCommandCommit " + liveTransaction.getId());
+ logger.trace("addCommandCommit {}", liveTransaction.getId());
}
+
pendingCommands.add(new CommitCompactCommand(liveTransaction, currentFile));
long[] ids = liveTransaction.getPositiveArray();
@@ -132,9 +133,7 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
}
public void addCommandRollback(final JournalTransaction liveTransaction, final JournalFile currentFile) {
- if (logger.isTraceEnabled()) {
- logger.trace("addCommandRollback " + liveTransaction + " currentFile " + currentFile);
- }
+ logger.trace("addCommandRollback {} currentFile {}", liveTransaction, currentFile);
pendingCommands.add(new RollbackCompactCommand(liveTransaction, currentFile));
}
@@ -144,7 +143,7 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
*/
public void addCommandDelete(final long id, final JournalFile usedFile) {
if (logger.isTraceEnabled()) {
- logger.trace("addCommandDelete id " + id + " usedFile " + usedFile);
+ logger.trace("addCommandDelete id {} usedFile {}", id, usedFile);
}
pendingCommands.add(new DeleteCompactCommand(id, usedFile));
}
@@ -155,7 +154,7 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
*/
public void addCommandUpdate(final long id, final JournalFile usedFile, final int size, final boolean replaceableUpdate) {
if (logger.isTraceEnabled()) {
- logger.trace("addCommandUpdate id " + id + " usedFile " + usedFile + " size " + size);
+ logger.trace("addCommandUpdate id {} usedFile {} size {}", id, usedFile, size);
}
pendingCommands.add(new UpdateCompactCommand(id, usedFile, size, replaceableUpdate));
}
@@ -190,9 +189,8 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
*/
public void replayPendingCommands() {
for (CompactCommand command : pendingCommands) {
- if (logger.isTraceEnabled()) {
- logger.trace("Replay " + command);
- }
+ logger.trace("Replay {}", command);
+
try {
command.execute();
} catch (Exception e) {
@@ -220,9 +218,8 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
@Override
public void onReadAddRecord(final RecordInfo info) throws Exception {
- if (logger.isTraceEnabled()) {
- logger.trace("Read Record " + info);
- }
+ logger.trace("Read Record {}", info);
+
if (containsRecord(info.id)) {
JournalInternalRecord addRecord = new JournalAddRecord(true, info.id, info.getUserRecordType(), EncoderPersister.getInstance(), new ByteArrayEncoding(info.data));
addRecord.setCompactCount((short) (info.compactCount + 1));
@@ -238,8 +235,9 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
@Override
public void onReadAddRecordTX(final long transactionID, final RecordInfo info) throws Exception {
if (logger.isTraceEnabled()) {
- logger.trace("Read Add Record TX " + transactionID + " info " + info);
+ logger.trace("Read Add Record TX {} info {}", transactionID, info);
}
+
if (pendingTransactions.get(transactionID) != null) {
produceAddRecordTX(transactionID, info);
} else if (containsRecord(info.id)) {
@@ -263,9 +261,8 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
@Override
public void onReadCommitRecord(final long transactionID, final int numberOfRecords) throws Exception {
-
if (logger.isTraceEnabled()) {
- logger.trace("onReadCommitRecord " + transactionID);
+ logger.trace("onReadCommitRecord {}", transactionID);
}
if (pendingTransactions.get(transactionID) != null) {
@@ -289,7 +286,7 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
@Override
public void onReadDeleteRecord(final long recordID) throws Exception {
if (logger.isTraceEnabled()) {
- logger.trace("onReadDeleteRecord " + recordID);
+ logger.trace("onReadDeleteRecord {}", recordID);
}
if (newRecords.get(recordID) != null) {
@@ -302,7 +299,7 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
@Override
public void onReadDeleteRecordTX(final long transactionID, final RecordInfo info) throws Exception {
if (logger.isTraceEnabled()) {
- logger.trace("onReadDeleteRecordTX " + transactionID + " info " + info);
+ logger.trace("onReadDeleteRecordTX {} info {}", transactionID, info);
}
if (pendingTransactions.get(transactionID) != null) {
@@ -362,7 +359,7 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
final byte[] extraData,
final int numberOfRecords) throws Exception {
if (logger.isTraceEnabled()) {
- logger.trace("onReadPrepareRecord " + transactionID);
+ logger.trace("onReadPrepareRecord {}", transactionID);
}
if (pendingTransactions.get(transactionID) != null) {
@@ -386,13 +383,12 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
@Override
public void onReadRollbackRecord(final long transactionID) throws Exception {
if (logger.isTraceEnabled()) {
- logger.trace("onReadRollbackRecord " + transactionID);
+ logger.trace("onReadRollbackRecord {}", transactionID);
}
if (pendingTransactions.get(transactionID) != null) {
// Sanity check, this should never happen
- logger.debug("Inconsistency during compacting: RollbackRecord ID = " + transactionID +
- " for an already rolled back transaction during compacting");
+ logger.debug("Inconsistency during compacting: RollbackRecord ID = {} for an already rolled back transaction during compacting", transactionID);
} else {
JournalTransaction newTransaction = newTransactions.remove(transactionID);
if (newTransaction != null) {
@@ -423,9 +419,7 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
@Override
public void onReadUpdateRecord(final RecordInfo info) throws Exception {
- if (logger.isTraceEnabled()) {
- logger.trace("onReadUpdateRecord " + info);
- }
+ logger.trace("onReadUpdateRecord {}", info);
if (containsRecord(info.id)) {
LongObjectHashMap<RunnableEx> longmap = pendingUpdates.get(info.userRecordType);
@@ -458,9 +452,7 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
@Override
public void onReadUpdateRecordTX(final long transactionID, final RecordInfo info) throws Exception {
- if (logger.isTraceEnabled()) {
- logger.trace("onReadUpdateRecordTX " + info);
- }
+ logger.trace("onReadUpdateRecordTX {}", info);
if (pendingTransactions.get(transactionID) != null) {
produceUpdateRecordTX(transactionID, info);
@@ -491,14 +483,13 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
JournalTransaction newTransaction = newTransactions.get(transactionID);
if (newTransaction == null) {
if (logger.isTraceEnabled()) {
- logger.trace("creating new journal Transaction " + transactionID);
+ logger.trace("creating new journal Transaction {}", transactionID);
}
newTransaction = new JournalTransaction(transactionID, this);
newTransactions.put(transactionID, newTransaction);
} else if (logger.isTraceEnabled()) {
// just logging
- logger.trace("reusing TX " + transactionID);
-
+ logger.trace("reusing TX {}", transactionID);
}
return newTransaction;
}
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java
index 50da09c5a3..e100da7a8b 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java
@@ -367,7 +367,7 @@ public class JournalFilesRepository {
final boolean renameTmp,
final boolean checkDelete) throws Exception {
if (logger.isDebugEnabled()) {
- logger.debug("Adding free file " + file + ", renameTMP=" + renameTmp + ", checkDelete=" + checkDelete);
+ logger.debug("Adding free file {}, renameTMP={}, checkDelete={}", file, renameTmp, checkDelete);
}
long calculatedSize = 0;
try {
@@ -381,9 +381,8 @@ public class JournalFilesRepository {
// Re-initialise it
if (logger.isTraceEnabled()) {
- logger.trace("Re-initializing file " + file + " as checkDelete=" + checkDelete +
- ", freeFilesCount=" + freeFilesCount + ", dataFiles.size=" + dataFiles.size() +
- ", openedFiles=" + openedFiles + ", poolSize=" + poolSize);
+ logger.trace("Re-initializing file {} as checkDelete={}, freeFilesCount={}, dataFiles.size={} openedFiles={}, poolSize={}",
+ file, checkDelete, freeFilesCount, dataFiles.size(), openedFiles, poolSize);
}
JournalFile jf = reinitializeFile(file);
@@ -395,17 +394,15 @@ public class JournalFilesRepository {
freeFiles.add(jf);
freeFilesCount.getAndIncrement();
} else {
- if (logger.isDebugEnabled()) {
- logger.debug("Deleting file " + file.getFile());
- }
+ logger.debug("Deleting file {}", file.getFile());
+
if (logger.isTraceEnabled()) {
- logger.trace("DataFiles.size() = " + dataFiles.size());
- logger.trace("openedFiles.size() = " + openedFiles.size());
- logger.trace("minfiles = " + minFiles + ", poolSize = " + poolSize);
- logger.trace("Free Files = " + freeFilesCount.get());
- logger.trace("File " + file + " being deleted as freeFiles.size() + dataFiles.size() + 1 + openedFiles.size() (" +
- (freeFilesCount.get() + dataFiles.size() + 1 + openedFiles.size()) +
- ") < minFiles (" + minFiles + ")");
+ logger.trace("DataFiles.size() = {}", dataFiles.size());
+ logger.trace("openedFiles.size() = {}", openedFiles.size());
+ logger.trace("minfiles = {}, poolSize = {}", minFiles, poolSize);
+ logger.trace("Free Files = {}", freeFilesCount.get());
+ logger.trace("File {} being deleted as freeFiles.size() + dataFiles.size() + 1 + openedFiles.size() () < minFiles ({})",
+ file, (freeFilesCount.get() + dataFiles.size() + 1 + openedFiles.size()), minFiles);
}
file.getFile().delete();
}
@@ -474,7 +471,7 @@ public class JournalFilesRepository {
*/
public JournalFile openFile() throws InterruptedException, ActiveMQIOErrorException {
if (logger.isTraceEnabled()) {
- logger.trace("enqueueOpenFile with openedFiles.size=" + openedFiles.size());
+ logger.trace("enqueueOpenFile with openedFiles.size={}", openedFiles.size());
}
// First try to get an open file, that's prepared and already open
@@ -505,9 +502,8 @@ public class JournalFilesRepository {
throw ActiveMQJournalBundle.BUNDLE.fileNotOpened();
}
}
- if (logger.isTraceEnabled()) {
- logger.trace("Returning file " + nextFile);
- }
+
+ logger.trace("Returning file {}", nextFile);
return nextFile;
}
@@ -526,9 +522,7 @@ public class JournalFilesRepository {
public synchronized void pushOpenedFile() throws Exception {
JournalFile nextOpenedFile = takeFile(true, true, true, false);
- if (logger.isTraceEnabled()) {
- logger.trace("pushing openFile " + nextOpenedFile);
- }
+ logger.trace("pushing openFile {}", nextOpenedFile);
if (!openedFiles.offer(nextOpenedFile)) {
ActiveMQJournalLogger.LOGGER.failedToAddFile(nextOpenedFile);
@@ -647,9 +641,7 @@ public class JournalFilesRepository {
final String fileName = createFileName(tmpCompact, fileID);
- if (logger.isTraceEnabled()) {
- logger.trace("Creating file " + fileName);
- }
+ logger.trace("Creating file {}", fileName);
String tmpFileName = fileName + ".tmp";
@@ -667,9 +659,7 @@ public class JournalFilesRepository {
sequentialFile.close(false, false);
- if (logger.isTraceEnabled()) {
- logger.trace("Renaming file " + tmpFileName + " as " + fileName);
- }
+ logger.trace("Renaming file {} as {}", tmpFileName, fileName);
sequentialFile.renameTo(fileName);
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
index d56041ad66..f4460f8a58 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
@@ -272,7 +272,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
File[] repeatFiles = historyFolder.listFiles((a, name) -> name.startsWith(getFilePrefix()) && name.endsWith(file.getFileID() + "." + filesRepository.getFileExtension()));
for (File f : repeatFiles) {
- logger.warn("File " + f + " was partially copied before, removing the file");
+ logger.warn("File {} was partially copied before, removing the file", f);
f.delete();
}
}
@@ -754,18 +754,10 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
preparedTransactionExtraDataSize)) {
// Avoid a buffer overflow caused by damaged data... continue
// scanning for more pendingTransactions...
- logger.trace("Record at position " + pos +
- " recordType = " +
- recordType +
- " file:" +
- file.getFile().getFileName() +
- " recordSize: " +
- recordSize +
- " variableSize: " +
- variableSize +
- " preparedTransactionExtraDataSize: " +
- preparedTransactionExtraDataSize +
- " is corrupted and it is being ignored (II)");
+ if (logger.isTraceEnabled()) {
+ logger.trace("Record at position {} recordType = {} file:{} recordSize: {} variableSize: {} preparedTransactionExtraDataSize: {} is corrupted and it is being ignored (II)",
+ pos, recordType, file.getFile().getFileName(), recordSize, variableSize, preparedTransactionExtraDataSize);
+ }
// If a file has damaged pendingTransactions, we make it a dataFile, and the
// next reclaiming will fix it
reader.markAsDataFile(file);
@@ -787,16 +779,10 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
// This is like testing a hash for the record. (We could replace the
// checkSize by some sort of calculated hash)
if (checkSize != variableSize + recordSize + preparedTransactionExtraDataSize) {
- logger.trace("Record at position " + pos +
- " recordType = " +
- recordType +
- " possible transactionID = " +
- transactionID +
- " possible recordID = " +
- recordID +
- " file:" +
- file.getFile().getFileName() +
- " is corrupted and it is being ignored (III)");
+ if (logger.isTraceEnabled()) {
+ logger.trace("Record at position {} recordType = {} possible transactionID = {} possible recordID = {} file:{} is corrupted and it is being ignored (III)",
+ pos, recordType, transactionID, recordID, file.getFile().getFileName());
+ }
// If a file has damaged pendingTransactions, we make it a dataFile, and the
// next reclaiming will fix it
@@ -813,7 +799,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
// the data now.
if (logger.isTraceEnabled()) {
- logger.trace("reading " + recordID + ", userRecordType=" + userRecordType + ", compactCount=" + compactCount);
+ logger.trace("reading {}, userRecordType={}, compactCount={}", recordID, userRecordType, compactCount);
}
boolean replaceableUpdate = replaceableRecords != null ? replaceableRecords.containsKey(userRecordType) : false;
@@ -933,10 +919,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
lineUpContext(callback);
if (logger.isTraceEnabled()) {
- logger.trace("scheduling appendAddRecord::id=" + id +
- ", userRecordType=" +
- recordType +
- ", record = " + record);
+ logger.trace("scheduling appendAddRecord::id={}, userRecordType={}, record = {}", id, recordType, record);
}
final long maxRecordSize = getMaxRecordSize();
@@ -958,21 +941,17 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
records.put(id, new JournalRecord(usedFile, addRecordEncodeSize));
if (logger.isTraceEnabled()) {
- logger.trace("appendAddRecord::id=" + id +
- ", userRecordType=" +
- recordType +
- ", record = " + record +
- ", usedFile = " +
- usedFile);
+ logger.trace("appendAddRecord::id={}, userRecordType={}, record = {}, usedFile = {}",
+ id, recordType, record, usedFile);
}
result.set(true);
} catch (ActiveMQShutdownException e) {
result.fail(e);
- logger.error("appendAddRecord:" + e, e);
+ logger.error("Exception during appendAddRecord:", e);
} catch (Throwable e) {
result.fail(e);
setErrorCondition(callback, null, e);
- logger.error("appendAddRecord::" + e, e);
+ logger.error("Exception during appendAddRecord:", e);
} finally {
journalLock.readLock().unlock();
}
@@ -994,10 +973,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
lineUpContext(callback);
if (logger.isTraceEnabled()) {
- logger.trace("scheduling appendAddEvent::id=" + id +
- ", userRecordType=" +
- recordType +
- ", record = " + record);
+ logger.trace("scheduling appendAddEvent::id={}, userRecordType={}, record = {}", id, recordType, record);
}
final long maxRecordSize = getMaxRecordSize();
@@ -1016,21 +992,17 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
JournalFile usedFile = appendRecord(addRecord, false, sync, null, callback);
if (logger.isTraceEnabled()) {
- logger.trace("appendAddEvent:id=" + id +
- ", userRecordType=" +
- recordType +
- ", record = " + record +
- ", usedFile = " +
- usedFile);
+ logger.trace("appendAddEvent:id={}, userRecordType={}, record = {}, usedFile = {}",
+ id, recordType, record, usedFile);
}
result.set(true);
} catch (ActiveMQShutdownException e) {
result.fail(e);
- logger.error("appendAddEvent:" + e, e);
+ logger.error("Exception during appendAddEvent:", e);
} catch (Throwable e) {
result.fail(e);
setErrorCondition(callback, null, e);
- logger.error("appendAddEvent::" + e, e);
+ logger.error("Exception during appendAddEvent:", e);
} finally {
journalLock.readLock().unlock();
}
@@ -1050,9 +1022,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
lineUpContext(callback);
if (logger.isTraceEnabled()) {
- logger.trace("scheduling appendUpdateRecord::id=" + id +
- ", userRecordType=" +
- recordType);
+ logger.trace("scheduling appendUpdateRecord::id={}, userRecordType={}", id, recordType);
}
final SimpleFuture<Boolean> onFoundAddInfo;
@@ -1088,12 +1058,9 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
lineUpContext(callback);
if (logger.isTraceEnabled()) {
- logger.trace("scheduling appendUpdateRecord::id=" + id +
- ", userRecordType=" +
- recordType);
+ logger.trace("scheduling appendUpdateRecord::id={}, userRecordType={}", id, recordType);
}
-
internalAppendUpdateRecord(id, recordType, persister, record, sync, replaceableUpdate, updateCallback, callback);
}
@@ -1121,7 +1088,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
updateCallback.onUpdate(id, false);
}
if (logger.isDebugEnabled()) {
- logger.debug("Record " + id + " had not been found");
+ logger.debug("Record {} had not been found", id);
}
if (callback != null) {
@@ -1134,11 +1101,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
JournalFile usedFile = appendRecord(updateRecord, false, sync, null, callback);
if (logger.isTraceEnabled()) {
- logger.trace("appendUpdateRecord::id=" + id +
- ", userRecordType=" +
- recordType +
- ", usedFile = " +
- usedFile);
+ logger.trace("appendUpdateRecord::id={}, userRecordType={}, usedFile = {}", id, recordType, usedFile);
}
// record==null here could only mean there is a compactor
@@ -1158,13 +1121,13 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
if (updateCallback != null) {
updateCallback.onUpdate(id, false);
}
- logger.error("appendUpdateRecord:" + e, e);
+ logger.error("Exception during appendUpdateRecord:", e);
} catch (Throwable e) {
if (updateCallback != null) {
updateCallback.onUpdate(id, false);
}
setErrorCondition(callback, null, e);
- logger.error("appendUpdateRecord:" + e, e);
+ logger.error("Exception during appendUpdateRecord:", e);
} finally {
journalLock.readLock().unlock();
}
@@ -1175,7 +1138,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
@Override
public void appendDeleteRecord(final long id, final boolean sync, final IOCompletion callback) throws Exception {
if (logger.isTraceEnabled()) {
- logger.trace("scheduling appendDeleteRecord::id=" + id);
+ logger.trace("scheduling appendDeleteRecord::id={}", id);
}
checkJournalIsLoaded();
@@ -1205,7 +1168,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
public void tryAppendDeleteRecord(final long id, final boolean sync, final JournalUpdateCallback updateCallback, final IOCompletion callback) throws Exception {
if (logger.isTraceEnabled()) {
- logger.trace("scheduling appendDeleteRecord::id=" + id);
+ logger.trace("scheduling appendDeleteRecord::id={}", id);
}
@@ -1256,7 +1219,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
JournalFile usedFile = appendRecord(deleteRecord, false, sync, null, callback);
if (logger.isTraceEnabled()) {
- logger.trace("appendDeleteRecord::id=" + id + ", usedFile = " + usedFile);
+ logger.trace("appendDeleteRecord::id={}, usedFile = {}", id, usedFile);
}
// record==null here could only mean there is a compactor
@@ -1274,12 +1237,12 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
if (updateCallback != null) {
updateCallback.onUpdate(id, false);
}
- logger.error("appendDeleteRecord:" + e, e);
+ logger.error("Exception during appendDeleteRecord:", e);
} catch (Throwable e) {
if (updateCallback != null) {
updateCallback.onUpdate(id, false);
}
- logger.error("appendDeleteRecord:" + e, e);
+ logger.error("Exception during appendDeleteRecord:", e);
setErrorCondition(callback, null, e);
} finally {
journalLock.readLock().unlock();
@@ -1300,12 +1263,8 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
final Object record) throws Exception {
checkJournalIsLoaded();
if (logger.isTraceEnabled()) {
- logger.trace("scheduling appendAddRecordTransactional:txID=" + txID +
- ",id=" +
- id +
- ", userRecordType=" +
- recordType +
- ", record = " + record);
+ logger.trace("scheduling appendAddRecordTransactional:txID={}, id={}, userRecordType={}, record = {}",
+ txID, id, recordType, record);
}
@@ -1327,19 +1286,13 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
JournalFile usedFile = appendRecord(addRecord, false, false, tx, null);
if (logger.isTraceEnabled()) {
- logger.trace("appendAddRecordTransactional:txID=" + txID +
- ",id=" +
- id +
- ", userRecordType=" +
- recordType +
- ", record = " + record +
- ", usedFile = " +
- usedFile);
+ logger.trace("appendAddRecordTransactional:txID={},id={}, userRecordType={}, record = {}, usedFile = {}",
+ txID, id, recordType, record, usedFile);
}
tx.addPositive(usedFile, id, encodeSize, false);
} catch (Throwable e) {
- logger.error("appendAddRecordTransactional:" + e, e);
+ logger.error("Exception during appendAddRecordTransactional:", e);
setErrorCondition(null, tx, e);
} finally {
journalLock.readLock().unlock();
@@ -1364,12 +1317,8 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
final Persister persister,
final Object record) throws Exception {
if ( logger.isTraceEnabled() ) {
- logger.trace( "scheduling appendUpdateRecordTransactional::txID=" + txID +
- ",id=" +
- id +
- ", userRecordType=" +
- recordType +
- ", record = " + record);
+ logger.trace("scheduling appendUpdateRecordTransactional::txID={}, id={}, userRecordType={}, record = {}",
+ txID, id, recordType, record);
}
checkJournalIsLoaded();
@@ -1389,20 +1338,14 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
JournalInternalRecord updateRecordTX = new JournalAddRecordTX( false, txID, id, recordType, persister, record );
JournalFile usedFile = appendRecord( updateRecordTX, false, false, tx, null );
- if ( logger.isTraceEnabled() ) {
- logger.trace( "appendUpdateRecordTransactional::txID=" + txID +
- ",id=" +
- id +
- ", userRecordType=" +
- recordType +
- ", record = " + record +
- ", usedFile = " +
- usedFile );
+ if (logger.isTraceEnabled()) {
+ logger.trace("appendUpdateRecordTransactional::txID={}, id={}, userRecordType={}, record = {}, usedFile = {}",
+ txID, id, recordType, record, usedFile );
}
tx.addPositive( usedFile, id, updateRecordTX.getEncodeSize(), false);
} catch (Throwable e ) {
- logger.error("appendUpdateRecordTransactional:" + e.getMessage(), e );
+ logger.error("Exception during appendUpdateRecordTransactional:", e );
setErrorCondition(null, tx, e );
} finally {
journalLock.readLock().unlock();
@@ -1415,11 +1358,8 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
public void appendDeleteRecordTransactional(final long txID,
final long id,
final EncodingSupport record) throws Exception {
- if (logger.isTraceEnabled()) {
- logger.trace("scheduling appendDeleteRecordTransactional::txID=" + txID +
- ", id=" +
- id);
- }
+
+ logger.trace("scheduling appendDeleteRecordTransactional::txID={}, id={}", txID, id);
checkJournalIsLoaded();
@@ -1440,16 +1380,12 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
JournalFile usedFile = appendRecord(deleteRecordTX, false, false, tx, null);
if (logger.isTraceEnabled()) {
- logger.trace("appendDeleteRecordTransactional::txID=" + txID +
- ", id=" +
- id +
- ", usedFile = " +
- usedFile);
+ logger.trace("appendDeleteRecordTransactional::txID={}, id={}, usedFile = {}", txID, id, usedFile);
}
tx.addNegative(usedFile, id);
} catch (Throwable e) {
- logger.error("appendDeleteRecordTransactional:" + e, e);
+ logger.error("Exception during appendDeleteRecordTransactional:", e);
setErrorCondition(null, tx, e);
} finally {
journalLock.readLock().unlock();
@@ -1478,7 +1414,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
lineUpContext(callback);
if (logger.isTraceEnabled()) {
- logger.trace("scheduling appendPrepareRecord::txID=" + txID);
+ logger.trace("scheduling appendPrepareRecord::txID={}", txID);
}
final SimpleFuture<JournalTransaction> result = newSyncAndCallbackResult(sync, callback);
@@ -1497,16 +1433,16 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
JournalFile usedFile = appendRecord(prepareRecord, true, sync, tx, callback);
if (logger.isTraceEnabled()) {
- logger.trace("appendPrepareRecord::txID=" + txID + ", usedFile = " + usedFile);
+ logger.trace("appendPrepareRecord::txID={}, usedFile = {}", txID, usedFile);
}
tx.prepare(usedFile);
} catch (ActiveMQShutdownException e) {
result.fail(e);
- logger.error("appendPrepareRecord:" + e, e);
+ logger.error("Exception during appendPrepareRecord:", e);
} catch (Throwable e) {
result.fail(e);
- logger.error("appendPrepareRecord:" + e, e);
+ logger.error("Exception during appendPrepareRecord:", e);
setErrorCondition(callback, tx, e);
} finally {
journalLock.readLock().unlock();
@@ -1556,9 +1492,8 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
lineUpContext(callback);
}
-
if (logger.isTraceEnabled()) {
- logger.trace("scheduling appendCommitRecord::txID=" + txID );
+ logger.trace("scheduling appendCommitRecord::txID={}", txID);
}
JournalTransaction txcheck = transactions.get(txID);
@@ -1585,16 +1520,16 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
JournalFile usedFile = appendRecord(commitRecord, true, sync, tx, callback);
if (logger.isTraceEnabled()) {
- logger.trace("appendCommitRecord::txID=" + txID + ", usedFile = " + usedFile);
+ logger.trace("appendCommitRecord::txID={}, usedFile = {}", txID, usedFile);
}
tx.commit(usedFile);
} catch (ActiveMQShutdownException e) {
result.fail(e);
- logger.error("appendCommitRecord:" + e, e);
+ logger.error("Exception during appendCommitRecord:", e);
} catch (Throwable e) {
result.fail(e);
- logger.error("appendCommitRecord:" + e, e);
+ logger.error("Exception during appendCommitRecord:", e);
setErrorCondition(callback, tx, e);
} finally {
journalLock.readLock().unlock();
@@ -1614,13 +1549,10 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
checkJournalIsLoaded();
lineUpContext(callback);
-
if (logger.isTraceEnabled()) {
- logger.trace("scheduling appendRollbackRecord::txID=" + txID );
+ logger.trace("scheduling appendRollbackRecord::txID={}", txID);
}
-
-
final SimpleFuture<JournalTransaction> result = newSyncAndCallbackResult(sync, callback);
appendExecutor.execute(new Runnable() {
@Override
@@ -1630,7 +1562,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
final JournalTransaction tx = transactions.remove(txID);
try {
if (logger.isTraceEnabled()) {
- logger.trace("appendRollbackRecord::txID=" + txID );
+ logger.trace("appendRollbackRecord::txID={}", txID);
}
if (tx == null) {
@@ -1644,10 +1576,10 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
tx.rollback(usedFile);
} catch (ActiveMQShutdownException e) {
result.fail(e);
- logger.error("appendRollbackRecord:" + e, e);
+ logger.error("Exception during appendRollbackRecord:", e);
} catch (Throwable e) {
result.fail(e);
- logger.error("appendRollbackRecord:" + e, e);
+ logger.error("Exception during appendRollbackRecord:", e);
setErrorCondition(callback, tx, e);
} finally {
journalLock.readLock().unlock();
@@ -1851,7 +1783,8 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
}
if (logger.isDebugEnabled()) {
- logger.debug("JournalImpl::compact " + JournalImpl.this + " for its " + (++compactCount) + " time");
+ ++compactCount; // Member used only for logging state when debug enabled
+ logger.debug("JournalImpl::compact {} for its {} time", JournalImpl.this, compactCount);
}
compactorLock.writeLock().lock();
@@ -1861,9 +1794,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
boolean previousReclaimValue = isAutoReclaim();
try {
- if (logger.isDebugEnabled()) {
- logger.debug("Starting compacting operation on journal " + this);
- }
+ logger.debug("Starting compacting operation on journal {}", this);
onCompactStart();
@@ -1928,14 +1859,12 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
// Restore compacted dataFiles
for (int i = newDatafiles.size() - 1; i >= 0; i--) {
JournalFile fileToAdd = newDatafiles.get(i);
- if (logger.isTraceEnabled()) {
- logger.trace("Adding file " + fileToAdd + " back as datafile");
- }
+ logger.trace("Adding file {} back as datafile", fileToAdd);
filesRepository.addDataFileOnTop(fileToAdd);
}
if (logger.isTraceEnabled()) {
- logger.trace("There are " + filesRepository.getDataFilesCount() + " datafiles Now");
+ logger.trace("There are {} datafiles Now", filesRepository.getDataFilesCount());
}
// Replay pending commands (including updates, deletes and commits)
@@ -1949,9 +1878,8 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
// that happened during the compacting
localCompactor.getNewTransactions().forEach((id, newTransaction) -> {
- if (logger.isTraceEnabled()) {
- logger.trace("Merging pending transaction " + newTransaction + " after compacting the journal");
- }
+ logger.trace("Merging pending transaction {} after compacting the journal", newTransaction);
+
JournalTransaction liveTransaction = transactions.get(newTransaction.getId());
if (liveTransaction != null) {
liveTransaction.merge(newTransaction);
@@ -1974,15 +1902,11 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
renameFiles(dataFilesToProcess, newDatafiles);
deleteControlFile(controlFile);
- if (logger.isDebugEnabled()) {
- logger.debug("Flushing compacting on journal " + this);
- }
+ logger.debug("Flushing compacting on journal {}", this);
setAutoReclaim(previousReclaimValue);
- if (logger.isDebugEnabled()) {
- logger.debug("Finished compacting on journal " + this);
- }
+ logger.debug("Finished compacting on journal {}", this);
} catch (Throwable e) {
try {
@@ -1993,10 +1917,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
}
} finally {
compactorLock.writeLock().unlock();
- if (logger.isDebugEnabled()) {
- logger.debug("JournalImpl::compact finalized");
- }
-
+ logger.debug("JournalImpl::compact finalized");
}
@@ -2131,7 +2052,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
final AtomicLong maxID = new AtomicLong(-1);
for (final JournalFile file : orderedFiles) {
- logger.trace("Loading file " + file.getFile().getFileName());
+ logger.trace("Loading file {}", file.getFile().getFileName());
final AtomicBoolean hasData = new AtomicBoolean(false);
@@ -2442,8 +2363,9 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
@Override
public void processBackupCleanup() {
if (logger.isDebugEnabled()) {
- logger.debug("processBackupCleanup with maxFiles = " + journalRetentionMaxFiles + " and period = " + journalRetentionPeriod);
+ logger.debug("processBackupCleanup with maxFiles = {} and period = {}", journalRetentionMaxFiles, journalRetentionPeriod);
}
+
if (journalRetentionFolder != null && (journalRetentionMaxFiles > 0 || journalRetentionPeriod > 0)) {
FilenameFilter fnf = (d, name) -> name.endsWith("." + filesRepository.getFileExtension());
@@ -2459,10 +2381,10 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
for (String fileName : fileNames) {
long timeOnFile = getDatePortionMillis(fileName);
if (timeOnFile < timeCutOf) {
- logger.debug("File " + fileName + " is too old and should go");
+ logger.debug("File {} is too old and should go", fileName);
File fileToRemove = new File(journalRetentionFolder, fileName);
if (!fileToRemove.delete()) {
- logger.debug("Could not remove " + fileToRemove);
+ logger.debug("Could not remove {}", fileToRemove);
}
} else {
break;
@@ -2478,7 +2400,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
int toRemove = fileNames.length - journalRetentionMaxFiles;
for (String file : fileNames) {
- logger.debug("Removing " + file);
+ logger.debug("Removing {}", file);
File fileToRemove = new File(journalRetentionFolder, file);
fileToRemove.delete();
toRemove--;
@@ -2551,9 +2473,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
File copyTo = new File(journalRetentionFolder, fileName);
- if (logger.isDebugEnabled()) {
- logger.debug("Copying journal retention from " + copyFrom + " to " + copyTo);
- }
+ logger.debug("Copying journal retention from {} to {}", copyFrom, copyTo);
try {
Files.copy(copyFrom.toPath(), copyTo.toPath(), StandardCopyOption.REPLACE_EXISTING);
@@ -2641,9 +2561,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
for (JournalFile file : filesRepository.getDataFiles()) {
if (file.isCanReclaim()) {
// File can be reclaimed or deleted
- if (logger.isTraceEnabled()) {
- logger.trace("Reclaiming file " + file);
- }
+ logger.trace("Reclaiming file {}", file);
filesRepository.removeDataFile(file);
@@ -2676,12 +2594,14 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
if (updateFactor > UPDATE_FACTOR) { // this means every add records with at least 10 records
if (logger.isDebugEnabled()) {
- logger.debug("There are " + addRecord + " records, with " + updateCount + " towards them. UpdateCound / AddCount = " + updateFactor + ", being greater than " + UPDATE_FACTOR + " meaning we have to schedule compacting");
+ logger.debug("There are {} records, with {} towards them. UpdateCound / AddCount = {}, being greater than {} meaning we have to schedule compacting",
+ addRecord, updateCount, updateFactor, UPDATE_FACTOR);
}
return true;
} else {
if (logger.isDebugEnabled()) {
- logger.debug("There are " + addRecord + " records, with " + updateCount + " towards them. UpdateCound / AddCount = " + updateFactor + ", which is lower than " + UPDATE_FACTOR + " meaning we are ok to leave these records");
+ logger.debug("There are {} records, with {} towards them. UpdateCound / AddCount = {}, which is lower than {} meaning we are ok to leave these records",
+ addRecord, updateCount, updateFactor, UPDATE_FACTOR);
}
}
}
@@ -3659,9 +3579,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
scheduleReclaim();
}
- if (logger.isTraceEnabled()) {
- logger.trace("Moving next file " + currentFile);
- }
+ logger.trace("Moving next file {}", currentFile);
fileFactory.activateBuffer(currentFile.getFile());
}
@@ -3681,7 +3599,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
try {
scheduleCompactAndBlock(60);
} catch (Exception e) {
- logger.warn("Error during compact", e.getMessage(), e);
+ logger.warn("Error during compact", e);
throw new RuntimeException(e);
}
}
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java
index c8a74defd4..7fb104df4b 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java
@@ -240,14 +240,15 @@ public class JournalTransaction {
// without setting this properly...
if (compacting && compactor != null) {
if (logger.isTraceEnabled()) {
- logger.trace("adding txID=" + this.id + " into compacting");
+ logger.trace("adding txID={} into compacting", this.id);
}
compactor.addCommandCommit(this, file);
} else {
if (logger.isTraceEnabled()) {
- logger.trace("there was no compactor on commit txID=" + this.id);
+ logger.trace("there was no compactor on commit txID={}", this.id);
}
+
if (pos != null) {
for (JournalUpdate trUpdate : pos) {
JournalRecord posFiles = journal.getRecords().get(trUpdate.id);
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPConnectionCallback.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPConnectionCallback.java
index 4b660d355d..c44a9d5546 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPConnectionCallback.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPConnectionCallback.java
@@ -108,7 +108,7 @@ public class AMQPConnectionCallback implements FailureListener, CloseListener {
if (factory != null) {
result = factory.create(server, manager, connection, protonConnectionDelegate);
} else {
- logger.debug("Mo matching mechanism found for: " + mechanism);
+ logger.debug("Mo matching mechanism found for: {}", mechanism);
}
}
return result;
@@ -241,7 +241,7 @@ public class AMQPConnectionCallback implements FailureListener, CloseListener {
}
if (tx == null) {
- logger.warn("Couldn't find txid = " + txid);
+ logger.warn("Couldn't find txid = {}", txid);
throw ActiveMQAMQPProtocolMessageBundle.BUNDLE.txNotFound(txid.toString());
}
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
index 972ec58763..efa25c89cb 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
@@ -714,7 +714,7 @@ public class AMQPSessionCallback implements SessionCallback {
((ProtonServerSenderContext) consumer.getProtocolContext()).close(ec);
connection.flush();
} catch (ActiveMQAMQPException e) {
- logger.error("Error closing link for " + consumer.getQueue().getAddress());
+ logger.error("Error closing link for {}", consumer.getQueue().getAddress());
}
});
}
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/client/ProtonClientConnectionManager.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/client/ProtonClientConnectionManager.java
index cd80501235..cdf998f267 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/client/ProtonClientConnectionManager.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/client/ProtonClientConnectionManager.java
@@ -87,10 +87,10 @@ public class ProtonClientConnectionManager implements BaseConnectionLifeCycleLis
public void connectionReadyForWrites(Object connectionID, boolean ready) {
RemotingConnection connection = connectionMap.get(connectionID);
if (connection != null) {
- log.info("Connection " + connection.getRemoteAddress() + " ready");
+ log.info("Connection {} ready", connection.getRemoteAddress());
connection.getTransportConnection().fireReady(true);
} else {
- log.error("Connection with id " + connectionID + " not found in connectionReadyForWrites()!");
+ log.error("Connection with id {} not found in connectionReadyForWrites()!", connectionID);
}
}
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnection.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnection.java
index e8551f0699..69ca43a060 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnection.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnection.java
@@ -337,7 +337,7 @@ public class AMQPBrokerConnection implements ClientConnectionLifeCycleListener,
retryCounter++;
ActiveMQAMQPProtocolLogger.LOGGER.retryConnection(brokerConnectConfiguration.getName(), host + ":" + port, retryCounter, brokerConnectConfiguration.getReconnectAttempts());
if (logger.isDebugEnabled()) {
- logger.debug("Reconnecting in " + brokerConnectConfiguration.getRetryInterval() + ", this is the " + retryCounter + " of " + brokerConnectConfiguration.getReconnectAttempts());
+ logger.debug("Reconnecting in {}, this is the {} of {}", brokerConnectConfiguration.getRetryInterval(), retryCounter, brokerConnectConfiguration.getReconnectAttempts());
}
reconnectFuture = scheduledExecutorService.schedule(() -> connectExecutor.execute(() -> doConnect()), brokerConnectConfiguration.getRetryInterval(), TimeUnit.MILLISECONDS);
} else {
@@ -346,7 +346,7 @@ public class AMQPBrokerConnection implements ClientConnectionLifeCycleListener,
connecting = false;
ActiveMQAMQPProtocolLogger.LOGGER.retryConnectionFailed(brokerConnectConfiguration.getName(), host + ":" + port, lastRetryCounter);
if (logger.isDebugEnabled()) {
- logger.debug("no more reconnections as the retry counter reached " + retryCounter + " out of " + brokerConnectConfiguration.getReconnectAttempts());
+ logger.debug("no more reconnections as the retry counter reached {} out of {}", retryCounter, brokerConnectConfiguration.getReconnectAttempts());
}
}
}
@@ -395,15 +395,13 @@ public class AMQPBrokerConnection implements ClientConnectionLifeCycleListener,
mirrorControlQueue = server.createQueue(new QueueConfiguration(getMirrorSNF(replicaConfig)).setAddress(getMirrorSNF(replicaConfig)).setRoutingType(RoutingType.ANYCAST).setDurable(replicaConfig.isDurable()).setInternal(true), true);
}
- if (logger.isDebugEnabled()) {
- logger.debug("Mirror queue " + mirrorControlQueue.getName());
- }
+ logger.debug("Mirror queue {}", mirrorControlQueue.getName());
mirrorControlQueue.setMirrorController(true);
QueueBinding snfReplicaQueueBinding = (QueueBinding)server.getPostOffice().getBinding(getMirrorSNF(replicaConfig));
if (snfReplicaQueueBinding == null) {
- logger.warn("Queue does not exist even after creation! " + replicaConfig);
+ logger.warn("Queue does not exist even after creation! {}", replicaConfig);
throw new IllegalAccessException("Cannot start replica");
}
@@ -453,9 +451,7 @@ public class AMQPBrokerConnection implements ClientConnectionLifeCycleListener,
AMQPSessionContext sessionContext,
Queue queue,
Symbol... capabilities) {
- if (logger.isDebugEnabled()) {
- logger.debug("Connecting inbound for " + queue);
- }
+ logger.debug("Connecting inbound for {}", queue);
if (session == null) {
logger.debug("session is null");
@@ -501,10 +497,7 @@ public class AMQPBrokerConnection implements ClientConnectionLifeCycleListener,
String brokerID,
Symbol[] desiredCapabilities,
Symbol[] targetCapabilities) {
- if (logger.isDebugEnabled()) {
- logger.debug("Connecting outbound for " + queue);
- }
-
+ logger.debug("Connecting outbound for {}", queue);
if (session == null) {
logger.debug("Session is null");
@@ -697,9 +690,7 @@ public class AMQPBrokerConnection implements ClientConnectionLifeCycleListener,
// keeping a single executor thread to this purpose would simplify things
connectExecutor.execute(() -> {
if (connecting) {
- if (logger.isDebugEnabled()) {
- logger.debug("Broker connection " + this.getName() + " was already in retry mode, exception or retry not captured");
- }
+ logger.debug("Broker connection {} was already in retry mode, exception or retry not captured", getName());
return;
}
connecting = true;
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnectionManager.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnectionManager.java
index 7e3206a0ec..ec9e865d2b 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnectionManager.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnectionManager.java
@@ -76,9 +76,8 @@ public class AMQPBrokerConnectionManager implements ActiveMQComponent, ClientCon
NettyConnector bridgesConnector = (NettyConnector)factory.createConnector(config.getTransportConfigurations().get(0).getParams(), null, this, server.getExecutorFactory().getExecutor(), server.getThreadPool(), server.getScheduledPool(), new ClientProtocolManagerWithAMQP(protonProtocolManager));
bridgesConnector.start();
- if (logger.isDebugEnabled()) {
- logger.debug("Connecting " + config);
- }
+ logger.debug("Connecting {}", config);
+
AMQPBrokerConnection amqpBrokerConnection = new AMQPBrokerConnection(this, config, protonProtocolManager, server, bridgesConnector);
amqpBrokerConnectionList.add(amqpBrokerConnection);
server.registerBrokerConnection(amqpBrokerConnection);
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerSource.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerSource.java
index ca0ca97949..188742af2c 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerSource.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerSource.java
@@ -128,9 +128,7 @@ public class AMQPMirrorControllerSource extends BasicMirrorController<Sender> im
@Override
public void addAddress(AddressInfo addressInfo) throws Exception {
- if (logger.isTraceEnabled()) {
- logger.trace(server + " addAddress " + addressInfo);
- }
+ logger.trace("{} addAddress {}", server, addressInfo);
if (getControllerInUse() != null && !addressInfo.isInternal()) {
return;
@@ -148,9 +146,8 @@ public class AMQPMirrorControllerSource extends BasicMirrorController<Sender> im
@Override
public void deleteAddress(AddressInfo addressInfo) throws Exception {
- if (logger.isTraceEnabled()) {
- logger.trace(server + " deleteAddress " + addressInfo);
- }
+ logger.trace("{} deleteAddress {}", server, addressInfo);
+
if (invalidTarget(getControllerInUse()) || addressInfo.isInternal()) {
return;
}
@@ -165,18 +162,18 @@ public class AMQPMirrorControllerSource extends BasicMirrorController<Sender> im
@Override
public void createQueue(QueueConfiguration queueConfiguration) throws Exception {
- if (logger.isTraceEnabled()) {
- logger.trace(server + " createQueue " + queueConfiguration);
- }
+ logger.trace("{} createQueue {}", server, queueConfiguration);
+
if (invalidTarget(getControllerInUse()) || queueConfiguration.isInternal()) {
if (logger.isTraceEnabled()) {
- logger.trace("Rejecting ping pong on create " + queueConfiguration + " as isInternal=" + queueConfiguration.isInternal() + " and mirror target = " + getControllerInUse());
+ logger.trace("Rejecting ping pong on create {} as isInternal={} and mirror target = {}", queueConfiguration, queueConfiguration.isInternal(), getControllerInUse());
}
+
return;
}
if (ignoreAddress(queueConfiguration.getAddress())) {
if (logger.isTraceEnabled()) {
- logger.trace("Skipping create " + queueConfiguration + ", queue address " + queueConfiguration.getAddress() + " doesn't match filter");
+ logger.trace("Skipping create {}, queue address {} doesn't match filter", queueConfiguration, queueConfiguration.getAddress());
}
return;
}
@@ -189,7 +186,7 @@ public class AMQPMirrorControllerSource extends BasicMirrorController<Sender> im
@Override
public void deleteQueue(SimpleString address, SimpleString queue) throws Exception {
if (logger.isTraceEnabled()) {
- logger.trace(server + " deleteQueue " + address + "/" + queue);
+ logger.trace("{} deleteQueue {}/{}", server, address, queue);
}
if (invalidTarget(getControllerInUse())) {
@@ -223,29 +220,21 @@ public class AMQPMirrorControllerSource extends BasicMirrorController<Sender> im
SimpleString address = context.getAddress(message);
if (invalidTarget(context.getMirrorSource())) {
- if (logger.isTraceEnabled()) {
- logger.trace("server " + server + " is discarding send to avoid infinite loop (reflection with the mirror)");
- }
+ logger.trace("server {} is discarding send to avoid infinite loop (reflection with the mirror)", server);
return;
}
if (context.isInternal()) {
- if (logger.isTraceEnabled()) {
- logger.trace("server " + server + " is discarding send to avoid sending to internal queue");
- }
+ logger.trace("server {} is discarding send to avoid sending to internal queue", server);
return;
}
if (ignoreAddress(address)) {
- if (logger.isTraceEnabled()) {
- logger.trace("server " + server + " is discarding send to address " + address + ", address doesn't match filter");
- }
+ logger.trace("server {} is discarding send to address {}, address doesn't match filter", server, address);
return;
}
- if (logger.isTraceEnabled()) {
- logger.trace(server + " send message " + message);
- }
+ logger.trace("{} send message {}", server, message);
try {
context.setReusable(false);
@@ -253,9 +242,7 @@ public class AMQPMirrorControllerSource extends BasicMirrorController<Sender> im
MessageReference ref = MessageReference.Factory.createReference(message, snfQueue);
String nodeID = setProtocolData(idSupplier, ref);
if (nodeID != null && nodeID.equals(getRemoteMirrorId())) {
- if (logger.isTraceEnabled()) {
- logger.trace("Message " + message + "already belonged to the node, " + getRemoteMirrorId() + ", it won't circle send");
- }
+ logger.trace("Message {} already belonged to the node, {}, it won't circle send", message, getRemoteMirrorId());
return;
}
snfQueue.refUp(ref);
@@ -331,26 +318,24 @@ public class AMQPMirrorControllerSource extends BasicMirrorController<Sender> im
if ((ref.getQueue() != null && (ref.getQueue().isInternalQueue() || ref.getQueue().isMirrorController()))) {
if (logger.isDebugEnabled()) {
- logger.debug(server + " rejecting postAcknowledge queue=" + ref.getQueue().getName() + ", ref=" + ref + " to avoid infinite loop with the mirror (reflection)");
+ logger.debug("{} rejecting postAcknowledge queue={}, ref={} to avoid infinite loop with the mirror (reflection)", server, ref.getQueue().getName(), ref);
}
return;
}
if (ignoreAddress(ref.getQueue().getAddress())) {
if (logger.isTraceEnabled()) {
- logger.trace(server + " rejecting postAcknowledge queue=" + ref.getQueue().getName() + ", ref=" + ref + ", queue address is excluded");
+ logger.trace("{} rejecting postAcknowledge queue={}, ref={}, queue address is excluded", server, ref.getQueue().getName(), ref);
}
return;
}
- if (logger.isTraceEnabled()) {
- logger.trace(server + " postAcknowledge " + ref);
- }
+ logger.trace("{} postAcknowledge {}", server, ref);
String nodeID = idSupplier.getServerID(ref); // notice the brokerID will be null for any message generated on this broker.
long internalID = idSupplier.getID(ref);
if (logger.isTraceEnabled()) {
- logger.trace(server + " sending ack message from server " + nodeID + " with messageID=" + internalID);
+ logger.trace("{} sending ack message from server {} with messageID={}", server, nodeID, internalID);
}
Message message = createMessage(ref.getQueue().getAddress(), ref.getQueue().getName(), POST_ACK, nodeID, internalID, reason);
route(server, message);
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerTarget.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerTarget.java
index a17aa355a2..4ca9c9dcd6 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerTarget.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerTarget.java
@@ -120,9 +120,7 @@ public class AMQPMirrorControllerTarget extends ProtonAbstractReceiver implement
@Override
public void run() {
- if (logger.isTraceEnabled()) {
- logger.trace("Delivery settling for " + delivery + ", context=" + delivery.getContext());
- }
+ logger.trace("Delivery settling for {}, context={}", delivery, delivery.getContext());
delivery.disposition(Accepted.getInstance());
settle(delivery);
connection.flush();
@@ -188,9 +186,7 @@ public class AMQPMirrorControllerTarget extends ProtonAbstractReceiver implement
recoverContext();
incrementSettle();
- if (logger.isTraceEnabled()) {
- logger.trace(server + "::actualdelivery call for " + message);
- }
+ logger.trace("{}::actualdelivery call for {}", server, message);
setControllerInUse(this);
delivery.setContext(message);
@@ -280,17 +276,15 @@ public class AMQPMirrorControllerTarget extends ProtonAbstractReceiver implement
@Override
public void addAddress(AddressInfo addressInfo) throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug(server + " adding address " + addressInfo);
- }
+ logger.debug("{} adding address {}", server, addressInfo);
+
server.addAddressInfo(addressInfo);
}
@Override
public void deleteAddress(AddressInfo addressInfo) throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug(server + " delete address " + addressInfo);
- }
+ logger.debug("{} delete address {}", server, addressInfo);
+
try {
server.removeAddressInfo(addressInfo.getName(), null, true);
} catch (ActiveMQAddressDoesNotExistException expected) {
@@ -303,25 +297,26 @@ public class AMQPMirrorControllerTarget extends ProtonAbstractReceiver implement
@Override
public void createQueue(QueueConfiguration queueConfiguration) throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug(server + " adding queue " + queueConfiguration);
- }
+ logger.debug("{} adding queue {}", server, queueConfiguration);
+
try {
server.createQueue(queueConfiguration, true);
} catch (Exception e) {
- logger.debug("Queue could not be created, already existed " + queueConfiguration, e);
+ logger.debug("Queue could not be created, already existed {}", queueConfiguration, e);
}
}
@Override
public void deleteQueue(SimpleString addressName, SimpleString queueName) throws Exception {
if (logger.isDebugEnabled()) {
- logger.debug(server + " destroy queue " + queueName + " on address = " + addressName + " server " + server.getIdentity());
+ logger.debug("{} destroy queue {} on address = {} server {}", server, queueName, addressName, server.getIdentity());
}
try {
server.destroyQueue(queueName, null, false, true, false, false);
} catch (ActiveMQNonExistentQueueException expected) {
- logger.debug(server + " queue " + queueName + " was previously removed", expected);
+ if (logger.isDebugEnabled()) {
+ logger.debug("{} queue {} was previously removed", server, queueName, expected);
+ }
}
}
@@ -333,19 +328,20 @@ public class AMQPMirrorControllerTarget extends ProtonAbstractReceiver implement
final Queue targetQueue = server.locateQueue(queue);
if (targetQueue == null) {
- logger.warn("Queue " + queue + " not found on mirror target, ignoring ack for queue=" + queue + ", messageID=" + messageID + ", nodeID=" + nodeID);
+ logger.warn("Queue {} not found on mirror target, ignoring ack for queue={}, messageID={}, nodeID={}", queue, queue, messageID, nodeID);
return false;
}
if (logger.isDebugEnabled()) {
// we only do the following check if debug
if (targetQueue.getConsumerCount() > 0) {
- logger.debug("server " + server.getIdentity() + ", queue " + targetQueue.getName() + " has consumers while delivering ack for " + messageID);
+ logger.debug("server {}, queue {} has consumers while delivering ack for {}", server.getIdentity(), targetQueue.getName(), messageID);
}
}
if (logger.isTraceEnabled()) {
- logger.trace("Server " + server.getIdentity() + " with queue = " + queue + " being acked for " + messageID + " coming from " + messageID + " targetQueue = " + targetQueue);
+ logger.trace("Server {} with queue = {} being acked for {} coming from {} targetQueue = {}",
+ server.getIdentity(), queue, messageID, messageID, targetQueue);
}
performAck(nodeID, messageID, targetQueue, ackMessage, reason, (short)0);
@@ -359,13 +355,13 @@ public class AMQPMirrorControllerTarget extends ProtonAbstractReceiver implement
private void performAck(String nodeID, long messageID, Queue targetQueue, ACKMessageOperation ackMessageOperation, AckReason reason, final short retry) {
if (logger.isTraceEnabled()) {
- logger.trace("performAck (nodeID=" + nodeID + ", messageID=" + messageID + ")" + ", targetQueue=" + targetQueue.getName());
+ logger.trace("performAck (nodeID={}, messageID={}), targetQueue={}", nodeID, messageID, targetQueue.getName());
}
MessageReference reference = targetQueue.removeWithSuppliedID(nodeID, messageID, referenceNodeStore);
if (reference == null) {
if (logger.isDebugEnabled()) {
- logger.debug("Retrying Reference not found on messageID=" + messageID + " nodeID=" + nodeID + ", currentRetry=" + retry);
+ logger.debug("Retrying Reference not found on messageID={}, nodeID={}, currentRetry={}", messageID, nodeID, retry);
}
switch (retry) {
case 0:
@@ -394,7 +390,7 @@ public class AMQPMirrorControllerTarget extends ProtonAbstractReceiver implement
if (reference != null) {
if (logger.isTraceEnabled()) {
- logger.trace("Post ack Server " + server + " worked well for messageID=" + messageID + " nodeID=" + nodeID);
+ logger.trace("Post ack Server {} worked well for messageID={} nodeID={}", server, messageID, nodeID);
}
try {
switch (reason) {
@@ -437,7 +433,7 @@ public class AMQPMirrorControllerTarget extends ProtonAbstractReceiver implement
}
if (logger.isTraceEnabled()) {
- logger.trace("sendMessage on server " + server + " for message " + message + " with internalID = " + internalIDLong + " mirror id " + internalMirrorID);
+ logger.trace("sendMessage on server {} for message {} with internalID = {} mirror id {}", server, message, internalIDLong, internalMirrorID);
}
routingContext.setDuplicateDetection(false); // we do our own duplicate detection here
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java
index 486d39c9e5..caaf5c62f2 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java
@@ -776,7 +776,7 @@ public class AMQPConnectionContext extends ProtonInitializable implements EventH
if (handler != null) {
handler.onMessage(delivery);
} else {
- log.warn("Handler is null, can't delivery " + delivery, new Exception("tracing location"));
+ log.warn("Handler is null, can't delivery {}", delivery, new Exception("tracing location"));
}
}
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java
index 65952fb298..3e0c3699e8 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java
@@ -678,9 +678,8 @@ public class ProtonServerSenderContext extends ProtonInitializable implements Pr
replaceInitialHeader(deliveryAnnotationsToEncode, context, new NettyWritable(frameBuffer));
} catch (IndexOutOfBoundsException indexOutOfBoundsException) {
assert position == 0 : "this shouldn't happen unless replaceInitialHeader is updating position before modifying frameBuffer";
- if (log.isDebugEnabled()) {
- log.debug("Delivery of message failed with an overFlowException, retrying again with expandable buffer");
- }
+ log.debug("Delivery of message failed with an overFlowException, retrying again with expandable buffer");
+
// on the very first packet, if the initial header was replaced with a much bigger header (re-encoding)
// we could recover the situation with a retry using an expandable buffer.
// this is tested on org.apache.activemq.artemis.tests.integration.amqp.AmqpMessageDivertsTest
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/handler/ProtonHandler.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/handler/ProtonHandler.java
index b7cfae0cf7..25fb38c4c5 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/handler/ProtonHandler.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/handler/ProtonHandler.java
@@ -411,7 +411,7 @@ public class ProtonHandler extends ProtonInitializable implements SaslListener {
int received = sasl.recv(dataSASL, 0, dataSASL.length);
if (log.isTraceEnabled()) {
- log.trace("Working on sasl, length:" + received);
+ log.trace("Working on sasl, length:{}", received);
}
byte[] response = chosenMechanism.processSASL(received != -1 ? dataSASL : null);
@@ -559,9 +559,8 @@ public class ProtonHandler extends ProtonInitializable implements SaslListener {
}
while ((ev = collector.peek()) != null) {
for (EventHandler h : handlers) {
- if (log.isTraceEnabled()) {
- log.trace("Handling " + ev + " towards " + h);
- }
+ log.trace("Handling {} towards {}", ev, h);
+
try {
Events.dispatch(ev, h);
} catch (ActiveMQSecurityException e) {
diff --git a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/converter/TestConversions.java b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/converter/TestConversions.java
index 9ddc71f9a0..20d5d001a5 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/converter/TestConversions.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/converter/TestConversions.java
@@ -418,7 +418,7 @@ public class TestConversions extends Assert {
for (int i = 0; i < 10; i++) {
if (logger.isDebugEnabled()) {
- logger.debug("Message encoded :: " + encodedMessage.toDebugString());
+ logger.debug("Message encoded :: {}", encodedMessage.toDebugString());
}
encodedMessage.messageChanged();
@@ -428,9 +428,7 @@ public class TestConversions extends Assert {
// this line is needed to force a failure
ICoreMessage coreMessage = encodedMessage.toCore();
- if (logger.isDebugEnabled()) {
- logger.debug("Converted message: " + coreMessage);
- }
+ logger.debug("Converted message: {}", coreMessage);
}
}
@@ -459,9 +457,7 @@ public class TestConversions extends Assert {
AmqpValue value = (AmqpValue) encodedMessage.getProtonMessage().getBody();
Assert.assertEquals(text, (String) value.getValue());
ICoreMessage coreMessage = encodedMessage.toCore();
- if (logger.isDebugEnabled()) {
- logger.debug("Converted message: " + coreMessage);
- }
+ logger.debug("Converted message: {}", coreMessage);
// I'm going to replace the message every 10 messages by a re-encoded version to check if the wiring still acturate.
// I want to mix replacing and not replacing to make sure the re-encoding is not giving me any surprises
diff --git a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTPublishManager.java b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTPublishManager.java
index 9e7c710dea..1bf3c35bd9 100644
--- a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTPublishManager.java
+++ b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTPublishManager.java
@@ -243,9 +243,7 @@ public class MQTTPublishManager {
if (closeMqttConnectionOnPublishAuthorizationFailure) {
throw e;
} else {
- if (logger.isDebugEnabled()) {
- logger.debug("MQTT 3.1.1 client not authorized to publish message.");
- }
+ logger.debug("MQTT 3.1.1 client not authorized to publish message.");
}
} else {
/*
@@ -258,9 +256,7 @@ public class MQTTPublishManager {
*
* Log the failure since we have to just swallow it.
*/
- if (logger.isDebugEnabled()) {
- logger.debug("MQTT 3.1 client not authorized to publish message.");
- }
+ logger.debug("MQTT 3.1 client not authorized to publish message.");
}
} catch (Throwable t) {
MQTTLogger.LOGGER.failedToPublishMqttMessage(t.getMessage(), t);
@@ -364,7 +360,7 @@ public class MQTTPublishManager {
releaseFlowControl(ref.getB());
}
} catch (ActiveMQIllegalStateException e) {
- logger.warn("MQTT Client(" + session.getState().getClientId() + ") attempted to Ack already Ack'd message");
+ logger.warn("MQTT Client({}) attempted to Ack already Ack'd message", session.getState().getClientId());
}
}
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
index 3e67ef417f..943d9a3cf2 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
@@ -293,7 +293,7 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
* Log packaged into a separate method for performance reasons.
*/
private static void traceBufferReceived(Object connectionID, Command command) {
- logger.trace("connectionID: " + connectionID + " RECEIVED: " + (command == null ? "NULL" : command));
+ logger.trace("connectionID: {} RECEIVED: {}", connectionID, (command == null ? "NULL" : command));
}
@Override
@@ -531,7 +531,7 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
* Log packaged into a separate method for performance reasons.
*/
private static void tracePhysicalSend(Connection transportConnection, Command command) {
- logger.trace("connectionID: " + (transportConnection == null ? "" : transportConnection.getID()) + " SENDING: " + (command == null ? "NULL" : command));
+ logger.trace("connectionID: {} SENDING: {}", (transportConnection == null ? "" : transportConnection.getID()), (command == null ? "NULL" : command));
}
public void physicalSend(Command command) throws IOException {
@@ -770,8 +770,7 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
try {
protocolManager.getScheduledPool().schedule(() -> {
fail(new ActiveMQException(reason, cause, ActiveMQExceptionType.GENERIC_EXCEPTION), reason);
- logger.warn("Stopping " + transportConnection.getRemoteAddress() + "because " +
- reason);
+ logger.warn("Stopping {} because {}", transportConnection.getRemoteAddress(), reason);
}, waitTimeMillis, TimeUnit.MILLISECONDS);
} catch (Throwable t) {
logger.warn("Cannot stop connection. This exception will be ignored.", t);
@@ -868,9 +867,7 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
* This will answer with commands to the client
*/
public boolean sendCommand(final Command command) {
- if (logger.isTraceEnabled()) {
- logger.trace("sending " + command);
- }
+ logger.trace("sending {}", command);
if (isDestroyed()) {
return false;
@@ -922,7 +919,8 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
if (!tempDestinationExists(info.getDestination().getPhysicalName())) {
this.state.addTempDestination(info);
if (logger.isDebugEnabled()) {
- logger.debug(this + " added temp destination to state: " + info.getDestination().getPhysicalName() + "; " + state.getTempDestinations().size());
+ logger.debug("{} added temp destination to state: {} ; {}",
+ this, info.getDestination().getPhysicalName(), state.getTempDestinations().size());
}
}
}
@@ -1035,7 +1033,7 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
ActiveMQDestination dest = new ActiveMQTempQueue(bindingName.toString());
state.removeTempDestination(dest);
if (logger.isDebugEnabled()) {
- logger.debug(this + " removed temp destination from state: " + bindingName + "; " + state.getTempDestinations().size());
+ logger.debug("{} removed temp destination from state: {} ; {}", this, bindingName, state.getTempDestinations().size());
}
if (!AdvisorySupport.isAdvisoryTopic(dest)) {
@@ -1046,7 +1044,7 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
try {
protocolManager.fireAdvisory(context, topic, advInfo);
} catch (Exception e) {
- logger.warn("Failed to fire advisory on " + topic, e);
+ logger.warn("Failed to fire advisory on {}", topic, e);
}
}
}
@@ -1138,7 +1136,7 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
if (!dest.isTemporary()) {
// this should not really happen,
// so I'm not creating a Logger for this
- logger.warn("OpenWire client sending a queue remove towards " + dest.getPhysicalName());
+ logger.warn("OpenWire client sending a queue remove towards {}", dest.getPhysicalName());
}
try {
server.destroyQueue(new SimpleString(dest.getPhysicalName()), getRemotingConnection());
@@ -1369,9 +1367,7 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
ex.errorCode = XAException.XA_HEURRB;
throw ex;
} else {
- if (logger.isTraceEnabled()) {
- logger.trace("xarollback into " + tx + ", xid=" + xid + " forcing a rollback regular");
- }
+ logger.trace("xarollback into {}, xid={} forcing a rollback regular", tx, xid);
try {
if (amqSession != null) {
@@ -1387,9 +1383,8 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
}
} else {
if (tx.getState() == Transaction.State.SUSPENDED) {
- if (logger.isTraceEnabled()) {
- logger.trace("xarollback into " + tx + " sending tx back as it was suspended");
- }
+ logger.trace("xarollback into {} sending tx back as it was suspended", tx);
+
// Put it back
resourceManager.putTransaction(xid, tx, OpenWireConnection.this);
XAException ex = new XAException("Cannot commit transaction, it is suspended " + xid);
@@ -1520,9 +1515,8 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
if (txID.isXATransaction()) {
ResourceManager resourceManager = server.getResourceManager();
Xid xid = OpenWireUtil.toXID(txID);
- if (logger.isTraceEnabled()) {
- logger.trace("XAcommit into " + tx + ", xid=" + xid);
- }
+
+ logger.trace("XAcommit into {}, xid={}", tx, xid);
if (tx == null) {
if (resourceManager.getHeuristicCommittedTransactions().contains(xid)) {
@@ -1535,9 +1529,7 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
ex.errorCode = XAException.XA_HEURRB;
throw ex;
} else {
- if (logger.isTraceEnabled()) {
- logger.trace("XAcommit into " + tx + ", xid=" + xid + " cannot find it");
- }
+ logger.trace("XAcommit into {}, xid={} cannot find it", tx, xid);
XAException ex = new XAException("Cannot find xid in resource manager: " + xid);
ex.errorCode = XAException.XAER_NOTA;
throw ex;
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABytesMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABytesMessage.java
index f62ee992ca..36c721ca39 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABytesMessage.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABytesMessage.java
@@ -40,9 +40,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
public ActiveMQRABytesMessage(final BytesMessage message, final ActiveMQRASession session) {
super(message, session);
- if (logger.isTraceEnabled()) {
- logger.trace("constructor(" + message + ", " + session + ")");
- }
+ logger.trace("constructor({}, {})", message, session);
}
/**
@@ -53,9 +51,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
*/
@Override
public long getBodyLength() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getBodyLength()");
- }
+ logger.trace("getBodyLength()");
return ((BytesMessage) message).getBodyLength();
}
@@ -68,9 +64,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
*/
@Override
public boolean readBoolean() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readBoolean()");
- }
+ logger.trace("readBoolean()");
return ((BytesMessage) message).readBoolean();
}
@@ -83,9 +77,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
*/
@Override
public byte readByte() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readByte()");
- }
+ logger.trace("readByte()");
return ((BytesMessage) message).readByte();
}
@@ -101,7 +93,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
@Override
public int readBytes(final byte[] value, final int length) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("readBytes(" + Arrays.toString(value) + ", " + length + ")");
+ logger.trace("readBytes({}, {})", Arrays.toString(value), length);
}
return ((BytesMessage) message).readBytes(value, length);
@@ -117,7 +109,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
@Override
public int readBytes(final byte[] value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("readBytes(" + Arrays.toString(value) + ")");
+ logger.trace("readBytes({})", Arrays.toString(value));
}
return ((BytesMessage) message).readBytes(value);
@@ -131,9 +123,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
*/
@Override
public char readChar() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readChar()");
- }
+ logger.trace("readChar()");
return ((BytesMessage) message).readChar();
}
@@ -146,9 +136,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
*/
@Override
public double readDouble() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readDouble()");
- }
+ logger.trace("readDouble()");
return ((BytesMessage) message).readDouble();
}
@@ -161,9 +149,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
*/
@Override
public float readFloat() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readFloat()");
- }
+ logger.trace("readFloat()");
return ((BytesMessage) message).readFloat();
}
@@ -176,9 +162,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
*/
@Override
public int readInt() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readInt()");
- }
+ logger.trace("readInt()");
return ((BytesMessage) message).readInt();
}
@@ -191,9 +175,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
*/
@Override
public long readLong() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readLong()");
- }
+ logger.trace("readLong()");
return ((BytesMessage) message).readLong();
}
@@ -206,9 +188,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
*/
@Override
public short readShort() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readShort()");
- }
+ logger.trace("readShort()");
return ((BytesMessage) message).readShort();
}
@@ -221,9 +201,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
*/
@Override
public int readUnsignedByte() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readUnsignedByte()");
- }
+ logger.trace("readUnsignedByte()");
return ((BytesMessage) message).readUnsignedByte();
}
@@ -236,9 +214,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
*/
@Override
public int readUnsignedShort() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readUnsignedShort()");
- }
+ logger.trace("readUnsignedShort()");
return ((BytesMessage) message).readUnsignedShort();
}
@@ -251,9 +227,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
*/
@Override
public String readUTF() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readUTF()");
- }
+ logger.trace("readUTF()");
return ((BytesMessage) message).readUTF();
}
@@ -265,9 +239,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
*/
@Override
public void reset() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("reset()");
- }
+ logger.trace("reset()");
((BytesMessage) message).reset();
}
@@ -281,7 +253,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
@Override
public void writeBoolean(final boolean value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("writeBoolean(" + value + ")");
+ logger.trace("writeBoolean({})", value);
}
((BytesMessage) message).writeBoolean(value);
@@ -296,7 +268,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
@Override
public void writeByte(final byte value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("writeByte(" + value + ")");
+ logger.trace("writeByte({})", value);
}
((BytesMessage) message).writeByte(value);
@@ -313,7 +285,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
@Override
public void writeBytes(final byte[] value, final int offset, final int length) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("writeBytes(" + Arrays.toString(value) + ", " + offset + ", " + length + ")");
+ logger.trace("writeBytes({}, {}, {})", Arrays.toString(value), offset, length);
}
((BytesMessage) message).writeBytes(value, offset, length);
@@ -328,7 +300,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
@Override
public void writeBytes(final byte[] value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("writeBytes(" + Arrays.toString(value) + ")");
+ logger.trace("writeBytes({})", Arrays.toString(value));
}
((BytesMessage) message).writeBytes(value);
@@ -343,7 +315,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
@Override
public void writeChar(final char value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("writeChar(" + value + ")");
+ logger.trace("writeChar({})", value);
}
((BytesMessage) message).writeChar(value);
@@ -358,7 +330,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
@Override
public void writeDouble(final double value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("writeDouble(" + value + ")");
+ logger.trace("writeDouble({})", value);
}
((BytesMessage) message).writeDouble(value);
@@ -373,7 +345,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
@Override
public void writeFloat(final float value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("writeFloat(" + value + ")");
+ logger.trace("writeFloat({})", value);
}
((BytesMessage) message).writeFloat(value);
@@ -388,7 +360,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
@Override
public void writeInt(final int value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("writeInt(" + value + ")");
+ logger.trace("writeInt({})", value);
}
((BytesMessage) message).writeInt(value);
@@ -403,7 +375,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
@Override
public void writeLong(final long value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("writeLong(" + value + ")");
+ logger.trace("writeLong({})", value);
}
((BytesMessage) message).writeLong(value);
@@ -417,9 +389,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
*/
@Override
public void writeObject(final Object value) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("writeObject(" + value + ")");
- }
+ logger.trace("writeObject({})", value);
((BytesMessage) message).writeObject(value);
}
@@ -433,7 +403,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
@Override
public void writeShort(final short value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("writeShort(" + value + ")");
+ logger.trace("writeShort({})", value);
}
((BytesMessage) message).writeShort(value);
@@ -447,9 +417,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
*/
@Override
public void writeUTF(final String value) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("writeUTF(" + value + ")");
- }
+ logger.trace("writeUTF({})", value);
((BytesMessage) message).writeUTF(value);
}
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionFactoryImpl.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionFactoryImpl.java
index 9a4e97b4e0..3cc75d4d61 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionFactoryImpl.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionFactoryImpl.java
@@ -75,25 +75,19 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
* @param cm The connection manager
*/
public ActiveMQRAConnectionFactoryImpl(final ActiveMQRAManagedConnectionFactory mcf, final ConnectionManager cm) {
- if (logger.isTraceEnabled()) {
- logger.trace("constructor(" + mcf + ", " + cm + ")");
- }
+ logger.trace("constructor({}, {})", mcf, cm);
this.mcf = mcf;
if (cm == null) {
// This is standalone usage, no appserver
this.cm = new ActiveMQRAConnectionManager();
- if (logger.isTraceEnabled()) {
- logger.trace("Created new ConnectionManager=" + this.cm);
- }
+ logger.trace("Created new ConnectionManager={}", this.cm);
} else {
this.cm = cm;
}
- if (logger.isTraceEnabled()) {
- logger.trace("Using ManagedConnectionFactory=" + mcf + ", ConnectionManager=" + cm);
- }
+ logger.trace("Using ManagedConnectionFactory={}, ConnectionManager={}", mcf, cm);
}
/**
@@ -103,9 +97,7 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
*/
@Override
public void setReference(final Reference reference) {
- if (logger.isTraceEnabled()) {
- logger.trace("setReference(" + reference + ")");
- }
+ logger.trace("setReference({})", reference);
this.reference = reference;
}
@@ -117,9 +109,8 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
*/
@Override
public Reference getReference() {
- if (logger.isTraceEnabled()) {
- logger.trace("getReference()");
- }
+ logger.trace("getReference()");
+
if (reference == null) {
try {
reference = new Reference(this.getClass().getCanonicalName(), new SerializableObjectRefAddr("ActiveMQ-CF", this), ActiveMQRAConnectionFactoryObjectFactory.class.getCanonicalName(), null);
@@ -140,15 +131,11 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
*/
@Override
public QueueConnection createQueueConnection() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("createQueueConnection()");
- }
+ logger.trace("createQueueConnection()");
ActiveMQRASessionFactoryImpl s = new ActiveMQRASessionFactoryImpl(mcf, cm, getResourceAdapter().getTM(), ActiveMQRAConnectionFactory.QUEUE_CONNECTION);
- if (logger.isTraceEnabled()) {
- logger.trace("Created queue connection: " + s);
- }
+ logger.trace("Created queue connection: {}", s);
return s;
}
@@ -163,9 +150,7 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
*/
@Override
public QueueConnection createQueueConnection(final String userName, final String password) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("createQueueConnection(" + userName + ", ****)");
- }
+ logger.trace("createQueueConnection({}, ****)", userName);
ActiveMQRASessionFactoryImpl s = new ActiveMQRASessionFactoryImpl(mcf, cm, getResourceAdapter().getTM(), ActiveMQRAConnectionFactory.QUEUE_CONNECTION);
s.setUserName(userName);
@@ -173,9 +158,7 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
validateUser(s);
- if (logger.isTraceEnabled()) {
- logger.trace("Created queue connection: " + s);
- }
+ logger.trace("Created queue connection: {}", s);
return s;
}
@@ -188,15 +171,11 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
*/
@Override
public TopicConnection createTopicConnection() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("createTopicConnection()");
- }
+ logger.trace("createTopicConnection()");
ActiveMQRASessionFactoryImpl s = new ActiveMQRASessionFactoryImpl(mcf, cm, getResourceAdapter().getTM(), ActiveMQRAConnectionFactory.TOPIC_CONNECTION);
- if (logger.isTraceEnabled()) {
- logger.trace("Created topic connection: " + s);
- }
+ logger.trace("Created topic connection: {}", s);
return s;
}
@@ -211,18 +190,14 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
*/
@Override
public TopicConnection createTopicConnection(final String userName, final String password) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("createTopicConnection(" + userName + ", ****)");
- }
+ logger.trace("createTopicConnection({}, ****)", userName);
ActiveMQRASessionFactoryImpl s = new ActiveMQRASessionFactoryImpl(mcf, cm, getResourceAdapter().getTM(), ActiveMQRAConnectionFactory.TOPIC_CONNECTION);
s.setUserName(userName);
s.setPassword(password);
validateUser(s);
- if (logger.isTraceEnabled()) {
- logger.trace("Created topic connection: " + s);
- }
+ logger.trace("Created topic connection: {}", s);
return s;
}
@@ -235,15 +210,11 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
*/
@Override
public Connection createConnection() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("createConnection()");
- }
+ logger.trace("createConnection()");
ActiveMQRASessionFactoryImpl s = new ActiveMQRASessionFactoryImpl(mcf, cm, getResourceAdapter().getTM(), ActiveMQRAConnectionFactory.CONNECTION);
- if (logger.isTraceEnabled()) {
- logger.trace("Created connection: " + s);
- }
+ logger.trace("Created connection: {}", s);
return s;
}
@@ -258,9 +229,7 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
*/
@Override
public Connection createConnection(final String userName, final String password) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("createConnection(" + userName + ", ****)");
- }
+ logger.trace("createConnection({}, ****)", userName);
ActiveMQRASessionFactoryImpl s = new ActiveMQRASessionFactoryImpl(mcf, cm, getResourceAdapter().getTM(), ActiveMQRAConnectionFactory.CONNECTION);
s.setUserName(userName);
@@ -268,9 +237,7 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
validateUser(s);
- if (logger.isTraceEnabled()) {
- logger.trace("Created connection: " + s);
- }
+ logger.trace("Created connection: {}", s);
return s;
}
@@ -283,15 +250,11 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
*/
@Override
public XAQueueConnection createXAQueueConnection() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("createXAQueueConnection()");
- }
+ logger.trace("createXAQueueConnection()");
ActiveMQRASessionFactoryImpl s = new ActiveMQRASessionFactoryImpl(mcf, cm, getResourceAdapter().getTM(), ActiveMQRAConnectionFactory.XA_QUEUE_CONNECTION);
- if (logger.isTraceEnabled()) {
- logger.trace("Created queue connection: " + s);
- }
+ logger.trace("Created queue connection: {}", s);
return s;
}
@@ -306,18 +269,14 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
*/
@Override
public XAQueueConnection createXAQueueConnection(final String userName, final String password) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("createXAQueueConnection(" + userName + ", ****)");
- }
+ logger.trace("createXAQueueConnection({}, ****)", userName);
ActiveMQRASessionFactoryImpl s = new ActiveMQRASessionFactoryImpl(mcf, cm, getResourceAdapter().getTM(), ActiveMQRAConnectionFactory.XA_QUEUE_CONNECTION);
s.setUserName(userName);
s.setPassword(password);
validateUser(s);
- if (logger.isTraceEnabled()) {
- logger.trace("Created queue connection: " + s);
- }
+ logger.trace("Created queue connection: {}", s);
return s;
}
@@ -330,15 +289,11 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
*/
@Override
public XATopicConnection createXATopicConnection() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("createXATopicConnection()");
- }
+ logger.trace("createXATopicConnection()");
ActiveMQRASessionFactoryImpl s = new ActiveMQRASessionFactoryImpl(mcf, cm, getResourceAdapter().getTM(), ActiveMQRAConnectionFactory.XA_TOPIC_CONNECTION);
- if (logger.isTraceEnabled()) {
- logger.trace("Created topic connection: " + s);
- }
+ logger.trace("Created topic connection: {}", s);
return s;
}
@@ -353,18 +308,14 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
*/
@Override
public XATopicConnection createXATopicConnection(final String userName, final String password) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("createXATopicConnection(" + userName + ", ****)");
- }
+ logger.trace("createXATopicConnection({}, ****)", userName);
ActiveMQRASessionFactoryImpl s = new ActiveMQRASessionFactoryImpl(mcf, cm, getResourceAdapter().getTM(), ActiveMQRAConnectionFactory.XA_TOPIC_CONNECTION);
s.setUserName(userName);
s.setPassword(password);
validateUser(s);
- if (logger.isTraceEnabled()) {
- logger.trace("Created topic connection: " + s);
- }
+ logger.trace("Created topic connection: {}", s);
return s;
}
@@ -377,15 +328,11 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
*/
@Override
public XAConnection createXAConnection() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("createXAConnection()");
- }
+ logger.trace("createXAConnection()");
ActiveMQRASessionFactoryImpl s = new ActiveMQRASessionFactoryImpl(mcf, cm, getResourceAdapter().getTM(), ActiveMQRAConnectionFactory.XA_CONNECTION);
- if (logger.isTraceEnabled()) {
- logger.trace("Created connection: " + s);
- }
+ logger.trace("Created connection: {}", s);
return s;
}
@@ -400,18 +347,14 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
*/
@Override
public XAConnection createXAConnection(final String userName, final String password) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("createXAConnection(" + userName + ", ****)");
- }
+ logger.trace("createXAConnection({}, ****)", userName);
ActiveMQRASessionFactoryImpl s = new ActiveMQRASessionFactoryImpl(mcf, cm, getResourceAdapter().getTM(), ActiveMQRAConnectionFactory.XA_CONNECTION);
s.setUserName(userName);
s.setPassword(password);
validateUser(s);
- if (logger.isTraceEnabled()) {
- logger.trace("Created connection: " + s);
- }
+ logger.trace("Created connection: {}", s);
return s;
}
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionManager.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionManager.java
index edb72a4721..c5dbcc2ea9 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionManager.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionManager.java
@@ -44,9 +44,7 @@ public class ActiveMQRAConnectionManager implements ConnectionManager {
* Constructor
*/
public ActiveMQRAConnectionManager() {
- if (logger.isTraceEnabled()) {
- logger.trace("constructor()");
- }
+ logger.trace("constructor()");
}
ConcurrentHashSet<ManagedConnection> connections = new ConcurrentHashSet<>();
@@ -62,16 +60,12 @@ public class ActiveMQRAConnectionManager implements ConnectionManager {
@Override
public Object allocateConnection(final ManagedConnectionFactory mcf,
final ConnectionRequestInfo cxRequestInfo) throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("allocateConnection(" + mcf + ", " + cxRequestInfo + ")");
- }
+ logger.trace("allocateConnection({}, {})", mcf, cxRequestInfo);
ManagedConnection mc = mcf.createManagedConnection(null, cxRequestInfo);
Object c = mc.getConnection(null, cxRequestInfo);
- if (logger.isTraceEnabled()) {
- logger.trace("Allocated connection: " + c + ", with managed connection: " + mc);
- }
+ logger.trace("Allocated connection: {}, with managed connection: {}", c, mc);
connections.add(mc);
return c;
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionMetaData.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionMetaData.java
index 78b6a80d63..5687d4e118 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionMetaData.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionMetaData.java
@@ -56,9 +56,7 @@ public class ActiveMQRAConnectionMetaData implements ConnectionMetaData {
* Constructor
*/
public ActiveMQRAConnectionMetaData() {
- if (logger.isTraceEnabled()) {
- logger.trace("constructor()");
- }
+ logger.trace("constructor()");
}
/**
@@ -68,9 +66,7 @@ public class ActiveMQRAConnectionMetaData implements ConnectionMetaData {
*/
@Override
public String getJMSVersion() {
- if (logger.isTraceEnabled()) {
- logger.trace("getJMSVersion()");
- }
+ logger.trace("getJMSVersion()");
return JMS_VERSION_NAME;
}
@@ -81,9 +77,7 @@ public class ActiveMQRAConnectionMetaData implements ConnectionMetaData {
*/
@Override
public int getJMSMajorVersion() {
- if (logger.isTraceEnabled()) {
- logger.trace("getJMSMajorVersion()");
- }
+ logger.trace("getJMSMajorVersion()");
return JMS_MAJOR_VERSION;
}
@@ -94,9 +88,7 @@ public class ActiveMQRAConnectionMetaData implements ConnectionMetaData {
*/
@Override
public int getJMSMinorVersion() {
- if (logger.isTraceEnabled()) {
- logger.trace("getJMSMinorVersion()");
- }
+ logger.trace("getJMSMinorVersion()");
return JMS_MINOR_VERSION;
}
@@ -107,9 +99,7 @@ public class ActiveMQRAConnectionMetaData implements ConnectionMetaData {
*/
@Override
public String getJMSProviderName() {
- if (logger.isTraceEnabled()) {
- logger.trace("getJMSProviderName()");
- }
+ logger.trace("getJMSProviderName()");
return "ActiveMQ Artemis";
}
@@ -121,9 +111,7 @@ public class ActiveMQRAConnectionMetaData implements ConnectionMetaData {
*/
@Override
public String getProviderVersion() {
- if (logger.isTraceEnabled()) {
- logger.trace("getJMSProviderName()");
- }
+ logger.trace("getJMSProviderName()");
return "2.4";
}
@@ -135,9 +123,7 @@ public class ActiveMQRAConnectionMetaData implements ConnectionMetaData {
*/
@Override
public int getProviderMajorVersion() {
- if (logger.isTraceEnabled()) {
- logger.trace("getProviderMajorVersion()");
- }
+ logger.trace("getProviderMajorVersion()");
return 2;
}
@@ -149,9 +135,7 @@ public class ActiveMQRAConnectionMetaData implements ConnectionMetaData {
*/
@Override
public int getProviderMinorVersion() {
- if (logger.isTraceEnabled()) {
- logger.trace("getProviderMinorVersion()");
- }
+ logger.trace("getProviderMinorVersion()");
return 4;
}
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionRequestInfo.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionRequestInfo.java
index ca88e5d1f7..00bb041e5e 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionRequestInfo.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionRequestInfo.java
@@ -67,9 +67,7 @@ public class ActiveMQRAConnectionRequestInfo implements ConnectionRequestInfo {
* @param type The connection type
*/
public ActiveMQRAConnectionRequestInfo(final ActiveMQRAProperties prop, final int type) {
- if (logger.isTraceEnabled()) {
- logger.trace("constructor(" + prop + ")");
- }
+ logger.trace("constructor({})", prop);
userName = prop.getUserName();
password = prop.getPassword();
@@ -88,12 +86,7 @@ public class ActiveMQRAConnectionRequestInfo implements ConnectionRequestInfo {
*/
public ActiveMQRAConnectionRequestInfo(final boolean transacted, final int acknowledgeMode, final int type) {
if (logger.isTraceEnabled()) {
- logger.trace("constructor(" + transacted +
- ", " +
- acknowledgeMode +
- ", " +
- type +
- ")");
+ logger.trace("constructor({}, {}, {})", transacted, acknowledgeMode, type);
}
this.transacted = transacted;
@@ -107,9 +100,7 @@ public class ActiveMQRAConnectionRequestInfo implements ConnectionRequestInfo {
* @param prop The resource adapter properties
*/
public void setDefaults(final ActiveMQRAProperties prop) {
- if (logger.isTraceEnabled()) {
- logger.trace("setDefaults(" + prop + ")");
- }
+ logger.trace("setDefaults({})", prop);
if (userName == null) {
userName = prop.getUserName();
@@ -128,9 +119,7 @@ public class ActiveMQRAConnectionRequestInfo implements ConnectionRequestInfo {
* @return The value
*/
public String getUserName() {
- if (logger.isTraceEnabled()) {
- logger.trace("getUserName()");
- }
+ logger.trace("getUserName()");
return userName;
}
@@ -141,9 +130,7 @@ public class ActiveMQRAConnectionRequestInfo implements ConnectionRequestInfo {
* @param userName The value
*/
public void setUserName(final String userName) {
- if (logger.isTraceEnabled()) {
- logger.trace("setUserName(" + userName + ")");
- }
+ logger.trace("setUserName({})", userName);
this.userName = userName;
}
@@ -154,9 +141,7 @@ public class ActiveMQRAConnectionRequestInfo implements ConnectionRequestInfo {
* @return The value
*/
public String getPassword() {
- if (logger.isTraceEnabled()) {
- logger.trace("getPassword()");
- }
+ logger.trace("getPassword()");
return password;
}
@@ -167,9 +152,7 @@ public class ActiveMQRAConnectionRequestInfo implements ConnectionRequestInfo {
* @param password The value
*/
public void setPassword(final String password) {
- if (logger.isTraceEnabled()) {
- logger.trace("setPassword(****)");
- }
+ logger.trace("setPassword(****)");
this.password = password;
}
@@ -180,9 +163,7 @@ public class ActiveMQRAConnectionRequestInfo implements ConnectionRequestInfo {
* @return The value
*/
public String getClientID() {
- if (logger.isTraceEnabled()) {
- logger.trace("getClientID()");
- }
+ logger.trace("getClientID()");
return clientID;
}
@@ -193,9 +174,7 @@ public class ActiveMQRAConnectionRequestInfo implements ConnectionRequestInfo {
* @param clientID The value
*/
public void setClientID(final String clientID) {
- if (logger.isTraceEnabled()) {
- logger.trace("setClientID(" + clientID + ")");
- }
+ logger.trace("setClientID({})", clientID);
this.clientID = clientID;
}
@@ -206,9 +185,7 @@ public class ActiveMQRAConnectionRequestInfo implements ConnectionRequestInfo {
* @return The type
*/
public int getType() {
- if (logger.isTraceEnabled()) {
- logger.trace("getType()");
- }
+ logger.trace("getType()");
return type;
}
@@ -220,7 +197,7 @@ public class ActiveMQRAConnectionRequestInfo implements ConnectionRequestInfo {
*/
public boolean isTransacted() {
if (logger.isTraceEnabled()) {
- logger.trace("isTransacted() " + transacted);
+ logger.trace("isTransacted() {}", transacted);
}
return transacted;
@@ -232,9 +209,7 @@ public class ActiveMQRAConnectionRequestInfo implements ConnectionRequestInfo {
* @return The mode
*/
public int getAcknowledgeMode() {
- if (logger.isTraceEnabled()) {
- logger.trace("getAcknowledgeMode()");
- }
+ logger.trace("getAcknowledgeMode()");
return acknowledgeMode;
}
@@ -247,9 +222,7 @@ public class ActiveMQRAConnectionRequestInfo implements ConnectionRequestInfo {
*/
@Override
public boolean equals(final Object obj) {
- if (logger.isTraceEnabled()) {
- logger.trace("equals(" + obj + ")");
- }
+ logger.trace("equals({})", obj);
if (obj == null) {
return false;
@@ -274,9 +247,7 @@ public class ActiveMQRAConnectionRequestInfo implements ConnectionRequestInfo {
*/
@Override
public int hashCode() {
- if (logger.isTraceEnabled()) {
- logger.trace("hashCode()");
- }
+ logger.trace("hashCode()");
int hash = 7;
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRACredential.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRACredential.java
index 9dd850afe4..4d424fc620 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRACredential.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRACredential.java
@@ -56,9 +56,7 @@ public class ActiveMQRACredential implements Serializable {
* Private constructor
*/
private ActiveMQRACredential() {
- if (logger.isTraceEnabled()) {
- logger.trace("constructor()");
- }
+ logger.trace("constructor()");
}
/**
@@ -67,9 +65,7 @@ public class ActiveMQRACredential implements Serializable {
* @return The value
*/
public String getUserName() {
- if (logger.isTraceEnabled()) {
- logger.trace("getUserName()");
- }
+ logger.trace("getUserName()");
return userName;
}
@@ -80,9 +76,7 @@ public class ActiveMQRACredential implements Serializable {
* @param userName The value
*/
private void setUserName(final String userName) {
- if (logger.isTraceEnabled()) {
- logger.trace("setUserName(" + userName + ")");
- }
+ logger.trace("setUserName({})", userName);
this.userName = userName;
}
@@ -93,9 +87,7 @@ public class ActiveMQRACredential implements Serializable {
* @return The value
*/
public String getPassword() {
- if (logger.isTraceEnabled()) {
- logger.trace("getPassword()");
- }
+ logger.trace("getPassword()");
return password;
}
@@ -106,9 +98,7 @@ public class ActiveMQRACredential implements Serializable {
* @param password The value
*/
private void setPassword(final String password) {
- if (logger.isTraceEnabled()) {
- logger.trace("setPassword(****)");
- }
+ logger.trace("setPassword(****)");
this.password = password;
}
@@ -126,7 +116,7 @@ public class ActiveMQRACredential implements Serializable {
final Subject subject,
final ConnectionRequestInfo info) throws SecurityException {
if (logger.isTraceEnabled()) {
- logger.trace("getCredential(" + mcf + ", " + subject + ", " + info + ")");
+ logger.trace("getCredential({}, {} ,{})", mcf, subject, info);
}
ActiveMQRACredential jc = new ActiveMQRACredential();
@@ -156,9 +146,7 @@ public class ActiveMQRACredential implements Serializable {
*/
@Override
public String toString() {
- if (logger.isTraceEnabled()) {
- logger.trace("toString()");
- }
+ logger.trace("toString()");
return super.toString() + "{ username=" + userName + ", password=**** }";
}
@@ -185,9 +173,7 @@ public class ActiveMQRACredential implements Serializable {
* @param mcf The managed connection factory
*/
GetCredentialAction(final Subject subject, final ManagedConnectionFactory mcf) {
- if (logger.isTraceEnabled()) {
- logger.trace("constructor(" + subject + ", " + mcf + ")");
- }
+ logger.trace("constructor({}, {})", subject, mcf);
this.subject = subject;
this.mcf = mcf;
@@ -200,9 +186,7 @@ public class ActiveMQRACredential implements Serializable {
*/
@Override
public PasswordCredential run() {
- if (logger.isTraceEnabled()) {
- logger.trace("run()");
- }
+ logger.trace("run()");
Set<PasswordCredential> creds = subject.getPrivateCredentials(PasswordCredential.class);
PasswordCredential pwdc = null;
@@ -224,9 +208,7 @@ public class ActiveMQRACredential implements Serializable {
* @return The credential
*/
static PasswordCredential getCredential(final Subject subject, final ManagedConnectionFactory mcf) {
- if (logger.isTraceEnabled()) {
- logger.trace("getCredential(" + subject + ", " + mcf + ")");
- }
+ logger.trace("getCredential({}, {})", subject, mcf);
GetCredentialAction action = new GetCredentialAction(subject, mcf);
return AccessController.doPrivileged(action);
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALocalTransaction.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALocalTransaction.java
index fb861a83ee..f8ec48c72e 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALocalTransaction.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALocalTransaction.java
@@ -42,9 +42,7 @@ public class ActiveMQRALocalTransaction implements LocalTransaction {
* @param mc The managed connection
*/
public ActiveMQRALocalTransaction(final ActiveMQRAManagedConnection mc) {
- if (logger.isTraceEnabled()) {
- logger.trace("constructor(" + mc + ")");
- }
+ logger.trace("constructor({})", mc);
this.mc = mc;
}
@@ -56,9 +54,7 @@ public class ActiveMQRALocalTransaction implements LocalTransaction {
*/
@Override
public void begin() throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("begin()");
- }
+ logger.trace("begin()");
// mc.setInManagedTx(true);
}
@@ -70,9 +66,7 @@ public class ActiveMQRALocalTransaction implements LocalTransaction {
*/
@Override
public void commit() throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("commit()");
- }
+ logger.trace("commit()");
mc.lock();
try {
@@ -94,9 +88,7 @@ public class ActiveMQRALocalTransaction implements LocalTransaction {
*/
@Override
public void rollback() throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("rollback()");
- }
+ logger.trace("rollback()");
mc.lock();
try {
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMCFProperties.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMCFProperties.java
index b40ab6a5e5..b3d60eb7a6 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMCFProperties.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMCFProperties.java
@@ -74,9 +74,7 @@ public class ActiveMQRAMCFProperties extends ConnectionFactoryProperties impleme
* Constructor
*/
public ActiveMQRAMCFProperties() {
- if (logger.isTraceEnabled()) {
- logger.trace("constructor()");
- }
+ logger.trace("constructor()");
useTryLock = null;
}
@@ -87,9 +85,7 @@ public class ActiveMQRAMCFProperties extends ConnectionFactoryProperties impleme
* @return The type
*/
public int getType() {
- if (logger.isTraceEnabled()) {
- logger.trace("getType()");
- }
+ logger.trace("getType()");
return type;
}
@@ -99,9 +95,7 @@ public class ActiveMQRAMCFProperties extends ConnectionFactoryProperties impleme
}
public void setConnectorClassName(final String connectorClassName) {
- if (logger.isTraceEnabled()) {
- logger.trace("setConnectorClassName(" + connectorClassName + ")");
- }
+ logger.trace("setConnectorClassName({})", connectorClassName);
strConnectorClassName = connectorClassName;
@@ -126,9 +120,7 @@ public class ActiveMQRAMCFProperties extends ConnectionFactoryProperties impleme
* @param defaultType either javax.jms.Topic or javax.jms.Queue
*/
public void setSessionDefaultType(final String defaultType) {
- if (logger.isTraceEnabled()) {
- logger.trace("setSessionDefaultType(" + type + ")");
- }
+ logger.trace("setSessionDefaultType({})", type);
if (defaultType.equals(ActiveMQRAMCFProperties.QUEUE_TYPE)) {
type = ActiveMQRAConnectionFactory.QUEUE_CONNECTION;
@@ -145,9 +137,7 @@ public class ActiveMQRAMCFProperties extends ConnectionFactoryProperties impleme
* @return The default session type
*/
public String getSessionDefaultType() {
- if (logger.isTraceEnabled()) {
- logger.trace("getSessionDefaultType()");
- }
+ logger.trace("getSessionDefaultType()");
if (type == ActiveMQRAConnectionFactory.CONNECTION) {
return "BOTH";
@@ -164,9 +154,7 @@ public class ActiveMQRAMCFProperties extends ConnectionFactoryProperties impleme
* @return the useTryLock.
*/
public Integer getUseTryLock() {
- if (logger.isTraceEnabled()) {
- logger.trace("getUseTryLock()");
- }
+ logger.trace("getUseTryLock()");
return useTryLock;
}
@@ -177,9 +165,7 @@ public class ActiveMQRAMCFProperties extends ConnectionFactoryProperties impleme
* @param useTryLock the useTryLock.
*/
public void setUseTryLock(final Integer useTryLock) {
- if (logger.isTraceEnabled()) {
- logger.trace("setUseTryLock(" + useTryLock + ")");
- }
+ logger.trace("setUseTryLock({})", useTryLock);
this.useTryLock = useTryLock;
}
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java
index 76d0438f91..3dc6b5aea3 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java
@@ -142,7 +142,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
final String userName,
final String password) throws ResourceException {
if (logger.isTraceEnabled()) {
- logger.trace("constructor(" + mcf + ", " + cri + ", " + userName + ", ****)");
+ logger.trace("constructor({}, {}, {}, ****))", mcf, cri, userName);
}
this.mcf = mcf;
@@ -188,9 +188,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
@Override
public synchronized Object getConnection(final Subject subject,
final ConnectionRequestInfo cxRequestInfo) throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("getConnection(" + subject + ", " + cxRequestInfo + ")");
- }
+ logger.trace("getConnection({}, {})", subject, cxRequestInfo);
// Check user first
ActiveMQRACredential credential = ActiveMQRACredential.getCredential(mcf, subject, cxRequestInfo);
@@ -219,9 +217,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
* @throws ResourceException Failed to close one or more handles.
*/
private void destroyHandles() throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("destroyHandles()");
- }
+ logger.trace("destroyHandles()");
for (ActiveMQRASession session : handles) {
session.destroy();
@@ -237,9 +233,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
*/
@Override
public void destroy() throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("destroy()");
- }
+ logger.trace("destroy()");
if (isDestroyed.get() || connection == null) {
return;
@@ -250,7 +244,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
try {
connection.setExceptionListener(null);
} catch (JMSException e) {
- logger.debug("Error unsetting the exception listener " + this, e);
+ logger.debug("Error unsetting the exception listener {}", this, e);
}
connection.signalStopToAllSessions();
@@ -288,7 +282,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
xaSession.close();
}
} catch (JMSException e) {
- logger.debug("Error closing session " + this, e);
+ logger.debug("Error closing session {}", this, e);
}
} catch (Throwable e) {
@@ -303,9 +297,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
*/
@Override
public void cleanup() throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("cleanup()");
- }
+ logger.trace("cleanup()");
if (isDestroyed.get()) {
throw new IllegalStateException("ManagedConnection already destroyed");
@@ -333,9 +325,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
*/
@Override
public void associateConnection(final Object obj) throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("associateConnection(" + obj + ")");
- }
+ logger.trace("associateConnection({})", obj);
if (!isDestroyed.get() && obj instanceof ActiveMQRASession) {
ActiveMQRASession h = (ActiveMQRASession) obj;
@@ -370,9 +360,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
* Aqquire a lock on the managed connection
*/
protected void lock() {
- if (logger.isTraceEnabled()) {
- logger.trace("lock()");
- }
+ logger.trace("lock()");
lock.lock();
}
@@ -383,9 +371,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
* @throws JMSException Thrown if an error occurs
*/
protected void tryLock() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("tryLock()");
- }
+ logger.trace("tryLock()");
Integer tryLock = mcf.getUseTryLock();
if (tryLock == null || tryLock.intValue() <= 0) {
@@ -405,9 +391,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
* Unlock the managed connection
*/
protected void unlock() {
- if (logger.isTraceEnabled()) {
- logger.trace("unlock()");
- }
+ logger.trace("unlock()");
lock.unlock();
}
@@ -419,9 +403,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
*/
@Override
public void addConnectionEventListener(final ConnectionEventListener l) {
- if (logger.isTraceEnabled()) {
- logger.trace("addConnectionEventListener(" + l + ")");
- }
+ logger.trace("addConnectionEventListener({})", l);
eventListeners.add(l);
}
@@ -433,9 +415,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
*/
@Override
public void removeConnectionEventListener(final ConnectionEventListener l) {
- if (logger.isTraceEnabled()) {
- logger.trace("removeConnectionEventListener(" + l + ")");
- }
+ logger.trace("removeConnectionEventListener({})", l);
eventListeners.remove(l);
}
@@ -448,9 +428,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
*/
@Override
public XAResource getXAResource() throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("getXAResource()");
- }
+ logger.trace("getXAResource()");
//
// Spec says a mc must always return the same XA resource,
@@ -467,9 +445,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
xaResource = ServiceUtils.wrapXAResource(activeMQRAXAResource, xaResourceProperties);
}
- if (logger.isTraceEnabled()) {
- logger.trace("XAResource=" + xaResource);
- }
+ logger.trace("XAResource={}", xaResource);
return xaResource;
}
@@ -482,15 +458,11 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
*/
@Override
public LocalTransaction getLocalTransaction() throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("getLocalTransaction()");
- }
+ logger.trace("getLocalTransaction()");
LocalTransaction tx = new ActiveMQRALocalTransaction(this);
- if (logger.isTraceEnabled()) {
- logger.trace("LocalTransaction=" + tx);
- }
+ logger.trace("LocalTransaction={}", tx);
return tx;
}
@@ -504,9 +476,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
*/
@Override
public ManagedConnectionMetaData getMetaData() throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("getMetaData()");
- }
+ logger.trace("getMetaData()");
if (isDestroyed.get()) {
throw new IllegalStateException("The managed connection is already destroyed");
@@ -523,9 +493,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
*/
@Override
public void setLogWriter(final PrintWriter out) throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("setLogWriter(" + out + ")");
- }
+ logger.trace("setLogWriter({})", out);
}
/**
@@ -536,9 +504,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
*/
@Override
public PrintWriter getLogWriter() throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("getLogWriter()");
- }
+ logger.trace("getLogWriter()");
return null;
}
@@ -554,12 +520,12 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
return;
}
if (logger.isTraceEnabled()) {
- logger.trace("onException(" + exception + ")");
+ logger.trace("onException()", exception);
}
if (isDestroyed.get()) {
if (logger.isTraceEnabled()) {
- logger.trace("Ignoring error on already destroyed connection " + this, exception);
+ logger.trace("Ignoring error on already destroyed connection {}", this, exception);
}
return;
}
@@ -584,15 +550,11 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
*/
protected Session getSession() throws JMSException {
if (xaResource != null && inManagedTx) {
- if (logger.isTraceEnabled()) {
- logger.trace("getSession() -> XA session " + xaSession.getSession());
- }
+ logger.trace("getSession() -> XA session {}", xaSession.getSession());
return xaSession.getSession();
} else {
- if (logger.isTraceEnabled()) {
- logger.trace("getSession() -> non XA session " + nonXAsession);
- }
+ logger.trace("getSession() -> non XA session {}", nonXAsession);
return nonXAsession;
}
@@ -604,9 +566,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
* @param event The event to send.
*/
protected void sendEvent(final ConnectionEvent event) {
- if (logger.isTraceEnabled()) {
- logger.trace("sendEvent(" + event + ")");
- }
+ logger.trace("sendEvent({})", event);
int type = event.getId();
@@ -647,9 +607,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
* @param handle The handle to remove.
*/
protected void removeHandle(final ActiveMQRASession handle) {
- if (logger.isTraceEnabled()) {
- logger.trace("removeHandle(" + handle + ")");
- }
+ logger.trace("removeHandle({})", handle);
handles.remove(handle);
}
@@ -660,9 +618,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
* @return The connection request info for this connection.
*/
protected ActiveMQRAConnectionRequestInfo getCRI() {
- if (logger.isTraceEnabled()) {
- logger.trace("getCRI()");
- }
+ logger.trace("getCRI()");
return cri;
}
@@ -673,9 +629,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
* @return The connection factory for this connection.
*/
protected ActiveMQRAManagedConnectionFactory getManagedConnectionFactory() {
- if (logger.isTraceEnabled()) {
- logger.trace("getManagedConnectionFactory()");
- }
+ logger.trace("getManagedConnectionFactory()");
return mcf;
}
@@ -686,9 +640,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
* @throws JMSException Thrown if the connection can't be started
*/
void start() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("start()");
- }
+ logger.trace("start()");
if (connection != null) {
connection.start();
@@ -701,9 +653,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
* @throws JMSException Thrown if the connection can't be stopped
*/
void stop() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("stop()");
- }
+ logger.trace("stop()");
if (connection != null) {
connection.stop();
@@ -716,9 +666,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
* @return The user name
*/
protected String getUserName() {
- if (logger.isTraceEnabled()) {
- logger.trace("getUserName()");
- }
+ logger.trace("getUserName()");
return userName;
}
@@ -729,9 +677,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
* @throws ResourceException Thrown if a connection couldn't be created
*/
private void setup() throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("setup()");
- }
+ logger.trace("setup()");
try {
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
index ad17d117c7..c88e69ffb0 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
@@ -82,9 +82,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
* Constructor
*/
public ActiveMQRAManagedConnectionFactory() {
- if (logger.isTraceEnabled()) {
- logger.trace("constructor()");
- }
+ logger.trace("constructor()");
ra = null;
cm = null;
@@ -99,9 +97,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
*/
@Override
public Object createConnectionFactory() throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.debug("createConnectionFactory()");
- }
+ logger.debug("createConnectionFactory()");
return createConnectionFactory(new ActiveMQRAConnectionManager());
}
@@ -115,19 +111,14 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
*/
@Override
public Object createConnectionFactory(final ConnectionManager cxManager) throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("createConnectionFactory(" + cxManager + ")");
- }
+ logger.trace("createConnectionFactory({})", cxManager);
cm = cxManager;
ActiveMQRAConnectionFactory cf = new ActiveMQRAConnectionFactoryImpl(this, cm);
- if (logger.isTraceEnabled()) {
- logger.trace("Created connection factory: " + cf +
- ", using connection manager: " +
- cm);
- }
+ logger.trace("Created connection factory: {}, using connection manager: {}", cf, cm);
+
return cf;
}
@@ -142,23 +133,17 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
@Override
public ManagedConnection createManagedConnection(final Subject subject,
final ConnectionRequestInfo cxRequestInfo) throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("createManagedConnection(" + subject + ", " + cxRequestInfo + ")");
- }
+ logger.trace("createManagedConnection({}, {})", subject, cxRequestInfo);
ActiveMQRAConnectionRequestInfo cri = getCRI((ActiveMQRAConnectionRequestInfo) cxRequestInfo);
ActiveMQRACredential credential = ActiveMQRACredential.getCredential(this, subject, cri);
- if (logger.isTraceEnabled()) {
- logger.trace("jms credential: " + credential);
- }
+ logger.trace("jms credential: {}", credential);
ActiveMQRAManagedConnection mc = new ActiveMQRAManagedConnection(this, cri, ra, credential.getUserName(), credential.getPassword());
- if (logger.isTraceEnabled()) {
- logger.trace("created new managed connection: " + mc);
- }
+ logger.trace("created new managed connection: {}", mc);
registerRecovery();
@@ -193,20 +178,13 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
final Subject subject,
final ConnectionRequestInfo cxRequestInfo) throws ResourceException {
if (logger.isTraceEnabled()) {
- logger.trace("matchManagedConnections(" + connectionSet +
- ", " +
- subject +
- ", " +
- cxRequestInfo +
- ")");
+ logger.trace("matchManagedConnections({}, {}, {})", connectionSet, subject, cxRequestInfo);
}
ActiveMQRAConnectionRequestInfo cri = getCRI((ActiveMQRAConnectionRequestInfo) cxRequestInfo);
ActiveMQRACredential credential = ActiveMQRACredential.getCredential(this, subject, cri);
- if (logger.isTraceEnabled()) {
- logger.trace("Looking for connection matching credentials: " + credential);
- }
+ logger.trace("Looking for connection matching credentials: {}", credential);
for (Object obj : connectionSet) {
if (obj instanceof ActiveMQRAManagedConnection) {
@@ -215,9 +193,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
if ((mc.getUserName() == null || mc.getUserName() != null && mc.getUserName().equals(credential.getUserName())) && mcf.equals(this)) {
if (cri.equals(mc.getCRI())) {
- if (logger.isTraceEnabled()) {
- logger.trace("Found matching connection: " + mc);
- }
+ logger.trace("Found matching connection: {}", mc);
return mc;
}
@@ -225,9 +201,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
}
}
- if (logger.isTraceEnabled()) {
- logger.trace("No matching connection was found");
- }
+ logger.trace("No matching connection was found");
return null;
}
@@ -240,9 +214,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
*/
@Override
public void setLogWriter(final PrintWriter out) throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("setLogWriter(" + out + ")");
- }
+ logger.trace("setLogWriter({})", out);
}
/**
@@ -253,9 +225,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
*/
@Override
public PrintWriter getLogWriter() throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("getLogWriter()");
- }
+ logger.trace("getLogWriter()");
return null;
}
@@ -267,9 +237,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
*/
@Override
public ResourceAdapter getResourceAdapter() {
- if (logger.isTraceEnabled()) {
- logger.trace("getResourceAdapter()");
- }
+ logger.trace("getResourceAdapter()");
return ra;
}
@@ -288,9 +256,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
*/
@Override
public void setResourceAdapter(final ResourceAdapter ra) throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("setResourceAdapter(" + ra + ")");
- }
+ logger.trace("setResourceAdapter({})", ra);
if (ra == null || !(ra instanceof ActiveMQResourceAdapter)) {
throw new ResourceException("Resource adapter is " + ra);
@@ -308,9 +274,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
*/
@Override
public boolean equals(final Object obj) {
- if (logger.isTraceEnabled()) {
- logger.trace("equals(" + obj + ")");
- }
+ logger.trace("equals({})", obj);
if (obj == null) {
return false;
@@ -332,9 +296,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
*/
@Override
public int hashCode() {
- if (logger.isTraceEnabled()) {
- logger.trace("hashCode()");
- }
+ logger.trace("hashCode()");
int hash = mcfProperties.hashCode();
hash += 31 * (ra != null ? ra.hashCode() : 0);
@@ -348,9 +310,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
* @return The value
*/
public String getSessionDefaultType() {
- if (logger.isTraceEnabled()) {
- logger.trace("getSessionDefaultType()");
- }
+ logger.trace("getSessionDefaultType()");
return mcfProperties.getSessionDefaultType();
}
@@ -361,9 +321,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
* @param type either javax.jms.Topic or javax.jms.Queue
*/
public void setSessionDefaultType(final String type) {
- if (logger.isTraceEnabled()) {
- logger.trace("setSessionDefaultType(" + type + ")");
- }
+ logger.trace("setSessionDefaultType({})", type);
mcfProperties.setSessionDefaultType(type);
}
@@ -746,9 +704,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
* @return the useTryLock.
*/
public Integer getUseTryLock() {
- if (logger.isTraceEnabled()) {
- logger.trace("getUseTryLock()");
- }
+ logger.trace("getUseTryLock()");
return mcfProperties.getUseTryLock();
}
@@ -759,9 +715,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
* @param useTryLock the useTryLock.
*/
public void setUseTryLock(final Integer useTryLock) {
- if (logger.isTraceEnabled()) {
- logger.trace("setUseTryLock(" + useTryLock + ")");
- }
+ logger.trace("setUseTryLock({})", useTryLock);
mcfProperties.setUseTryLock(useTryLock);
}
@@ -772,9 +726,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
* @return The metadata
*/
public ConnectionMetaData getMetaData() {
- if (logger.isTraceEnabled()) {
- logger.trace("getMetadata()");
- }
+ logger.trace("getMetadata()");
return new ActiveMQRAConnectionMetaData();
}
@@ -785,9 +737,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
* @return The properties
*/
protected ActiveMQRAMCFProperties getProperties() {
- if (logger.isTraceEnabled()) {
- logger.trace("getProperties()");
- }
+ logger.trace("getProperties()");
return mcfProperties;
}
@@ -799,9 +749,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
* @return The instance
*/
private ActiveMQRAConnectionRequestInfo getCRI(final ActiveMQRAConnectionRequestInfo info) {
- if (logger.isTraceEnabled()) {
- logger.trace("getCRI(" + info + ")");
- }
+ logger.trace("getCRI({})", info);
if (info == null) {
// Create a default one
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java
index f7389a9dc5..7e8e0297df 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java
@@ -41,9 +41,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
public ActiveMQRAMapMessage(final MapMessage message, final ActiveMQRASession session) {
super(message, session);
- if (logger.isTraceEnabled()) {
- logger.trace("constructor(" + message + ", " + session + ")");
- }
+ logger.trace("constructor({}, {})", message, session);
}
/**
@@ -55,9 +53,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
*/
@Override
public boolean getBoolean(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getBoolean(" + name + ")");
- }
+ logger.trace("getBoolean({})", name);
return ((MapMessage) message).getBoolean(name);
}
@@ -71,9 +67,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
*/
@Override
public byte getByte(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getByte(" + name + ")");
- }
+ logger.trace("getByte({})", name);
return ((MapMessage) message).getByte(name);
}
@@ -87,9 +81,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
*/
@Override
public byte[] getBytes(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getBytes(" + name + ")");
- }
+ logger.trace("getBytes({})", name);
return ((MapMessage) message).getBytes(name);
}
@@ -103,9 +95,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
*/
@Override
public char getChar(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getChar(" + name + ")");
- }
+ logger.trace("getChar({})", name);
return ((MapMessage) message).getChar(name);
}
@@ -119,9 +109,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
*/
@Override
public double getDouble(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getDouble(" + name + ")");
- }
+ logger.trace("getDouble({})", name);
return ((MapMessage) message).getDouble(name);
}
@@ -135,9 +123,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
*/
@Override
public float getFloat(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getFloat(" + name + ")");
- }
+ logger.trace("getFloat({})", name);
return ((MapMessage) message).getFloat(name);
}
@@ -151,9 +137,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
*/
@Override
public int getInt(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getInt(" + name + ")");
- }
+ logger.trace("getInt({})", name);
return ((MapMessage) message).getInt(name);
}
@@ -167,9 +151,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
*/
@Override
public long getLong(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getLong(" + name + ")");
- }
+ logger.trace("getLong({})", name);
return ((MapMessage) message).getLong(name);
}
@@ -182,9 +164,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
*/
@Override
public Enumeration getMapNames() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getMapNames()");
- }
+ logger.trace("getMapNames()");
return ((MapMessage) message).getMapNames();
}
@@ -198,9 +178,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
*/
@Override
public Object getObject(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getObject(" + name + ")");
- }
+ logger.trace("getObject({})", name);
return ((MapMessage) message).getObject(name);
}
@@ -214,9 +192,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
*/
@Override
public short getShort(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getShort(" + name + ")");
- }
+ logger.trace("getShort({})", name);
return ((MapMessage) message).getShort(name);
}
@@ -230,9 +206,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
*/
@Override
public String getString(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getString(" + name + ")");
- }
+ logger.trace("getString({})", name);
return ((MapMessage) message).getString(name);
}
@@ -246,9 +220,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
*/
@Override
public boolean itemExists(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("itemExists(" + name + ")");
- }
+ logger.trace("itemExists({})", name);
return ((MapMessage) message).itemExists(name);
}
@@ -263,7 +235,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
@Override
public void setBoolean(final String name, final boolean value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setBoolean(" + name + ", " + value + ")");
+ logger.trace("setBoolean({}, {})", name, value);
}
((MapMessage) message).setBoolean(name, value);
@@ -279,7 +251,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
@Override
public void setByte(final String name, final byte value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setByte(" + name + ", " + value + ")");
+ logger.trace("setByte({}, {})", name, value);
}
((MapMessage) message).setByte(name, value);
@@ -297,8 +269,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
@Override
public void setBytes(final String name, final byte[] value, final int offset, final int length) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setBytes(" + name + ", " + Arrays.toString(value) + ", " + offset + ", " +
- length + ")");
+ logger.trace("setBytes({}, {}, {}, {})", name, Arrays.toString(value), offset, length);
}
((MapMessage) message).setBytes(name, value, offset, length);
@@ -314,7 +285,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
@Override
public void setBytes(final String name, final byte[] value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setBytes(" + name + ", " + Arrays.toString(value) + ")");
+ logger.trace("setBytes({}, {})", name, Arrays.toString(value));
}
((MapMessage) message).setBytes(name, value);
@@ -330,7 +301,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
@Override
public void setChar(final String name, final char value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setChar(" + name + ", " + value + ")");
+ logger.trace("setChar({}, {})", name, value);
}
((MapMessage) message).setChar(name, value);
@@ -346,7 +317,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
@Override
public void setDouble(final String name, final double value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setDouble(" + name + ", " + value + ")");
+ logger.trace("setDouble({}, {})", name, value);
}
((MapMessage) message).setDouble(name, value);
@@ -362,7 +333,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
@Override
public void setFloat(final String name, final float value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setFloat(" + name + ", " + value + ")");
+ logger.trace("setFloat({}, {})", name, value);
}
((MapMessage) message).setFloat(name, value);
@@ -378,7 +349,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
@Override
public void setInt(final String name, final int value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setInt(" + name + ", " + value + ")");
+ logger.trace("setInt({}, {})", name, value);
}
((MapMessage) message).setInt(name, value);
@@ -394,7 +365,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
@Override
public void setLong(final String name, final long value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setLong(" + name + ", " + value + ")");
+ logger.trace("setLong({}, {})", name, value);
}
((MapMessage) message).setLong(name, value);
@@ -410,7 +381,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
@Override
public void setObject(final String name, final Object value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setObject(" + name + ", " + value + ")");
+ logger.trace("setObject({}, {})", name, value);
}
((MapMessage) message).setObject(name, value);
@@ -426,7 +397,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
@Override
public void setShort(final String name, final short value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setShort(" + name + ", " + value + ")");
+ logger.trace("setShort({}, {})", name, value);
}
((MapMessage) message).setShort(name, value);
@@ -441,9 +412,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
*/
@Override
public void setString(final String name, final String value) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("setString(" + name + ", " + value + ")");
- }
+ logger.trace("setString({}, {})", name, value);
((MapMessage) message).setString(name, value);
}
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java
index 36cb8204d0..5ab313a7c0 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java
@@ -55,9 +55,7 @@ public class ActiveMQRAMessage implements Message {
checkNotNull(message);
checkNotNull(session);
- if (logger.isTraceEnabled()) {
- logger.trace("constructor(" + message + ", " + session + ")");
- }
+ logger.trace("constructor({}, {})", message, session);
this.message = message;
this.session = session;
@@ -70,9 +68,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public void acknowledge() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("acknowledge()");
- }
+ logger.trace("acknowledge()");
session.getSession(); // Check for closed
message.acknowledge();
@@ -85,9 +81,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public void clearBody() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("clearBody()");
- }
+ logger.trace("clearBody()");
message.clearBody();
}
@@ -99,9 +93,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public void clearProperties() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("clearProperties()");
- }
+ logger.trace("clearProperties()");
message.clearProperties();
}
@@ -115,9 +107,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public boolean getBooleanProperty(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getBooleanProperty(" + name + ")");
- }
+ logger.trace("getBooleanProperty({})", name);
return message.getBooleanProperty(name);
}
@@ -131,9 +121,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public byte getByteProperty(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getByteProperty(" + name + ")");
- }
+ logger.trace("getByteProperty({})", name);
return message.getByteProperty(name);
}
@@ -147,9 +135,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public double getDoubleProperty(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getDoubleProperty(" + name + ")");
- }
+ logger.trace("getDoubleProperty({})", name);
return message.getDoubleProperty(name);
}
@@ -163,9 +149,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public float getFloatProperty(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getFloatProperty(" + name + ")");
- }
+ logger.trace("getFloatProperty({})", name);
return message.getFloatProperty(name);
}
@@ -179,9 +163,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public int getIntProperty(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getIntProperty(" + name + ")");
- }
+ logger.trace("getIntProperty({})", name);
return message.getIntProperty(name);
}
@@ -194,9 +176,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public String getJMSCorrelationID() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getJMSCorrelationID()");
- }
+ logger.trace("getJMSCorrelationID()");
return message.getJMSCorrelationID();
}
@@ -209,9 +189,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public byte[] getJMSCorrelationIDAsBytes() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getJMSCorrelationIDAsBytes()");
- }
+ logger.trace("getJMSCorrelationIDAsBytes()");
return message.getJMSCorrelationIDAsBytes();
}
@@ -224,9 +202,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public int getJMSDeliveryMode() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getJMSDeliveryMode()");
- }
+ logger.trace("getJMSDeliveryMode()");
return message.getJMSDeliveryMode();
}
@@ -239,9 +215,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public Destination getJMSDestination() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getJMSDestination()");
- }
+ logger.trace("getJMSDestination()");
return message.getJMSDestination();
}
@@ -254,9 +228,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public long getJMSExpiration() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getJMSExpiration()");
- }
+ logger.trace("getJMSExpiration()");
return message.getJMSExpiration();
}
@@ -269,9 +241,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public String getJMSMessageID() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getJMSMessageID()");
- }
+ logger.trace("getJMSMessageID()");
return message.getJMSMessageID();
}
@@ -284,9 +254,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public int getJMSPriority() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getJMSPriority()");
- }
+ logger.trace("getJMSPriority()");
return message.getJMSPriority();
}
@@ -299,9 +267,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public boolean getJMSRedelivered() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getJMSRedelivered()");
- }
+ logger.trace("getJMSRedelivered()");
return message.getJMSRedelivered();
}
@@ -314,9 +280,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public Destination getJMSReplyTo() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getJMSReplyTo()");
- }
+ logger.trace("getJMSReplyTo()");
return message.getJMSReplyTo();
}
@@ -329,9 +293,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public long getJMSTimestamp() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getJMSTimestamp()");
- }
+ logger.trace("getJMSTimestamp()");
return message.getJMSTimestamp();
}
@@ -344,9 +306,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public String getJMSType() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getJMSType()");
- }
+ logger.trace("getJMSType()");
return message.getJMSType();
}
@@ -360,9 +320,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public long getLongProperty(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getLongProperty(" + name + ")");
- }
+ logger.trace("getLongProperty({})", name);
return message.getLongProperty(name);
}
@@ -376,9 +334,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public Object getObjectProperty(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getObjectProperty(" + name + ")");
- }
+ logger.trace("getObjectProperty({})", name);
return message.getObjectProperty(name);
}
@@ -391,9 +347,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public Enumeration getPropertyNames() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getPropertyNames()");
- }
+ logger.trace("getPropertyNames()");
return message.getPropertyNames();
}
@@ -407,9 +361,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public short getShortProperty(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getShortProperty(" + name + ")");
- }
+ logger.trace("getShortProperty({})", name);
return message.getShortProperty(name);
}
@@ -423,9 +375,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public String getStringProperty(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getStringProperty(" + name + ")");
- }
+ logger.trace("getStringProperty({})", name);
return message.getStringProperty(name);
}
@@ -439,9 +389,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public boolean propertyExists(final String name) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("propertyExists(" + name + ")");
- }
+ logger.trace("propertyExists({})", name);
return message.propertyExists(name);
}
@@ -456,7 +404,7 @@ public class ActiveMQRAMessage implements Message {
@Override
public void setBooleanProperty(final String name, final boolean value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setBooleanProperty(" + name + ", " + value + ")");
+ logger.trace("setBooleanProperty({}, {})", name, value);
}
message.setBooleanProperty(name, value);
@@ -472,7 +420,7 @@ public class ActiveMQRAMessage implements Message {
@Override
public void setByteProperty(final String name, final byte value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setByteProperty(" + name + ", " + value + ")");
+ logger.trace("setByteProperty({}, {})", name, value);
}
message.setByteProperty(name, value);
@@ -488,7 +436,7 @@ public class ActiveMQRAMessage implements Message {
@Override
public void setDoubleProperty(final String name, final double value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setDoubleProperty(" + name + ", " + value + ")");
+ logger.trace("setDoubleProperty({}, {})", name, value);
}
message.setDoubleProperty(name, value);
@@ -504,7 +452,7 @@ public class ActiveMQRAMessage implements Message {
@Override
public void setFloatProperty(final String name, final float value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setFloatProperty(" + name + ", " + value + ")");
+ logger.trace("setFloatProperty({}, {})", name, value);
}
message.setFloatProperty(name, value);
@@ -520,7 +468,7 @@ public class ActiveMQRAMessage implements Message {
@Override
public void setIntProperty(final String name, final int value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setIntProperty(" + name + ", " + value + ")");
+ logger.trace("setIntProperty({}, {})", name, value);
}
message.setIntProperty(name, value);
@@ -535,7 +483,7 @@ public class ActiveMQRAMessage implements Message {
@Override
public void setJMSCorrelationID(final String correlationID) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setJMSCorrelationID(" + correlationID + ")");
+ logger.trace("setJMSCorrelationID({})", correlationID);
}
message.setJMSCorrelationID(correlationID);
@@ -550,7 +498,7 @@ public class ActiveMQRAMessage implements Message {
@Override
public void setJMSCorrelationIDAsBytes(final byte[] correlationID) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setJMSCorrelationIDAsBytes(" + Arrays.toString(correlationID) + ")");
+ logger.trace("setJMSCorrelationIDAsBytes({})", Arrays.toString(correlationID));
}
message.setJMSCorrelationIDAsBytes(correlationID);
@@ -565,7 +513,7 @@ public class ActiveMQRAMessage implements Message {
@Override
public void setJMSDeliveryMode(final int deliveryMode) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setJMSDeliveryMode(" + deliveryMode + ")");
+ logger.trace("setJMSDeliveryMode({})", deliveryMode);
}
message.setJMSDeliveryMode(deliveryMode);
@@ -579,9 +527,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public void setJMSDestination(final Destination destination) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("setJMSDestination(" + destination + ")");
- }
+ logger.trace("setJMSDestination({})", destination);
message.setJMSDestination(destination);
}
@@ -595,7 +541,7 @@ public class ActiveMQRAMessage implements Message {
@Override
public void setJMSExpiration(final long expiration) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setJMSExpiration(" + expiration + ")");
+ logger.trace("setJMSExpiration({})", expiration);
}
message.setJMSExpiration(expiration);
@@ -609,9 +555,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public void setJMSMessageID(final String id) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("setJMSMessageID(" + id + ")");
- }
+ logger.trace("setJMSMessageID({})", id);
message.setJMSMessageID(id);
}
@@ -625,7 +569,7 @@ public class ActiveMQRAMessage implements Message {
@Override
public void setJMSPriority(final int priority) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setJMSPriority(" + priority + ")");
+ logger.trace("setJMSPriority({})", priority);
}
message.setJMSPriority(priority);
@@ -640,7 +584,7 @@ public class ActiveMQRAMessage implements Message {
@Override
public void setJMSRedelivered(final boolean redelivered) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setJMSRedelivered(" + redelivered + ")");
+ logger.trace("setJMSRedelivered({})", redelivered);
}
message.setJMSRedelivered(redelivered);
@@ -654,9 +598,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public void setJMSReplyTo(final Destination replyTo) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("setJMSReplyTo(" + replyTo + ")");
- }
+ logger.trace("setJMSReplyTo({})", replyTo);
message.setJMSReplyTo(replyTo);
}
@@ -670,7 +612,7 @@ public class ActiveMQRAMessage implements Message {
@Override
public void setJMSTimestamp(final long timestamp) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setJMSTimestamp(" + timestamp + ")");
+ logger.trace("setJMSTimestamp({})", timestamp);
}
message.setJMSTimestamp(timestamp);
@@ -684,9 +626,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public void setJMSType(final String type) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("setJMSType(" + type + ")");
- }
+ logger.trace("setJMSType({})", type);
message.setJMSType(type);
}
@@ -701,7 +641,7 @@ public class ActiveMQRAMessage implements Message {
@Override
public void setLongProperty(final String name, final long value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setLongProperty(" + name + ", " + value + ")");
+ logger.trace("setLongProperty({}, {})", name, value);
}
message.setLongProperty(name, value);
@@ -716,9 +656,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public void setObjectProperty(final String name, final Object value) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("setObjectProperty(" + name + ", " + value + ")");
- }
+ logger.trace("setObjectProperty({}, {})", name, value);
message.setObjectProperty(name, value);
}
@@ -733,7 +671,7 @@ public class ActiveMQRAMessage implements Message {
@Override
public void setShortProperty(final String name, final short value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setShortProperty(" + name + ", " + value + ")");
+ logger.trace("setShortProperty({}, {})", name, value);
}
message.setShortProperty(name, value);
@@ -749,7 +687,7 @@ public class ActiveMQRAMessage implements Message {
@Override
public void setStringProperty(final String name, final String value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setStringProperty(" + name + ", " + value + ")");
+ logger.trace("setStringProperty({}, {})", name, value);
}
message.setStringProperty(name, value);
@@ -757,34 +695,31 @@ public class ActiveMQRAMessage implements Message {
@Override
public long getJMSDeliveryTime() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getJMSDeliveryTime()");
- }
+ logger.trace("getJMSDeliveryTime()");
+
return message.getJMSDeliveryTime();
}
@Override
public void setJMSDeliveryTime(long deliveryTime) throws JMSException {
-
if (logger.isTraceEnabled()) {
- logger.trace("setJMSDeliveryTime(" + deliveryTime + ")");
+ logger.trace("setJMSDeliveryTime({})", deliveryTime);
}
+
message.setJMSDeliveryTime(deliveryTime);
}
@Override
public <T> T getBody(Class<T> c) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getBody(" + c + ")");
- }
+ logger.trace("getBody({})", c);
+
return message.getBody(c);
}
@Override
public boolean isBodyAssignableTo(Class c) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("isBodyAssignableTo(" + c + ")");
- }
+ logger.trace("isBodyAssignableTo({})", c);
+
return message.isBodyAssignableTo(c);
}
@@ -795,9 +730,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public int hashCode() {
- if (logger.isTraceEnabled()) {
- logger.trace("hashCode()");
- }
+ logger.trace("hashCode()");
return message.hashCode();
}
@@ -810,9 +743,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public boolean equals(final Object object) {
- if (logger.isTraceEnabled()) {
- logger.trace("equals(" + object + ")");
- }
+ logger.trace("equals({})", object);
if (object != null && object instanceof ActiveMQRAMessage) {
return message.equals(((ActiveMQRAMessage) object).message);
@@ -828,9 +759,7 @@ public class ActiveMQRAMessage implements Message {
*/
@Override
public String toString() {
- if (logger.isTraceEnabled()) {
- logger.trace("toString()");
- }
+ logger.trace("toString()");
return message.toString();
}
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageConsumer.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageConsumer.java
index 00da38bdd2..2d8341b459 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageConsumer.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageConsumer.java
@@ -58,11 +58,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer {
this.session = session;
if (logger.isTraceEnabled()) {
- logger.trace("new ActiveMQMessageConsumer " + this +
- " consumer=" +
- consumer +
- " session=" +
- session);
+ logger.trace("new ActiveMQMessageConsumer {} consumer={} session={}", this, consumer, session);
}
}
@@ -73,9 +69,8 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer {
*/
@Override
public void close() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("close " + this);
- }
+ logger.trace("close {}", this);
+
try {
closeConsumer();
} finally {
@@ -89,9 +84,8 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer {
* @throws JMSException Thrown if an error occurs
*/
void checkState() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("checkState()");
- }
+ logger.trace("checkState()");
+
session.checkState();
}
@@ -103,9 +97,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer {
*/
@Override
public MessageListener getMessageListener() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getMessageListener()");
- }
+ logger.trace("getMessageListener()");
checkState();
session.checkStrict();
@@ -142,9 +134,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer {
*/
@Override
public String getMessageSelector() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getMessageSelector()");
- }
+ logger.trace("getMessageSelector()");
checkState();
return consumer.getMessageSelector();
@@ -160,16 +150,12 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer {
public Message receive() throws JMSException {
session.lock();
try {
- if (logger.isTraceEnabled()) {
- logger.trace("receive " + this);
- }
+ logger.trace("receive {}", this);
checkState();
Message message = consumer.receive();
- if (logger.isTraceEnabled()) {
- logger.trace("received " + this + " result=" + message);
- }
+ logger.trace("received {} result={}", this, message);
if (message == null) {
return null;
@@ -193,15 +179,13 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer {
session.lock();
try {
if (logger.isTraceEnabled()) {
- logger.trace("receive " + this + " timeout=" + timeout);
+ logger.trace("receive {} timeout={}", this, timeout);
}
checkState();
Message message = consumer.receive(timeout);
- if (logger.isTraceEnabled()) {
- logger.trace("received " + this + " result=" + message);
- }
+ logger.trace("received {} result={}", this, message);
if (message == null) {
return null;
@@ -223,16 +207,12 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer {
public Message receiveNoWait() throws JMSException {
session.lock();
try {
- if (logger.isTraceEnabled()) {
- logger.trace("receiveNoWait " + this);
- }
+ logger.trace("receiveNoWait {}", this);
checkState();
Message message = consumer.receiveNoWait();
- if (logger.isTraceEnabled()) {
- logger.trace("received " + this + " result=" + message);
- }
+ logger.trace("received {} result={}", this, message);
if (message == null) {
return null;
@@ -250,9 +230,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer {
* @throws JMSException Thrown if an error occurs
*/
void closeConsumer() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("closeConsumer()");
- }
+ logger.trace("closeConsumer()");
consumer.close();
}
@@ -264,9 +242,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer {
* @return The wrapped message
*/
Message wrapMessage(final Message message) {
- if (logger.isTraceEnabled()) {
- logger.trace("wrapMessage(" + message + ")");
- }
+ logger.trace("wrapMessage({})", message);
if (message instanceof BytesMessage) {
return new ActiveMQRABytesMessage((BytesMessage) message, session);
@@ -289,9 +265,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer {
* @return The wrapped listener
*/
MessageListener wrapMessageListener(final MessageListener listener) {
- if (logger.isTraceEnabled()) {
- logger.trace("getMessageSelector()");
- }
+ logger.trace("getMessageSelector()");
return new ActiveMQRAMessageListener(listener, this);
}
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageListener.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageListener.java
index d269f1d49b..e8d1608a1d 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageListener.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageListener.java
@@ -48,9 +48,7 @@ public class ActiveMQRAMessageListener implements MessageListener {
* @param consumer the consumer
*/
public ActiveMQRAMessageListener(final MessageListener listener, final ActiveMQRAMessageConsumer consumer) {
- if (logger.isTraceEnabled()) {
- logger.trace("constructor(" + listener + ", " + consumer + ")");
- }
+ logger.trace("constructor({}, {})", listener, consumer);
this.listener = listener;
this.consumer = consumer;
@@ -63,9 +61,7 @@ public class ActiveMQRAMessageListener implements MessageListener {
*/
@Override
public void onMessage(Message message) {
- if (logger.isTraceEnabled()) {
- logger.trace("onMessage(" + message + ")");
- }
+ logger.trace("onMessage({})", message);
message = consumer.wrapMessage(message);
listener.onMessage(message);
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageProducer.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageProducer.java
index 24502fd29e..903b14d4fe 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageProducer.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageProducer.java
@@ -54,11 +54,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
this.session = session;
if (logger.isTraceEnabled()) {
- logger.trace("new ActiveMQMessageProducer " + this +
- " producer=" +
- producer +
- " session=" +
- session);
+ logger.trace("new ActiveMQMessageProducer {} producer={} session={}", this, producer, session);
}
}
@@ -69,9 +65,8 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
*/
@Override
public void close() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("close " + this);
- }
+ logger.trace("close {}", this);
+
try {
closeProducer();
} finally {
@@ -98,26 +93,15 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
session.lock();
try {
if (logger.isTraceEnabled()) {
- logger.trace("send " + this +
- " destination=" +
- destination +
- " message=" +
- message +
- " deliveryMode=" +
- deliveryMode +
- " priority=" +
- priority +
- " ttl=" +
- timeToLive);
+ logger.trace("send {} destination={} message={} deliveryMode={} priority={} ttl={}",
+ this, destination, message, deliveryMode, priority, timeToLive);
}
checkState();
producer.send(destination, message, deliveryMode, priority, timeToLive);
- if (logger.isTraceEnabled()) {
- logger.trace("sent " + this + " result=" + message);
- }
+ logger.trace("sent {} result={}", this, message);
} finally {
session.unlock();
}
@@ -135,16 +119,14 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
session.lock();
try {
if (logger.isTraceEnabled()) {
- logger.trace("send " + this + " destination=" + destination + " message=" + message);
+ logger.trace("send {} destination={} message={}", this, destination, message);
}
checkState();
producer.send(destination, message);
- if (logger.isTraceEnabled()) {
- logger.trace("sent " + this + " result=" + message);
- }
+ logger.trace("sent {} result={}", this, message);
} finally {
session.unlock();
}
@@ -167,24 +149,15 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
session.lock();
try {
if (logger.isTraceEnabled()) {
- logger.trace("send " + this +
- " message=" +
- message +
- " deliveryMode=" +
- deliveryMode +
- " priority=" +
- priority +
- " ttl=" +
- timeToLive);
+ logger.trace("send {} message={} deliveryMode={} priority={} ttl={}",
+ this, message, deliveryMode, priority, timeToLive);
}
checkState();
producer.send(message, deliveryMode, priority, timeToLive);
- if (logger.isTraceEnabled()) {
- logger.trace("sent " + this + " result=" + message);
- }
+ logger.trace("sent {} result={}", this, message);
} finally {
session.unlock();
}
@@ -200,17 +173,13 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
public void send(final Message message) throws JMSException {
session.lock();
try {
- if (logger.isTraceEnabled()) {
- logger.trace("send " + this + " message=" + message);
- }
+ logger.trace("send {} result={}", this, message);
checkState();
producer.send(message);
- if (logger.isTraceEnabled()) {
- logger.trace("sent " + this + " result=" + message);
- }
+ logger.trace("sent {} result={}", this, message);
} finally {
session.unlock();
}
@@ -224,9 +193,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
*/
@Override
public int getDeliveryMode() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getRoutingType()");
- }
+ logger.trace("getRoutingType()");
return producer.getDeliveryMode();
}
@@ -239,9 +206,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
*/
@Override
public Destination getDestination() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getDestination()");
- }
+ logger.trace("getDestination()");
return producer.getDestination();
}
@@ -254,9 +219,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
*/
@Override
public boolean getDisableMessageID() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getDisableMessageID()");
- }
+ logger.trace("getDisableMessageID()");
return producer.getDisableMessageID();
}
@@ -269,9 +232,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
*/
@Override
public boolean getDisableMessageTimestamp() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getDisableMessageTimestamp()");
- }
+ logger.trace("getDisableMessageTimestamp()");
return producer.getDisableMessageTimestamp();
}
@@ -284,9 +245,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
*/
@Override
public int getPriority() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getPriority()");
- }
+ logger.trace("getPriority()");
return producer.getPriority();
}
@@ -299,9 +258,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
*/
@Override
public long getTimeToLive() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getTimeToLive()");
- }
+ logger.trace("getTimeToLive()");
return producer.getTimeToLive();
}
@@ -315,7 +272,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
@Override
public void setDeliveryMode(final int deliveryMode) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setRoutingType(" + deliveryMode + ")");
+ logger.trace("setRoutingType({})", deliveryMode);
}
producer.setDeliveryMode(deliveryMode);
@@ -330,7 +287,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
@Override
public void setDisableMessageID(final boolean value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setDisableMessageID(" + value + ")");
+ logger.trace("setDisableMessageID({})", value);
}
producer.setDisableMessageID(value);
@@ -345,7 +302,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
@Override
public void setDisableMessageTimestamp(final boolean value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setDisableMessageTimestamp(" + value + ")");
+ logger.trace("setDisableMessageTimestamp({})", value);
}
producer.setDisableMessageTimestamp(value);
@@ -360,7 +317,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
@Override
public void setPriority(final int defaultPriority) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setPriority(" + defaultPriority + ")");
+ logger.trace("setPriority({})", defaultPriority);
}
producer.setPriority(defaultPriority);
@@ -375,7 +332,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
@Override
public void setTimeToLive(final long timeToLive) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setTimeToLive(" + timeToLive + ")");
+ logger.trace("setTimeToLive({})", timeToLive);
}
producer.setTimeToLive(timeToLive);
@@ -384,24 +341,22 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
@Override
public void setDeliveryDelay(long deliveryDelay) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("setDeliveryDelay(" + deliveryDelay + ")");
+ logger.trace("setDeliveryDelay({})", deliveryDelay);
}
producer.setDeliveryDelay(deliveryDelay);
}
@Override
public long getDeliveryDelay() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getDeliveryDelay()");
- }
+ logger.trace("getDeliveryDelay()");
+
return producer.getDeliveryDelay();
}
@Override
public void send(Message message, CompletionListener completionListener) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("send(" + message + ", " + completionListener + ")");
- }
+ logger.trace("send({}, {})", message, completionListener);
+
producer.send(message, completionListener);
}
@@ -412,8 +367,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
long timeToLive,
CompletionListener completionListener) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("send(" + message + ", " + deliveryMode + ", " + priority + ", " + timeToLive +
- ", " + completionListener + ")");
+ logger.trace("send({}, {}, {}, {}, {})", message, deliveryMode, priority, timeToLive, completionListener);
}
producer.send(message, deliveryMode, priority, timeToLive, completionListener);
}
@@ -423,7 +377,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
Message message,
CompletionListener completionListener) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("send(" + destination + ", " + message + ", " + completionListener + ")");
+ logger.trace("send({}, {}, {})", destination, message, completionListener);
}
producer.send(destination, message, completionListener);
}
@@ -436,8 +390,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
long timeToLive,
CompletionListener completionListener) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("send(" + destination + ", " + message + ", " + deliveryMode + ", " + priority +
- ", " + timeToLive + ", " + completionListener + ")");
+ logger.trace("send({}, {}, {}, {}, {}, {})", destination, message, deliveryMode, priority, timeToLive, completionListener);
}
producer.send(destination, message, deliveryMode, priority, timeToLive, completionListener);
}
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java
index 153d2689e1..5fcc904cb8 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java
@@ -41,9 +41,7 @@ public class ActiveMQRAMetaData implements ManagedConnectionMetaData {
* @param mc The managed connection
*/
public ActiveMQRAMetaData(final ActiveMQRAManagedConnection mc) {
- if (logger.isTraceEnabled()) {
- logger.trace("constructor(" + mc + ")");
- }
+ logger.trace("constructor({})", mc);
this.mc = mc;
}
@@ -56,9 +54,7 @@ public class ActiveMQRAMetaData implements ManagedConnectionMetaData {
*/
@Override
public String getEISProductName() throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("getEISProductName()");
- }
+ logger.trace("getEISProductName()");
return "ActiveMQ Artemis";
}
@@ -71,9 +67,7 @@ public class ActiveMQRAMetaData implements ManagedConnectionMetaData {
*/
@Override
public String getEISProductVersion() throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("getEISProductVersion()");
- }
+ logger.trace("getEISProductVersion()");
return "2.0";
}
@@ -86,9 +80,7 @@ public class ActiveMQRAMetaData implements ManagedConnectionMetaData {
*/
@Override
public String getUserName() throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("getUserName()");
- }
+ logger.trace("getUserName()");
return mc.getUserName();
}
@@ -101,9 +93,7 @@ public class ActiveMQRAMetaData implements ManagedConnectionMetaData {
*/
@Override
public int getMaxConnections() throws ResourceException {
- if (logger.isTraceEnabled()) {
- logger.trace("getMaxConnections()");
- }
+ logger.trace("getMaxConnections()");
return 0;
}
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAObjectMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAObjectMessage.java
index 05ce308eb1..3c4733a6c9 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAObjectMessage.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAObjectMessage.java
@@ -40,9 +40,7 @@ public class ActiveMQRAObjectMessage extends ActiveMQRAMessage implements Object
public ActiveMQRAObjectMessage(final ObjectMessage message, final ActiveMQRASession session) {
super(message, session);
- if (logger.isTraceEnabled()) {
- logger.trace("constructor(" + message + ", " + session + ")");
- }
+ logger.trace("constructor({}, {})", message, session);
}
/**
@@ -53,9 +51,7 @@ public class ActiveMQRAObjectMessage extends ActiveMQRAMessage implements Object
*/
@Override
public Serializable getObject() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getObject()");
- }
+ logger.trace("getObject()");
return ((ObjectMessage) message).getObject();
}
@@ -68,9 +64,7 @@ public class ActiveMQRAObjectMessage extends ActiveMQRAMessage implements Object
*/
@Override
public void setObject(final Serializable object) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("setObject(" + object + ")");
- }
+ logger.trace("setObject({})", object);
((ObjectMessage) message).setObject(object);
}
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAProperties.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAProperties.java
index 60f465fadd..3bee0ae81e 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAProperties.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAProperties.java
@@ -89,9 +89,7 @@ public class ActiveMQRAProperties extends ConnectionFactoryProperties implements
* Constructor
*/
public ActiveMQRAProperties() {
- if (logger.isTraceEnabled()) {
- logger.trace("constructor()");
- }
+ logger.trace("constructor()");
}
/**
@@ -100,9 +98,7 @@ public class ActiveMQRAProperties extends ConnectionFactoryProperties implements
* @return The value
*/
public String getUserName() {
- if (logger.isTraceEnabled()) {
- logger.trace("getUserName()");
- }
+ logger.trace("getUserName()");
return userName;
}
@@ -113,9 +109,7 @@ public class ActiveMQRAProperties extends ConnectionFactoryProperties implements
* @param userName The value
*/
public void setUserName(final String userName) {
- if (logger.isTraceEnabled()) {
- logger.trace("setUserName(" + userName + ")");
- }
+ logger.trace("setUserName({})", userName);
this.userName = userName;
}
@@ -126,9 +120,7 @@ public class ActiveMQRAProperties extends ConnectionFactoryProperties implements
* @return The value
*/
public String getPassword() {
- if (logger.isTraceEnabled()) {
- logger.trace("getPassword()");
- }
+ logger.trace("getPassword()");
return password;
}
@@ -144,9 +136,7 @@ public class ActiveMQRAProperties extends ConnectionFactoryProperties implements
* @param password The value
*/
public void setPassword(final String password) {
- if (logger.isTraceEnabled()) {
- logger.trace("setPassword(****)");
- }
+ logger.trace("setPassword(****)");
this.password = password;
}
@@ -182,9 +172,7 @@ public class ActiveMQRAProperties extends ConnectionFactoryProperties implements
* @return The value
*/
public Boolean getUseLocalTx() {
- if (logger.isTraceEnabled()) {
- logger.trace("getUseLocalTx()");
- }
+ logger.trace("getUseLocalTx()");
return localTx;
}
@@ -195,9 +183,7 @@ public class ActiveMQRAProperties extends ConnectionFactoryProperties implements
* @param localTx The value
*/
public void setUseLocalTx(final Boolean localTx) {
- if (logger.isTraceEnabled()) {
- logger.trace("setUseLocalTx(" + localTx + ")");
- }
+ logger.trace("setUseLocalTx({})", localTx);
this.localTx = localTx;
}
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueReceiver.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueReceiver.java
index d0f694d932..fe8a0eb2dc 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueReceiver.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueReceiver.java
@@ -40,9 +40,7 @@ public class ActiveMQRAQueueReceiver extends ActiveMQRAMessageConsumer implement
public ActiveMQRAQueueReceiver(final QueueReceiver consumer, final ActiveMQRASession session) {
super(consumer, session);
- if (logger.isTraceEnabled()) {
- logger.trace("constructor(" + consumer + ", " + session + ")");
- }
+ logger.trace("constructor({}, {})", consumer, session);
}
/**
@@ -53,9 +51,7 @@ public class ActiveMQRAQueueReceiver extends ActiveMQRAMessageConsumer implement
*/
@Override
public Queue getQueue() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getQueue()");
- }
+ logger.trace("getQueue()");
checkState();
return ((QueueReceiver) consumer).getQueue();
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueSender.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueSender.java
index 1d02def198..3783748c40 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueSender.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueSender.java
@@ -42,7 +42,7 @@ public class ActiveMQRAQueueSender extends ActiveMQRAMessageProducer implements
super(producer, session);
if (logger.isTraceEnabled()) {
- logger.trace("constructor(" + producer + ", " + session + ")");
+ logger.trace("constructor({}, {})", producer, session);
}
}
@@ -54,9 +54,7 @@ public class ActiveMQRAQueueSender extends ActiveMQRAMessageProducer implements
*/
@Override
public Queue getQueue() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getQueue()");
- }
+ logger.trace("getQueue()");
return ((QueueSender) producer).getQueue();
}
@@ -80,25 +78,14 @@ public class ActiveMQRAQueueSender extends ActiveMQRAMessageProducer implements
session.lock();
try {
if (logger.isTraceEnabled()) {
- logger.trace("send " + this +
- " destination=" +
- destination +
- " message=" +
- message +
- " deliveryMode=" +
- deliveryMode +
- " priority=" +
- priority +
- " ttl=" +
- timeToLive);
+ logger.trace("send {} destination={} message={} deliveryMode={} priority={} ttl={}",
+ this, destination, message, deliveryMode, priority, timeToLive);
}
checkState();
producer.send(destination, message, deliveryMode, priority, timeToLive);
- if (logger.isTraceEnabled()) {
- logger.trace("sent " + this + " result=" + message);
- }
+ logger.trace("sent {} result={}", this, message);
} finally {
session.unlock();
}
@@ -116,15 +103,13 @@ public class ActiveMQRAQueueSender extends ActiveMQRAMessageProducer implements
session.lock();
try {
if (logger.isTraceEnabled()) {
- logger.trace("send " + this + " destination=" + destination + " message=" + message);
+ logger.trace("send {} destination={} message={}", this, destination, message);
}
checkState();
producer.send(destination, message);
- if (logger.isTraceEnabled()) {
- logger.trace("sent " + this + " result=" + message);
- }
+ logger.trace("sent {} result={}", this, message);
} finally {
session.unlock();
}
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASession.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASession.java
index 9364a4d4eb..6c444f17ea 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASession.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASession.java
@@ -98,9 +98,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
* @param cri The connection request info
*/
public ActiveMQRASession(final ActiveMQRAManagedConnection mc, final ActiveMQRAConnectionRequestInfo cri) {
- if (logger.isTraceEnabled()) {
- logger.trace("constructor(" + mc + ", " + cri + ")");
- }
+ logger.trace("constructor({}, {})", mc, cri);
this.mc = mc;
this.cri = cri;
@@ -115,9 +113,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
* @param sf The session factory
*/
public void setActiveMQSessionFactory(final ActiveMQRASessionFactory sf) {
- if (logger.isTraceEnabled()) {
- logger.trace("setActiveMQSessionFactory(" + sf + ")");
- }
+ logger.trace("setActiveMQSessionFactory({})", sf);
this.sf = sf;
}
@@ -129,9 +125,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
* @throws IllegalStateException The session is closed
*/
protected void lock() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("lock()");
- }
+ logger.trace("lock()");
final ActiveMQRAManagedConnection mcLocal = this.mc;
if (mcLocal != null) {
@@ -145,9 +139,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
* Unlock
*/
protected void unlock() {
- if (logger.isTraceEnabled()) {
- logger.trace("unlock()");
- }
+ logger.trace("unlock()");
final ActiveMQRAManagedConnection mcLocal = this.mc;
if (mcLocal != null) {
@@ -168,9 +160,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
public BytesMessage createBytesMessage() throws JMSException {
Session session = getSessionInternal();
- if (logger.isTraceEnabled()) {
- logger.trace("createBytesMessage" + session);
- }
+ logger.trace("createBytesMessage(), {}", session);
return session.createBytesMessage();
}
@@ -185,9 +175,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
public MapMessage createMapMessage() throws JMSException {
Session session = getSessionInternal();
- if (logger.isTraceEnabled()) {
- logger.trace("createMapMessage(), " + session);
- }
+ logger.trace("createMapMessage(), {}", session);
return session.createMapMessage();
}
@@ -202,9 +190,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
public Message createMessage() throws JMSException {
Session session = getSessionInternal();
- if (logger.isTraceEnabled()) {
- logger.trace("createMessage" + session);
- }
+ logger.trace("createMessage(), {}", session);
return session.createMessage();
}
@@ -219,9 +205,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
public ObjectMessage createObjectMessage() throws JMSException {
Session session = getSessionInternal();
- if (logger.isTraceEnabled()) {
- logger.trace("createObjectMessage" + session);
- }
+ logger.trace("createObjectMessage(), {}", session);
return session.createObjectMessage();
}
@@ -237,9 +221,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
public ObjectMessage createObjectMessage(final Serializable object) throws JMSException {
Session session = getSessionInternal();
- if (logger.isTraceEnabled()) {
- logger.trace("createObjectMessage(" + object + ")" + session);
- }
+ logger.trace("createObjectMessage({})", object, session);
return session.createObjectMessage(object);
}
@@ -254,9 +236,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
public StreamMessage createStreamMessage() throws JMSException {
Session session = getSessionInternal();
- if (logger.isTraceEnabled()) {
- logger.trace("createStreamMessage" + session);
- }
+ logger.trace("createStreamMessage(), {}", session);
return session.createStreamMessage();
}
@@ -271,9 +251,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
public TextMessage createTextMessage() throws JMSException {
Session session = getSessionInternal();
- if (logger.isTraceEnabled()) {
- logger.trace("createTextMessage" + session);
- }
+ logger.trace("createTextMessage(), {}", session);
return session.createTextMessage();
}
@@ -289,9 +267,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
public TextMessage createTextMessage(final String string) throws JMSException {
Session session = getSessionInternal();
- if (logger.isTraceEnabled()) {
- logger.trace("createTextMessage(" + string + ")" + session);
- }
+ logger.trace("createTextMessage({}) {}", string, session);
return session.createTextMessage(string);
}
@@ -304,9 +280,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
*/
@Override
public boolean getTransacted() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getTransacted()");
- }
+ logger.trace("getTransacted()");
getSessionInternal();
return cri.isTransacted();
@@ -320,9 +294,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
*/
@Override
public MessageListener getMessageListener() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getMessageListener()");
- }
+ logger.trace("getMessageListener()");
throw new IllegalStateException("Method not allowed");
}
@@ -335,9 +307,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
*/
@Override
public void setMessageListener(final MessageListener listener) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("setMessageListener(" + listener + ")");
- }
+ logger.trace("setMessageListener({})", listener);
throw new IllegalStateException("Method not allowed");
}
@@ -349,9 +319,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
*/
@Override
public void run() {
- if (logger.isTraceEnabled()) {
- logger.trace("run()");
- }
+ logger.trace("run()");
throw new Error("Method not allowed");
}
@@ -364,9 +332,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
*/
@Override
public void close() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("close()");
- }
+ logger.trace("close()");
sf.closeSession(this);
closeSession();
@@ -392,9 +358,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
throw new IllegalStateException("Session is not transacted");
}
- if (logger.isTraceEnabled()) {
- logger.trace("Commit session " + this);
- }
+ logger.trace("Commit session {}", this);
session.commit();
} finally {
@@ -422,9 +386,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
throw new IllegalStateException("Session is not transacted");
}
- if (logger.isTraceEnabled()) {
- logger.trace("Rollback session " + this);
- }
+ logger.trace("Rollback session {}", this);
session.rollback();
} finally {
@@ -447,9 +409,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
throw new IllegalStateException("Session is transacted");
}
- if (logger.isTraceEnabled()) {
- logger.trace("Recover session " + this);
- }
+ logger.trace("Recover session {}", this);
session.recover();
} finally {
@@ -473,13 +433,13 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
Session session = getSessionInternal();
if (logger.isTraceEnabled()) {
- logger.trace("createTopic " + session + " topicName=" + topicName);
+ logger.trace("createTopic {} topicName={}", session, topicName);
}
Topic result = session.createTopic(topicName);
if (logger.isTraceEnabled()) {
- logger.trace("createdTopic " + session + " topic=" + result);
+ logger.trace("createdTopic {} topic={}", session, result);
}
return result;
@@ -498,16 +458,12 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
try {
TopicSession session = getTopicSessionInternal();
- if (logger.isTraceEnabled()) {
- logger.trace("createSubscriber " + session + " topic=" + topic);
- }
+ logger.trace("createSubscriber {} topic={}", session, topic);
TopicSubscriber result = session.createSubscriber(topic);
result = new ActiveMQRATopicSubscriber(result, this);
- if (logger.isTraceEnabled()) {
- logger.trace("createdSubscriber " + session + " ActiveMQTopicSubscriber=" + result);
- }
+ logger.trace("createdSubscriber {} ActiveMQTopicSubscriber={}", session, result);
addConsumer(result);
@@ -535,21 +491,13 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
TopicSession session = getTopicSessionInternal();
if (logger.isTraceEnabled()) {
- logger.trace("createSubscriber " + session +
- " topic=" +
- topic +
- " selector=" +
- messageSelector +
- " noLocal=" +
- noLocal);
+ logger.trace("createSubscriber {} topic={} selector={} noLocal={}", session, topic, messageSelector, noLocal);
}
TopicSubscriber result = session.createSubscriber(topic, messageSelector, noLocal);
result = new ActiveMQRATopicSubscriber(result, this);
- if (logger.isTraceEnabled()) {
- logger.trace("createdSubscriber " + session + " ActiveMQTopicSubscriber=" + result);
- }
+ logger.trace("createdSubscriber {} ActiveMQTopicSubscriber={}", session, result);
addConsumer(result);
@@ -578,15 +526,13 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
Session session = getSessionInternal();
if (logger.isTraceEnabled()) {
- logger.trace("createDurableSubscriber " + session + " topic=" + topic + " name=" + name);
+ logger.trace("createDurableSubscriber {} topic={} name={}", session, topic, name);
}
TopicSubscriber result = session.createDurableSubscriber(topic, name);
result = new ActiveMQRATopicSubscriber(result, this);
- if (logger.isTraceEnabled()) {
- logger.trace("createdDurableSubscriber " + session + " ActiveMQTopicSubscriber=" + result);
- }
+ logger.trace("createdDurableSubscriber {} ActiveMQTopicSubscriber={}", session, result);
addConsumer(result);
@@ -616,23 +562,14 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
Session session = getSessionInternal();
if (logger.isTraceEnabled()) {
- logger.trace("createDurableSubscriber " + session +
- " topic=" +
- topic +
- " name=" +
- name +
- " selector=" +
- messageSelector +
- " noLocal=" +
- noLocal);
+ logger.trace("createDurableSubscriber {} topic={} name={} selector={} noLocal={}",
+ session, topic, name, messageSelector, noLocal);
}
TopicSubscriber result = session.createDurableSubscriber(topic, name, messageSelector, noLocal);
result = new ActiveMQRATopicSubscriber(result, this);
- if (logger.isTraceEnabled()) {
- logger.trace("createdDurableSubscriber " + session + " ActiveMQTopicSubscriber=" + result);
- }
+ logger.trace("createdDurableSubscriber {} ActiveMQTopicSubscriber={}", session, result);
addConsumer(result);
@@ -655,16 +592,12 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
try {
TopicSession session = getTopicSessionInternal();
- if (logger.isTraceEnabled()) {
- logger.trace("createPublisher " + session + " topic=" + topic);
- }
+ logger.trace("createPublisher {} topic={}", session, topic);
TopicPublisher result = session.createPublisher(topic);
result = new ActiveMQRATopicPublisher(result, this);
- if (logger.isTraceEnabled()) {
- logger.trace("createdPublisher " + session + " publisher=" + result);
- }
+ logger.trace("createdPublisher {} publisher=", session, result);
addProducer(result);
@@ -690,15 +623,11 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
try {
Session session = getSessionInternal();
- if (logger.isTraceEnabled()) {
- logger.trace("createTemporaryTopic " + session);
- }
+ logger.trace("createTemporaryTopic {}", session);
TemporaryTopic temp = session.createTemporaryTopic();
- if (logger.isTraceEnabled()) {
- logger.trace("createdTemporaryTopic " + session + " temp=" + temp);
- }
+ logger.trace("createdTemporaryTopic {} temp={}", session, temp);
sf.addTemporaryTopic(temp);
@@ -724,9 +653,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
try {
Session session = getSessionInternal();
- if (logger.isTraceEnabled()) {
- logger.trace("unsubscribe " + session + " name=" + name);
- }
+ logger.trace("unsubscribe {} name={}", session, name);
session.unsubscribe(name);
} finally {
@@ -749,15 +676,11 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
Session session = getSessionInternal();
- if (logger.isTraceEnabled()) {
- logger.trace("createBrowser " + session + " queue=" + queue);
- }
+ logger.trace("createBrowser {} queue={}", session, queue);
QueueBrowser result = session.createBrowser(queue);
- if (logger.isTraceEnabled()) {
- logger.trace("createdBrowser " + session + " browser=" + result);
- }
+ logger.trace("createdBrowser {} browser={}", session, result);
return result;
}
@@ -779,14 +702,12 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
Session session = getSessionInternal();
if (logger.isTraceEnabled()) {
- logger.trace("createBrowser " + session + " queue=" + queue + " selector=" + messageSelector);
+ logger.trace("createBrowser {} queue={} selector={}", session, queue, messageSelector);
}
QueueBrowser result = session.createBrowser(queue, messageSelector);
- if (logger.isTraceEnabled()) {
- logger.trace("createdBrowser " + session + " browser=" + result);
- }
+ logger.trace("createdBrowser {} browser={}", session, result);
return result;
}
@@ -806,15 +727,11 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
Session session = getSessionInternal();
- if (logger.isTraceEnabled()) {
- logger.trace("createQueue " + session + " queueName=" + queueName);
- }
+ logger.trace("createQueue {} queueName={}", session, queueName);
Queue result = session.createQueue(queueName);
- if (logger.isTraceEnabled()) {
- logger.trace("createdQueue " + session + " queue=" + result);
- }
+ logger.trace("createdQueue {} queue={}", session, result);
return result;
}
@@ -832,16 +749,12 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
try {
QueueSession session = getQueueSessionInternal();
- if (logger.isTraceEnabled()) {
- logger.trace("createReceiver " + session + " queue=" + queue);
- }
+ logger.trace("createReceiver {} queue={}", session, queue);
QueueReceiver result = session.createReceiver(queue);
result = new ActiveMQRAQueueReceiver(result, this);
- if (logger.isTraceEnabled()) {
- logger.trace("createdReceiver " + session + " receiver=" + result);
- }
+ logger.trace("createdReceiver {} receiver={}", session, result);
addConsumer(result);
@@ -866,15 +779,13 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
QueueSession session = getQueueSessionInternal();
if (logger.isTraceEnabled()) {
- logger.trace("createReceiver " + session + " queue=" + queue + " selector=" + messageSelector);
+ logger.trace("createReceiver {} queue={} selector={}", session, queue, messageSelector);
}
QueueReceiver result = session.createReceiver(queue, messageSelector);
result = new ActiveMQRAQueueReceiver(result, this);
- if (logger.isTraceEnabled()) {
- logger.trace("createdReceiver " + session + " receiver=" + result);
- }
+ logger.trace("createdReceiver {} receiver={}", session, result);
addConsumer(result);
@@ -897,16 +808,12 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
try {
QueueSession session = getQueueSessionInternal();
- if (logger.isTraceEnabled()) {
- logger.trace("createSender " + session + " queue=" + queue);
- }
+ logger.trace("createSender {} queue={}", session, queue);
QueueSender result = session.createSender(queue);
result = new ActiveMQRAQueueSender(result, this);
- if (logger.isTraceEnabled()) {
- logger.trace("createdSender " + session + " sender=" + result);
- }
+ logger.trace("createdSender {} sender={}", session, result);
addProducer(result);
@@ -932,15 +839,11 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
try {
Session session = getSessionInternal();
- if (logger.isTraceEnabled()) {
- logger.trace("createTemporaryQueue " + session);
- }
+ logger.trace("createTemporaryQueue {}", session);
TemporaryQueue temp = session.createTemporaryQueue();
- if (logger.isTraceEnabled()) {
- logger.trace("createdTemporaryQueue " + session + " temp=" + temp);
- }
+ logger.trace("createdTemporaryQueue {} temp={}", session, temp);
sf.addTemporaryQueue(temp);
@@ -963,16 +866,12 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
try {
Session session = getSessionInternal();
- if (logger.isTraceEnabled()) {
- logger.trace("createConsumer " + session + " dest=" + destination);
- }
+ logger.trace("createConsumer {} dest={}", session, destination);
MessageConsumer result = session.createConsumer(destination);
result = new ActiveMQRAMessageConsumer(result, this);
- if (logger.isTraceEnabled()) {
- logger.trace("createdConsumer " + session + " consumer=" + result);
- }
+ logger.trace("createdConsumer {} consumer={}", session, result);
addConsumer(result);
@@ -998,19 +897,13 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
Session session = getSessionInternal();
if (logger.isTraceEnabled()) {
- logger.trace("createConsumer " + session +
- " dest=" +
- destination +
- " messageSelector=" +
- messageSelector);
+ logger.trace("createConsumer {} dest={} messageSelector={}", session, destination, messageSelector);
}
MessageConsumer result = session.createConsumer(destination, messageSelector);
result = new ActiveMQRAMessageConsumer(result, this);
- if (logger.isTraceEnabled()) {
- logger.trace("createdConsumer " + session + " consumer=" + result);
- }
+ logger.trace("createdConsumer {} consumer={}", session, result);
addConsumer(result);
@@ -1038,21 +931,14 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
Session session = getSessionInternal();
if (logger.isTraceEnabled()) {
- logger.trace("createConsumer " + session +
- " dest=" +
- destination +
- " messageSelector=" +
- messageSelector +
- " noLocal=" +
- noLocal);
+ logger.trace("createConsumer {} dest={} messageSelector={} noLocal={}",
+ session, destination, messageSelector, noLocal);
}
MessageConsumer result = session.createConsumer(destination, messageSelector, noLocal);
result = new ActiveMQRAMessageConsumer(result, this);
- if (logger.isTraceEnabled()) {
- logger.trace("createdConsumer " + session + " consumer=" + result);
- }
+ logger.trace("createdConsumer {} consumer={}", session, result);
addConsumer(result);
@@ -1075,16 +961,12 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
try {
Session session = getSessionInternal();
- if (logger.isTraceEnabled()) {
- logger.trace("createProducer " + session + " dest=" + destination);
- }
+ logger.trace("createProducer {} dest={}", session, destination);
MessageProducer result = session.createProducer(destination);
result = new ActiveMQRAMessageProducer(result, this);
- if (logger.isTraceEnabled()) {
- logger.trace("createdProducer " + session + " producer=" + result);
- }
+ logger.trace("createdProducer {} producer={}", session, result);
addProducer(result);
@@ -1102,9 +984,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
*/
@Override
public int getAcknowledgeMode() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getAcknowledgeMode()");
- }
+ logger.trace("getAcknowledgeMode()");
getSessionInternal();
return cri.getAcknowledgeMode();
@@ -1115,9 +995,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
*/
@Override
public XAResource getXAResource() {
- if (logger.isTraceEnabled()) {
- logger.trace("getXAResource()");
- }
+ logger.trace("getXAResource()");
if (cri.getType() == ActiveMQRAConnectionFactory.CONNECTION || cri.getType() == ActiveMQRAConnectionFactory.QUEUE_CONNECTION ||
cri.getType() == ActiveMQRAConnectionFactory.TOPIC_CONNECTION) {
@@ -1154,9 +1032,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
*/
@Override
public Session getSession() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getNonXAsession()");
- }
+ logger.trace("getNonXAsession()");
if (cri.getType() == ActiveMQRAConnectionFactory.CONNECTION || cri.getType() == ActiveMQRAConnectionFactory.QUEUE_CONNECTION ||
cri.getType() == ActiveMQRAConnectionFactory.TOPIC_CONNECTION) {
@@ -1179,9 +1055,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
*/
@Override
public QueueSession getQueueSession() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getQueueSession()");
- }
+ logger.trace("getQueueSession()");
if (cri.getType() == ActiveMQRAConnectionFactory.CONNECTION || cri.getType() == ActiveMQRAConnectionFactory.QUEUE_CONNECTION ||
cri.getType() == ActiveMQRAConnectionFactory.TOPIC_CONNECTION) {
@@ -1204,9 +1078,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
*/
@Override
public TopicSession getTopicSession() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getTopicSession()");
- }
+ logger.trace("getTopicSession()");
if (cri.getType() == ActiveMQRAConnectionFactory.CONNECTION || cri.getType() == ActiveMQRAConnectionFactory.QUEUE_CONNECTION ||
cri.getType() == ActiveMQRAConnectionFactory.TOPIC_CONNECTION) {
@@ -1229,15 +1101,13 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
Session session = getSessionInternal();
if (logger.isTraceEnabled()) {
- logger.trace("createSharedConsumer " + session + " topic=" + topic + ", sharedSubscriptionName=" + sharedSubscriptionName);
+ logger.trace("createSharedConsumer {} topic={}, sharedSubscriptionName={}", session, topic, sharedSubscriptionName);
}
MessageConsumer result = session.createSharedConsumer(topic, sharedSubscriptionName);
result = new ActiveMQRAMessageConsumer(result, this);
- if (logger.isTraceEnabled()) {
- logger.trace("createdConsumer " + session + " consumer=" + result);
- }
+ logger.trace("createdConsumer {} consumer={}", session, result);
addConsumer(result);
@@ -1256,16 +1126,14 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
Session session = getSessionInternal();
if (logger.isTraceEnabled()) {
- logger.trace("createSharedConsumer " + session + " topic=" + topic +
- ", sharedSubscriptionName=" + sharedSubscriptionName + ", messageSelector=" + messageSelector);
+ logger.trace("createSharedConsumer {} topic={}, sharedSubscriptionName={}, messageSelector={}",
+ session, topic, sharedSubscriptionName, messageSelector);
}
MessageConsumer result = session.createSharedConsumer(topic, sharedSubscriptionName, messageSelector);
result = new ActiveMQRAMessageConsumer(result, this);
- if (logger.isTraceEnabled()) {
- logger.trace("createdConsumer " + session + " consumer=" + result);
- }
+ logger.trace("createdConsumer {} consumer={}", session, result);
addConsumer(result);
@@ -1282,15 +1150,13 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
Session session = getSessionInternal();
if (logger.isTraceEnabled()) {
- logger.trace("createSharedConsumer " + session + " topic=" + topic + ", name=" + name);
+ logger.trace("createSharedConsumer {} topic={}, name={}", session, topic, name);
}
MessageConsumer result = session.createDurableConsumer(topic, name);
result = new ActiveMQRAMessageConsumer(result, this);
- if (logger.isTraceEnabled()) {
- logger.trace("createdConsumer " + session + " consumer=" + result);
- }
+ logger.trace("createdConsumer {} consumer={}", session, result);
addConsumer(result);
@@ -1310,16 +1176,14 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
Session session = getSessionInternal();
if (logger.isTraceEnabled()) {
- logger.trace("createDurableConsumer " + session + " topic=" + topic + ", name=" + name +
- ", messageSelector=" + messageSelector + ", noLocal=" + noLocal);
+ logger.trace("createDurableConsumer {} topic={}, name={}, messageSelector={}, noLocal={}",
+ session, topic, name, messageSelector, noLocal);
}
MessageConsumer result = session.createDurableConsumer(topic, name, messageSelector, noLocal);
result = new ActiveMQRAMessageConsumer(result, this);
- if (logger.isTraceEnabled()) {
- logger.trace("createdConsumer " + session + " consumer=" + result);
- }
+ logger.trace("createdConsumer {} consumer={}", session, result);
addConsumer(result);
@@ -1336,16 +1200,13 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
Session session = getSessionInternal();
if (logger.isTraceEnabled()) {
- logger.trace("createSharedDurableConsumer " + session + " topic=" + topic + ", name=" +
- name);
+ logger.trace("createSharedDurableConsumer {} topic={}, name={}", session, topic, name);
}
MessageConsumer result = session.createSharedDurableConsumer(topic, name);
result = new ActiveMQRAMessageConsumer(result, this);
- if (logger.isTraceEnabled()) {
- logger.trace("createdConsumer " + session + " consumer=" + result);
- }
+ logger.trace("createdConsumer {} consumer={}", session, result);
addConsumer(result);
@@ -1364,16 +1225,14 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
Session session = getSessionInternal();
if (logger.isTraceEnabled()) {
- logger.trace("createSharedDurableConsumer " + session + " topic=" + topic + ", name=" +
- name + ", messageSelector=" + messageSelector);
+ logger.trace("createSharedDurableConsumer {} topic={}, name={}, messageSelector={}",
+ session, topic, name, messageSelector);
}
MessageConsumer result = session.createSharedDurableConsumer(topic, name, messageSelector);
result = new ActiveMQRAMessageConsumer(result, this);
- if (logger.isTraceEnabled()) {
- logger.trace("createdConsumer " + session + " consumer=" + result);
- }
+ logger.trace("createdConsumer {} consumer={}", session, result);
addConsumer(result);
@@ -1389,9 +1248,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
* @param managedConnection The managed connection
*/
void setManagedConnection(final ActiveMQRAManagedConnection managedConnection) {
- if (logger.isTraceEnabled()) {
- logger.trace("setManagedConnection(" + managedConnection + ")");
- }
+ logger.trace("setManagedConnection({})", managedConnection);
if (mc != null) {
mc.removeHandle(this);
@@ -1411,9 +1268,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
* Destroy
*/
void destroy() {
- if (logger.isTraceEnabled()) {
- logger.trace("destroy()");
- }
+ logger.trace("destroy()");
mc = null;
}
@@ -1424,9 +1279,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
* @throws JMSException Thrown if an error occurs
*/
void start() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("start()");
- }
+ logger.trace("start()");
if (mc != null) {
mc.start();
@@ -1439,9 +1292,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
* @throws JMSException Thrown if an error occurs
*/
void stop() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("stop()");
- }
+ logger.trace("stop()");
if (mc != null) {
mc.stop();
@@ -1454,9 +1305,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
* @throws JMSException Thrown if an error occurs
*/
void checkStrict() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("checkStrict()");
- }
+ logger.trace("checkStrict()");
if (mc != null) {
throw new IllegalStateException(ActiveMQRASessionFactory.ISE);
@@ -1516,9 +1365,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
* @param consumer The consumer
*/
void addConsumer(final MessageConsumer consumer) {
- if (logger.isTraceEnabled()) {
- logger.trace("addConsumer(" + consumer + ")");
- }
+ logger.trace("addConsumer({})", consumer);
synchronized (consumers) {
consumers.add(consumer);
@@ -1531,9 +1378,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
* @param consumer The consumer
*/
void removeConsumer(final MessageConsumer consumer) {
- if (logger.isTraceEnabled()) {
- logger.trace("removeConsumer(" + consumer + ")");
- }
+ logger.trace("removeConsumer({})", consumer);
synchronized (consumers) {
consumers.remove(consumer);
@@ -1546,9 +1391,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
* @param producer The producer
*/
void addProducer(final MessageProducer producer) {
- if (logger.isTraceEnabled()) {
- logger.trace("addProducer(" + producer + ")");
- }
+ logger.trace("addProducer({})", producer);
synchronized (producers) {
producers.add(producer);
@@ -1561,9 +1404,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
* @param producer The producer
*/
void removeProducer(final MessageProducer producer) {
- if (logger.isTraceEnabled()) {
- logger.trace("removeProducer(" + producer + ")");
- }
+ logger.trace("removeProducer({})", producer);
synchronized (producers) {
producers.remove(producer);
@@ -1584,9 +1425,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
Session session = mc.getSession();
- if (logger.isTraceEnabled()) {
- logger.trace("getSessionInternal " + session + " for " + this);
- }
+ logger.trace("getSessionInternal {} for {}", session, this);
return session;
}
@@ -1607,7 +1446,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
XAResource xares = mc.getXAResource();
if (logger.isTraceEnabled()) {
- logger.trace("getXAResourceInternal " + xares + " for " + this);
+ logger.trace("getXAResourceInternal {} for {}", xares, this);
}
return xares;
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASessionFactoryImpl.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASessionFactoryImpl.java
index c214772786..d3581f58b7 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASessionFactoryImpl.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASessionFactoryImpl.java
@@ -147,7 +147,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
this.type = type;
if (logger.isTraceEnabled()) {
- logger.trace("constructor(" + mcf + ", " + cm + ", " + type);
+ logger.trace("constructor({}, {}, {})", mcf, cm, type);
}
}
@@ -197,9 +197,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
*/
@Override
public void setReference(final Reference reference) {
- if (logger.isTraceEnabled()) {
- logger.trace("setReference(" + reference + ")");
- }
+ logger.trace("setReference({})", reference);
this.reference = reference;
}
@@ -211,9 +209,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
*/
@Override
public Reference getReference() {
- if (logger.isTraceEnabled()) {
- logger.trace("getReference()");
- }
+ logger.trace("getReference()");
return reference;
}
@@ -224,9 +220,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
* @param name The user name
*/
public void setUserName(final String name) {
- if (logger.isTraceEnabled()) {
- logger.trace("setUserName(" + name + ")");
- }
+ logger.trace("setUserName({})", name);
userName = name;
}
@@ -237,9 +231,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
* @param password The password
*/
public void setPassword(final String password) {
- if (logger.isTraceEnabled()) {
- logger.trace("setPassword(****)");
- }
+ logger.trace("setPassword(****)");
this.password = password;
}
@@ -252,9 +244,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
*/
@Override
public String getClientID() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getClientID()");
- }
+ logger.trace("getClientID()");
checkClosed();
@@ -273,9 +263,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
*/
@Override
public void setClientID(final String cID) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("setClientID(" + cID + ")");
- }
+ logger.trace("setClientID({})", cID);
throw new IllegalStateException(ISE);
}
@@ -291,7 +279,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
@Override
public QueueSession createQueueSession(final boolean transacted, final int acknowledgeMode) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("createQueueSession(" + transacted + ", " + acknowledgeMode + ")");
+ logger.trace("createQueueSession({}, {})", transacted, acknowledgeMode);
}
checkClosed();
@@ -311,9 +299,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
*/
@Override
public XAQueueSession createXAQueueSession() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("createXAQueueSession()");
- }
+ logger.trace("createXAQueueSession()");
checkClosed();
@@ -341,14 +327,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
final ServerSessionPool sessionPool,
final int maxMessages) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("createConnectionConsumer(" + queue +
- ", " +
- messageSelector +
- ", " +
- sessionPool +
- ", " +
- maxMessages +
- ")");
+ logger.trace("createConnectionConsumer({}, {}, {}, {})", queue, messageSelector, sessionPool, maxMessages);
}
throw new IllegalStateException(ISE);
@@ -365,7 +344,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
@Override
public TopicSession createTopicSession(final boolean transacted, final int acknowledgeMode) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("createTopicSession(" + transacted + ", " + acknowledgeMode + ")");
+ logger.trace("createTopicSession({}, {})", transacted, acknowledgeMode);
}
checkClosed();
@@ -385,9 +364,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
*/
@Override
public XATopicSession createXATopicSession() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("createXATopicSession()");
- }
+ logger.trace("createXATopicSession()");
checkClosed();
@@ -415,14 +392,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
final ServerSessionPool sessionPool,
final int maxMessages) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("createConnectionConsumer(" + topic +
- ", " +
- messageSelector +
- ", " +
- sessionPool +
- ", " +
- maxMessages +
- ")");
+ logger.trace("createConnectionConsumer({}, {}, {}, {})", topic, messageSelector, sessionPool, maxMessages);
}
throw new IllegalStateException(ISE);
@@ -446,16 +416,8 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
final ServerSessionPool sessionPool,
final int maxMessages) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("createConnectionConsumer(" + topic +
- ", " +
- subscriptionName +
- ", " +
- messageSelector +
- ", " +
- sessionPool +
- ", " +
- maxMessages +
- ")");
+ logger.trace("createConnectionConsumer({}, {}, {}, {}, {})",
+ topic, subscriptionName, messageSelector, sessionPool, maxMessages);
}
throw new IllegalStateException(ISE);
@@ -474,12 +436,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
final ServerSessionPool pool,
final int maxMessages) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("createConnectionConsumer(" + destination +
- ", " +
- pool +
- ", " +
- maxMessages +
- ")");
+ logger.trace("createConnectionConsumer({}, {}, {})", destination, pool, maxMessages);
}
throw new IllegalStateException(ISE);
@@ -501,14 +458,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
final ServerSessionPool pool,
final int maxMessages) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("createConnectionConsumer(" + destination +
- ", " +
- name +
- ", " +
- pool +
- ", " +
- maxMessages +
- ")");
+ logger.trace("createConnectionConsumer({}, {}, {}, {})", destination, name, pool, maxMessages);
}
throw new IllegalStateException(ISE);
@@ -525,7 +475,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
@Override
public Session createSession(final boolean transacted, final int acknowledgeMode) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("createSession(" + transacted + ", " + acknowledgeMode + ")");
+ logger.trace("createSession({}, {})", transacted, acknowledgeMode);
}
checkClosed();
@@ -540,9 +490,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
*/
@Override
public XASession createXASession() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("createXASession()");
- }
+ logger.trace("createXASession()");
checkClosed();
return allocateConnection(type);
@@ -556,9 +504,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
*/
@Override
public ConnectionMetaData getMetaData() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getMetaData()");
- }
+ logger.trace("getMetaData()");
checkClosed();
return mcf.getMetaData();
@@ -572,9 +518,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
*/
@Override
public ExceptionListener getExceptionListener() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("getExceptionListener()");
- }
+ logger.trace("getExceptionListener()");
throw new IllegalStateException(ISE);
}
@@ -587,9 +531,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
*/
@Override
public void setExceptionListener(final ExceptionListener listener) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("setExceptionListener(" + listener + ")");
- }
+ logger.trace("setExceptionListener({})", listener);
throw new IllegalStateException(ISE);
}
@@ -603,9 +545,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
public void start() throws JMSException {
checkClosed();
- if (logger.isTraceEnabled()) {
- logger.trace("start() " + this);
- }
+ logger.trace("start() {}", this);
synchronized (sessions) {
if (started) {
@@ -626,9 +566,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
*/
@Override
public void stop() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("stop() " + this);
- }
+ logger.trace("stop() {}", this);
throw new IllegalStateException(ISE);
}
@@ -640,9 +578,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
*/
@Override
public void close() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("close() " + this);
- }
+ logger.trace("close() {}", this);
if (closed) {
return;
@@ -666,9 +602,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
for (Iterator<TemporaryQueue> i = tempQueues.iterator(); i.hasNext(); ) {
TemporaryQueue temp = i.next();
try {
- if (logger.isTraceEnabled()) {
- logger.trace("Closing temporary queue " + temp + " for " + this);
- }
+ logger.trace("Closing temporary queue {} for {}", temp, this);
temp.delete();
} catch (Throwable t) {
logger.trace("Error deleting temporary queue", t);
@@ -681,9 +615,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
for (Iterator<TemporaryTopic> i = tempTopics.iterator(); i.hasNext(); ) {
TemporaryTopic temp = i.next();
try {
- if (logger.isTraceEnabled()) {
- logger.trace("Closing temporary topic " + temp + " for " + this);
- }
+ logger.trace("Closing temporary topic {} for {}", temp, this);
temp.delete();
} catch (Throwable t) {
logger.trace("Error deleting temporary queue", t);
@@ -701,9 +633,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
*/
@Override
public void closeSession(final ActiveMQRASession session) throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("closeSession(" + session + ")");
- }
+ logger.trace("closeSession({})", session);
synchronized (sessions) {
sessions.remove(session);
@@ -717,9 +647,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
*/
@Override
public void addTemporaryQueue(final TemporaryQueue temp) {
- if (logger.isTraceEnabled()) {
- logger.trace("addTemporaryQueue(" + temp + ")");
- }
+ logger.trace("addTemporaryQueue({})", temp);
synchronized (tempQueues) {
tempQueues.add(temp);
@@ -733,9 +661,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
*/
@Override
public void addTemporaryTopic(final TemporaryTopic temp) {
- if (logger.isTraceEnabled()) {
- logger.trace("addTemporaryTopic(" + temp + ")");
- }
+ logger.trace("addTemporaryTopic({})", temp);
synchronized (tempTopics) {
tempTopics.add(temp);
@@ -759,8 +685,8 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
ServerSessionPool sessionPool,
int maxMessages) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("createSharedConnectionConsumer(" + topic + ", " + subscriptionName + ", " +
- messageSelector + ", " + sessionPool + ", " + maxMessages + ")");
+ logger.trace("createSharedConnectionConsumer({}, {}, {}, {}, {})",
+ topic, subscriptionName, messageSelector, sessionPool, maxMessages);
}
throw new IllegalStateException(ISE);
@@ -773,8 +699,8 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
ServerSessionPool sessionPool,
int maxMessages) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("createSharedDurableConnectionConsumer(" + topic + ", " + subscriptionName +
- ", " + messageSelector + ", " + sessionPool + ", " + maxMessages + ")");
+ logger.trace("createSharedDurableConnectionConsumer({}, {}, {}, {}, {})",
+ topic, subscriptionName, messageSelector, sessionPool, maxMessages);
}
throw new IllegalStateException(ISE);
@@ -804,12 +730,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
int acknowledgeMode,
final int sessionType) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("allocateConnection(" + transacted +
- ", " +
- acknowledgeMode +
- ", " +
- sessionType +
- ")");
+ logger.trace("allocateConnection({}, {}, {})", transacted, acknowledgeMode, sessionType);
}
try {
@@ -866,16 +787,12 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
info.setClientID(clientID);
info.setDefaults(((ActiveMQResourceAdapter) mcf.getResourceAdapter()).getProperties());
- if (logger.isTraceEnabled()) {
- logger.trace("Allocating session for " + this + " with request info=" + info);
- }
+ logger.trace("Allocating session for {} with request info={}", this, info);
ActiveMQRASession session = (ActiveMQRASession) cm.allocateConnection(mcf, info);
try {
- if (logger.isTraceEnabled()) {
- logger.trace("Allocated " + this + " session=" + session);
- }
+ logger.trace("Allocated {} session={}", this, session);
session.setActiveMQSessionFactory(this);
@@ -921,9 +838,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
* @throws IllegalStateException Thrown if closed
*/
protected void checkClosed() throws IllegalStateException {
- if (logger.isTraceEnabled()) {
- logger.trace("checkClosed()" + this);
- }
+ logger.trace("checkClosed() {}", this);
if (closed) {
throw new IllegalStateException("The connection is closed");
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAStreamMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAStreamMessage.java
index 658eb4e49c..f7f04925c4 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAStreamMessage.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAStreamMessage.java
@@ -40,9 +40,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
public ActiveMQRAStreamMessage(final StreamMessage message, final ActiveMQRASession session) {
super(message, session);
- if (logger.isTraceEnabled()) {
- logger.trace("constructor(" + message + ", " + session + ")");
- }
+ logger.trace("constructor({}, {})", message, session);
}
/**
@@ -53,9 +51,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
*/
@Override
public boolean readBoolean() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readBoolean()");
- }
+ logger.trace("readBoolean()");
return ((StreamMessage) message).readBoolean();
}
@@ -68,9 +64,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
*/
@Override
public byte readByte() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readByte()");
- }
+ logger.trace("readByte()");
return ((StreamMessage) message).readByte();
}
@@ -85,7 +79,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
@Override
public int readBytes(final byte[] value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("readBytes(" + Arrays.toString(value) + ")");
+ logger.trace("readBytes({})", Arrays.toString(value));
}
return ((StreamMessage) message).readBytes(value);
@@ -99,9 +93,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
*/
@Override
public char readChar() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readChar()");
- }
+ logger.trace("readChar()");
return ((StreamMessage) message).readChar();
}
@@ -114,9 +106,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
*/
@Override
public double readDouble() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readDouble()");
- }
+ logger.trace("readDouble()");
return ((StreamMessage) message).readDouble();
}
@@ -129,9 +119,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
*/
@Override
public float readFloat() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readFloat()");
- }
+ logger.trace("readFloat()");
return ((StreamMessage) message).readFloat();
}
@@ -144,9 +132,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
*/
@Override
public int readInt() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readInt()");
- }
+ logger.trace("readInt()");
return ((StreamMessage) message).readInt();
}
@@ -159,9 +145,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
*/
@Override
public long readLong() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readLong()");
- }
+ logger.trace("readLong()");
return ((StreamMessage) message).readLong();
}
@@ -174,9 +158,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
*/
@Override
public Object readObject() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readObject()");
- }
+ logger.trace("readObject()");
return ((StreamMessage) message).readObject();
}
@@ -189,9 +171,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
*/
@Override
public short readShort() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readShort()");
- }
+ logger.trace("readShort()");
return ((StreamMessage) message).readShort();
}
@@ -204,9 +184,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
*/
@Override
public String readString() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("readString()");
- }
+ logger.trace("readString()");
return ((StreamMessage) message).readString();
}
@@ -218,9 +196,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
*/
@Override
public void reset() throws JMSException {
- if (logger.isTraceEnabled()) {
- logger.trace("reset()");
- }
+ logger.trace("reset()");
((StreamMessage) message).reset();
}
@@ -234,7 +210,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
@Override
public void writeBoolean(final boolean value) throws JMSException {
if (logger.isTraceEnabled()) {
- logger.trace("writeBoolean(" + value + ")");
+ logger.trace("writeBoolean({})", value);
}
... 13614 lines suppressed ...