This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


    from 3da715a6ef ARTEMIS-5331 bump slf4j.version from 2.0.16 to 2.0.17
     new 003063aee6 ARTEMIS-5315 remove unnecessary InetAddresses code
     new 8eb52efadd NO-JIRA remove dead code with invalid JavaDoc
     new 5b12277994 ARTEMIS-5314 overhaul JavaDoc formatting & content

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/activemq/artemis/boot/Artemis.java  |   5 +-
 .../configuration/ArtemisClientConfiguration.java  |  16 +-
 .../org/apache/activemq/artemis/cli/Artemis.java   |  18 +-
 .../artemis/cli/commands/ActionAbstract.java       |  16 +-
 .../artemis/cli/commands/Configurable.java         |   2 +-
 .../artemis/cli/commands/InputAbstract.java        |   5 +-
 .../apache/activemq/artemis/cli/commands/Run.java  |   8 +-
 .../artemis/cli/commands/helper/HelperCreate.java  |  10 +-
 .../messages/perf/AsyncJms2ProducerFacade.java     |   4 +-
 .../messages/perf/PaddingDecimalFormat.java        |   4 +-
 .../artemis/cli/commands/tools/PrintData.java      |   6 -
 .../cli/commands/tools/xml/XMLMessageExporter.java |   4 +-
 .../cli/commands/tools/xml/XMLMessageImporter.java |   9 +-
 .../cli/commands/tools/xml/XmlDataConstants.java   |   4 +-
 .../cli/commands/tools/xml/XmlDataExporter.java    |  14 +-
 .../cli/commands/tools/xml/XmlDataImporter.java    |  20 +-
 .../artemis/cli/commands/user/AddUser.java         |   2 +-
 .../artemis/cli/commands/user/RemoveUser.java      |   2 +
 .../artemis/cli/commands/user/ResetUser.java       |   2 +
 .../artemis/cli/commands/util/SyncCalculation.java |  18 +-
 .../artemis/cli/process/ProcessBuilder.java        |   4 -
 .../activemq/artemis/integration/FileBroker.java   |   8 +-
 .../apache/activemq/artemis/util/ServerUtil.java   |  13 +-
 .../activemq/artemis/cli/commands/CreateTest.java  |   2 +-
 .../org/apache/activemq/cli/test/ArtemisTest.java  |   4 +-
 .../activemq/artemis/api/core/ActiveMQBuffer.java  | 743 +++++++++------------
 .../activemq/artemis/api/core/ActiveMQBuffers.java |   4 +-
 .../artemis/api/core/ActiveMQException.java        |   6 +-
 .../api/core/ActiveMQIllegalStateException.java    |   4 +-
 ...ActiveMQInterceptorRejectedPacketException.java |   1 -
 .../ActiveMQLargeMessageInterruptedException.java  |   3 -
 .../artemis/api/core/ActiveMQNativeIOError.java    |   1 -
 .../api/core/ActiveMQObjectClosedException.java    |   3 +-
 .../core/ActiveMQRemoteDisconnectException.java    |   2 +-
 .../core/ActiveMQReplicationTimeooutException.java |   4 +-
 .../api/core/ActiveMQSecurityException.java        |   2 +-
 .../api/core/ActiveMQSessionCreationException.java |   4 +-
 .../artemis/api/core/ParameterisedAddress.java     |  20 +-
 .../artemis/api/core/QueueConfiguration.java       |  42 +-
 .../activemq/artemis/api/core/SimpleString.java    |  62 +-
 .../artemis/core/persistence/Persister.java        |  10 +-
 .../artemis/core/persistence/PersisterIDs.java     |  11 +-
 .../core/server/ActiveMQScheduledComponent.java    |  50 +-
 .../artemis/core/server/NetworkHealthCheck.java    |   6 +-
 .../apache/activemq/artemis/json/JsonArray.java    | 101 +--
 .../apache/activemq/artemis/json/JsonNumber.java   |   5 +-
 .../apache/activemq/artemis/json/JsonObject.java   |  41 +-
 .../activemq/artemis/json/JsonObjectBuilder.java   |  96 +--
 .../apache/activemq/artemis/json/JsonValue.java    |   1 -
 .../apache/activemq/artemis/logs/AuditLogger.java  |  21 +-
 .../artemis/utils/AbstractByteBufPool.java         |  18 +-
 .../activemq/artemis/utils/AbstractPool.java       |   8 +-
 .../artemis/utils/ActiveMQThreadFactory.java       |  12 +-
 .../activemq/artemis/utils/ArtemisCloseable.java   |   4 +-
 .../activemq/artemis/utils/AutomaticLatch.java     |  10 +-
 .../apache/activemq/artemis/utils/ByteUtil.java    |  17 +-
 .../activemq/artemis/utils/ClassloadingUtil.java   |   5 +-
 .../activemq/artemis/utils/ConcurrentUtil.java     |   3 +-
 .../artemis/utils/DefaultSensitiveStringCodec.java |  20 +-
 .../org/apache/activemq/artemis/utils/Env.java     |  14 +-
 .../activemq/artemis/utils/FactoryFinder.java      |  18 +-
 .../apache/activemq/artemis/utils/FileUtil.java    |   6 +-
 .../activemq/artemis/utils/HashProcessor.java      |   6 +-
 .../apache/activemq/artemis/utils/IPV6Util.java    |   3 +-
 .../activemq/artemis/utils/InetAddresses.java      | 390 +----------
 .../apache/activemq/artemis/utils/JsonLoader.java  |   4 +-
 .../artemis/utils/PasswordMaskingUtil.java         |  33 +-
 .../apache/activemq/artemis/utils/PendingTask.java |   5 +-
 .../activemq/artemis/utils/PowerOf2Util.java       |  12 +-
 .../activemq/artemis/utils/Preconditions.java      |  27 +-
 .../apache/activemq/artemis/utils/RandomUtil.java  |   6 +-
 .../activemq/artemis/utils/ReferenceCounter.java   |   6 +-
 .../artemis/utils/ReferenceCounterUtil.java        |   4 +-
 .../activemq/artemis/utils/ReusableLatch.java      |  29 +-
 .../activemq/artemis/utils/SelectorTranslator.java |  16 +-
 .../activemq/artemis/utils/SensitiveDataCodec.java |   4 +-
 .../activemq/artemis/utils/SizeAwareMetric.java    |   4 +-
 .../activemq/artemis/utils/SpawnedVMSupport.java   |  35 +-
 .../activemq/artemis/utils/StringEscapeUtils.java  |   7 +-
 .../apache/activemq/artemis/utils/Suppliers.java   |  19 +-
 .../apache/activemq/artemis/utils/TimeUtils.java   |   3 -
 .../apache/activemq/artemis/utils/UTF8Util.java    |   2 +-
 .../org/apache/activemq/artemis/utils/UUID.java    |  58 +-
 .../activemq/artemis/utils/UUIDGenerator.java      |  24 +-
 .../apache/activemq/artemis/utils/UUIDTimer.java   | 166 ++---
 .../org/apache/activemq/artemis/utils/Waiter.java  |   6 +-
 .../artemis/utils/actors/ArtemisExecutor.java      |  31 +-
 .../activemq/artemis/utils/actors/HandlerBase.java |  11 +-
 .../artemis/utils/actors/OrderedExecutor.java      |   6 +-
 .../utils/actors/OrderedExecutorFactory.java       |   5 +-
 .../artemis/utils/actors/ProcessorBase.java        |  29 +-
 .../activemq/artemis/utils/bean/MetaBean.java      |  32 +-
 .../utils/collections/ArrayResettableIterator.java |   6 +-
 .../ConcurrentAppendOnlyChunkedList.java           |  17 +-
 .../utils/collections/ConcurrentHashSet.java       |   2 +-
 .../utils/collections/ConcurrentLongHashMap.java   |   4 +-
 .../utils/collections/ConcurrentLongHashSet.java   |   3 +-
 .../artemis/utils/collections/LinkedList.java      |   8 +-
 .../artemis/utils/collections/LinkedListImpl.java  |  26 +-
 .../utils/collections/LinkedListIterator.java      |   7 +-
 .../artemis/utils/collections/LongHashSet.java     |  35 +-
 .../utils/collections/MultiResettableIterator.java |   4 +-
 .../artemis/utils/collections/NoOpMap.java         |   6 +-
 .../artemis/utils/collections/NodeStore.java       |  17 +-
 .../utils/collections/PriorityCollection.java      |  10 +-
 .../utils/collections/PriorityLinkedList.java      |  16 +-
 .../utils/collections/ResettableIterator.java      |   4 +-
 .../utils/collections/SparseArrayLinkedList.java   |  19 +-
 .../artemis/utils/collections/TypedProperties.java |   9 +-
 .../utils/collections/UpdatableIterator.java       |  15 +-
 .../utils/critical/CriticalAnalyzerImpl.java       |   3 +-
 .../artemis/utils/critical/CriticalCloseable.java  |  13 +-
 .../artemis/utils/critical/CriticalComponent.java  |  14 +-
 .../utils/critical/CriticalComponentImpl.java      |   4 +-
 .../activemq/artemis/utils/pools/MpscPool.java     |   9 +-
 .../apache/activemq/artemis/utils/pools/Pool.java  |   9 +-
 .../activemq/artemis/utils/uri/URIFactory.java     |  18 +-
 .../activemq/artemis/utils/uri/URISchema.java      |   7 +-
 .../activemq/artemis/utils/uri/URISupport.java     |  91 ++-
 .../activemq/artemis/utils/URIParserTest.java      |   8 -
 .../artemis/utils/actors/ThresholdActorTest.java   |   5 +-
 .../artemis/utils/collections/LongHashSetTest.java |   5 +-
 .../api/config/ActiveMQDefaultConfiguration.java   | 116 ++--
 .../activemq/artemis/api/core/BaseInterceptor.java |   5 +-
 .../artemis/api/core/BroadcastEndpoint.java        |  30 +-
 .../api/core/BroadcastGroupConfiguration.java      |   4 +-
 .../api/core/ChannelBroadcastEndpointFactory.java  |   2 +-
 .../api/core/DiscoveryGroupConfiguration.java      |  27 +-
 .../activemq/artemis/api/core/FilterConstants.java |   4 +-
 .../activemq/artemis/api/core/ICoreMessage.java    |  42 +-
 .../activemq/artemis/api/core/Interceptor.java     |   6 +-
 .../artemis/api/core/JGroupsBroadcastEndpoint.java |   6 +-
 .../api/core/JGroupsChannelBroadcastEndpoint.java  |   2 +-
 .../apache/activemq/artemis/api/core/Message.java  | 279 +++++---
 .../activemq/artemis/api/core/RefCountMessage.java |  40 +-
 .../artemis/api/core/RefCountMessageListener.java  |   3 +-
 .../artemis/api/core/TransportConfiguration.java   |  45 +-
 .../api/core/TrustManagerFactoryPlugin.java        |   3 +-
 .../api/core/UDPBroadcastEndpointFactory.java      |   5 +-
 .../artemis/api/core/client/ActiveMQClient.java    | 105 ++-
 .../artemis/api/core/client/ClientConsumer.java    |  50 +-
 .../artemis/api/core/client/ClientMessage.java     |  48 +-
 .../artemis/api/core/client/ClientProducer.java    |  88 +--
 .../artemis/api/core/client/ClientRequestor.java   |  19 +-
 .../artemis/api/core/client/ClientSession.java     | 485 +++++++-------
 .../api/core/client/ClientSessionFactory.java      |  90 +--
 .../api/core/client/ClusterTopologyListener.java   |  14 +-
 .../api/core/client/FailoverEventListener.java     |   3 +-
 .../artemis/api/core/client/MessageHandler.java    |   4 +-
 .../core/client/SendAcknowledgementHandler.java    |  24 +-
 .../artemis/api/core/client/ServerLocator.java     | 323 +++++----
 .../api/core/client/SessionFailureListener.java    |   2 +-
 .../artemis/api/core/client/TopologyMember.java    |  42 +-
 .../RandomConnectionLoadBalancingPolicy.java       |   4 +-
 .../RandomStickyConnectionLoadBalancingPolicy.java |   3 +-
 .../RoundRobinConnectionLoadBalancingPolicy.java   |   7 +-
 .../artemis/api/core/jgroups/JChannelManager.java  |   9 +-
 .../artemis/api/core/jgroups/JChannelWrapper.java  |   5 +-
 .../artemis/api/core/jgroups/JGroupsReceiver.java  |   3 +-
 .../api/core/management/AcceptorControl.java       |  11 +-
 .../core/management/ActiveMQComponentControl.java  |   2 +-
 .../api/core/management/ActiveMQServerControl.java | 525 +++++++--------
 .../api/core/management/AddressControl.java        | 113 ++--
 .../artemis/api/core/management/Attribute.java     |   3 +-
 .../core/management/BaseBroadcastGroupControl.java |   8 +-
 .../artemis/api/core/management/BridgeControl.java |  51 +-
 .../api/core/management/BroadcastGroupControl.java |   6 +-
 .../core/management/BrokerConnectionControl.java   |  14 +-
 .../core/management/ClusterConnectionControl.java  |  72 +-
 .../api/core/management/DayCounterInfo.java        |  15 +-
 .../artemis/api/core/management/DivertControl.java |  31 +-
 .../JGroupsChannelBroadcastGroupControl.java       |   2 +-
 .../JGroupsFileBroadcastGroupControl.java          |   6 +-
 .../api/core/management/ManagementHelper.java      |  37 +-
 .../api/core/management/MessageCounterInfo.java    |  28 +-
 .../artemis/api/core/management/NodeInfo.java      |   8 +-
 .../api/core/management/ObjectNameBuilder.java     |  54 +-
 .../artemis/api/core/management/Operation.java     |   3 +-
 .../artemis/api/core/management/Parameter.java     |   3 +-
 .../artemis/api/core/management/QueueControl.java  | 203 +++---
 .../management/RemoteBrokerConnectionControl.java  |  10 +-
 .../artemis/api/core/management/ResourceNames.java |   6 +-
 .../artemis/api/core/management/RoleInfo.java      |  30 +-
 .../api/core/management/SimpleManagement.java      |  20 +-
 .../impl/ResetLimitWrappedActiveMQBuffer.java      |   2 -
 .../artemis/core/client/ActiveMQClientLogger.java  |   5 +-
 .../client/impl/AfterConnectInternalListener.java  |   5 +-
 .../core/client/impl/ClientConsumerImpl.java       |  32 +-
 .../core/client/impl/ClientConsumerInternal.java   |   3 -
 .../core/client/impl/ClientLargeMessageImpl.java   |  10 +-
 .../core/client/impl/ClientMessageImpl.java        |  19 +-
 .../core/client/impl/ClientMessageInternal.java    |   9 -
 .../client/impl/ClientProducerCreditManager.java   |   6 +-
 .../impl/ClientProducerCreditManagerImpl.java      |   3 -
 .../core/client/impl/ClientProducerImpl.java       |  32 +-
 .../core/client/impl/ClientProducerInternal.java   |   3 -
 .../core/client/impl/ClientSessionFactoryImpl.java |  22 +-
 .../client/impl/ClientSessionFactoryInternal.java  |   4 +-
 .../core/client/impl/ClientSessionImpl.java        | 152 +----
 .../core/client/impl/ClientSessionInternal.java    |  14 +-
 .../impl/CompressedLargeMessageControllerImpl.java |   3 -
 .../core/client/impl/LargeMessageController.java   |   2 +-
 .../client/impl/LargeMessageControllerImpl.java    |  32 +-
 .../core/client/impl/ServerLocatorImpl.java        |  42 +-
 .../core/client/impl/ServerLocatorInternal.java    |   8 +-
 .../artemis/core/client/impl/Topology.java         |  38 +-
 .../core/client/impl/TopologyMemberImpl.java       |  10 +-
 .../artemis/core/cluster/DiscoveryGroup.java       |  15 +-
 .../core/config/TransformerConfiguration.java      |   6 +-
 .../artemis/core/message/LargeBodyReader.java      |   8 +-
 .../artemis/core/message/impl/CoreMessage.java     |  40 +-
 .../core/message/impl/CoreMessagePersister.java    |   8 +-
 .../core/message/impl/MessageInternalImpl.java     |  82 +--
 .../artemis/core/protocol/core/Channel.java        |  95 ++-
 .../artemis/core/protocol/core/ChannelHandler.java |   4 +-
 .../core/protocol/core/CoreRemotingConnection.java |  34 +-
 .../artemis/core/protocol/core/Packet.java         |  36 +-
 .../core/impl/ActiveMQClientProtocolManager.java   |  12 +-
 .../protocol/core/impl/ActiveMQSessionContext.java |   5 -
 .../core/impl/BackwardsCompatibilityUtils.java     |   8 +-
 .../core/protocol/core/impl/ChannelImpl.java       |  15 +-
 .../core/protocol/core/impl/PacketImpl.java        |   4 +-
 .../protocol/core/impl/RemotingConnectionImpl.java |  15 +-
 .../wireformat/ClusterTopologyChangeMessage.java   |   3 -
 .../ClusterTopologyChangeMessage_V2.java           |   6 -
 .../core/impl/wireformat/CreateQueueMessage.java   |   3 -
 .../core/protocol/core/impl/wireformat/Ping.java   |   4 +-
 .../core/impl/wireformat/QueueAbstractPacket.java  |   5 +-
 .../core/impl/wireformat/RollbackMessage.java      |   6 -
 .../impl/wireformat/SessionAddMetaDataMessage.java |   2 +-
 .../wireformat/SessionAddMetaDataMessageV2.java    |   2 +-
 .../SessionBindingQueryResponseMessage.java        |   3 -
 .../wireformat/SessionContinuationMessage.java     |  16 +-
 .../wireformat/SessionForceConsumerDelivery.java   |   3 -
 .../SessionReceiveContinuationMessage.java         |   9 -
 .../wireformat/SessionReceiveLargeMessage.java     |   5 +-
 .../wireformat/SessionSendContinuationMessage.java |  27 +-
 .../SessionSendContinuationMessage_V2.java         |   8 -
 .../SessionSendContinuationMessage_V3.java         |   8 -
 .../core/impl/wireformat/SessionSendMessage.java   |  16 +-
 .../impl/wireformat/SessionSendMessage_V2.java     |   4 +-
 .../impl/wireformat/SessionSendMessage_V3.java     |   4 +-
 .../SubscribeClusterTopologyUpdatesMessageV2.java  |   3 -
 .../artemis/core/remoting/CloseListener.java       |   3 +-
 .../artemis/core/remoting/FailureListener.java     |   4 +-
 .../remoting/impl/TransportConfigurationUtil.java  |  12 +-
 .../remoting/impl/netty/CheckDependencies.java     |   4 +-
 .../core/remoting/impl/netty/NettyConnection.java  |   8 +-
 .../core/remoting/impl/netty/NettyConnector.java   |   5 +-
 .../remoting/impl/netty/TransportConstants.java    |  30 +-
 .../impl/ssl/CachingOpenSSLContextFactory.java     |  10 +-
 .../impl/ssl/CachingSSLContextFactory.java         |  14 +-
 .../impl/ssl/DefaultOpenSSLContextFactory.java     |   6 +-
 .../artemis/core/remoting/impl/ssl/SSLSupport.java |  24 +-
 .../activemq/artemis/core/security/Role.java       |   8 -
 .../server/ComponentConfigurationRoutingType.java  |   4 +-
 .../server/management/NotificationService.java     |   8 +-
 .../artemis/core/transaction/impl/XidImpl.java     |   6 -
 .../activemq/artemis/reader/BytesMessageUtil.java  |   6 +-
 .../activemq/artemis/reader/MessageUtil.java       |   2 +-
 .../activemq/artemis/reader/StreamMessageUtil.java |  11 +-
 .../core/protocol/AbstractRemotingConnection.java  |   4 +-
 .../spi/core/protocol/RemotingConnection.java      |  71 +-
 .../spi/core/remoting/AbstractConnector.java       |   3 -
 .../remoting/BaseConnectionLifeCycleListener.java  |  12 +-
 .../artemis/spi/core/remoting/BufferDecoder.java   |   9 +-
 .../artemis/spi/core/remoting/BufferHandler.java   |   3 +-
 .../spi/core/remoting/ClientProtocolManager.java   |   4 +-
 .../remoting/ClientProtocolManagerFactory.java     |   4 +-
 .../artemis/spi/core/remoting/Connection.java      |  55 +-
 .../artemis/spi/core/remoting/Connector.java       |  23 +-
 .../spi/core/remoting/ConnectorFactory.java        |   2 +-
 .../artemis/spi/core/remoting/SessionContext.java  |  37 +-
 .../core/remoting/ssl/OpenSSLContextFactory.java   |  21 +-
 .../ssl/OpenSSLContextFactoryProvider.java         |   5 +-
 .../spi/core/remoting/ssl/SSLContextConfig.java    |   6 +-
 .../spi/core/remoting/ssl/SSLContextFactory.java   |  22 +-
 .../remoting/ssl/SSLContextFactoryProvider.java    |   6 +-
 .../InVMTransportConfigurationSchema.java          |   3 +-
 .../schema/serverLocator/ConnectionOptions.java    |   5 +-
 .../artemis/utils/ActiveMQBufferInputStream.java   |   8 -
 .../activemq/artemis/utils/AutoCreateUtil.java     |  15 +-
 .../activemq/artemis/utils/BufferHelper.java       |  12 -
 .../artemis/utils/ConfirmationWindowWarning.java   |   3 -
 .../activemq/artemis/utils/DeflaterReader.java     |   9 +-
 .../apache/activemq/artemis/utils/IDGenerator.java |  10 +-
 .../activemq/artemis/utils/InflaterReader.java     |   9 +-
 .../activemq/artemis/utils/InflaterWriter.java     |   9 +-
 .../apache/activemq/artemis/utils/JNDIUtil.java    |   7 +-
 .../utils/ObjectInputStreamWithClassLoader.java    |  38 +-
 .../apache/activemq/artemis/utils/PrefixUtil.java  |   6 +-
 .../artemis/utils/TimeAndCounterIDGenerator.java   |   4 +-
 .../activemq/artemis/utils/TokenBucketLimiter.java |   2 +-
 .../artemis/utils/TokenBucketLimiterImpl.java      |   6 +-
 .../org/apache/activemq/artemis/utils/XMLUtil.java |   3 +-
 .../remoting/impl/netty/TransportConstantTest.java |   5 +-
 .../activemq/artemis/message/CoreMessageTest.java  |  26 +-
 .../apache/activemq/artemis/dto/RequestLogDTO.java |   3 +-
 .../artemis/jdbc/store/drivers/JDBCUtils.java      |   6 +-
 .../jdbc/store/file/JDBCSequentialFile.java        |  17 +-
 .../file/JDBCSequentialFileFactoryDriver.java      |  34 -
 .../store/file/PostgresLargeObjectManager.java     |   3 +-
 .../artemis/jdbc/store/file/ScheduledWrite.java    |   4 +-
 .../jdbc/store/journal/JDBCJournalImpl.java        |  12 +-
 .../store/journal/JDBCJournalLoaderCallback.java   |   6 +-
 .../jdbc/store/sql/PropertySQLProvider.java        |   4 +-
 .../store/file/JDBCSequentialFileFactoryTest.java  |   2 -
 .../artemis/api/jms/ActiveMQJMSClient.java         |  69 +-
 .../activemq/artemis/api/jms/JMSFactoryType.java   |  67 +-
 .../api/jms/management/JMSManagementHelper.java    |  33 +-
 .../artemis/jms/client/ActiveMQConnection.java     |  45 +-
 .../jms/client/ActiveMQConnectionFactory.java      |  34 +-
 .../artemis/jms/client/ActiveMQDestination.java    |  10 +-
 .../artemis/jms/client/ActiveMQJMSContext.java     |   9 +-
 .../artemis/jms/client/ActiveMQJMSProducer.java    |  13 +-
 .../artemis/jms/client/ActiveMQMapMessage.java     |  15 +-
 .../artemis/jms/client/ActiveMQMessage.java        |  33 +-
 .../jms/client/ActiveMQMessageConsumer.java        |   4 +-
 .../jms/client/ActiveMQMessageProducer.java        |  10 +-
 .../artemis/jms/client/ActiveMQObjectMessage.java  |   2 +-
 .../activemq/artemis/jms/client/ActiveMQQueue.java |   7 +-
 .../artemis/jms/client/ActiveMQSession.java        | 172 ++++-
 .../artemis/jms/client/ActiveMQTemporaryQueue.java |   6 +-
 .../artemis/jms/client/ActiveMQTextMessage.java    |   2 -
 .../activemq/artemis/jms/client/ActiveMQTopic.java |   7 +-
 .../artemis/jms/client/ActiveMQXAConnection.java   |   4 +-
 .../jms/client/ActiveMQXAConnectionFactory.java    |   3 +-
 .../artemis/jms/client/ActiveMQXASession.java      |   8 -
 .../jms/client/ConnectionFactoryOptions.java       |   4 +-
 .../jms/client/DefaultConnectionProperties.java    |   3 +-
 .../artemis/jms/client/JmsExceptionUtils.java      |   6 -
 .../artemis/jms/client/ThreadAwareContext.java     |  34 +-
 .../jndi/ActiveMQInitialContextFactory.java        |   8 +-
 .../artemis/jndi/JNDIReferenceFactory.java         |  45 +-
 .../apache/activemq/artemis/jndi/JNDIStorable.java |  27 +-
 .../activemq/artemis/jndi/ReadOnlyContext.java     |  38 +-
 .../activemq/artemis/uri/JMSConnectionOptions.java |   5 +-
 .../artemis/jms/bridge/QualityOfServiceMode.java   |  64 +-
 .../artemis/jms/bridge/impl/JMSBridgeImpl.java     |  25 +-
 .../jms/persistence/config/PersistedBindings.java  |  20 -
 .../config/PersistedConnectionFactory.java         |  12 -
 .../artemis/jms/server/JMSServerConfigParser.java  |   4 -
 .../artemis/jms/server/JMSServerManager.java       |  76 +--
 .../impl/ConnectionFactoryConfigurationImpl.java   |  12 +-
 .../server/config/impl/FileJMSConfiguration.java   |  19 -
 .../artemis/jms/server/embedded/EmbeddedJMS.java   |  18 +-
 .../jms/server/impl/JMSServerManagerImpl.java      | 165 +----
 .../artemis/core/io/AbstractSequentialFile.java    |  11 +-
 .../core/io/AbstractSequentialFileFactory.java     |   6 +-
 .../activemq/artemis/core/io/IOCallback.java       |  10 +-
 .../activemq/artemis/core/io/SequentialFile.java   |  57 +-
 .../artemis/core/io/SequentialFileFactory.java     |  32 +-
 .../artemis/core/io/aio/AIOSequentialFile.java     |   9 +-
 .../core/io/aio/AIOSequentialFileFactory.java      |   9 +-
 .../artemis/core/io/buffer/TimedBuffer.java        |  10 +-
 .../core/io/buffer/TimedBufferObserver.java        |   3 +-
 .../artemis/core/io/mapped/MappedFile.java         |  12 +-
 .../artemis/core/io/nio/NIOSequentialFile.java     |  14 +-
 .../core/io/nio/NIOSequentialFileFactory.java      |   2 +-
 .../artemis/core/io/util/ByteBufferPool.java       |  15 +-
 .../artemis/core/journal/EncoderPersister.java     |   6 +-
 .../activemq/artemis/core/journal/Journal.java     |  94 ++-
 .../core/journal/JournalLoadInformation.java       |  16 -
 .../activemq/artemis/core/journal/RecordInfo.java  |   3 +-
 .../core/journal/TransactionFailureCallback.java   |   7 +-
 .../core/journal/collections/JournalHashMap.java   |  23 +-
 .../journal/impl/AbstractJournalUpdateTask.java    |   9 -
 .../core/journal/impl/FileWrapperJournal.java      |  12 +-
 .../core/journal/impl/JournalCompactor.java        |  23 +-
 .../core/journal/impl/JournalConstants.java        |   7 +-
 .../artemis/core/journal/impl/JournalFile.java     |   7 +-
 .../core/journal/impl/JournalFilesRepository.java  |  38 +-
 .../artemis/core/journal/impl/JournalImpl.java     | 165 ++---
 .../core/journal/impl/JournalReaderCallback.java   |  33 -
 .../artemis/core/journal/impl/JournalRecord.java   |   6 +-
 .../core/journal/impl/JournalRecordProvider.java   |   7 +-
 .../core/journal/impl/JournalTransaction.java      |  44 +-
 .../core/journal/impl/ObjIntIntArrayList.java      |   7 +-
 .../artemis/core/journal/impl/Reclaimer.java       |  22 +-
 .../journal/impl/dataformat/JournalAddRecord.java  |  10 -
 .../impl/dataformat/JournalAddRecordTX.java        |   5 -
 .../impl/dataformat/JournalCompleteRecordTX.java   |  13 +-
 .../impl/dataformat/JournalDeleteRecord.java       |   3 -
 .../impl/dataformat/JournalDeleteRecordTX.java     |   5 -
 .../artemis/core/io/aio/FileIOUtilTest.java        |   8 +-
 .../artemis/junit/ActiveMQConsumerResource.java    |  17 +-
 .../junit/ActiveMQDynamicProducerResource.java     |  17 +-
 .../artemis/junit/ActiveMQProducerResource.java    |  10 +-
 .../artemis/junit/EmbeddedActiveMQResource.java    |  21 +-
 .../artemis/junit/EmbeddedJMSResource.java         |  22 +-
 .../artemis/junit/ActiveMQConsumerExtension.java   |  12 +-
 .../junit/ActiveMQDynamicProducerExtension.java    |  13 +-
 .../artemis/junit/ActiveMQProducerExtension.java   |  13 +-
 .../artemis/junit/EmbeddedActiveMQExtension.java   |   4 +-
 .../junit/AbstractActiveMQClientDelegate.java      |   2 -
 .../artemis/junit/ActiveMQConsumerOperations.java  |   9 +-
 .../junit/ActiveMQDynamicProducerOperations.java   |  22 +-
 .../artemis/junit/ActiveMQProducerOperations.java  |  37 +-
 .../artemis/junit/EmbeddedActiveMQDelegate.java    |   5 +-
 .../artemis/junit/EmbeddedActiveMQOperations.java  | 134 ++--
 .../artemis/junit/EmbeddedJMSDelegate.java         |  22 +-
 .../artemis/junit/EmbeddedJMSOperations.java       |  50 +-
 .../lockmanager/file/FileBasedLockManager.java     |   5 +-
 .../artemis/logs/annotation/GetLogger.java         |   4 +-
 .../artemis/logs/annotation/LogBundle.java         |   9 +-
 .../artemis/logs/annotation/LogMessage.java        |  10 +-
 .../processor/LogAnnotationProcessor.java          |   4 +-
 .../artemis/maven/ArtemisCreatePlugin.java         |   4 +-
 .../artemis/maven/ArtemisDependencyDocPlugin.java  |  26 +-
 .../artemis/maven/ArtemisDependencyScanPlugin.java |   4 +-
 .../protocol/amqp/broker/AMQPLargeMessage.java     |  21 +-
 .../artemis/protocol/amqp/broker/AMQPMessage.java  | 124 ++--
 .../amqp/broker/AMQPMessageBrokerAccessor.java     |  30 +-
 .../protocol/amqp/broker/AMQPMessagePersister.java |   4 +-
 .../amqp/broker/AMQPMessagePersisterV2.java        |   4 +-
 .../amqp/broker/AMQPMessagePersisterV3.java        |   4 +-
 .../protocol/amqp/broker/AMQPSessionCallback.java  |  66 +-
 .../protocol/amqp/broker/AMQPStandardMessage.java  |   4 +-
 .../broker/ActiveMQProtonRemotingConnection.java   |   6 +-
 .../artemis/protocol/amqp/broker/KMPNeedle.java    |  11 +-
 .../amqp/broker/ProtonProtocolManager.java         |  34 +-
 .../amqp/broker/ProtonProtocolManagerFactory.java  |  11 +-
 .../amqp/client/ProtonClientProtocolManager.java   |   7 +-
 .../amqp/connect/AMQPBrokerConnection.java         |  63 +-
 .../connect/AMQPBrokerConnectionConstants.java     |  12 +-
 .../amqp/connect/AMQPBrokerConnectionManager.java  |  18 +-
 .../amqp/connect/AMQPRemoteBrokerConnection.java   |  59 +-
 .../amqp/connect/federation/AMQPFederation.java    | 210 +++---
 .../federation/AMQPFederationAddressConsumer.java  |  15 +-
 .../AMQPFederationAddressPolicyManager.java        |  64 +-
 .../AMQPFederationAddressSenderController.java     |   9 +-
 .../federation/AMQPFederationAsyncCompletion.java  |  15 +-
 .../AMQPFederationCommandDispatcher.java           |  35 +-
 .../federation/AMQPFederationCommandProcessor.java |  13 +-
 .../federation/AMQPFederationConfiguration.java    | 108 +--
 .../federation/AMQPFederationConstants.java        | 192 +++---
 .../connect/federation/AMQPFederationConsumer.java | 126 ++--
 .../AMQPFederationConsumerConfiguration.java       |  45 +-
 .../federation/AMQPFederationConsumerControl.java  |  52 +-
 .../federation/AMQPFederationConsumerManager.java  | 114 ++--
 .../connect/federation/AMQPFederationControl.java  |   6 +-
 .../federation/AMQPFederationEventDispatcher.java  |  56 +-
 .../federation/AMQPFederationEventProcessor.java   |  27 +-
 .../federation/AMQPFederationEventSupport.java     |  51 +-
 .../AMQPFederationGenericConsumerInfo.java         |  27 +-
 .../AMQPFederationLocalPolicyControl.java          |   6 +-
 .../AMQPFederationLocalPolicyManager.java          | 107 ++-
 .../AMQPFederationManagementSupport.java           | 188 ++----
 .../connect/federation/AMQPFederationMetrics.java  |  12 +-
 .../federation/AMQPFederationPolicyManager.java    |  67 +-
 .../federation/AMQPFederationPolicySupport.java    | 116 ++--
 .../federation/AMQPFederationProducerControl.java  |  56 +-
 .../federation/AMQPFederationQueueConsumer.java    |  21 +-
 .../AMQPFederationQueuePolicyManager.java          |  69 +-
 .../AMQPFederationQueueSenderController.java       |   8 +-
 .../AMQPFederationRemoteAddressPolicyManager.java  |  13 +-
 .../AMQPFederationRemotePolicyControl.java         |  11 +-
 .../AMQPFederationRemotePolicyControlType.java     |   8 +-
 .../AMQPFederationRemotePolicyManager.java         |  35 +-
 .../AMQPFederationRemoteQueuePolicyManager.java    |  13 +-
 .../federation/AMQPFederationSenderController.java |  20 +-
 .../connect/federation/AMQPFederationSource.java   |  63 +-
 .../AMQPFederationSourceControlType.java           |   6 +-
 .../connect/federation/AMQPFederationTarget.java   |   8 +-
 .../AMQPFederationTargetControlType.java           |   6 +-
 .../ActiveMQServerAMQPFederationPlugin.java        |  73 +-
 .../mirror/AMQPMirrorControllerAggregation.java    |   4 +-
 .../connect/mirror/AMQPMirrorControllerSource.java |  16 +-
 .../connect/mirror/AMQPMirrorControllerTarget.java |  30 +-
 .../connect/mirror/AMQPMirrorMessageFactory.java   |   3 +-
 .../protocol/amqp/connect/mirror/AckManager.java   |  10 +-
 .../amqp/connect/mirror/MirrorTransaction.java     |   5 +-
 .../amqp/connect/mirror/ReferenceIDSupplier.java   |   9 +-
 .../amqp/connect/mirror/ReferenceNodeStore.java    |   4 +-
 .../amqp/converter/AMQPContentTypeSupport.java     |   8 +-
 .../amqp/converter/AMQPMessageIdHelper.java        |  88 +--
 .../amqp/converter/AMQPMessageSupport.java         |  77 +--
 .../protocol/amqp/converter/AmqpCoreConverter.java |   5 +-
 .../coreWrapper/CoreMapMessageWrapper.java         |   4 +-
 .../coreWrapper/CoreTextMessageWrapper.java        |   6 +-
 .../protocol/amqp/federation/Federation.java       |   6 +-
 .../amqp/federation/FederationConstants.java       |   7 +-
 .../amqp/federation/FederationConsumer.java        |   4 +-
 .../amqp/federation/FederationConsumerInfo.java    |  53 +-
 .../FederationReceiveFromAddressPolicy.java        |  15 +-
 .../FederationReceiveFromQueuePolicy.java          |   4 +-
 .../FederationReceiveFromResourcePolicy.java       |  12 +-
 .../logger/ActiveMQAMQPProtocolMessageBundle.java  |   8 +-
 .../amqp/proton/AMQPConnectionContext.java         |  31 +-
 .../protocol/amqp/proton/AMQPConstants.java        |   6 +-
 .../amqp/proton/AMQPLargeMessageReader.java        |   3 +-
 .../amqp/proton/AMQPLargeMessageWriter.java        |   7 +-
 .../protocol/amqp/proton/AMQPMessageWriter.java    |   5 +-
 .../protocol/amqp/proton/AMQPSessionContext.java   |   4 -
 .../proton/AMQPTunneledCoreLargeMessageReader.java |  21 +-
 .../proton/AMQPTunneledCoreLargeMessageWriter.java |  10 +-
 .../amqp/proton/AMQPTunneledCoreMessageReader.java |   7 +-
 .../amqp/proton/AMQPTunneledCoreMessageWriter.java |  10 +-
 .../amqp/proton/AMQPTunneledMessageConstants.java  |  28 +-
 .../artemis/protocol/amqp/proton/AmqpSupport.java  | 151 ++---
 .../amqp/proton/AmqpTransferTagGenerator.java      |  24 +-
 .../amqp/proton/DefaultSenderController.java       |  10 +-
 .../protocol/amqp/proton/MessageReader.java        |  35 +-
 .../protocol/amqp/proton/MessageWriter.java        |  59 +-
 .../amqp/proton/ProtonAbstractReceiver.java        | 115 ++--
 .../amqp/proton/ProtonDeliveryHandler.java         |   7 +-
 .../amqp/proton/ProtonServerSenderContext.java     |  15 +-
 .../protocol/amqp/proton/SenderController.java     |  49 +-
 .../protocol/amqp/proton/handler/EventHandler.java |   3 -
 .../amqp/proton/handler/ProtonHandler.java         |  22 +-
 .../proton/transaction/ProtonTransactionImpl.java  |  17 +-
 .../ProtonTransactionRefsOperation.java            |   8 +-
 .../amqp/sasl/ExternalServerSASLFactory.java       |   3 -
 .../protocol/amqp/sasl/GSSAPIServerSASL.java       |   4 +-
 .../protocol/amqp/sasl/ServerSASLFactory.java      |  15 +-
 .../protocol/amqp/sasl/ServerSASLPlain.java        |   3 -
 .../protocol/amqp/sasl/scram/SCRAMClientSASL.java  |   3 +-
 .../amqp/sasl/scram/SCRAMServerSASLFactory.java    |   4 +-
 .../amqp/sasl/scram/ScramClientFunctionality.java  |  55 +-
 .../sasl/scram/ScramClientFunctionalityImpl.java   |  16 +-
 .../amqp/sasl/scram/ScramServerFunctionality.java  |  52 +-
 .../sasl/scram/ScramServerFunctionalityImpl.java   |  14 +-
 .../artemis/protocol/amqp/util/NettyReadable.java  |   4 +-
 .../artemis/protocol/amqp/util/NettyWritable.java  |   4 +-
 .../artemis/protocol/amqp/util/TLSEncode.java      |   4 +-
 .../protocol/amqp/broker/AMQPMessageTest.java      |   4 +-
 .../AMQPFederationPolicySupportTest.java           |   3 +-
 .../converter/message/AMQPMessageIdHelperTest.java | 290 ++++----
 .../message/JMSMappingInboundTransformerTest.java  |  91 ++-
 .../artemis/protocol/amqp/sasl/SCRAMTest.java      |   3 -
 .../HornetQClientProtocolManagerFactory.java       |   4 +-
 .../artemis/core/protocol/mqtt/MQTTConnection.java |   5 -
 .../core/protocol/mqtt/MQTTConnectionManager.java  |   8 +-
 .../core/protocol/mqtt/MQTTProtocolHandler.java    |   7 +-
 .../core/protocol/mqtt/MQTTProtocolManager.java    |   8 +-
 .../core/protocol/mqtt/MQTTPublishManager.java     |   3 -
 .../core/protocol/mqtt/MQTTSessionState.java       |  23 +-
 .../core/protocol/mqtt/MQTTStateManager.java       |  41 +-
 .../protocol/mqtt/MQTTSubscriptionManager.java     |   8 +-
 .../artemis/core/protocol/mqtt/MQTTUtil.java       |  28 +-
 .../artemis/core/protocol/mqtt/MQTTUtilTest.java   |  29 +-
 .../artemis/core/protocol/mqtt/StateSerDeTest.java |  29 +-
 .../core/protocol/openwire/OpenWireConnection.java |  17 +-
 .../protocol/openwire/OpenWireFrameParser.java     |   3 +-
 .../protocol/openwire/OpenWireProtocolManager.java |  26 +-
 .../openwire/amq/AMQConnectionContext.java         |  21 -
 .../core/protocol/openwire/amq/AMQConsumer.java    |  13 +-
 .../openwire/amq/AMQProducerBrokerExchange.java    |  12 -
 .../core/protocol/openwire/amq/AMQSession.java     |  10 +-
 .../core/protocol/stomp/StompConnection.java       |   7 +-
 .../artemis/core/protocol/stomp/StompDecoder.java  |   8 -
 .../core/protocol/stomp/StompFrameInterceptor.java |   2 +-
 .../core/protocol/stomp/StompProtocolManager.java  |   3 -
 .../protocol/stomp/VersionedStompFrameHandler.java |   7 +-
 .../protocol/stomp/v11/StompFrameHandlerV11.java   |   5 +-
 .../protocol/stomp/v12/StompFrameHandlerV12.java   |   3 +-
 .../ConnectionFactoryObjectFactory.java            |   2 +-
 .../referenceable/SerializableObjectRefAddr.java   |   2 +-
 .../artemis/ra/ActiveMQRABytesMessage.java         | 141 +---
 .../ra/ActiveMQRAConnectionFactoryImpl.java        | 125 ++--
 .../artemis/ra/ActiveMQRAConnectionManager.java    |   8 -
 .../artemis/ra/ActiveMQRAConnectionMetaData.java   |  39 +-
 .../ra/ActiveMQRAConnectionRequestInfo.java        |  89 +--
 .../activemq/artemis/ra/ActiveMQRACredential.java  |  59 +-
 .../artemis/ra/ActiveMQRALocalTransaction.java     |  23 -
 .../activemq/artemis/ra/ActiveMQRALogger.java      |   4 +-
 .../artemis/ra/ActiveMQRAMCFProperties.java        |  51 +-
 .../artemis/ra/ActiveMQRAManagedConnection.java    | 153 +----
 .../ra/ActiveMQRAManagedConnectionFactory.java     | 126 +---
 .../activemq/artemis/ra/ActiveMQRAMapMessage.java  | 159 +----
 .../activemq/artemis/ra/ActiveMQRAMessage.java     | 283 ++------
 .../artemis/ra/ActiveMQRAMessageConsumer.java      |  76 +--
 .../artemis/ra/ActiveMQRAMessageListener.java      |  20 +-
 .../artemis/ra/ActiveMQRAMessageProducer.java      | 127 +---
 .../activemq/artemis/ra/ActiveMQRAMetaData.java    |  33 +-
 .../artemis/ra/ActiveMQRAObjectMessage.java        |  20 +-
 .../activemq/artemis/ra/ActiveMQRAProperties.java  |  55 +-
 .../artemis/ra/ActiveMQRAQueueReceiver.java        |  13 +-
 .../activemq/artemis/ra/ActiveMQRAQueueSender.java |  28 +-
 .../activemq/artemis/ra/ActiveMQRAService.java     |   8 +-
 .../activemq/artemis/ra/ActiveMQRASession.java     | 316 ++-------
 .../artemis/ra/ActiveMQRASessionFactory.java       |  18 +-
 .../artemis/ra/ActiveMQRASessionFactoryImpl.java   | 217 +-----
 .../artemis/ra/ActiveMQRAStreamMessage.java        | 130 +---
 .../activemq/artemis/ra/ActiveMQRATextMessage.java |  18 +-
 .../artemis/ra/ActiveMQRATopicPublisher.java       |  41 +-
 .../artemis/ra/ActiveMQRATopicSubscriber.java      |  18 +-
 .../activemq/artemis/ra/ActiveMQRAXAResource.java  |  22 +-
 .../activemq/artemis/ra/ActiveMQRaUtils.java       |  34 +-
 .../artemis/ra/ActiveMQResourceAdapter.java        | 481 +------------
 .../artemis/ra/ConnectionFactoryProperties.java    |   7 +-
 .../artemis/ra/inflow/ActiveMQActivation.java      |  66 +-
 .../artemis/ra/inflow/ActiveMQActivationSpec.java  | 248 +------
 .../artemis/ra/inflow/ActiveMQMessageHandler.java  |   9 -
 .../ActiveMQRAConnectionFactoryObjectFactory.java  |   2 +-
 .../referenceable/SerializableObjectRefAddr.java   |   4 +-
 artemis-selector/pom.xml                           |  18 +
 .../selector/filter/ArithmeticExpression.java      |  11 -
 .../artemis/selector/filter/BinaryExpression.java  |  22 +-
 .../artemis/selector/filter/BooleanExpression.java |   9 +-
 .../selector/filter/ComparisonExpression.java      |  20 +-
 .../selector/filter/ConstantExpression.java        |  17 +-
 .../artemis/selector/filter/Expression.java        |   4 +-
 .../artemis/selector/filter/Filterable.java        |  18 +-
 .../artemis/selector/filter/LogicExpression.java   |   6 +-
 .../selector/filter/PropertyExpression.java        |  11 -
 .../artemis/selector/filter/UnaryExpression.java   |  16 +-
 .../artemis/selector/filter/XPathExpression.java   |   4 +-
 .../artemis/selector/filter/XQueryExpression.java  |   4 +-
 .../activemq/artemis/selector/impl/LRUCache.java   |  28 +-
 .../activemq/artemis/selector/SelectorTest.java    |   3 -
 .../selector/UnknownHandlingSelectorTest.java      |   6 +-
 .../activemq/artemis/osgi/ProtocolTracker.java     |   7 +-
 .../artemis/core/config/BridgeConfiguration.java   |  82 +--
 .../config/ClusterConnectionConfiguration.java     |  61 --
 .../artemis/core/config/Configuration.java         | 570 ++++++++--------
 .../core/config/CoreQueueConfiguration.java        |  33 -
 .../artemis/core/config/DivertConfiguration.java   |  26 +-
 .../artemis/core/config/FileDeploymentManager.java |  18 +-
 .../artemis/core/config/WildcardConfiguration.java |  14 +-
 .../AMQPFederatedBrokerConnectionElement.java      |  52 +-
 .../AMQPFederationBrokerPlugin.java                |   5 +-
 .../AMQPMirrorBrokerConnectionElement.java         |  26 +-
 .../BrokerConnectConfiguration.java                |   7 +-
 .../core/config/ha/ReplicaPolicyConfiguration.java |   4 +-
 .../ha/ReplicationBackupPolicyConfiguration.java   |   4 +-
 .../core/config/impl/ConfigurationImpl.java        |   6 -
 .../core/config/impl/FileConfiguration.java        |   5 +-
 .../core/config/impl/LegacyJMSConfiguration.java   |   6 -
 .../core/config/impl/SecurityConfiguration.java    |  12 +-
 .../storage/DatabaseStorageConfiguration.java      |  16 +-
 .../artemis/core/deployers/Deployable.java         |  35 +-
 .../deployers/impl/FileConfigurationParser.java    |  65 +-
 .../activemq/artemis/core/filter/Filter.java       |   9 +-
 .../activemq/artemis/core/filter/FilterUtils.java  |   4 +-
 .../artemis/core/filter/impl/FilterImpl.java       |  30 +-
 .../management/impl/ActiveMQServerControlImpl.java |   5 -
 .../core/management/impl/QueueControlImpl.java     |  26 +-
 .../management/impl/view/ActiveMQAbstractView.java |   3 -
 .../core/management/impl/view/ConsumerField.java   |   5 +-
 .../core/management/impl/view/ProducerField.java   |   5 +-
 .../core/messagecounter/MessageCounter.java        |  49 +-
 .../impl/MessageCounterManagerImpl.java            |   3 -
 .../artemis/core/paging/PageTransactionInfo.java   |  14 +-
 .../activemq/artemis/core/paging/PagedMessage.java |  20 +-
 .../artemis/core/paging/PagingManager.java         |  23 +-
 .../activemq/artemis/core/paging/PagingStore.java  |  64 +-
 .../core/paging/cursor/NonExistentPage.java        |   6 +-
 .../core/paging/cursor/PageCursorProvider.java     |   4 -
 .../core/paging/cursor/PageSubscription.java       |  28 +-
 .../core/paging/cursor/PagedReferenceImpl.java     |  11 +-
 .../cursor/impl/PageCounterRebuildManager.java     |  13 +-
 .../paging/cursor/impl/PageCursorProviderImpl.java |  53 +-
 .../core/paging/cursor/impl/PagePositionImpl.java  |  30 +-
 .../cursor/impl/PageSubscriptionCounterImpl.java   |  28 +-
 .../paging/cursor/impl/PageSubscriptionImpl.java   |  49 +-
 .../activemq/artemis/core/paging/impl/Page.java    |  18 +-
 .../artemis/core/paging/impl/PageCache.java        |   3 +-
 .../artemis/core/paging/impl/PageTimedWriter.java  |   9 +-
 .../core/paging/impl/PageTransactionInfoImpl.java  |  21 +-
 .../artemis/core/paging/impl/PagedMessageImpl.java |   4 +-
 .../core/paging/impl/PagingManagerImpl.java        |  11 +-
 .../artemis/core/paging/impl/PagingStoreImpl.java  |  53 +-
 .../artemis/core/persistence/OperationContext.java |  15 +-
 .../artemis/core/persistence/StorageManager.java   |  92 +--
 .../config/PersistedAddressSetting.java            |  10 +-
 .../config/PersistedAddressSettingJSON.java        |   4 -
 .../core/persistence/config/PersistedRole.java     |   3 -
 .../config/PersistedSecuritySetting.java           |  59 --
 .../core/persistence/config/PersistedUser.java     |   3 -
 .../journal/AbstractJournalStorageManager.java     |  55 +-
 .../impl/journal/BatchingIDGenerator.java          |   4 +-
 .../persistence/impl/journal/BufferSplitter.java   |   4 +-
 .../persistence/impl/journal/DescribeJournal.java  |   5 -
 .../persistence/impl/journal/JournalRecordIds.java |   5 +-
 .../impl/journal/JournalStorageManager.java        |  25 +-
 .../core/persistence/impl/journal/LargeBody.java   |  13 +-
 .../impl/journal/LargeServerMessageImpl.java       |   8 +-
 .../impl/journal/LargeServerMessageInSync.java     |   6 -
 .../impl/journal/OperationContextImpl.java         |  26 +-
 .../impl/journal/codec/DeleteEncoding.java         |   9 -
 .../journal/codec/FinishPageMessageOperation.java  |   3 +-
 .../impl/journal/codec/LargeMessagePersister.java  |  10 -
 .../journal/codec/PendingLargeMessageEncoding.java |  10 -
 .../activemq/artemis/core/postoffice/Address.java  |   2 +-
 .../artemis/core/postoffice/AddressManager.java    |  16 +-
 .../activemq/artemis/core/postoffice/Binding.java  |   6 +-
 .../activemq/artemis/core/postoffice/Bindings.java |   4 -
 .../artemis/core/postoffice/DuplicateIDCache.java  |   5 +-
 .../artemis/core/postoffice/PostOffice.java        |  33 +-
 .../artemis/core/postoffice/QueueInfo.java         |   3 -
 .../artemis/core/postoffice/impl/AddressImpl.java  |   2 +-
 .../artemis/core/postoffice/impl/AddressMap.java   |   6 +-
 .../artemis/core/postoffice/impl/BindingsImpl.java |  16 +-
 .../core/postoffice/impl/CopyOnWriteBindings.java  |  26 +-
 .../postoffice/impl/InMemoryDuplicateIDCache.java  |  11 +-
 .../impl/PersistentDuplicateIDCache.java           |  11 +-
 .../core/postoffice/impl/PostOfficeImpl.java       |  24 +-
 .../core/postoffice/impl/SimpleAddressManager.java |   3 -
 .../postoffice/impl/WildcardAddressManager.java    |   6 +-
 .../artemis/core/protocol/ProtocolHandler.java     |   3 +-
 .../protocol/core/ServerSessionPacketHandler.java  |   3 +-
 .../protocol/core/impl/ActiveMQPacketHandler.java  |   3 +-
 .../core/impl/CoreProtocolManagerFactory.java      |   7 +-
 .../impl/wireformat/BackupRegistrationMessage.java |   8 +-
 .../core/impl/wireformat/NodeAnnounceMessage.java  |   3 -
 .../impl/wireformat/ReplicationAddMessage.java     |  12 -
 .../impl/wireformat/ReplicationAddTXMessage.java   |   9 -
 .../impl/wireformat/ReplicationCommitMessage.java  |   3 -
 .../impl/wireformat/ReplicationDeleteMessage.java  |   6 -
 .../wireformat/ReplicationDeleteTXMessage.java     |   9 -
 .../ReplicationLargeMessageBeginMessage.java       |   3 -
 .../ReplicationLargeMessageEndMessage.java         |   9 +-
 .../ReplicationLargeMessageWriteMessage.java       |  10 -
 .../wireformat/ReplicationPageEventMessage.java    |   9 -
 .../wireformat/ReplicationPageWriteMessage.java    |   6 -
 .../impl/wireformat/ReplicationPrepareMessage.java |   6 -
 .../ReplicationPrimaryIsStoppingMessage.java       |  16 +-
 .../wireformat/ReplicationStartSyncMessage.java    |   8 +-
 .../wireformat/ReplicationSyncFileMessage.java     |  11 +-
 .../core/remoting/impl/invm/InVMAcceptor.java      |   2 +-
 .../remoting/impl/netty/HttpAcceptorHandler.java   |   3 +-
 .../core/remoting/impl/netty/NettyAcceptor.java    |  16 +-
 .../core/remoting/server/RemotingService.java      |  34 +-
 .../remoting/server/impl/RemotingServiceImpl.java  |  10 +-
 .../core/replication/ReplicatedJournal.java        | 157 +----
 .../core/replication/ReplicatedLargeMessage.java   |   3 +-
 .../core/replication/ReplicationEndpoint.java      |  73 +-
 .../core/replication/ReplicationManager.java       |  45 +-
 .../core/security/impl/SecurityStoreImpl.java      |  21 +-
 .../artemis/core/server/ActivateCallback.java      |  17 +-
 .../core/server/ActivationFailureListener.java     |   4 +-
 .../artemis/core/server/ActiveMQMessageBundle.java |  20 +-
 .../artemis/core/server/ActiveMQServer.java        | 206 +++---
 .../artemis/core/server/ActiveMQServers.java       |   4 +-
 .../artemis/core/server/BrokerConnection.java      |  12 +-
 .../activemq/artemis/core/server/Consumer.java     |  39 +-
 .../activemq/artemis/core/server/ConsumerInfo.java |  55 +-
 .../core/server/CoreLargeServerMessage.java        |   3 +-
 .../activemq/artemis/core/server/HandleStatus.java |   6 +-
 .../artemis/core/server/LargeServerMessage.java    |   2 -
 .../artemis/core/server/MemoryManager.java         |   3 +-
 .../artemis/core/server/MessageReference.java      |  38 +-
 .../activemq/artemis/core/server/NodeLocator.java  |   6 +-
 .../activemq/artemis/core/server/NodeManager.java  |   5 -
 .../apache/activemq/artemis/core/server/Queue.java | 105 ++-
 .../activemq/artemis/core/server/QueueConfig.java  |  21 +-
 .../activemq/artemis/core/server/QueueFactory.java |   6 +-
 .../core/server/RemoteBrokerConnection.java        |  15 +-
 .../artemis/core/server/RoutingContext.java        |   4 +-
 .../artemis/core/server/SecuritySettingPlugin.java |  16 +-
 .../artemis/core/server/ServerConsumer.java        |  29 +-
 .../artemis/core/server/ServerMessage.java         |   6 +-
 .../artemis/core/server/ServerSession.java         |  31 +-
 .../artemis/core/server/ServiceRegistry.java       |  30 +-
 .../artemis/core/server/cluster/BackupManager.java |  93 ++-
 .../artemis/core/server/cluster/Bridge.java        |   4 +-
 .../core/server/cluster/ClusterConnection.java     |  13 +-
 .../core/server/cluster/ClusterControl.java        |  27 +-
 .../core/server/cluster/ClusterController.java     |  39 +-
 .../core/server/cluster/ClusterManager.java        |  21 +-
 .../core/server/cluster/ha/ColocatedHAManager.java |  44 +-
 .../artemis/core/server/cluster/ha/HAManager.java  |   6 +-
 .../artemis/core/server/cluster/ha/HAPolicy.java   |  15 +-
 .../core/server/cluster/ha/ReplicaPolicy.java      |  11 +-
 .../core/server/cluster/ha/ReplicatedPolicy.java   |  21 +-
 .../cluster/ha/ReplicationPrimaryPolicy.java       |   3 +-
 .../server/cluster/ha/StandaloneHAManager.java     |   6 +-
 .../core/server/cluster/impl/BridgeImpl.java       |  24 +-
 .../core/server/cluster/impl/BridgeMetrics.java    |   8 +-
 .../server/cluster/impl/BroadcastGroupImpl.java    |  12 +-
 .../cluster/impl/ClusterConnectionBridge.java      |   8 +-
 .../server/cluster/impl/ClusterConnectionImpl.java |  75 +--
 .../cluster/impl/ClusterConnectionMetrics.java     |  12 +-
 .../core/server/cluster/impl/Redistributor.java    |   3 -
 .../cluster/impl/RemoteQueueBindingImpl.java       |   6 +-
 .../artemis/core/server/cluster/quorum/Quorum.java |   4 +-
 .../core/server/cluster/quorum/QuorumManager.java  |  38 +-
 .../core/server/cluster/quorum/QuorumVote.java     |  21 +-
 .../server/cluster/quorum/QuorumVoteHandler.java   |   9 -
 .../cluster/quorum/QuorumVoteServerConnect.java    |  11 +-
 .../cluster/quorum/SharedNothingBackupQuorum.java  |  18 +-
 .../artemis/core/server/cluster/quorum/Vote.java   |  14 +-
 .../core/server/embedded/EmbeddedActiveMQ.java     |  14 +-
 .../artemis/core/server/federation/Federation.java |   8 +-
 .../core/server/federation/FederationManager.java  |   8 +-
 .../federation/address/FederatedAddress.java       |  10 +-
 .../server/federation/queue/FederatedQueue.java    |  10 +-
 .../artemis/core/server/files/FileMoveManager.java |   5 +-
 .../core/server/files/FileStoreMonitor.java        |  10 +-
 .../artemis/core/server/group/GroupingHandler.java |   4 +-
 .../core/server/group/impl/GroupBinding.java       |   3 -
 .../server/group/impl/LocalGroupingHandler.java    |   5 +-
 .../server/group/impl/RemoteGroupingHandler.java   |   4 +-
 .../server/impl/AbstractProtocolReference.java     |   7 +-
 .../artemis/core/server/impl/Activation.java       |  54 +-
 .../core/server/impl/ActiveMQServerImpl.java       |  58 +-
 .../artemis/core/server/impl/AddressInfo.java      |  10 -
 .../server/impl/AnyNodeLocatorForReplication.java  |   7 +-
 .../server/impl/BackupRecoveryJournalLoader.java   |   9 +-
 .../core/server/impl/BucketMessageGroups.java      |  19 +-
 .../core/server/impl/CleaningActivateCallback.java |   4 +-
 .../core/server/impl/ConnectorsService.java        |   8 +-
 .../core/server/impl/DisabledMessageGroups.java    |   3 +-
 .../artemis/core/server/impl/DivertImpl.java       |   3 -
 .../core/server/impl/FileBasedNodeManager.java     |  11 +-
 .../core/server/impl/FileLockNodeManager.java      |   4 -
 .../server/impl/GroupFirstMessageReference.java    |   7 +-
 .../artemis/core/server/impl/InVMNodeManager.java  |   6 +-
 .../artemis/core/server/impl/LastValueQueue.java   |   8 +-
 .../artemis/core/server/impl/MapMessageGroups.java |   3 +-
 .../core/server/impl/MessageReferenceImpl.java     |  11 +-
 .../core/server/impl/PostOfficeJournalLoader.java  |   9 -
 .../core/server/impl/QueueConfigurationUtils.java  |  20 +-
 .../core/server/impl/QueueConsumersImpl.java       |  22 +-
 .../artemis/core/server/impl/QueueFactoryImpl.java |   3 -
 .../artemis/core/server/impl/QueueImpl.java        | 132 ++--
 .../core/server/impl/QueueMessageMetrics.java      |  14 +-
 .../artemis/core/server/impl/RefsOperation.java    |   3 +-
 .../server/impl/ReplicationBackupActivation.java   |  10 +-
 .../artemis/core/server/impl/ReplicationError.java |   7 +-
 .../core/server/impl/ReplicationObserver.java      |   3 +-
 .../server/impl/ReplicationPrimaryActivation.java  |   8 +-
 .../core/server/impl/RoutingContextImpl.java       |   2 +-
 .../artemis/core/server/impl/ScaleDownHandler.java |  13 +-
 .../core/server/impl/ServerConsumerImpl.java       |  40 +-
 .../core/server/impl/ServerSessionImpl.java        |  43 +-
 .../core/server/impl/ServiceRegistryImpl.java      |   3 +-
 .../server/impl/SharedNothingBackupActivation.java |  30 +-
 .../impl/SharedNothingPrimaryActivation.java       |  15 +-
 .../core/server/impl/SimpleMessageGroups.java      |   5 +-
 .../impl/jdbc/ActiveMQScheduledLeaseLock.java      |   3 +-
 .../core/server/impl/jdbc/JdbcLeaseLock.java       |   8 +-
 .../artemis/core/server/impl/jdbc/LeaseLock.java   |  19 +-
 .../core/server/impl/jdbc/ScheduledLeaseLock.java  |   3 +-
 .../core/server/impl/jdbc/SharedStateManager.java  |   3 +-
 .../quorum/ActivationSequenceStateMachine.java     |  38 +-
 .../server/management/ArtemisMBeanServerGuard.java |  14 +-
 .../management/ArtemisRbacInvocationHandler.java   |  33 +-
 .../server/management/ConnectorServerFactory.java  |   2 -
 .../core/server/management/JaasAuthenticator.java  |   4 +-
 .../core/server/management/RmiRegistryFactory.java |   9 -
 .../management/impl/HawtioSecurityControlImpl.java |  11 +-
 .../management/impl/ManagementServiceImpl.java     |  14 +-
 .../metrics/NettyPooledAllocatorMetrics.java       |   4 +-
 .../core/server/mirror/MirrorController.java       |   2 +-
 .../server/plugin/ActiveMQServerAddressPlugin.java |   9 -
 .../server/plugin/ActiveMQServerBasePlugin.java    |   5 -
 .../server/plugin/ActiveMQServerBindingPlugin.java |  17 -
 .../server/plugin/ActiveMQServerBridgePlugin.java  |  21 +-
 .../plugin/ActiveMQServerConnectionPlugin.java     |   9 -
 .../plugin/ActiveMQServerConsumerPlugin.java       |  26 -
 .../plugin/ActiveMQServerCriticalPlugin.java       |   5 -
 .../plugin/ActiveMQServerFederationPlugin.java     |  34 +-
 .../server/plugin/ActiveMQServerMessagePlugin.java | 107 +--
 .../core/server/plugin/ActiveMQServerPlugin.java   |   3 -
 .../server/plugin/ActiveMQServerQueuePlugin.java   |  33 -
 .../plugin/ActiveMQServerResourcePlugin.java       |  21 -
 .../server/plugin/ActiveMQServerSessionPlugin.java |  42 --
 .../plugin/impl/LoggingActiveMQServerPlugin.java   | 131 +---
 .../impl/NotificationActiveMQServerPlugin.java     |  29 -
 .../protocol/websocket/WebSocketFrameEncoder.java  |   7 +-
 .../websocket/WebSocketFrameEncoderType.java       |  29 +-
 .../core/server/transformer/ServerMessageImpl.java |   6 +-
 .../core/settings/HierarchicalRepository.java      |  16 +-
 .../core/settings/impl/AddressSettings.java        |  36 -
 .../impl/HierarchicalObjectRepository.java         |  50 +-
 .../activemq/artemis/core/settings/impl/Match.java |   8 +-
 .../core/settings/impl/ResourceLimitSettings.java  |   6 -
 .../artemis/core/transaction/Transaction.java      |  24 +-
 .../transaction/TransactionOperationAbstract.java  |   3 -
 .../transaction/impl/BindingsTransactionImpl.java  |   3 -
 .../core/transaction/impl/TransactionImpl.java     |   3 -
 .../protocol/AbstractProtocolManagerFactory.java   |   9 +-
 .../spi/core/protocol/MessagePersister.java        |   8 +-
 .../artemis/spi/core/protocol/ProtocolManager.java |  15 +-
 .../spi/core/protocol/ProtocolManagerFactory.java  |  32 +-
 .../artemis/spi/core/protocol/SessionCallback.java |  21 +-
 .../artemis/spi/core/remoting/Acceptor.java        |  16 +-
 .../artemis/spi/core/remoting/AcceptorFactory.java |   4 +-
 .../core/security/ActiveMQJAASSecurityManager.java |   6 +-
 .../spi/core/security/ActiveMQSecurityManager.java |  11 +-
 .../core/security/ActiveMQSecurityManager2.java    |  23 +-
 .../core/security/ActiveMQSecurityManager3.java    |  30 +-
 .../core/security/ActiveMQSecurityManager4.java    |  34 +-
 .../core/security/ActiveMQSecurityManager5.java    |  29 +-
 .../core/security/ActiveMQSecurityManagerImpl.java |   2 -
 .../spi/core/security/jaas/AuditLoginModule.java   |  12 +-
 .../core/security/jaas/CertificateCallback.java    |  12 +-
 .../core/security/jaas/CertificateLoginModule.java |  22 +-
 .../spi/core/security/jaas/ClientIDCallback.java   |  11 -
 .../spi/core/security/jaas/DigestCallback.java     |   3 +-
 .../spi/core/security/jaas/GuestLoginModule.java   |   5 +-
 .../spi/core/security/jaas/HmacCallback.java       |   8 -
 .../jaas/PrincipalConversionLoginModule.java       |   4 +-
 .../spi/core/security/jaas/PrincipalsCallback.java |   4 +-
 .../core/security/jaas/ReloadableProperties.java   |   2 +-
 .../core/security/jaas/SCRAMMechanismCallback.java |   1 +
 .../security/jaas/SCRAMPropertiesLoginModule.java  |  16 +-
 .../jaas/TextFileCertificateLoginModule.java       |  30 +-
 .../spi/core/security/scram/ScramException.java    |   3 +
 .../spi/core/security/scram/ScramUtils.java        |  97 +--
 .../spi/core/security/scram/StringPrep.java        | 109 +--
 .../artemis/spi/core/security/scram/UserData.java  |  19 -
 .../core/config/impl/ConfigurationImplTest.java    |   1 -
 .../config/impl/ConfigurationValidationTest.java   |   4 +-
 .../config/impl/FileConfigurationParserTest.java   |   6 +-
 .../impl/WrongRoleFileConfigurationParserTest.java |   7 +-
 .../artemis/core/filter/impl/FilterTest.java       |   1 -
 .../impl/netty/HttpAcceptorHandlerTest.java        |   3 -
 .../core/security/jaas/NoCacheLoginModule.java     |  29 +-
 .../cluster/impl/BroadcastGroupImplTest.java       |  18 +-
 .../artemis/core/server/embedded/MainTest.java     |   6 +-
 .../server/group/impl/ClusteredResetMockTest.java  |   5 +-
 .../websocket/WebSocketFrameEncoderTest.java       |   3 -
 .../websocket/WebSocketServerHandlerTest.java      |   3 -
 .../artemis/core/settings/RepositoryTest.java      |   5 +-
 .../artemis/tests/util/ServerTestBase.java         |  44 +-
 .../artemis/service/extensions/ServiceUtils.java   |   7 +-
 .../xa/ActiveMQXAResourceWrapperImpl.java          |   7 +-
 .../xa/recovery/ActiveMQXAResourceRecovery.java    |  12 +-
 .../xa/recovery/ActiveMQXAResourceWrapper.java     |  20 +-
 .../extensions/xa/recovery/XARecoveryConfig.java   |   3 -
 .../artemis/logs/AssertionLoggerHandler.java       |  16 +-
 .../tests/extensions/SubjectDotDoAsExtension.java  |  33 +-
 .../extensions/TestMethodNameMatchExtension.java   |   8 +-
 .../tests/extensions/ThreadLeakCheckDelegate.java  |   3 -
 .../parameterized/ParameterizedTestExtension.java  |   8 +-
 .../artemis/tests/util/ArtemisTestCase.java        |  10 +-
 .../activemq/artemis/utils/SilentTestCase.java     |   3 +-
 .../artemis/component/AuthenticationFilter.java    |   6 +-
 .../activemq/artemis/component/JolokiaFilter.java  |  18 +-
 .../artemis/component/WebServerComponent.java      |   2 +-
 .../apache/activemq/cli/test/WebServerCLITest.java |   4 +-
 docs/hacking-guide/_formatting.adoc                |   4 +
 etc/checkstyle.xml                                 |  11 +
 pom.xml                                            |   2 +-
 .../org/apache/activemq/broker/BrokerService.java  |   5 +-
 .../apache/activemq/broker/SslBrokerService.java   |  10 +-
 .../broker/artemiswrapper/InVMNameParser.java      |   7 -
 .../artemiswrapper/NonSerializableFactory.java     |   4 -
 .../org/apache/activemq/usage/SystemUsage.java     |  21 +-
 .../apache/activemq/ActiveMQMessageAuditTest.java  |  13 +-
 .../org/apache/activemq/AutoFailTestSupport.java   |  30 +-
 .../apache/activemq/CombinationTestSupport.java    |  29 +-
 .../org/apache/activemq/ConnectionCleanupTest.java |   9 -
 ...ConnectionCloseMultipleTimesConcurrentTest.java |   9 -
 .../activemq/ConnectionCloseMultipleTimesTest.java |   9 -
 .../activemq/ConsumerReceiveWithTimeoutTest.java   |  13 +-
 ...eConsumerButDontStartConnectionWarningTest.java |   3 -
 .../apache/activemq/EmbeddedBrokerTestSupport.java |  12 +-
 .../java/org/apache/activemq/ExpiryHogTest.java    |   3 -
 .../activemq/JMSDurableTopicRedeliverTest.java     |   5 -
 .../org/apache/activemq/JMSIndividualAckTest.java  |  12 -
 .../org/apache/activemq/JMSQueueRedeliverTest.java |   3 -
 .../apache/activemq/JmsAutoAckListenerTest.java    |   8 -
 .../java/org/apache/activemq/JmsAutoAckTest.java   |   8 -
 .../java/org/apache/activemq/JmsBenchmark.java     |  10 +-
 .../apache/activemq/JmsClientAckListenerTest.java  |  10 -
 .../java/org/apache/activemq/JmsClientAckTest.java |  12 -
 .../activemq/JmsConnectionStartStopTest.java       |  13 -
 .../JmsConsumerResetActiveListenerTest.java        |   4 -
 .../activemq/JmsCreateConsumerInOnMessageTest.java |  13 -
 .../JmsDurableQueueWildcardSendReceiveTest.java    |  12 +-
 .../activemq/JmsDurableTopicSelectorTest.java      |   3 -
 .../activemq/JmsDurableTopicSendReceiveTest.java   |  10 -
 .../activemq/JmsDurableTopicTransactionTest.java   |   3 -
 .../JmsDurableTopicWildcardSendReceiveTest.java    |  14 +-
 .../activemq/JmsMultipleClientsTestSupport.java    |   4 +-
 .../org/apache/activemq/JmsQueueBrowserTest.java   |   2 -
 .../activemq/JmsQueueCompositeSendReceiveTest.java |  22 -
 .../apache/activemq/JmsQueueRequestReplyTest.java  |   5 -
 .../org/apache/activemq/JmsQueueSelectorTest.java  |   3 -
 .../apache/activemq/JmsQueueSendReceiveTest.java   |   5 -
 ...ReceiveTwoConnectionsStartBeforeBrokerTest.java |   3 -
 .../JmsQueueSendReceiveTwoConnectionsTest.java     |   5 -
 .../JmsQueueSendReceiveUsingTwoSessionsTest.java   |   5 -
 .../JmsQueueTopicCompositeSendReceiveTest.java     |  22 -
 .../apache/activemq/JmsQueueTransactionTest.java   |  20 +-
 .../activemq/JmsQueueWildcardSendReceiveTest.java  |  14 -
 .../org/apache/activemq/JmsRedeliveredTest.java    |  84 +--
 .../apache/activemq/JmsSendReceiveTestSupport.java |  31 +-
 .../JmsSendReceiveWithMessageExpirationTest.java   |  11 -
 .../activemq/JmsSendWithAsyncCallbackTest.java     |   3 -
 .../org/apache/activemq/JmsSessionRecoverTest.java |  38 --
 .../apache/activemq/JmsTempDestinationTest.java    |  35 +-
 .../activemq/JmsTopicCompositeSendReceiveTest.java |  20 -
 .../org/apache/activemq/JmsTopicRedeliverTest.java |  21 -
 .../apache/activemq/JmsTopicRequestReplyTest.java  |   7 +-
 .../org/apache/activemq/JmsTopicSelectorTest.java  |   3 -
 .../JmsTopicSendReceiveSubscriberTest.java         |   3 -
 .../apache/activemq/JmsTopicSendReceiveTest.java   |   7 +-
 .../JmsTopicSendReceiveWithTwoConnectionsTest.java |   3 -
 ...icSendReceiveWithTwoConnectionsWithJMXTest.java |   4 -
 .../activemq/JmsTopicSendSameMessageTest.java      |   3 -
 .../apache/activemq/JmsTopicTransactionTest.java   |   3 -
 .../activemq/JmsTopicWildcardSendReceiveTest.java  |   3 -
 .../apache/activemq/JmsTransactionTestSupport.java |  74 +-
 .../apache/activemq/LargeMessageTestSupport.java   |   3 -
 .../activemq/MessageListenerRedeliveryTest.java    |   3 -
 .../apache/activemq/MessageTransformationTest.java |   5 +-
 .../org/apache/activemq/RedeliveryPolicyTest.java  |  18 -
 .../test/java/org/apache/activemq/TestSupport.java |   7 +-
 .../apache/activemq/ZeroPrefetchConsumerTest.java  |   3 -
 .../activemq/blob/BlobTransferPolicyUriTest.java   |   3 -
 .../apache/activemq/broker/BrokerBenchmark.java    |  14 +-
 .../activemq/broker/BrokerRestartTestSupport.java  |  11 +-
 .../org/apache/activemq/broker/BrokerTest.java     |   4 +-
 .../apache/activemq/broker/BrokerTestSupport.java  |   8 +-
 .../activemq/command/ActiveMQBytesMessageTest.java |  14 +-
 .../activemq/command/ActiveMQMapMessageTest.java   |  14 -
 .../activemq/command/ActiveMQMessageTest.java      |  15 +-
 .../command/ActiveMQObjectMessageTest.java         |  14 -
 .../command/ActiveMQStreamMessageTest.java         |  14 -
 .../activemq/command/ActiveMQTextMessageTest.java  |   3 -
 .../apache/activemq/demo/DefaultQueueSender.java   |  12 +-
 .../org/apache/activemq/demo/SimpleConsumer.java   |  36 +-
 .../org/apache/activemq/demo/SimpleProducer.java   |  41 +-
 .../apache/activemq/demo/SimpleQueueReceiver.java  |  32 +-
 .../apache/activemq/demo/SimpleQueueSender.java    |  37 +-
 .../activemq/network/NetworkTestSupport.java       |  19 +-
 .../activemq/openwire/BooleanStreamTest.java       |   3 -
 .../activemq/openwire/DataFileGenerator.java       |   7 -
 .../openwire/NumberRangesWhileMarshallingTest.java |   3 -
 .../apache/activemq/test/JmsResourceProvider.java  |  86 +--
 .../activemq/test/JmsSendReceiveTestSupport.java   |  17 +-
 .../activemq/test/JmsTopicSendReceiveTest.java     |   9 +-
 .../JmsTopicSendReceiveWithTwoConnectionsTest.java |  25 -
 .../java/org/apache/activemq/test/TestSupport.java |  70 +-
 .../activemq/transport/QueueClusterTest.java       |   3 -
 .../activemq/transport/StubCompositeTransport.java |   3 -
 .../apache/activemq/transport/StubTransport.java   |   4 -
 .../activemq/transport/StubTransportListener.java  |   4 -
 .../activemq/transport/TopicClusterTest.java       |   3 -
 .../failover/FailoverComplexClusterTest.java       |  56 +-
 .../multicast/MulticastTransportTest.java          |   4 -
 .../transport/nio/NIOJmsSendAndReceiveTest.java    |   3 -
 .../activemq/transport/peer/PeerTransportTest.java |   6 -
 .../transport/reliable/DropCommandStrategy.java    |   7 +-
 .../transport/reliable/ReliableTransportTest.java  |   3 -
 .../reliable/UnreliableCommandDatagramChannel.java |   3 -
 .../reliable/UnreliableCommandDatagramSocket.java  |   3 -
 .../transport/reliable/UnreliableUdpTransport.java |   4 +-
 .../reliable/UnreliableUdpTransportTest.java       |   4 -
 .../transport/tcp/InactivityMonitorTest.java       |  15 +-
 .../transport/tcp/QualityOfServiceUtilsTest.java   |   5 +-
 .../transport/tcp/ServerSocketTstFactory.java      |   2 -
 .../transport/tcp/SslContextBrokerServiceTest.java |   3 -
 .../activemq/transport/tcp/TcpFaultyTransport.java |   5 -
 .../transport/tcp/TcpFaultyTransportServer.java    |   5 -
 .../transport/tcp/TcpTransportBindTest.java        |   2 -
 .../transport/tcp/TcpTransportServerTest.java      |   3 -
 .../activemq/transport/tcp/TransportUriTest.java   |   3 -
 .../transport/tcp/WireformatNegociationTest.java   |  18 -
 ...eiveWithTwoConnectionsAndLargeMessagesTest.java |   4 -
 .../udp/UdpSendReceiveWithTwoConnectionsTest.java  |   3 -
 .../activemq/transport/udp/UdpTestSupport.java     |   3 -
 .../activemq/transport/udp/UdpTransportTest.java   |   4 -
 .../transport/udp/UdpTransportUsingServerTest.java |   4 -
 .../org/apache/activemq/util/MessageIdList.java    |  10 -
 .../java/org/apache/activemq/util/SocketProxy.java |  23 +-
 .../MultiThreadRandomReattachTestBase.java         |   8 +-
 .../largemessage/LargeMessageTestBase.java         |  17 -
 .../tests/integration/ra/DummyTransaction.java     |   7 -
 .../integration/stomp/util/ClientStompFrame.java   |   2 +-
 .../stomp/util/ClientStompFrameV10.java            |   2 +-
 .../stomp/util/ClientStompFrameV12.java            |   2 +-
 .../stomp/util/StompFrameFactoryV11.java           |   2 +-
 .../core/journal/impl/JournalImplTestBase.java     |  12 -
 .../core/journal/impl/JournalImplTestUnit.java     |   7 +-
 .../impl/fakes/FakeSequentialFileFactory.java      |  49 --
 .../unit/core/postoffice/impl/fakes/FakeQueue.java |   7 -
 .../artemis/tests/util/ActiveMQTestBase.java       | 152 +----
 .../activemq/artemis/tests/util/JMSTestBase.java   |  16 +-
 .../artemis/tests/util/SingleServerTestBase.java   |   4 +-
 .../activemq/artemis/tests/util/TcpProxy.java      |   9 +-
 .../activemq/artemis/utils/TestParameters.java     |   4 +-
 .../activemq/artemis/utils/network/NetUtil.java    |  18 +-
 .../activemq/transport/amqp/AmqpSupport.java       |   4 +-
 .../amqp/client/AmqpAbstractResource.java          |  30 +-
 .../activemq/transport/amqp/client/AmqpClient.java |  58 +-
 .../transport/amqp/client/AmqpConnection.java      |  19 +-
 .../transport/amqp/client/AmqpEventSink.java       |   3 +-
 .../transport/amqp/client/AmqpFrameValidator.java  |   3 +-
 .../transport/amqp/client/AmqpMessage.java         | 116 ++--
 .../client/AmqpOperationTimedOutException.java     |   3 +-
 .../transport/amqp/client/AmqpReceiver.java        | 225 +++----
 .../amqp/client/AmqpRedirectedException.java       |  10 +-
 .../transport/amqp/client/AmqpResource.java        |  45 +-
 .../activemq/transport/amqp/client/AmqpSender.java |  76 +--
 .../transport/amqp/client/AmqpSession.java         | 119 ++--
 .../transport/amqp/client/AmqpSupport.java         |  17 +-
 .../amqp/client/AmqpTransactionContext.java        |   3 +-
 .../amqp/client/AmqpTransactionCoordinator.java    |   4 +-
 .../amqp/client/AmqpTransferTagGenerator.java      |  15 +-
 .../transport/amqp/client/AmqpValidator.java       |   4 +-
 .../amqp/client/sasl/AbstractMechanism.java        |   3 +-
 .../transport/amqp/client/sasl/Mechanism.java      |  42 +-
 .../transport/amqp/client/sasl/PlainMechanism.java |   2 +-
 .../amqp/client/sasl/SaslAuthenticator.java        |   9 +-
 .../transport/amqp/client/util/AsyncResult.java    |  13 +-
 .../client/util/ClientFutureSynchronization.java   |   5 +-
 .../amqp/client/util/IOExceptionSupport.java       |   6 +-
 .../transport/amqp/client/util/IdGenerator.java    |  36 +-
 .../transport/amqp/client/util/PropertyUtil.java   |  83 ++-
 .../amqp/client/util/StringArrayConverter.java     |   7 +-
 .../amqp/client/util/UnmodifiableProxy.java        |   5 +-
 .../transport/netty/NettyTcpTransport.java         |  23 +-
 .../transport/netty/NettyTransportFactory.java     |  14 +-
 .../transport/netty/NettyTransportListener.java    |   9 +-
 .../transport/netty/NettyTransportOptions.java     |  40 +-
 .../transport/netty/NettyTransportSslOptions.java  |  97 +--
 .../transport/netty/NettyTransportSupport.java     |  65 +-
 .../activemq/transport/netty/NettyWSTransport.java |  15 +-
 .../transport/netty/X509AliasKeyManager.java       |   5 +-
 .../artemis/tests/compatibility/GroovyRun.java     |  14 +-
 .../tests/compatibility/HQClientTopologyTest.java  |   4 +-
 .../tests/compatibility/HQFailoverTest.java        |   4 +-
 .../compatibility/JournalCompatibilityTest.java    |   9 +-
 .../tests/compatibility/base/TestClassLoader.java  |   7 +-
 .../artemis/tests/db/paging/PagingTest.java        |  26 +-
 .../e2e/brokerConnection/ValidateContainer.java    |  14 +-
 .../artemis/tests/e2e/common/ContainerService.java |   8 +-
 .../isolated/web/WebServerComponentTest.java       |   7 +-
 .../paging/impl/PagingManagerTestAccessor.java     |   4 +-
 .../server/cluster/impl/BridgeTestAccessor.java    |   5 +-
 .../artemis/tests/integration/InVMCloseTest.java   |  31 +-
 .../artemis/tests/integration/SimpleTest.java      |  64 +-
 .../tests/integration/SingleServerSimpleTest.java  |  36 +-
 .../tests/integration/String64KLimitTest.java      |   7 +-
 .../integration/addressing/AddressConfigTest.java  |   6 +-
 .../integration/amqp/AmqpClientTestSupport.java    |   4 +-
 .../amqp/AmqpDescribedTypePayloadTest.java         |   4 +-
 .../integration/amqp/AmqpExpiredMessageTest.java   |  12 +-
 .../integration/amqp/AmqpFlowControlTest.java      |   4 +-
 .../amqp/AmqpFullyQualifiedNameTest.java           |   1 -
 .../tests/integration/amqp/AmqpManagementTest.java |   1 -
 .../integration/amqp/AmqpMessageRoutingTest.java   |   6 +-
 .../amqp/AmqpReceiverDispositionTest.java          |   7 +-
 .../amqp/AmqpTargetedFQQNSecurityTest.java         |   4 +-
 .../tests/integration/amqp/AmqpTestSupport.java    |   3 +-
 .../amqp/DLQAfterExpiredMessageTest.java           |   5 +-
 .../amqp/PropertyParseOptimizationTest.java        |   4 +-
 .../connect/AMQPFederationAddressPolicyTest.java   |   3 +-
 .../connect/AMQPFederationQueuePolicyTest.java     |   3 +-
 .../integration/amqp/connect/AMQPReplicaTest.java  |  12 +-
 .../integration/amqp/connect/AckManagerTest.java   |   7 +-
 .../amqp/connect/MirrorControllerBasicTest.java    |   7 +-
 .../integration/amqp/connect/PagedMirrorTest.java  |  31 +-
 .../amqp/connect/QpidDispatchPeerTest.java         |  12 +-
 .../amqp/connect/SNFPagedMirrorTest.java           |  31 +-
 .../amqp/connect/ValidateAMQPErrorsTest.java       |  10 +-
 .../largemessages/AmqpReplicatedTestSupport.java   |   3 +-
 .../tests/integration/amqp/sasl/SaslScramTest.java |   7 +-
 .../tests/integration/client/AckBatchSizeTest.java |   9 +-
 .../tests/integration/client/AcknowledgeTest.java  |   6 +-
 .../integration/client/ActiveMQCrashTest.java      |   3 -
 .../tests/integration/client/AutogroupIdTest.java  |  21 +-
 .../client/ConcurrentCreateDeleteProduceTest.java  |   8 +-
 .../integration/client/ConfirmationWindowTest.java |  37 +-
 .../integration/client/ConsumerCloseTest.java      |   1 -
 .../integration/client/ConsumerFilterTest.java     |  10 -
 .../tests/integration/client/ConsumerTest.java     |   4 -
 .../integration/client/ConsumerWindowSizeTest.java |  22 +-
 .../integration/client/ExpiryLargeMessageTest.java |   2 -
 .../integration/client/FailureDeadlockTest.java    |   4 +-
 .../FlowControlOnIgnoreLargeMessageBodyTest.java   |   3 -
 .../tests/integration/client/HangConsumerTest.java |  54 +-
 .../client/IncompatibleVersionTest.java            |   4 +-
 .../client/InterruptedLargeMessageTest.java        |   4 -
 .../client/JMSPagingFileDeleteTest.java            |   5 -
 .../integration/client/JmsNettyNioStressTest.java  |  31 +-
 .../tests/integration/client/JournalCrashTest.java |   4 -
 .../client/LargeMessageCompressTest.java           |   5 +-
 .../tests/integration/client/LargeMessageTest.java |   6 -
 .../client/LibaioDependencyCheckTest.java          |   5 +-
 .../integration/client/MessageBufferTest.java      |  31 +-
 .../client/MessageConsumerRollbackTest.java        |   5 -
 .../integration/client/MessagePriorityTest.java    |   8 +-
 .../client/MultipleThreadFilterOneTest.java        |  10 +-
 .../integration/client/ReceiveImmediateTest.java   |   2 -
 .../integration/client/RedeliveryConsumerTest.java |   4 -
 .../integration/client/SessionCloseOnGCTest.java   |   4 +-
 .../client/SessionFactoryCloseTest.java            |   7 +-
 .../tests/integration/client/SessionTest.java      |   2 +-
 .../tests/integration/client/SlowConsumerTest.java |  11 +-
 .../client/TransactionDurabilityTest.java          |   2 -
 .../integration/clientcrash/ClientCrashTest.java   |   4 +-
 .../integration/clientcrash/ClientExitTest.java    |  13 +-
 .../cluster/bridge/BridgeReconnectTest.java        |   8 -
 .../integration/cluster/bridge/BridgeTest.java     |   9 -
 .../bridge/BridgeWithDiscoveryGroupStartTest.java  |   3 -
 .../bridge/ClusteredBridgeReconnectTest.java       |   6 +-
 .../cluster/bridge/NettyBridgeReconnectTest.java   |   3 -
 .../crossprotocol/LargeHeadersClusterTest.java     |   5 -
 .../ProtocolsMessageLoadBalancingTest.java         |   5 -
 .../AnycastRoutingWithClusterTest.java             |   8 +-
 .../AutoDeleteClusteredDestinationTest.java        |  32 +-
 .../distribution/AutoDeleteDistributedTest.java    |   9 +-
 .../cluster/distribution/ClusterTestBase.java      |  23 +-
 .../distribution/ClusteredGroupingTest.java        |   3 +-
 .../distribution/MessageRedistributionTest.java    |   8 +-
 .../MessageRedistributionWithDiscoveryTest.java    |   4 -
 .../distribution/NettySymmetricClusterTest.java    |   9 +-
 .../distribution/OnewayTwoNodeClusterTest.java     |   4 +-
 .../RemoteBindingWithoutLoadBalancingTest.java     |   5 +-
 .../cluster/distribution/SymmetricClusterTest.java |  14 +-
 .../distribution/TemporaryJMSQueueClusterTest.java |  31 +-
 .../distribution/TemporaryQueueClusterTest.java    |   5 +-
 .../cluster/distribution/URISimpleClusterTest.java |   2 +-
 .../cluster/failover/AsynchronousFailoverTest.java |   2 +-
 .../cluster/failover/BackupSyncJournalTest.java    |   7 -
 .../failover/BackupSyncLargeMessageTest.java       |  11 +-
 .../ClusterWithBackupFailoverTestBase.java         |   3 +-
 .../cluster/failover/FailBackAutoTest.java         |   6 -
 .../cluster/failover/FailBackManualTest.java       |   5 -
 .../cluster/failover/FailoverListenerTest.java     |  15 +-
 .../integration/cluster/failover/FailoverTest.java |  14 -
 .../cluster/failover/FailoverTestBase.java         |  20 +-
 .../cluster/failover/FakeServiceComponent.java     |   4 +-
 .../cluster/failover/LargeMessageFailoverTest.java |   8 -
 ...ltiplePrimariesMultipleBackupsFailoverTest.java |   2 -
 .../failover/NettyReplicatedFailoverTest.java      |  21 +-
 .../failover/NetworkFailureFailoverTest.java       |   7 +-
 .../cluster/failover/PagingFailoverTest.java       |   1 -
 .../failover/PrimaryToPrimaryFailoverTest.java     |   3 -
 .../failover/QuorumFailOverPrimaryVotesTest.java   |   6 +-
 .../failover/ReplicatedDistributionTest.java       |   4 -
 .../cluster/failover/SecurityFailoverTest.java     |   6 -
 .../cluster/failover/SharedStoreBackupTest.java    |   3 +-
 .../SinglePrimaryMultipleBackupsFailoverTest.java  |   2 -
 ...agerNettyNoGroupNameReplicatedFailoverTest.java |   4 +-
 ...eplicatedLargeMessageWithDelayFailoverTest.java |   3 +-
 .../reattach/RandomReattachIntegrationTest.java    |   3 -
 .../integration/cluster/reattach/ReattachTest.java |   4 +-
 .../cluster/topology/NonHATopologyTest.java        |   5 +-
 .../cluster/topology/TopologyClusterTestBase.java  |   5 -
 .../integration/cluster/util/BackupSyncDelay.java  |  17 +-
 .../cluster/util/RemoteServerConfiguration.java    |   7 +-
 .../consumer/DetectOrphanedConsumerTest.java       |   4 +-
 .../consumer/OrphanedConsumerDefenseTest.java      |   8 +-
 .../crossprotocol/OpenWireToAMQPTest.java          |   4 +-
 .../integration/discovery/DiscoveryBaseTest.java   |   8 -
 .../tests/integration/discovery/DiscoveryTest.java |  48 +-
 .../integration/divert/PersistentDivertTest.java   |   3 -
 .../federation/FederatedAddressTest.java           |   3 -
 .../integration/federation/FederatedQueueTest.java |   3 -
 .../integration/federation/FederatedTestBase.java  |   3 -
 .../integration/http/CoreClientOverHttpTest.java   |   1 -
 .../integration/interceptors/InterceptorTest.java  |   3 -
 .../jms/ActiveMQConnectionFactoryTest.java         |   3 -
 .../tests/integration/jms/FloodServerTest.java     |   3 -
 .../integration/jms/ProgrammaticRedeployTest.java  |   2 +-
 .../tests/integration/jms/RedeployTest.java        |  11 +-
 .../integration/jms/SimpleJNDIClientTest.java      |   3 -
 .../integration/jms/client/ConnectionTest.java     |   1 -
 .../integration/jms/client/ExclusiveTest.java      |   3 -
 .../tests/integration/jms/client/GroupingTest.java |  13 +-
 .../tests/integration/jms/client/LVQTest.java      |   3 -
 .../jms/client/MessageProducerTest.java            |   3 -
 .../tests/integration/jms/client/MessageTest.java  |   6 -
 .../jms/client/NoLocalSubscriberTest.java          |   5 +-
 .../integration/jms/client/ReceiveNoWaitTest.java  |  10 +-
 .../jms/client/RemoteConnectionStressTest.java     |   3 -
 .../tests/integration/jms/client/RollbackTest.java |  31 +-
 ...ssionClosedOnRemotingConnectionFailureTest.java |   7 -
 .../client/SessionMetadataAddExceptionTest.java    |   3 +-
 .../integration/jms/client/StoreConfigTest.java    |   7 -
 .../integration/jms/client/TopicCleanupTest.java   |   6 +-
 .../jms/cluster/JMSFailoverListenerTest.java       |   5 +-
 .../integration/jms/cluster/JMSFailoverTest.java   |   8 +-
 .../jms/cluster/LargeMessageOverBridgeTest.java    |  10 -
 .../connection/CloseDestroyedConnectionTest.java   |   2 +-
 .../jms/connection/ConcurrentSessionCloseTest.java |   1 -
 .../ConnectionFactorySerializationTest.java        |   2 +-
 ...nectionFactoryWithJGroupsSerializationTest.java |  10 +-
 .../jms/connection/ExceptionListenerTest.java      |  18 +-
 .../integration/jms/consumer/JmsConsumerTest.java  |   8 +-
 .../jms/divert/DivertAndACKClientTest.java         |   5 -
 .../integration/jms/jms2client/JmsContextTest.java |  17 +-
 .../JmsProducerCompletionListenerTest.java         |   4 -
 .../jms/multiprotocol/JMSFQQNConsumerTest.java     |   3 +-
 .../jms/server/JMSServerStartStopTest.java         |   4 -
 .../integration/journal/AIOJournalImplTest.java    |  13 +-
 .../journal/AIOUnbuferedJournalImplTest.java       |  13 +-
 .../integration/journal/DuplicateRecordIdTest.java |  31 +-
 .../journal/JournalCompactSplitTest.java           |   4 -
 .../integration/journal/JournalDataPrintTest.java  |  31 +-
 .../integration/journal/NIOImportExportTest.java   |   5 -
 .../integration/journal/NIOJournalCompactTest.java |   2 +-
 .../management/ManagementActivationTest.java       |  24 +-
 .../management/ManagementWithPagingServerTest.java |   4 +-
 .../integration/management/QueueControlTest.java   |  41 +-
 .../management/QueueControlUsingCoreTest.java      |  15 -
 ...urityManagementWithConfiguredAdminUserTest.java |   8 +-
 .../artemis/tests/integration/mqtt/MQTTTest.java   |   7 +-
 .../tests/integration/mqtt/MQTTTestSupport.java    |   6 +-
 .../tests/integration/mqtt/PahoMQTTTest.java       |   4 +-
 .../mqtt/util/ResourceLoadingSslContext.java       |   7 +-
 .../artemis/tests/integration/mqtt5/MQTT5Test.java |  12 +-
 .../tests/integration/mqtt5/package-info.java      |   1 -
 .../mqtt5/spec/ControlPacketFormatTests.java       |   2 +-
 .../integration/mqtt5/spec/DataFormatTests.java    |   2 +-
 .../mqtt5/spec/EnhancedAuthenticationTests.java    |   2 +-
 .../integration/mqtt5/spec/FlowControlTests.java   |   2 +-
 .../integration/mqtt5/spec/HandlingErrorTests.java |   6 +-
 .../mqtt5/spec/MessageOrderingTests.java           |   2 +-
 .../mqtt5/spec/MessageReceiptTests.java            |   4 +-
 .../mqtt5/spec/NetworkConnectionTests.java         |   2 +-
 .../tests/integration/mqtt5/spec/QoSTests.java     |   2 +-
 .../integration/mqtt5/spec/SessionStateTests.java  |   2 +-
 .../integration/mqtt5/spec/SubscriptionTests.java  |   6 +-
 .../mqtt5/spec/TopicNameAndFilterTests.java        |   2 +-
 .../integration/mqtt5/spec/WebSocketTests.java     |   3 +-
 .../mqtt5/spec/controlpackets/AuthTests.java       |   3 +-
 .../mqtt5/spec/controlpackets/ConnAckTests.java    |   7 +-
 .../mqtt5/spec/controlpackets/ConnectTests.java    |   2 +-
 .../mqtt5/spec/controlpackets/DisconnectTests.java |   2 +-
 .../mqtt5/spec/controlpackets/PubAckTests.java     |   4 +-
 .../mqtt5/spec/controlpackets/PubCompTests.java    |   4 +-
 .../mqtt5/spec/controlpackets/PubRecTests.java     |   4 +-
 .../mqtt5/spec/controlpackets/PubRelTests.java     |   2 +-
 .../mqtt5/spec/controlpackets/PublishTests.java    |  76 +--
 .../mqtt5/spec/controlpackets/SubAckTests.java     |   4 +-
 .../mqtt5/spec/controlpackets/SubscribeTests.java  |  24 +-
 .../mqtt5/spec/controlpackets/UnsubAckTests.java   |   2 +-
 .../spec/controlpackets/UnsubscribeTests.java      |   2 +-
 .../mqtt5/spec/controlpackets/package-info.java    |   1 -
 .../ssl/CertificateAuthenticationSslTests.java     |   4 +-
 .../integration/openwire/BasicOpenWireTest.java    |   5 -
 .../integration/openwire/SimpleOpenWireTest.java   |   4 -
 .../integration/openwire/TempQueueWithDotTest.java |  13 +-
 .../openwire/VerySimpleOenwireTest.java            |   6 +-
 .../openwire/amq/JMSDurableTopicRedeliverTest.java |   2 -
 .../openwire/amq/JMSIndividualAckTest.java         |   6 -
 .../integration/openwire/amq/JmsAutoAckTest.java   |   2 -
 .../integration/openwire/amq/JmsClientAckTest.java |   8 -
 .../openwire/amq/JmsConnectionStartStopTest.java   |  10 +-
 .../amq/JmsConsumerResetActiveListenerTest.java    |   7 +-
 .../amq/JmsCreateConsumerInOnMessageTest.java      |   4 -
 .../amq/JmsDurableTopicSendReceiveTest.java        |   2 -
 .../openwire/amq/JmsQueueBrowserTest.java          |   7 +-
 .../openwire/amq/JmsResourceProvider.java          |  73 +-
 .../openwire/amq/JmsSendReceiveTestSupport.java    |  12 -
 .../openwire/amq/JmsTopicRedeliverTest.java        |   2 -
 .../openwire/amq/JmsTopicRequestReplyTest.java     |   5 +-
 .../openwire/amq/JmsTransactionTestSupport.java    |  58 +-
 .../openwire/amq/RedeliveryPolicyTest.java         |  30 -
 .../openwire/interop/GeneralInteropTest.java       |   7 +-
 .../integration/paging/JournalPagingTest.java      |   7 +-
 .../integration/paging/PageCountSyncServer.java    |   6 +-
 .../paging/PageTransactionCleanupTest.java         |   2 +-
 .../integration/paging/PagingCounterTest.java      |   5 -
 .../tests/integration/paging/PagingOrderTest.java  |   4 +-
 .../tests/integration/paging/PagingSendTest.java   |  18 +-
 .../tests/integration/paging/PagingSyncTest.java   |   2 +-
 .../paging/PagingWithFailoverBackup.java           |   4 +-
 .../AddressSettingsConfigurationStorageTest.java   |   4 -
 .../persistence/JMSStorageManagerTest.java         |   4 -
 .../persistence/RolesConfigurationStorageTest.java |   4 -
 .../persistence/StorageManagerTestBase.java        |  11 -
 .../persistence/XmlImportExportTest.java           |   1 -
 .../metrics/AbstractPersistentStatTestSupport.java |   9 -
 .../tests/integration/plugin/CacheMetricsTest.java |  31 +-
 .../tests/integration/plugin/JvmMetricsTest.java   |  31 +-
 .../integration/plugin/MetricsPluginTest.java      |  31 +-
 .../tests/integration/plugin/NettyMetricsTest.java |  31 +-
 .../integration/plugin/SystemMetricsTest.java      |  31 +-
 .../integration/plugin/XmlConfigPluginTest.java    |   2 -
 .../integration/ra/ActiveMQClusteredTest.java      |   8 +-
 .../integration/ra/ActiveMQMessageHandlerTest.java |   4 -
 .../tests/integration/ra/ResourceAdapterTest.java  |   2 -
 .../tests/integration/remoting/PingTest.java       |  14 +-
 .../integration/replication/ReplicationTest.java   |  11 +-
 .../SharedNothingReplicationFlowControlTest.java   |   7 +-
 .../integration/scheduling/DelayedMessageTest.java |   3 -
 .../scheduling/MultipliedDelayedMessageTest.java   |   3 -
 .../scheduling/ScheduledMessageTest.java           |   3 -
 .../integration/security/JMSXUserIDPluginTest.java |   2 -
 .../security/PersistedSecuritySettingTest.java     |  31 +-
 .../tests/integration/security/SecurityTest.java   |  15 +-
 .../integration/server/AIOFileLockTimeoutTest.java |   9 +-
 .../integration/server/NIOFileLockTimeoutTest.java |   9 +-
 .../server/PotentialOOMELoggingTest.java           |   8 +-
 .../integration/server/RetroactiveAddressTest.java |  31 +-
 .../integration/server/ScaleDownDirectTest.java    |   4 +-
 .../integration/server/SimpleStartStopTest.java    |   8 +-
 .../ssl/CoreClientOverOneWaySSLTest.java           |  17 +-
 .../artemis/tests/integration/stomp/StompTest.java |   5 -
 .../tests/integration/stomp/StompTestBase.java     |   4 -
 .../stomp/StompWithClientIdValidationTest.java     |   4 +-
 .../artemis/tests/integration/xa/BasicXaTest.java  |   4 -
 .../tests/integration/xa/XaTimeoutTest.java        |  12 +-
 .../artemis/tests/util/JMSClusteredTestBase.java   |  12 -
 .../tests/util/TransportConfigurationUtils.java    |   5 -
 .../artemis/jms/tests/AcknowledgementTest.java     |   6 +-
 .../artemis/jms/tests/CTSMiscellaneousTest.java    |   3 +-
 .../artemis/jms/tests/ConnectionClosedTest.java    |  11 +-
 .../artemis/jms/tests/ConnectionFactoryTest.java   |   7 +-
 .../activemq/artemis/jms/tests/ConnectionTest.java |   4 -
 .../artemis/jms/tests/DurableSubscriptionTest.java |  20 +-
 .../artemis/jms/tests/MessageConsumerTest.java     |  19 +-
 .../artemis/jms/tests/MessageProducerTest.java     |   3 -
 .../jms/tests/MessageWithReadResolveTest.java      |   9 +-
 .../artemis/jms/tests/MiscellaneousTest.java       |   7 -
 .../jms/tests/NonDurableSubscriberTest.java        |   2 -
 .../artemis/jms/tests/PersistenceTest.java         |   4 +-
 .../activemq/artemis/jms/tests/QueueTest.java      |   2 -
 .../artemis/jms/tests/ReferenceableTest.java       |   2 +-
 .../activemq/artemis/jms/tests/SecurityTest.java   |   6 +-
 .../jms/tests/TemporaryDestinationTest.java        |  13 +-
 .../activemq/artemis/jms/tests/TopicTest.java      |   3 -
 .../artemis/jms/tests/TransactedSessionTest.java   |   9 +-
 .../tests/message/BodyIsAssignableFromTest.java    |  10 -
 .../jms/tests/message/BytesMessageTest.java        |   2 -
 .../jms/tests/message/JMSReplyToHeaderTest.java    |   5 -
 .../jms/tests/message/MessageHeaderTest.java       | 178 -----
 .../tests/message/ObjectMessageDeliveryTest.java   |   8 -
 .../jms/tests/message/SimpleJMSBytesMessage.java   |   4 -
 .../jms/tests/message/SimpleJMSMapMessage.java     |   3 -
 .../jms/tests/message/SimpleJMSMessage.java        |   4 +-
 .../artemis/jms/tests/selector/SelectorTest.java   |  15 +-
 .../artemis/jms/tests/tools/ServerManagement.java  |  12 +-
 .../tools/container/InVMInitialContextFactory.java |   2 +-
 .../artemis/jms/tests/tools/container/Server.java  |  78 +--
 .../artemis/amqpJMS/ActiveMQAMQPAdmin.java         |   3 -
 .../artemis/amqpJMS/JoramAMQPAggregationTest.java  |   2 -
 .../activemq/artemis/common/AbstractAdmin.java     |   8 +-
 .../artemis/common/testjndi/TestContext.java       |  43 +-
 .../common/testjndi/TestContextFactory.java        |   7 +-
 .../artemis/jms/JoramCoreAggregationTest.java      |   2 -
 .../java/org/objectweb/jtests/jms/admin/Admin.java |  62 +-
 .../jms/conform/connection/ConnectionTest.java     |  12 +-
 .../conform/connection/TopicConnectionTest.java    |  56 +-
 .../jms/conform/message/MessageBodyTest.java       |   9 +-
 .../jms/conform/message/MessageDefaultTest.java    |   9 +-
 .../jms/conform/message/MessageTypeTest.java       | 105 ++-
 .../conform/message/headers/MessageHeaderTest.java |  42 +-
 .../message/properties/JMSXPropertyTest.java       |  10 +-
 .../properties/MessagePropertyConversionTest.java  | 313 ++++-----
 .../message/properties/MessagePropertyTest.java    |  63 +-
 .../jtests/jms/conform/queue/QueueBrowserTest.java |  14 +-
 .../jms/conform/queue/TemporaryQueueTest.java      |   6 -
 .../jms/conform/selector/SelectorSyntaxTest.java   |  30 +-
 .../jtests/jms/conform/selector/SelectorTest.java  |  49 +-
 .../jms/conform/session/QueueSessionTest.java      |  21 +-
 .../jtests/jms/conform/session/SessionTest.java    |  42 +-
 .../jms/conform/session/TopicSessionTest.java      |  24 +-
 .../jms/conform/session/UnifiedSessionTest.java    |  56 +-
 .../jms/conform/topic/TemporaryTopicTest.java      |   6 -
 .../jtests/jms/framework/JMSTestCase.java          |  18 +-
 .../jtests/jms/framework/PTPTestCase.java          |  38 +-
 .../jtests/jms/framework/PubSubTestCase.java       |  38 +-
 .../objectweb/jtests/jms/framework/TestConfig.java |   4 +-
 .../jtests/jms/framework/UnifiedTestCase.java      |  51 +-
 .../artemis/tests/leak/FilteredPagingLeakTest.java |   7 +-
 .../artemis/tests/leak/JournalLeakTest.java        |   5 +-
 .../artemis/tests/leak/MemoryAssertions.java       |   4 +-
 .../tests/leak/MessageReferenceLeakTest.java       |  33 +-
 .../artemis/tests/leak/PagingLeakTest.java         |   5 +-
 .../performance/journal/FakeJournalImplTest.java   |   3 -
 .../paging/MeasurePagingMultiThreadTest.java       |  18 -
 .../sends/AbstractSendReceivePerfTest.java         |   5 +-
 .../performance/sends/MeasureCommitPerfTest.java   |   2 +-
 .../BrokerConnectionBridgeSecurityTest.java        |  31 +-
 .../BrokerConnectionMirrorSecurityTest.java        |  31 +-
 .../smoke/brokerConnection/DualFederationTest.java |  31 +-
 .../DualMirrorNoContainerTest.java                 |  31 +-
 .../MirrorInfiniteRetryReplicaTest.java            |   8 +-
 .../brokerConnection/MirroredSubscriptionTest.java |  31 +-
 .../brokerConnection/PagedMirrorSmokeTest.java     |  31 +-
 .../artemis/tests/smoke/console/ConsoleTest.java   |   4 +-
 .../artemis/tests/smoke/jmx/JmxConnectionTest.java |  34 +-
 .../smoke/resourcetest/MaxQueueResourceTest.java   |  31 +-
 .../smoke/upgradeTest/CompareUpgradeTest.java      |   4 +-
 .../tests/smoke/upgradeTest/UpgradeTest.java       |  35 +-
 .../artemis/tests/soak/client/ClientAbstract.java  |  12 +-
 .../artemis/tests/soak/client/Receiver.java        |  12 -
 .../activemq/artemis/tests/soak/client/Sender.java |   9 -
 .../ClusterNotificationsContinuityTest.java        |  42 +-
 .../soak/interrupt/JournalFlushInterruptTest.java  |  33 +-
 .../soak/interruptlm/LargeMessageFrozenTest.java   |   4 +-
 .../artemis/tests/soak/owleak/OWLeakTest.java      |   6 +-
 .../tests/soak/paging/FlowControlPagingTest.java   |   6 +-
 .../tests/soak/paging/HorizontalPagingTest.java    |   7 +-
 .../tests/soak/paging/MegaCleanerPagingTest.java   |   2 +-
 .../tests/soak/paging/SubscriptionPagingTest.java  |   9 +-
 .../soak/replicaTxCheck/ReplicaTXCheckTest.java    |   7 +-
 .../journal/AIOMultiThreadCompactorStressTest.java |   3 -
 .../journal/JournalCleanupCompactStressTest.java   |   7 +-
 .../stress/journal/JournalRestartStressTest.java   |  12 +-
 .../stress/journal/LargeJournalStressTest.java     |   3 -
 .../stress/journal/MixupCompactorTestBase.java     |   4 -
 .../journal/MultiThreadConsumerStressTest.java     |   2 +-
 .../journal/NIOMultiThreadCompactorStressTest.java |  15 -
 .../tests/stress/paging/PageCursorStressTest.java  |  27 -
 .../tests/stress/remote/PingStressTest.java        |   4 +-
 .../core/server/impl/QueueConcurrentTest.java      |   4 +-
 .../asyncio/MultiThreadAsynchronousFileTest.java   |  10 +-
 .../core/client/impl/LargeMessageBufferTest.java   |  44 +-
 .../core/config/impl/ConnectorsServiceTest.java    |   6 -
 .../unit/core/journal/impl/TimedBufferTest.java    |   8 +-
 .../tests/unit/core/paging/impl/PageTest.java      |   7 -
 .../core/paging/impl/PagingManagerImplTest.java    |   7 +-
 .../unit/core/paging/impl/PagingStoreImplTest.java |   9 +-
 .../core/postoffice/impl/BindingsImplTest.java     |  47 --
 .../impl/WildcardAddressManagerUnitTest.java       |  23 +-
 .../impl/netty/ChannelBufferWrapper2Test.java      |   2 -
 .../remoting/impl/netty/NettyConnectorTest.java    |   1 -
 .../impl/ActiveMQSecurityManagerImplTest.java      |   3 -
 .../tests/unit/core/server/impl/QueueImplTest.java |   4 -
 .../tests/unit/logging/AssertionLoggerTest.java    |   6 +-
 .../unit/ra/ActiveMQResourceAdapterConfigTest.java |  11 +-
 .../unit/ra/ConnectionFactoryPropertiesTest.java   |   3 +-
 .../artemis/tests/unit/util/FakePagingManager.java |  22 -
 .../artemis/tests/unit/util/LinkedListTest.java    |   5 +-
 .../artemis/tests/unit/util/ReusableLatchTest.java |  12 +-
 1517 files changed, 11178 insertions(+), 21586 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact



Reply via email to