You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2024/06/21 17:13:32 UTC

(activemq-artemis) branch main updated: ARTEMIS-4829 use lambdas consistently

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

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


The following commit(s) were added to refs/heads/main by this push:
     new d7cf5dfa44 ARTEMIS-4829 use lambdas consistently
d7cf5dfa44 is described below

commit d7cf5dfa446020a8d36086d38e57aaf00781c9dd
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Wed Jun 19 16:44:15 2024 -0500

    ARTEMIS-4829 use lambdas consistently
    
    This commit uses lambdas or method references wherever possible. There
    are still a handful of places that appear like they could be changed but
    couldn't mainly because they use "this" and the meaning of "this"
    changes when using a lambda.
---
 .../org/apache/activemq/artemis/boot/Artemis.java  |   7 +-
 .../artemis/cli/commands/tools/DBOption.java       |   8 +-
 .../artemis/cli/commands/tools/PrintData.java      |   7 +-
 .../cli/commands/tools/xml/XmlDataExporter.java    |  45 +-
 .../cli/commands/tools/xml/XmlDataImporter.java    |  14 +-
 .../artemis/cli/process/ProcessBuilder.java        |  19 +-
 .../apache/activemq/artemis/util/ServerUtil.java   |   7 +-
 .../core/server/ActiveMQScheduledComponent.java    |   7 +-
 .../artemis/core/server/NetworkHealthCheck.java    |   7 +-
 .../activemq/artemis/utils/UUIDGenerator.java      |  37 +-
 .../artemis/utils/actors/ArtemisExecutor.java      |  15 +-
 .../utils/critical/CriticalAnalyzerImpl.java       |   7 +-
 .../activemq/artemis/utils/NetworkHealthTest.java  |  17 +-
 .../artemis/utils/ReferenceCounterTest.java        |  14 +-
 .../activemq/artemis/utils/SimpleFutureTest.java   |  14 +-
 .../artemis/utils/TypedPropertiesTest.java         |  21 +-
 .../artemis/api/core/client/ActiveMQClient.java    |   7 +-
 .../core/client/impl/ClientConsumerImpl.java       |  27 +-
 .../core/client/impl/ClientSessionFactoryImpl.java |  37 +-
 .../core/client/impl/ClientSessionImpl.java        |  13 +-
 .../core/client/impl/ServerLocatorImpl.java        |  52 +-
 .../artemis/core/client/impl/Topology.java         |  45 +-
 .../protocol/core/impl/ActiveMQSessionContext.java |   7 +-
 .../remoting/impl/TransportConfigurationUtil.java  |  13 +-
 .../core/remoting/impl/netty/NettyConnector.java   |  14 +-
 .../remoting/impl/netty/SharedEventLoopGroup.java  |  31 +-
 .../artemis/core/remoting/impl/ssl/SSLSupport.java |   7 +-
 .../activemq/artemis/utils/VersionLoader.java      |  16 +-
 .../org/apache/activemq/artemis/utils/XMLUtil.java |   7 +-
 .../activemq/artemis/ClientThreadPoolsTest.java    |  65 +--
 .../core/protocol/core/impl/ChannelImplTest.java   |   7 +-
 .../impl/netty/SharedEventLoopGroupTest.java       |  32 +-
 .../artemis/message/CoreMTMessageTest.java         |  33 +-
 .../jdbc/store/journal/JDBCJournalImpl.java        |  13 +-
 .../store/file/JDBCSequentialFileFactoryTest.java  |   6 +-
 .../artemis/jms/client/ActiveMQConnection.java     |  23 +-
 .../jms/client/ActiveMQConnectionFactory.java      |  11 +-
 .../client/ActiveMQConnectionForContextImpl.java   |  17 +-
 .../jms/client/DefaultConnectionProperties.java    |  15 +-
 .../artemis/jms/bridge/impl/JMSBridgeImpl.java     |  16 +-
 .../core/io/AbstractSequentialFileFactory.java     |   7 +-
 .../core/journal/impl/JournalFilesRepository.java  |   7 +-
 .../artemis/core/journal/impl/JournalImpl.java     | 607 ++++++++++-----------
 .../activemq/artemis/maven/ArtemisCLIPlugin.java   |   7 +-
 .../artemis/maven/ArtemisDependencyDocPlugin.java  |  12 +-
 .../activemq/artemis/maven/ArtemisStopPlugin.java  |   7 +-
 .../protocol/amqp/sasl/GSSAPIServerSASL.java       |  18 +-
 .../amqp/sasl/scram/SCRAMServerSASLFactory.java    |  32 +-
 .../artemis/protocol/amqp/util/TLSEncode.java      |   7 +-
 .../protocol/amqp/broker/AMQPMessageTest.java      |  31 +-
 .../proton/ProtonServerReceiverContextTest.java    |  50 +-
 .../protocol/amqp/util/CreditsSemaphoreTest.java   |  25 +-
 .../protocol/hornetq/PropertiesConversionTest.java | 140 +++--
 .../core/protocol/openwire/OpenWireConnection.java |   9 +-
 .../core/protocol/openwire/amq/AMQConsumer.java    |   9 +-
 .../core/protocol/stomp/StompProtocolManager.java  |  47 +-
 .../activemq/artemis/ra/ActiveMQRaUtils.java       |  23 +-
 .../artemis/ra/inflow/ActiveMQActivation.java      |  16 +-
 .../core/config/impl/ConfigurationImpl.java        |  37 +-
 .../deployers/impl/FileConfigurationParser.java    |  21 +-
 .../management/impl/ActiveMQServerControlImpl.java |  38 +-
 .../paging/cursor/impl/PageCursorProviderImpl.java |  21 +-
 .../paging/cursor/impl/PageSubscriptionImpl.java   |  10 +-
 .../artemis/core/paging/impl/PageSyncTimer.java    |   7 +-
 .../journal/AbstractJournalStorageManager.java     |   7 +-
 .../persistence/impl/journal/DescribeJournal.java  |  23 +-
 .../impl/journal/JDBCJournalStorageManager.java    |   7 +-
 .../impl/journal/JournalStorageManager.java        |  27 +-
 .../impl/journal/OperationContextImpl.java         |  17 +-
 .../impl/nullpm/NullStorageManager.java            |   7 +-
 .../protocol/core/impl/CoreProtocolManager.java    | 104 ++--
 .../core/remoting/impl/invm/InVMAcceptor.java      |   9 +-
 .../core/remoting/impl/invm/InVMConnection.java    |   7 +-
 .../core/remoting/impl/invm/InVMConnector.java     |  14 +-
 .../core/remoting/impl/netty/NettyAcceptor.java    |  43 +-
 .../remoting/server/impl/RemotingServiceImpl.java  |  37 +-
 .../core/replication/ReplicationEndpoint.java      |  17 +-
 .../artemis/core/server/cluster/BackupManager.java |  96 ++--
 .../core/server/cluster/ClusterManager.java        |  14 +-
 .../core/server/cluster/impl/BridgeImpl.java       |  62 +--
 .../server/cluster/impl/ClusterConnectionImpl.java |  32 +-
 .../artemis/core/server/files/FileMoveManager.java |  36 +-
 .../server/group/impl/GroupHandlingAbstract.java   |  16 +-
 .../server/group/impl/LocalGroupingHandler.java    |  47 +-
 .../core/server/impl/ActiveMQServerImpl.java       |  82 +--
 .../core/server/impl/ColocatedActivation.java      |  47 +-
 .../artemis/core/server/impl/QueueImpl.java        |  22 +-
 .../core/server/impl/ServerConsumerImpl.java       |  51 +-
 .../core/server/impl/ServiceRegistryImpl.java      |   7 +-
 .../server/impl/SharedNothingBackupActivation.java |  33 +-
 .../impl/SharedNothingPrimaryActivation.java       | 172 +++---
 .../server/impl/SharedStoreBackupActivation.java   |  19 +-
 .../core/server/management/JaasAuthenticator.java  |  42 +-
 .../core/config/impl/ConfigurationImplTest.java    |  23 +-
 .../core/config/impl/FileConfigurationTest.java    |  21 +-
 .../impl/journal/OperationContextUnitTest.java     |  34 +-
 .../artemis/core/reload/ReloadManagerTest.java     |  28 +-
 .../core/security/jaas/GuestLoginModuleTest.java   |  26 +-
 .../security/jaas/LDAPModuleRoleExpansionTest.java |  22 +-
 .../impl/ClusterConnectionImplMockTest.java        |   7 +-
 .../core/server/impl/ActiveMQServerImplTest.java   |  15 +-
 .../journal/JournalStorageManagerConstantTest.java |  12 +-
 .../artemis/core/settings/RepositoryTest.java      |   7 +-
 .../core/security/jaas/Krb5LoginModuleTest.java    |  25 +-
 .../core/security/jaas/LDAPLoginModuleTest.java    | 117 ++--
 .../artemis/service/extensions/ServiceUtils.java   |  28 +-
 .../apache/activemq/ActiveMQConnectionFactory.java |  33 +-
 .../org/apache/activemq/broker/BrokerService.java  |  21 +-
 .../activemq/ActiveMQConnectionFactoryTest.java    |  12 +-
 .../org/apache/activemq/AutoFailTestSupport.java   |  37 +-
 ...ConnectionCloseMultipleTimesConcurrentTest.java |  23 +-
 .../activemq/ConsumerReceiveWithTimeoutTest.java   |  23 +-
 .../java/org/apache/activemq/JMSConsumerTest.java  | 183 +++----
 .../java/org/apache/activemq/JmsBenchmark.java     |  73 ++-
 .../activemq/JmsConnectionStartStopTest.java       |  32 +-
 .../apache/activemq/JmsMessageConsumerTest.java    |  16 +-
 .../activemq/JmsMultipleClientsTestSupport.java    |  23 +-
 ...ReceiveTwoConnectionsStartBeforeBrokerTest.java |   7 +-
 .../org/apache/activemq/JmsRedeliveredTest.java    |   7 +-
 .../JmsSendReceiveWithMessageExpirationTest.java   |   7 +-
 .../activemq/JmsSendWithAsyncCallbackTest.java     |   6 +-
 .../apache/activemq/JmsTempDestinationTest.java    |  14 +-
 .../apache/activemq/JmsTopicRequestReplyTest.java  |   7 +-
 .../activemq/MessageListenerRedeliveryTest.java    |  51 +-
 .../activemq/OnePrefetchAsyncConsumerTest.java     |  41 +-
 .../java/org/apache/activemq/OptimizedAckTest.java |  51 +-
 .../org/apache/activemq/RedeliveryPolicyTest.java  |  68 +--
 .../apache/activemq/broker/BrokerBenchmark.java    | 139 +++--
 .../activemq/openwire/BooleanStreamTest.java       |  28 +-
 .../failover/ConnectionHangOnStartupTest.java      |  19 +-
 .../transport/failover/FailoverBackupLeakTest.java |  16 +-
 .../FailoverConsumerOutstandingCommitTest.java     |  69 +--
 .../failover/FailoverConsumerUnconsumedTest.java   | 195 +++----
 .../transport/failover/FailoverDuplicateTest.java  |  64 +--
 .../failover/FailoverPrefetchZeroTest.java         |  44 +-
 .../failover/FailoverTransactionTest.java          | 236 ++++----
 .../failover/FailoverTransportBackupsTest.java     |  63 +--
 .../transport/failover/FailoverTransportTest.java  |   7 +-
 .../activemq/transport/failover/ReconnectTest.java |  18 +-
 .../transport/failover/SlowConnectionTest.java     |  26 +-
 .../fanout/FanoutTransportBrokerTest.java          |  19 +-
 .../transport/nio/NIOSSLConcurrencyTest.java       |   7 +-
 .../activemq/transport/nio/NIOSSLLoadTest.java     |   7 +-
 .../reliable/UnreliableUdpTransportTest.java       |  12 +-
 .../transport/tcp/InactivityMonitorTest.java       |  13 +-
 .../core/journal/impl/JournalImplTestBase.java     |  22 +-
 .../activemq/artemis/tests/util/TcpProxy.java      |  17 +-
 .../apache/activemq/artemis/utils/ExecuteUtil.java |  26 +-
 .../transport/amqp/client/AmqpConnection.java      | 163 +++---
 .../transport/amqp/client/AmqpReceiver.java        | 316 +++++------
 .../activemq/transport/amqp/client/AmqpSender.java |  30 +-
 .../transport/amqp/client/AmqpSession.java         | 152 ++----
 .../amqp/client/AmqpTransactionContext.java        | 100 ++--
 .../amqp/client/util/TypeConversionSupport.java    |  91 +--
 .../amqp/client/util/UnmodifiableProxy.java        |  87 ++-
 .../transport/netty/NettyTcpTransport.java         |  39 +-
 .../tests/compatibility/AddressConfigTest.java     |  30 +-
 .../tests/compatibility/JmsReplyToQueueTest.java   |  46 +-
 .../compatibility/JmsReplyToTempQueueTest.java     |  46 +-
 .../compatibility/JmsReplyToTempTopicTest.java     |  46 +-
 .../tests/compatibility/JmsReplyToTopicTest.java   |  46 +-
 .../artemis/tests/compatibility/Mesh2Test.java     |  17 +-
 .../artemis/tests/compatibility/MeshTest.java      |  17 +-
 .../tests/compatibility/OldAddressSpaceTest.java   |  34 +-
 .../artemis/tests/db/paging/PagingTest.java        | 142 +++--
 .../artemis/tests/e2e/common/ContainerService.java |   7 +-
 .../isolated/client/ConnectionDroppedTest.java     |  19 +-
 .../isolated/security/JmxSecurityTest.java         |  28 +-
 .../addressing/TwoWaysRemoveAddressTest.java       |  60 +-
 .../amqp/AmqpBrokerRequestedHearbeatsTest.java     |  27 +-
 .../integration/amqp/AmqpFlowControlTest.java      |  50 +-
 .../amqp/AmqpProtocolHeaderHandlingTest.java       |  16 +-
 .../integration/amqp/AmqpSendReceiveTest.java      | 136 ++---
 .../integration/amqp/AmqpTransactionTest.java      |  49 +-
 .../amqp/ClientDefinedMultiConsumerTest.java       |  21 +-
 .../tests/integration/amqp/ExtremeCancelsTest.java |  43 +-
 .../tests/integration/amqp/GlobalDiskFullTest.java |  54 +-
 .../integration/amqp/JMSClientTestSupport.java     |  29 +-
 .../tests/integration/amqp/JMSConnectionTest.java  |  18 +-
 .../integration/amqp/JMSDurableConsumerTest.java   |  78 +--
 .../integration/amqp/JMSMessageConsumerTest.java   |  94 ++--
 .../integration/amqp/JMSSaslExternalTest.java      |  39 +-
 .../tests/integration/amqp/JMSSaslGssapiTest.java  |  67 ++-
 .../amqp/JMSTemporaryDestinationTest.java          |  16 +-
 .../integration/amqp/JMSTopicConsumerTest.java     |  37 +-
 .../amqp/connect/AMQPMirrorFastACKTest.java        |  21 +-
 .../tests/integration/client/AcknowledgeTest.java  |  51 +-
 .../integration/client/ActiveMQCrashTest.java      |  29 +-
 .../integration/client/CommitRollbackTest.java     |  19 +-
 .../integration/client/ConsumerCloseTest.java      |  37 +-
 .../integration/client/ConsumerStuckTest.java      |  99 ++--
 .../tests/integration/client/ConsumerTest.java     | 159 +++---
 .../integration/client/ConsumerWindowSizeTest.java |  45 +-
 .../integration/client/FailureDeadlockTest.java    |  13 +-
 .../tests/integration/client/HangConsumerTest.java |  15 +-
 .../client/IncompatibleVersionTest.java            |   8 +-
 .../integration/client/InitialConnectionTest.java  |  19 +-
 .../client/InterruptedLargeMessageTest.java        |  62 +--
 .../integration/client/JmsNettyNioStressTest.java  | 167 +++---
 .../integration/client/MessageConcurrencyTest.java |  14 +-
 .../integration/client/MessageDurabilityTest.java  |  14 +-
 .../tests/integration/client/MessageRateTest.java  |  25 +-
 .../integration/client/ProducerCloseTest.java      |  14 +-
 .../client/ProducerFlowControlTest.java            |  15 +-
 .../tests/integration/client/ProducerTest.java     |  51 +-
 .../integration/client/ReceiveImmediateTest.java   |  20 +-
 .../tests/integration/client/ReceiveTest.java      |  17 +-
 .../tests/integration/client/RequestorTest.java    |  23 +-
 .../tests/integration/client/SendAckFailTest.java  |  62 +--
 .../tests/integration/client/SessionCloseTest.java | 165 ++----
 .../SessionSendAcknowledgementHandlerTest.java     |   5 +-
 .../tests/integration/client/SlowConsumerTest.java | 107 ++--
 .../integration/client/TemporaryQueueTest.java     |  76 +--
 .../integration/cluster/bridge/BridgeTest.java     |   7 +-
 .../AnycastRoutingWithClusterTest.java             |  21 +-
 .../distribution/AutoDeleteDistributedTest.java    |  18 +-
 .../distribution/ClusteredGroupingTest.java        | 280 +++++-----
 .../distribution/ClusteredMessageCounterTest.java  |  13 +-
 .../failover/BackupSyncLargeMessageTest.java       |  25 +-
 .../integration/cluster/failover/FailoverTest.java | 115 ++--
 .../failover/NetworkFailureFailoverTest.java       | 233 ++++----
 .../cluster/failover/ReplicaTimeoutTest.java       |  35 +-
 .../cluster/failover/ReplicatedFailoverTest.java   |  22 +-
 ...agerNettyNoGroupNameReplicatedFailoverTest.java |  24 +-
 .../cluster/reattach/OrderReattachTest.java        |  49 +-
 .../integration/cluster/reattach/ReattachTest.java | 135 ++---
 .../NettyHAClientTopologyWithDiscoveryTest.java    |  27 +-
 .../integration/discovery/DiscoveryBaseTest.java   |  26 +-
 .../discovery/DiscoveryStayAliveTest.java          |  19 +-
 .../tests/integration/divert/DivertTest.java       |   7 +-
 .../divert/ReplicationWithDivertTest.java          |  38 +-
 .../jdbc/store/journal/JDBCJournalTest.java        |  14 +-
 .../jms/ManualReconnectionToSingleServerTest.java  |  13 +-
 .../integration/jms/cluster/JMSFailoverTest.java   |  29 +-
 .../jms/consumer/CreateSubscriptionTest.java       |  63 +--
 .../integration/jms/consumer/JmsConsumerTest.java  |  10 +-
 .../integration/journal/CrashOnCompactTest.java    |  13 +-
 .../journal/MappedSequentialFileFactoryTest.java   | 152 +++---
 .../integration/journal/MessageJournalTest.java    |  14 +-
 .../integration/journal/NIOJournalCompactTest.java | 180 +++---
 .../journal/NIOSequentialFileFactoryTest.java      | 166 +++---
 .../integration/journal/RelativePathTest.java      |  14 +-
 .../management/ActiveMQServerControlTest.java      |  21 +-
 .../integration/management/QueueControlTest.java   |  76 ++-
 .../management/SecurityNotificationTest.java       |  21 +-
 .../tests/integration/mqtt/MQTTFQQNTest.java       |  23 +-
 .../mqtt/MQTTRejectingInterceptorTest.java         |  22 +-
 .../artemis/tests/integration/mqtt/MQTTTest.java   |  46 +-
 .../tests/integration/mqtt/PahoMQTTTest.java       |   7 +-
 .../integration/openwire/BasicSecurityTest.java    | 381 +++++++------
 .../openwire/CompactingOpenWireTest.java           |  67 ++-
 .../openwire/OpenWireProtocolManagerTest.java      |  20 +-
 .../integration/openwire/SimpleOpenWireTest.java   |  58 +-
 .../integration/openwire/amq/JMSConsumer1Test.java |  27 +-
 .../integration/openwire/amq/JMSConsumer2Test.java |  37 +-
 .../integration/openwire/amq/JMSConsumer5Test.java |  25 +-
 .../integration/openwire/amq/JMSConsumer6Test.java |  21 +-
 .../integration/openwire/amq/JMSConsumer7Test.java |  60 +-
 .../integration/openwire/amq/JMSConsumer8Test.java |  54 +-
 .../integration/openwire/amq/JMSConsumer9Test.java |  30 +-
 .../openwire/amq/JmsConnectionStartStopTest.java   |  38 +-
 .../openwire/amq/JmsTopicRequestReplyTest.java     |   7 +-
 .../amq/MessageListenerRedeliveryTest.java         |  45 +-
 .../amq/ProducerFlowControlSendFailTest.java       |  16 +-
 .../cluster/MessageRedistributionTest.java         |   7 +-
 .../management/OpenWireDeleteQueueTest.java        |  17 +-
 .../integration/paging/AddressFullLoggingTest.java |  16 +-
 .../paging/GlobalJournalPagingTest.java            |  17 +-
 .../paging/PageCountSyncOnNonTXTest.java           |   7 +-
 .../integration/paging/PageCounterRebuildTest.java |  27 +-
 .../tests/integration/paging/PagingOrderTest.java  |  84 ++-
 .../tests/integration/paging/PagingSendTest.java   |  41 +-
 .../persistence/DeleteQueueRestartTest.java        |  17 +-
 .../metrics/JournalPageCountSizeTest.java          |   7 +-
 .../metrics/JournalPendingMessageTest.java         |  39 +-
 .../tests/integration/plugin/MqttPluginTest.java   |  23 +-
 .../tests/integration/remoting/PingTest.java       |  47 +-
 .../tests/integration/remoting/ReconnectTest.java  |  53 +-
 .../integration/replication/ReplicationTest.java   |  16 +-
 .../scheduling/ScheduledMessageTest.java           |  39 +-
 .../server/ActivationFailureListenerTest.java      |  12 +-
 .../integration/server/FileLockTimeoutTest.java    |  13 +-
 .../integration/server/GracefulShutdownTest.java   |  26 +-
 .../tests/integration/server/ScaleDownTest.java    |   7 +-
 .../artemis/tests/integration/stomp/StompTest.java |  33 +-
 .../tests/integration/stomp/v11/StompV11Test.java  |  61 +--
 .../tests/integration/stomp/v12/StompV12Test.java  |  75 ++-
 .../tests/integration/xa/XaTimeoutTest.java        |  89 ++-
 .../activemq/artemis/jms/tests/BrowserTest.java    |  13 +-
 .../apache/activemq/artemis/jms/tests/JMSTest.java |  43 +-
 .../artemis/jms/tests/MessageConsumerTest.java     | 150 ++---
 .../artemis/jms/tests/MessageProducerTest.java     |  13 +-
 .../artemis/jms/tests/MiscellaneousTest.java       |  35 +-
 .../jms/tests/TemporaryDestinationTest.java        |  17 +-
 .../jms/tests/message/JMSExpirationHeaderTest.java | 118 ++--
 .../artemis/jms/tests/selector/SelectorTest.java   |  50 +-
 .../activemq/artemis/common/AbstractAdmin.java     |  19 +-
 .../jms/conform/connection/ConnectionTest.java     |  16 +-
 .../integration/karaf/ArtemisFeatureTest.java      |  53 +-
 .../storage/SendReceiveMultiThreadTest.java        |  65 ++-
 .../replicationflow/SoakReplicatedPagingTest.java  |  18 +-
 .../journal/JournalCleanupCompactStressTest.java   |  48 +-
 .../stress/journal/JournalRestartStressTest.java   |  41 +-
 .../stress/journal/MixupCompactorTestBase.java     |  28 +-
 .../tests/stress/paging/PageCursorStressTest.java  |  51 +-
 .../tests/stress/remote/PingStressTest.java        |  26 +-
 .../timing/jms/bridge/impl/JMSBridgeImplTest.java  |  31 +-
 .../timing/util/TokenBucketLimiterImplTest.java    |  53 +-
 .../core/client/impl/LargeMessageBufferTest.java   |  48 +-
 .../core/journal/impl/AlignedJournalImplTest.java  | 103 ++--
 .../journal/impl/JournaHistorylBackupTest.java     |  21 +-
 .../impl/JournalFileRepositoryOrderTest.java       |  25 +-
 .../unit/core/paging/impl/PagingStoreImplTest.java |  36 +-
 .../core/postoffice/impl/BindingsImplTest.java     |  15 +-
 .../impl/WildcardAddressManagerPerfTest.java       |  14 +-
 .../impl/netty/NettyAcceptorFactoryTest.java       |  11 +-
 .../remoting/impl/netty/NettyAcceptorTest.java     |  15 +-
 .../remoting/impl/netty/NettyConnectorTest.java    | 103 +---
 .../tests/unit/core/server/impl/FileLockTest.java  |  15 +-
 .../unit/jms/client/ActiveMQStreamMessageTest.java | 202 ++-----
 .../artemis/tests/unit/util/LinkedListTest.java    |  27 +-
 .../artemis/tests/unit/util/MemorySizeTest.java    |  14 +-
 322 files changed, 5468 insertions(+), 8540 deletions(-)

diff --git a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
index 0212524c52..1100105ad6 100644
--- a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
+++ b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
@@ -127,12 +127,7 @@ public class Artemis {
             }
 
             // Sort the list by file name..
-            Collections.sort(files, new Comparator<File>() {
-               @Override
-               public int compare(File file, File file1) {
-                  return file.getName().compareTo(file1.getName());
-               }
-            });
+            Collections.sort(files, Comparator.comparing(File::getName));
 
             for (File f : files) {
                add(urls, f);
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DBOption.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DBOption.java
index 919404b406..837df21a33 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DBOption.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DBOption.java
@@ -26,7 +26,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.ThreadFactory;
 
 import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.artemis.cli.commands.ActionContext;
@@ -292,12 +291,7 @@ public class DBOption extends OptionalLocking {
       executor = Executors.newFixedThreadPool(5, ActiveMQThreadFactory.defaultThreadFactory(getClass().getName()));
       executorFactory = new OrderedExecutorFactory(executor);
 
-      scheduledExecutorService = new ScheduledThreadPoolExecutor(configuration.getScheduledThreadPoolMaxSize(), new ThreadFactory() {
-         @Override
-         public Thread newThread(Runnable r) {
-            return new Thread(r);
-         }
-      });
+      scheduledExecutorService = new ScheduledThreadPoolExecutor(configuration.getScheduledThreadPoolMaxSize(), r -> new Thread(r));
 
       HierarchicalRepository<AddressSettings> addressSettingsRepository = new HierarchicalObjectRepository<>(config.getWildcardConfiguration());
       addressSettingsRepository.setDefault(new AddressSettings());
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/PrintData.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/PrintData.java
index f1ac2f2622..6afedff617 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/PrintData.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/PrintData.java
@@ -229,12 +229,7 @@ public class PrintData extends DBOption {
       ActiveMQThreadFactory daemonFactory = new ActiveMQThreadFactory("cli", true, PrintData.class.getClassLoader());
       final ScheduledExecutorService scheduled = Executors.newScheduledThreadPool(1, daemonFactory);
       final ExecutorService executor = Executors.newFixedThreadPool(10, daemonFactory);
-      ExecutorFactory execfactory = new ExecutorFactory() {
-         @Override
-         public ArtemisExecutor getExecutor() {
-            return ArtemisExecutor.delegate(executor);
-         }
-      };
+      ExecutorFactory execfactory = () -> ArtemisExecutor.delegate(executor);
       try {
 
          final StorageManager sm = new NullStorageManager();
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java
index 83dc493c90..174fbfff12 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java
@@ -184,35 +184,30 @@ public final class XmlDataExporter extends DBOption {
       messageJournal.start();
 
       // Just logging these, no action necessary
-      TransactionFailureCallback transactionFailureCallback = new TransactionFailureCallback() {
-         @Override
-         public void failedTransaction(long transactionID,
-                                       List<RecordInfo> records1,
-                                       List<RecordInfo> recordsToDelete) {
-            StringBuilder message = new StringBuilder();
-            message.append("Encountered failed journal transaction: ").append(transactionID);
-            for (int i = 0; i < records1.size(); i++) {
-               if (i == 0) {
-                  message.append("; Records: ");
-               }
-               message.append(records1.get(i));
-               if (i != (records1.size() - 1)) {
-                  message.append(", ");
-               }
+      TransactionFailureCallback transactionFailureCallback = (transactionID, records1, recordsToDelete) -> {
+         StringBuilder message = new StringBuilder();
+         message.append("Encountered failed journal transaction: ").append(transactionID);
+         for (int i = 0; i < records1.size(); i++) {
+            if (i == 0) {
+               message.append("; Records: ");
             }
-
-            for (int i = 0; i < recordsToDelete.size(); i++) {
-               if (i == 0) {
-                  message.append("; RecordsToDelete: ");
-               }
-               message.append(recordsToDelete.get(i));
-               if (i != (recordsToDelete.size() - 1)) {
-                  message.append(", ");
-               }
+            message.append(records1.get(i));
+            if (i != (records1.size() - 1)) {
+               message.append(", ");
             }
+         }
 
-            logger.debug(message.toString());
+         for (int i = 0; i < recordsToDelete.size(); i++) {
+            if (i == 0) {
+               message.append("; RecordsToDelete: ");
+            }
+            message.append(recordsToDelete.get(i));
+            if (i != (recordsToDelete.size() - 1)) {
+               message.append(", ");
+            }
          }
+
+         logger.debug(message.toString());
       };
 
       messageJournal.load(records, preparedTransactions, transactionFailureCallback, false);
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
index f4bc95c9df..e76f6989b8 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
@@ -231,22 +231,12 @@ public final class XmlDataImporter extends ConnectionConfigurationAbtract {
    }
 
    private static URL findResource(final String resourceName) {
-      return AccessController.doPrivileged(new PrivilegedAction<URL>() {
-         @Override
-         public URL run() {
-            return ClassloadingUtil.findResource(resourceName);
-         }
-      });
+      return AccessController.doPrivileged((PrivilegedAction<URL>) () -> ClassloadingUtil.findResource(resourceName));
    }
 
    private void processXml() throws Exception {
       if (sort) {
-         messages = new TreeSet<XMLMessageImporter.MessageInfo>(new Comparator<XMLMessageImporter.MessageInfo>() {
-            @Override
-            public int compare(XMLMessageImporter.MessageInfo o1, XMLMessageImporter.MessageInfo o2) {
-               return Long.compare(o1.id, o2.id);
-            }
-         });
+         messages = new TreeSet<XMLMessageImporter.MessageInfo>(Comparator.comparingLong(o -> o.id));
       }
       while (reader.hasNext()) {
          if (logger.isDebugEnabled()) {
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/process/ProcessBuilder.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/process/ProcessBuilder.java
index 9eb796098e..8e64d75116 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/process/ProcessBuilder.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/process/ProcessBuilder.java
@@ -29,17 +29,11 @@ public class ProcessBuilder {
    static ConcurrentHashSet<Process> processes = new ConcurrentHashSet<>();
 
    static {
-      Runtime.getRuntime().addShutdownHook(new Thread() {
-         @Override
-         public void run() {
-            for (Process p : processes) {
-               //               if (p.isAlive())
-               {
-                  p.destroy();
-               }
-            }
+      Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+         for (Process p : processes) {
+            p.destroy();
          }
-      });
+      }));
    }
 
    /**
@@ -47,10 +41,7 @@ public class ProcessBuilder {
     */
    public static void cleanupProcess() {
       for (Process p : processes) {
-         //         if (!p.isAlive())
-         {
-            processes.remove(p);
-         }
+         processes.remove(p);
       }
    }
 
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java
index 7cbc983430..cfb1c4509c 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java
@@ -116,12 +116,7 @@ public class ServerUtil {
          builder.directory(new File(artemisInstance + "/bin"));
 
          final Process process = builder.start();
-         Runtime.getRuntime().addShutdownHook(new Thread() {
-            @Override
-            public void run() {
-               process.destroy();
-            }
-         });
+         Runtime.getRuntime().addShutdownHook(new Thread(() -> process.destroy()));
 
          ProcessLogger outputLogger = new ProcessLogger(true, process.getInputStream(), jobName, false);
          outputLogger.start();
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
index 3fe9b75812..ae7c773381 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
@@ -175,12 +175,7 @@ public abstract class ActiveMQScheduledComponent implements ActiveMQComponent, R
    }
 
    private ClassLoader getThisClassLoader() {
-      return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
-         @Override
-         public ClassLoader run() {
-            return ActiveMQScheduledComponent.this.getClass().getClassLoader();
-         }
-      });
+      return AccessController.doPrivileged((PrivilegedAction<ClassLoader>) () -> ActiveMQScheduledComponent.this.getClass().getClassLoader());
 
    }
 
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java
index f4e810b9dd..73c86e2976 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java
@@ -165,12 +165,7 @@ public class NetworkHealthCheck extends ActiveMQScheduledComponent {
 
 
    private ClassLoader getThisClassLoader() {
-      return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
-         @Override
-         public ClassLoader run() {
-            return NetworkHealthCheck.this.getClass().getClassLoader();
-         }
-      });
+      return AccessController.doPrivileged((PrivilegedAction<ClassLoader>) () -> NetworkHealthCheck.this.getClass().getClassLoader());
 
    }
 
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
index b0f84d36cf..2ea4194f0a 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
@@ -269,33 +269,30 @@ public final class UUIDGenerator {
       Collection<Callable<byte[]>> tasks = new ArrayList<>(ifaces.size());
 
       for (final NetworkInterface networkInterface : ifaces) {
-         tasks.add(new Callable<byte[]>() {
-            @Override
-            public byte[] call() throws Exception {
-               boolean up = networkInterface.isUp();
-               boolean loopback = networkInterface.isLoopback();
-               boolean virtual = networkInterface.isVirtual();
-
-               if (loopback || virtual || !up) {
-                  throw new Exception("not suitable interface");
-               }
+         tasks.add(() -> {
+            boolean up = networkInterface.isUp();
+            boolean loopback = networkInterface.isLoopback();
+            boolean virtual = networkInterface.isVirtual();
 
-               byte[] address = networkInterface.getHardwareAddress();
-               if (address != null) {
+            if (loopback || virtual || !up) {
+               throw new Exception("not suitable interface");
+            }
 
-                  byte[] paddedAddress = UUIDGenerator.getZeroPaddedSixBytes(address);
+            byte[] address = networkInterface.getHardwareAddress();
+            if (address != null) {
 
-                  if (UUIDGenerator.isDenyList(address)) {
-                     throw new Exception("deny listed address");
-                  }
+               byte[] paddedAddress = UUIDGenerator.getZeroPaddedSixBytes(address);
 
-                  if (paddedAddress != null) {
-                     return paddedAddress;
-                  }
+               if (UUIDGenerator.isDenyList(address)) {
+                  throw new Exception("deny listed address");
                }
 
-               throw new Exception("invalid network interface");
+               if (paddedAddress != null) {
+                  return paddedAddress;
+               }
             }
+
+            throw new Exception("invalid network interface");
          });
       }
       try {
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ArtemisExecutor.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ArtemisExecutor.java
index ffd3f5faeb..e1ea54e0c3 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ArtemisExecutor.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ArtemisExecutor.java
@@ -30,12 +30,7 @@ public interface ArtemisExecutor extends Executor {
     * @return
     */
    static ArtemisExecutor delegate(Executor executor) {
-      return new ArtemisExecutor() {
-         @Override
-         public void execute(Runnable command) {
-            executor.execute(command);
-         }
-      };
+      return executor::execute;
    }
 
    /**
@@ -104,13 +99,7 @@ public interface ArtemisExecutor extends Executor {
     */
    default boolean isFlushed() {
       CountDownLatch latch = new CountDownLatch(1);
-      Runnable runnable = new Runnable() {
-         @Override
-         public void run() {
-            latch.countDown();
-         }
-      };
-      execute(runnable);
+      execute(latch::countDown);
       try {
          return latch.await(100, TimeUnit.MILLISECONDS);
       } catch (InterruptedException e) {
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalAnalyzerImpl.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalAnalyzerImpl.java
index 5fddd1d7d8..b58eeb86b3 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalAnalyzerImpl.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalAnalyzerImpl.java
@@ -64,12 +64,7 @@ public class CriticalAnalyzerImpl implements CriticalAnalyzer {
          }
 
          private ClassLoader getThisClassLoader() {
-            return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
-               @Override
-               public ClassLoader run() {
-                  return CriticalAnalyzerImpl.this.getClass().getClassLoader();
-               }
-            });
+            return AccessController.doPrivileged((PrivilegedAction<ClassLoader>) () -> CriticalAnalyzerImpl.this.getClass().getClassLoader());
 
          }
 
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/NetworkHealthTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/NetworkHealthTest.java
index b12e2fd5b7..347888f6e9 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/NetworkHealthTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/NetworkHealthTest.java
@@ -33,8 +33,6 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
 import org.apache.activemq.artemis.core.server.ActiveMQComponent;
 import org.apache.activemq.artemis.core.server.NetworkHealthCheck;
@@ -101,15 +99,12 @@ public class NetworkHealthTest {
       InetSocketAddress address = new InetSocketAddress("127.0.0.1", 8787);
       httpServer = HttpServer.create(address, 100);
       httpServer.start();
-      httpServer.createContext("/", new HttpHandler() {
-         @Override
-         public void handle(HttpExchange t) throws IOException {
-            String response = "<html><body><b>This is a unit test</b></body></html>";
-            t.sendResponseHeaders(200, response.length());
-            OutputStream os = t.getResponseBody();
-            os.write(response.getBytes());
-            os.close();
-         }
+      httpServer.createContext("/", t -> {
+         String response = "<html><body><b>This is a unit test</b></body></html>";
+         t.sendResponseHeaders(200, response.length());
+         OutputStream os = t.getResponseBody();
+         os.write(response.getBytes());
+         os.close();
       });
    }
 
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ReferenceCounterTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ReferenceCounterTest.java
index 80583ae463..c7d1659643 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ReferenceCounterTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ReferenceCounterTest.java
@@ -94,12 +94,7 @@ public class ReferenceCounterTest {
       Thread[] t = new Thread[100];
 
       for (int i = 0; i < t.length; i++) {
-         t[i] = new Thread() {
-            @Override
-            public void run() {
-               ref.increment();
-            }
-         };
+         t[i] = new Thread(() -> ref.increment());
          t[i].start();
       }
 
@@ -108,12 +103,7 @@ public class ReferenceCounterTest {
       }
 
       for (int i = 0; i < t.length; i++) {
-         t[i] = new Thread() {
-            @Override
-            public void run() {
-               ref.decrement();
-            }
-         };
+         t[i] = new Thread(() -> ref.decrement());
          t[i].start();
       }
 
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SimpleFutureTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SimpleFutureTest.java
index 717acb58bf..b8639e42b3 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SimpleFutureTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SimpleFutureTest.java
@@ -28,12 +28,7 @@ public class SimpleFutureTest extends ArtemisTestCase {
    public void testFuture() throws Exception {
       final long randomStart = System.currentTimeMillis();
       final SimpleFuture<Long> simpleFuture = new SimpleFutureImpl<>();
-      Thread t = new Thread() {
-         @Override
-         public void run() {
-            simpleFuture.set(randomStart);
-         }
-      };
+      Thread t = new Thread(() -> simpleFuture.set(randomStart));
       t.start();
 
       assertEquals(randomStart, simpleFuture.get().longValue());
@@ -43,12 +38,7 @@ public class SimpleFutureTest extends ArtemisTestCase {
    @Test
    public void testException() throws Exception {
       final SimpleFuture<Long> simpleFuture = new SimpleFutureImpl<>();
-      Thread t = new Thread() {
-         @Override
-         public void run() {
-            simpleFuture.fail(new Exception("hello"));
-         }
-      };
+      Thread t = new Thread(() -> simpleFuture.fail(new Exception("hello")));
       t.start();
 
       boolean failed = false;
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/TypedPropertiesTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/TypedPropertiesTest.java
index d556954186..476f3f06de 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/TypedPropertiesTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/TypedPropertiesTest.java
@@ -398,20 +398,17 @@ public class TypedPropertiesTest {
       AtomicBoolean running = new AtomicBoolean(true);
       AtomicLong copies = new AtomicLong(0);
       AtomicBoolean error = new AtomicBoolean(false);
-      Thread t = new Thread() {
-         @Override
-         public void run() {
-            while (running.get() && !error.get()) {
-               try {
-                  copies.incrementAndGet();
-                  TypedProperties copiedProperties = new TypedProperties(properties);
-               } catch (Throwable e) {
-                  e.printStackTrace();
-                  error.set(true);
-               }
+      Thread t = new Thread(() -> {
+         while (running.get() && !error.get()) {
+            try {
+               copies.incrementAndGet();
+               TypedProperties copiedProperties = new TypedProperties(properties);
+            } catch (Throwable e) {
+               e.printStackTrace();
+               error.set(true);
             }
          }
-      };
+      });
       t.start();
       for (int i = 0; !error.get() && (i < 100 || copies.get() < 50); i++) {
          properties.putIntProperty(SimpleString.of("key" + i), i);
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
index bd9327ed81..94feade8e7 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
@@ -264,12 +264,7 @@ public final class ActiveMQClient {
 
    public static synchronized ScheduledExecutorService getGlobalScheduledThreadPool() {
       if (globalScheduledThreadPool == null) {
-         ThreadFactory factory = AccessController.doPrivileged(new PrivilegedAction<ThreadFactory>() {
-            @Override
-            public ThreadFactory run() {
-               return new ActiveMQThreadFactory("ActiveMQ-client-global-scheduled-threads", true, ClientSessionFactoryImpl.class.getClassLoader());
-            }
-         });
+         ThreadFactory factory = AccessController.doPrivileged((PrivilegedAction<ThreadFactory>) () -> new ActiveMQThreadFactory("ActiveMQ-client-global-scheduled-threads", true, ClientSessionFactoryImpl.class.getClassLoader()));
 
          globalScheduledThreadPool = new ScheduledThreadPoolExecutor(ActiveMQClient.globalScheduledThreadPoolSize, factory);
       }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java
index 431921b13a..de5a183f63 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java
@@ -463,12 +463,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
       resetLargeMessageController();
 
       //execute the future after the last onMessage call
-      sessionExecutor.execute(new Runnable() {
-         @Override
-         public void run() {
-            future.run();
-         }
-      });
+      sessionExecutor.execute(future::run);
 
       return onMessageThread;
    }
@@ -867,12 +862,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
 
          // If resetting a slow consumer, we need to wait the execution
          final CountDownLatch latch = new CountDownLatch(1);
-         flowControlExecutor.execute(new Runnable() {
-            @Override
-            public void run() {
-               latch.countDown();
-            }
-         });
+         flowControlExecutor.execute(latch::countDown);
 
          try {
             latch.await(10, TimeUnit.SECONDS);
@@ -898,14 +888,11 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
     */
    private void sendCredits(final int credits) {
       pendingFlowControl.countUp();
-      flowControlExecutor.execute(new Runnable() {
-         @Override
-         public void run() {
-            try {
-               sessionContext.sendConsumerCredits(ClientConsumerImpl.this, credits);
-            } finally {
-               pendingFlowControl.countDown();
-            }
+      flowControlExecutor.execute(() -> {
+         try {
+            sessionContext.sendConsumerCredits(ClientConsumerImpl.this, credits);
+         } finally {
+            pendingFlowControl.countDown();
          }
       });
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
index d7dc12f61b..67a6b723fb 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
@@ -419,12 +419,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
 
       // It has to use the same executor as the disconnect message is being sent through
 
-      closeExecutor.execute(new Runnable() {
-         @Override
-         public void run() {
-            handleConnectionFailure(connectionID, ex);
-         }
-      });
+      closeExecutor.execute(() -> handleConnectionFailure(connectionID, ex));
 
    }
 
@@ -1150,12 +1145,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
       }
       // else... we will try to instantiate a new one
 
-      return AccessController.doPrivileged(new PrivilegedAction<ConnectorFactory>() {
-         @Override
-         public ConnectorFactory run() {
-            return (ConnectorFactory) ClassloadingUtil.newInstanceFromClassLoader(ClientSessionFactoryImpl.class, connectorFactoryClassName, ConnectorFactory.class);
-         }
-      });
+      return AccessController.doPrivileged((PrivilegedAction<ConnectorFactory>) () -> (ConnectorFactory) ClassloadingUtil.newInstanceFromClassLoader(ClientSessionFactoryImpl.class, connectorFactoryClassName, ConnectorFactory.class));
    }
 
    public class CloseRunnable implements Runnable {
@@ -1365,12 +1355,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
                theConn.bufferReceived(connectionID, buffer);
             } catch (final RuntimeException e) {
                ActiveMQClientLogger.LOGGER.disconnectOnErrorDecoding(e);
-               threadPool.execute(new Runnable() {
-                  @Override
-                  public void run() {
-                     theConn.fail(new ActiveMQException(e.getMessage()));
-                  }
-               });
+               threadPool.execute(() -> theConn.fail(new ActiveMQException(e.getMessage())));
             }
          } else {
             logger.debug("TheConn == null on ClientSessionFactoryImpl::DelegatingBufferHandler, ignoring packet");
@@ -1386,12 +1371,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
                theConn.endOfBatch(connectionID);
             } catch (final RuntimeException e) {
                ActiveMQClientLogger.LOGGER.disconnectOnErrorDecoding(e);
-               threadPool.execute(new Runnable() {
-                  @Override
-                  public void run() {
-                     theConn.fail(new ActiveMQException(e.getMessage()));
-                  }
-               });
+               threadPool.execute(() -> theConn.fail(new ActiveMQException(e.getMessage())));
             }
          } else {
             logger.debug("TheConn == null on ClientSessionFactoryImpl::DelegatingBufferHandler, ignoring packet");
@@ -1472,13 +1452,8 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
 
                cancelled = true;
 
-               threadPool.execute(new Runnable() {
-                  // Must be executed on different thread
-                  @Override
-                  public void run() {
-                     connectionInUse.fail(me);
-                  }
-               });
+               // Must be executed on different thread
+               threadPool.execute(() -> connectionInUse.fail(me));
 
                return;
             } else {
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
index 065a1945fc..537fafd0af 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
@@ -1327,14 +1327,11 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
       final ClientConsumerInternal consumer = getConsumer(context);
 
       if (consumer != null) {
-         closeExecutor.execute(new Runnable() {
-            @Override
-            public void run() {
-               try {
-                  consumer.close();
-               } catch (ActiveMQException e) {
-                  ActiveMQClientLogger.LOGGER.unableToCloseConsumer(e);
-               }
+         closeExecutor.execute(() -> {
+            try {
+               consumer.close();
+            } catch (ActiveMQException e) {
+               ActiveMQClientLogger.LOGGER.unableToCloseConsumer(e);
             }
          });
       }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
index 165b5518fe..c7eff111ca 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
@@ -253,12 +253,9 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
       if (config.connectionLoadBalancingPolicyClassName == null) {
          throw new IllegalStateException("Please specify a load balancing policy class name on the session factory");
       }
-      AccessController.doPrivileged(new PrivilegedAction<Object>() {
-         @Override
-         public Object run() {
-               loadBalancingPolicy = (ConnectionLoadBalancingPolicy) ClassloadingUtil.newInstanceFromClassLoader(ServerLocatorImpl.class, config.connectionLoadBalancingPolicyClassName, ConnectionLoadBalancingPolicy.class);
-               return null;
-         }
+      AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
+         loadBalancingPolicy = (ConnectionLoadBalancingPolicy) ClassloadingUtil.newInstanceFromClassLoader(ServerLocatorImpl.class, config.connectionLoadBalancingPolicyClassName, ConnectionLoadBalancingPolicy.class);
+         return null;
       });
    }
 
@@ -514,15 +511,12 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
       this.startExecutor = executor;
 
       if (executor != null) {
-         executor.execute(new Runnable() {
-            @Override
-            public void run() {
-               try {
-                  connect();
-               } catch (Exception e) {
-                  if (!isClosed()) {
-                     ActiveMQClientLogger.LOGGER.errorConnectingToNodes(e);
-                  }
+         executor.execute(() -> {
+            try {
+               connect();
+            } catch (Exception e) {
+               if (!isClosed()) {
+                  ActiveMQClientLogger.LOGGER.errorConnectingToNodes(e);
                }
             }
          });
@@ -1641,14 +1635,11 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
          // The node is alone in the cluster. We create a connection to the new node
          // to trigger the node notification to form the cluster.
 
-         Runnable connectRunnable = new Runnable() {
-            @Override
-            public void run() {
-               try {
-                  connect();
-               } catch (ActiveMQException e) {
-                  ActiveMQClientLogger.LOGGER.errorConnectingToNodes(e);
-               }
+         Runnable connectRunnable = () -> {
+            try {
+               connect();
+            } catch (ActiveMQException e) {
+               ActiveMQClientLogger.LOGGER.errorConnectingToNodes(e);
             }
          };
          if (startExecutor != null) {
@@ -1943,17 +1934,14 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
       if (interceptorList == null || interceptorList.trim().equals("")) {
          return;
       }
-      AccessController.doPrivileged(new PrivilegedAction<Object>() {
-         @Override
-         public Object run() {
+      AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
 
-            String[] arrayInterceptor = interceptorList.split(",");
-            for (String strValue : arrayInterceptor) {
-               Interceptor interceptor = (Interceptor) ClassloadingUtil.newInstanceFromClassLoader(ServerLocatorImpl.class, strValue.trim(), Interceptor.class);
-               interceptors.add(interceptor);
-            }
-            return null;
+         String[] arrayInterceptor = interceptorList.split(",");
+         for (String strValue : arrayInterceptor) {
+            Interceptor interceptor = (Interceptor) ClassloadingUtil.newInstanceFromClassLoader(ServerLocatorImpl.class, strValue.trim(), Interceptor.class);
+            interceptors.add(interceptor);
          }
+         return null;
       });
 
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java
index bb96d72513..8371c85623 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java
@@ -271,20 +271,16 @@ public final class Topology {
       }
 
       if (copy.size() > 0) {
-         executor.execute(new Runnable() {
-            @Override
-            public void run() {
-               for (ClusterTopologyListener listener : copy) {
-                  if (logger.isTraceEnabled()) {
-                     logger.trace("{} informing {} about node up = {} connector = {}",
-                                  Topology.this, listener, nodeId, memberToSend.getConnector());
-                  }
+         executor.execute(() -> {
+            for (ClusterTopologyListener listener : copy) {
+               if (logger.isTraceEnabled()) {
+                  logger.trace("{} informing {} about node up = {} connector = {}", Topology.this, listener, nodeId, memberToSend.getConnector());
+               }
 
-                  try {
-                     listener.nodeUP(memberToSend, false);
-                  } catch (Throwable e) {
-                     ActiveMQClientLogger.LOGGER.errorSendingTopology(e);
-                  }
+               try {
+                  listener.nodeUP(memberToSend, false);
+               } catch (Throwable e) {
+                  ActiveMQClientLogger.LOGGER.errorSendingTopology(e);
                }
             }
          });
@@ -354,23 +350,20 @@ public final class Topology {
    public synchronized void sendTopology(final ClusterTopologyListener listener) {
       logger.debug("{} is sending topology to {}", this, listener);
 
-      executor.execute(new Runnable() {
-         @Override
-         public void run() {
-            int count = 0;
+      executor.execute(() -> {
+         int count = 0;
 
-            final Map<String, TopologyMemberImpl> copy;
+         final Map<String, TopologyMemberImpl> copy;
 
-            synchronized (Topology.this) {
-               copy = new HashMap<>(topology);
-            }
+         synchronized (Topology.this) {
+            copy = new HashMap<>(topology);
+         }
 
-            for (Map.Entry<String, TopologyMemberImpl> entry : copy.entrySet()) {
-               if (logger.isDebugEnabled()) {
-                  logger.debug("{} sending {} / {} to {}", Topology.this, entry.getKey(), entry.getValue().getConnector(), listener);
-               }
-               listener.nodeUP(entry.getValue(), ++count == copy.size());
+         for (Entry<String, TopologyMemberImpl> entry : copy.entrySet()) {
+            if (logger.isDebugEnabled()) {
+               logger.debug("{} sending {} / {} to {}", Topology.this, entry.getKey(), entry.getValue().getConnector(), listener);
             }
+            listener.nodeUP(entry.getValue(), ++count == copy.size());
          }
       });
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
index 483acfd435..4170c2e7a9 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
@@ -1180,12 +1180,7 @@ public class ActiveMQSessionContext extends SessionContext {
    }
 
    protected ClassLoader lookupTCCL() {
-      return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
-         @Override
-         public ClassLoader run() {
-            return Thread.currentThread().getContextClassLoader();
-         }
-      });
+      return AccessController.doPrivileged((PrivilegedAction<ClassLoader>) () -> Thread.currentThread().getContextClassLoader());
 
    }
 
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/TransportConfigurationUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/TransportConfigurationUtil.java
index 20839917eb..3bb417ac65 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/TransportConfigurationUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/TransportConfigurationUtil.java
@@ -61,14 +61,11 @@ public class TransportConfigurationUtil {
    }
 
    private static Object instantiateObject(final String className, final Class expectedType) {
-      return AccessController.doPrivileged(new PrivilegedAction<Object>() {
-         @Override
-         public Object run() {
-            try {
-               return ClassloadingUtil.newInstanceFromClassLoader(TransportConfigurationUtil.class, className, expectedType);
-            } catch (IllegalStateException e) {
-               return null;
-            }
+      return AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
+         try {
+            return ClassloadingUtil.newInstanceFromClassLoader(TransportConfigurationUtil.class, className, expectedType);
+         } catch (IllegalStateException e) {
+            return null;
          }
       });
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
index 7413755ab9..40314e57f3 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
@@ -1257,24 +1257,14 @@ public class NettyConnector extends AbstractConnector {
       public void connectionDestroyed(final Object connectionID, boolean failed) {
          if (connections.remove(connectionID) != null) {
             // Execute on different thread to avoid deadlocks
-            closeExecutor.execute(new Runnable() {
-               @Override
-               public void run() {
-                  listener.connectionDestroyed(connectionID, failed);
-               }
-            });
+            closeExecutor.execute(() -> listener.connectionDestroyed(connectionID, failed));
          }
       }
 
       @Override
       public void connectionException(final Object connectionID, final ActiveMQException me) {
          // Execute on different thread to avoid deadlocks
-         closeExecutor.execute(new Runnable() {
-            @Override
-            public void run() {
-               listener.connectionException(connectionID, me);
-            }
-         });
+         closeExecutor.execute(() -> listener.connectionException(connectionID, me));
       }
 
       @Override
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/SharedEventLoopGroup.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/SharedEventLoopGroup.java
index 24c393cdee..e7affad519 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/SharedEventLoopGroup.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/SharedEventLoopGroup.java
@@ -86,27 +86,20 @@ public class SharedEventLoopGroup extends DelegatingEventLoopGroup {
    public Future<?> shutdownGracefully(final long l, final long l2, final TimeUnit timeUnit) {
       synchronized (SharedEventLoopGroup.class) {
          if (channelFactoryCount.decrementAndGet() == 0) {
-            shutdown.compareAndSet(null, next().scheduleAtFixedRate(new Runnable() {
-               @Override
-               public void run() {
-                  synchronized (SharedEventLoopGroup.class) {
-                     if (shutdown.get() != null) {
-                        Future<?> future = SharedEventLoopGroup.super.shutdownGracefully(l, l2, timeUnit);
-                        future.addListener(new FutureListener<Object>() {
-                           @Override
-                           public void operationComplete(Future<Object> future) throws Exception {
-                              if (future.isSuccess()) {
-                                 terminationPromise.setSuccess(null);
-                              } else {
-                                 terminationPromise.setFailure(future.cause());
-                              }
-                           }
-                        });
-                        instance = null;
-                     }
+            shutdown.compareAndSet(null, next().scheduleAtFixedRate(() -> {
+               synchronized (SharedEventLoopGroup.class) {
+                  if (shutdown.get() != null) {
+                     Future<?> future = SharedEventLoopGroup.super.shutdownGracefully(l, l2, timeUnit);
+                     future.addListener((FutureListener<Object>) future1 -> {
+                        if (future1.isSuccess()) {
+                           terminationPromise.setSuccess(null);
+                        } else {
+                           terminationPromise.setFailure(future1.cause());
+                        }
+                     });
+                     instance = null;
                   }
                }
-
             }, 10, 10, TimeUnit.SECONDS));
          }
          return terminationPromise;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
index 8c600e4e25..f90fd03c28 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
@@ -415,12 +415,7 @@ public class SSLSupport {
     * For that reason any class trying to do a privileged block should do with the AccessController directly.
     */
    private static URL findResource(final String resourceName) {
-      return AccessController.doPrivileged(new PrivilegedAction<URL>() {
-         @Override
-         public URL run() {
-            return ClassloadingUtil.findResource(resourceName);
-         }
-      });
+      return AccessController.doPrivileged((PrivilegedAction<URL>) () -> ClassloadingUtil.findResource(resourceName));
    }
 
    private Pair<PrivateKey, X509Certificate[]> getPrivateKeyAndCertChain(KeyStore keyStore) throws KeyStoreException, UnrecoverableKeyException, NoSuchAlgorithmException {
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/VersionLoader.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/VersionLoader.java
index b76005c039..94849c8e1a 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/VersionLoader.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/VersionLoader.java
@@ -24,7 +24,6 @@ import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Properties;
 import java.util.StringTokenizer;
@@ -50,12 +49,7 @@ public final class VersionLoader {
       try {
 
          try {
-            PROP_FILE_NAME = AccessController.doPrivileged(new PrivilegedAction<String>() {
-               @Override
-               public String run() {
-                  return System.getProperty(VersionLoader.VERSION_PROP_FILE_KEY);
-               }
-            });
+            PROP_FILE_NAME = AccessController.doPrivileged((PrivilegedAction<String>) () -> System.getProperty(VersionLoader.VERSION_PROP_FILE_KEY));
          } catch (Throwable e) {
             ActiveMQClientLogger.LOGGER.unableToInitVersionLoader(e);
             PROP_FILE_NAME = null;
@@ -121,13 +115,7 @@ public final class VersionLoader {
                definedVersions.add(new VersionImpl(versionName, majorVersion, minorVersion, microVersion, incrementingVersion, compatibleVersionArray));
             }
             //We want the higher version to be the first
-            Collections.sort(definedVersions, new Comparator<Version>() {
-               @Override
-               public int compare(Version version1, Version version2) {
-                  return version2.getIncrementingVersion() - version1.getIncrementingVersion();
-               }
-
-            });
+            Collections.sort(definedVersions, (version1, version2) -> version2.getIncrementingVersion() - version1.getIncrementingVersion());
             return definedVersions.toArray(new Version[incrementingVersions.length]);
          } catch (IOException e) {
             // if we get here then the messaging hasn't been built properly and the version.properties is skewed in some
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
index fd3c940d39..7703421eb4 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
@@ -395,12 +395,7 @@ public final class XMLUtil {
    }
 
    public static URL findResource(final String resourceName) {
-      return AccessController.doPrivileged(new PrivilegedAction<URL>() {
-         @Override
-         public URL run() {
-            return ClassloadingUtil.findResource(resourceName);
-         }
-      });
+      return AccessController.doPrivileged((PrivilegedAction<URL>) () -> ClassloadingUtil.findResource(resourceName));
    }
 
 }
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/ClientThreadPoolsTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/ClientThreadPoolsTest.java
index 09206ab6e1..7cf10b4937 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/ClientThreadPoolsTest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/ClientThreadPoolsTest.java
@@ -81,16 +81,13 @@ public class ClientThreadPoolsTest {
       final CountDownLatch inUse = new CountDownLatch(1);
       final CountDownLatch neverLeave = new CountDownLatch(1);
 
-      ActiveMQClient.getGlobalThreadPool().execute(new Runnable() {
-         @Override
-         public void run() {
-            try {
-               inUse.countDown();
-               neverLeave.await();
-            } catch (Exception e) {
-               e.printStackTrace();
-               neverLeave.countDown();
-            }
+      ActiveMQClient.getGlobalThreadPool().execute(() -> {
+         try {
+            inUse.countDown();
+            neverLeave.await();
+         } catch (Exception e) {
+            e.printStackTrace();
+            neverLeave.countDown();
          }
       });
 
@@ -114,16 +111,13 @@ public class ClientThreadPoolsTest {
       final CountDownLatch inUse = new CountDownLatch(1);
       final CountDownLatch neverLeave = new CountDownLatch(1);
 
-      ActiveMQClient.getGlobalThreadPool().execute(new Runnable() {
-         @Override
-         public void run() {
-            try {
-               inUse.countDown();
-               neverLeave.await();
-            } catch (Exception e) {
-               e.printStackTrace();
-               neverLeave.countDown();
-            }
+      ActiveMQClient.getGlobalThreadPool().execute(() -> {
+         try {
+            inUse.countDown();
+            neverLeave.await();
+         } catch (Exception e) {
+            e.printStackTrace();
+            neverLeave.countDown();
          }
       });
 
@@ -192,23 +186,20 @@ public class ClientThreadPoolsTest {
 
       for (int i = 0; i < expectedMax * 3; i++) {
          final int localI = i;
-         threadPool.execute(new Runnable() {
-            @Override
-            public void run() {
-               try {
-
-                  if (debugExecutions) {
-                     System.out.println("runnable " + localI);
-                  }
-                  doneMax.countDown();
-                  latch.await();
-                  latchTotal.countDown();
-               } catch (Exception e) {
-                  errors.incrementAndGet();
-               } finally {
-                  if (debugExecutions) {
-                     System.out.println("done " + localI);
-                  }
+         threadPool.execute(() -> {
+            try {
+
+               if (debugExecutions) {
+                  System.out.println("runnable " + localI);
+               }
+               doneMax.countDown();
+               latch.await();
+               latchTotal.countDown();
+            } catch (Exception e) {
+               errors.incrementAndGet();
+            } finally {
+               if (debugExecutions) {
+                  System.out.println("done " + localI);
                }
             }
          });
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImplTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImplTest.java
index 7efa37f31b..72aa5d1f44 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImplTest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImplTest.java
@@ -75,12 +75,7 @@ public class ChannelImplTest {
    }
 
    private CommandConfirmationHandler wrapAsPerActiveMQSessionContext(ResponseHandler responseHandler) {
-      return new CommandConfirmationHandler() {
-         @Override
-         public void commandConfirmed(Packet packet) {
-            responseHandler.handleResponse(packet, null);
-         }
-      };
+      return packet -> responseHandler.handleResponse(packet, null);
    }
 
    @Test
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/core/remoting/impl/netty/SharedEventLoopGroupTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/core/remoting/impl/netty/SharedEventLoopGroupTest.java
index 2000497cf0..1fb467bc65 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/core/remoting/impl/netty/SharedEventLoopGroupTest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/core/remoting/impl/netty/SharedEventLoopGroupTest.java
@@ -34,29 +34,23 @@ public class SharedEventLoopGroupTest {
       final CyclicBarrier barrier = new CyclicBarrier(2);
 
       AtomicReference<SharedEventLoopGroup> sharedEventLoopGroup1 = new AtomicReference<>();
-      Thread t1 = new Thread(new Runnable() {
-         @Override
-         public void run() {
-            sharedEventLoopGroup1.set(SharedEventLoopGroup.getInstance(threadFactory -> customNioEventLoopGroup));
-            customNioEventLoopGroup.setCyclicBarrier(barrier);
-            sharedEventLoopGroup1.get().shutdownGracefully();
-            customNioEventLoopGroup.setCyclicBarrier(null);
-         }
+      Thread t1 = new Thread(() -> {
+         sharedEventLoopGroup1.set(SharedEventLoopGroup.getInstance(threadFactory -> customNioEventLoopGroup));
+         customNioEventLoopGroup.setCyclicBarrier(barrier);
+         sharedEventLoopGroup1.get().shutdownGracefully();
+         customNioEventLoopGroup.setCyclicBarrier(null);
       });
       t1.start();
 
       AtomicReference<SharedEventLoopGroup> sharedEventLoopGroup2 = new AtomicReference<>();
-      Thread t2 = new Thread(new Runnable() {
-         @Override
-         public void run() {
-            try {
-               barrier.await();
-               sharedEventLoopGroup2.set(SharedEventLoopGroup.getInstance(threadFactory -> new NioEventLoopGroup(2, threadFactory)));
-            } catch (InterruptedException e) {
-               e.printStackTrace();
-            } catch (BrokenBarrierException e) {
-               e.printStackTrace();
-            }
+      Thread t2 = new Thread(() -> {
+         try {
+            barrier.await();
+            sharedEventLoopGroup2.set(SharedEventLoopGroup.getInstance(threadFactory -> new NioEventLoopGroup(2, threadFactory)));
+         } catch (InterruptedException e) {
+            e.printStackTrace();
+         } catch (BrokenBarrierException e) {
+            e.printStackTrace();
          }
       });
       t2.start();
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/message/CoreMTMessageTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/message/CoreMTMessageTest.java
index 00fc02904b..4d2efd173c 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/message/CoreMTMessageTest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/message/CoreMTMessageTest.java
@@ -83,24 +83,21 @@ public class CoreMTMessageTest {
       final CountDownLatch startFlag = new CountDownLatch(1);
       final AtomicInteger errors = new AtomicInteger(0);
 
-      Runnable runnable = new Runnable() {
-         @Override
-         public void run() {
-            try {
-               ActiveMQBuffer buffer = ActiveMQBuffers.dynamicBuffer(10 * 1024);
-               aligned.countDown();
-               assertTrue(startFlag.await(5, TimeUnit.SECONDS));
-               coreMessage.messageChanged();
-               coreMessage.sendBuffer(buffer.byteBuf(), 0);
-               CoreMessage recMessage = new CoreMessage();
-               recMessage.receiveBuffer(buffer.byteBuf());
-               assertEquals(ADDRESS2, recMessage.getAddressSimpleString());
-               assertEquals(33, recMessage.getMessageID());
-               assertEquals(propValue, recMessage.getSimpleStringProperty(SimpleString.of("str-prop")));
-            } catch (Throwable e) {
-               e.printStackTrace();
-               errors.incrementAndGet();
-            }
+      Runnable runnable = () -> {
+         try {
+            ActiveMQBuffer buffer1 = ActiveMQBuffers.dynamicBuffer(10 * 1024);
+            aligned.countDown();
+            assertTrue(startFlag.await(5, TimeUnit.SECONDS));
+            coreMessage.messageChanged();
+            coreMessage.sendBuffer(buffer1.byteBuf(), 0);
+            CoreMessage recMessage = new CoreMessage();
+            recMessage.receiveBuffer(buffer1.byteBuf());
+            assertEquals(ADDRESS2, recMessage.getAddressSimpleString());
+            assertEquals(33, recMessage.getMessageID());
+            assertEquals(propValue, recMessage.getSimpleStringProperty(SimpleString.of("str-prop")));
+         } catch (Throwable e) {
+            e.printStackTrace();
+            errors.incrementAndGet();
          }
       };
 
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
index 9f48ab3d4f..03c023df23 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
@@ -327,15 +327,12 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
    }
 
    private void executeCallbacks(final List<JDBCJournalRecord> records, final boolean success) {
-      Runnable r = new Runnable() {
-         @Override
-         public void run() {
-            for (JDBCJournalRecord record : records) {
-               if (logger.isTraceEnabled()) {
-                  logger.trace("Calling callback {} with success = {}", record, success);
-               }
-               record.complete(success);
+      Runnable r = () -> {
+         for (JDBCJournalRecord record : records) {
+            if (logger.isTraceEnabled()) {
+               logger.trace("Calling callback {} with success = {}", record, success);
             }
+            record.complete(success);
          }
       };
       completeExecutor.execute(r);
diff --git a/artemis-jdbc-store/src/test/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryTest.java b/artemis-jdbc-store/src/test/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryTest.java
index 0c52421d97..be161f0d30 100644
--- a/artemis-jdbc-store/src/test/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryTest.java
+++ b/artemis-jdbc-store/src/test/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryTest.java
@@ -43,7 +43,6 @@ import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
 import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
 import org.apache.activemq.artemis.core.io.IOCallback;
-import org.apache.activemq.artemis.core.io.IOCriticalErrorListener;
 import org.apache.activemq.artemis.core.io.SequentialFile;
 import org.apache.activemq.artemis.jdbc.store.drivers.JDBCConnectionProvider;
 import org.apache.activemq.artemis.jdbc.store.drivers.JDBCDataSourceUtils;
@@ -99,10 +98,7 @@ public class JDBCSequentialFileFactoryTest extends ArtemisTestCase {
       dataSourceProperties.put("driverClassName", className);
       String tableName = "FILES";
       String jdbcDatasourceClass = ActiveMQDefaultConfiguration.getDefaultDataSourceClassName();
-      factory = new JDBCSequentialFileFactory(new JDBCConnectionProvider(JDBCDataSourceUtils.getDataSource(jdbcDatasourceClass, dataSourceProperties)), JDBCUtils.getSQLProvider(dataSourceProperties, tableName, SQLProvider.DatabaseStoreType.PAGE), executor, scheduledExecutorService, 100, new IOCriticalErrorListener() {
-         @Override
-         public void onIOException(Throwable code, String message, String file) {
-         }
+      factory = new JDBCSequentialFileFactory(new JDBCConnectionProvider(JDBCDataSourceUtils.getDataSource(jdbcDatasourceClass, dataSourceProperties)), JDBCUtils.getSQLProvider(dataSourceProperties, tableName, SQLProvider.DatabaseStoreType.PAGE), executor, scheduledExecutorService, 100, (code, message, file) -> {
       });
       factory.start();
    }
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
index 4fd156cfc5..cebf7c43bd 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
@@ -366,12 +366,9 @@ public class ActiveMQConnection extends ActiveMQConnectionForContextImpl impleme
             }
          }
 
-         AccessController.doPrivileged(new PrivilegedAction() {
-            @Override
-            public Object run() {
-               failoverListenerExecutor.shutdown();
-               return null;
-            }
+         AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
+            failoverListenerExecutor.shutdown();
+            return null;
          });
 
          closed = true;
@@ -725,12 +722,7 @@ public class ActiveMQConnection extends ActiveMQConnectionForContextImpl impleme
 
                   je.initCause(me);
 
-                  new Thread(new Runnable() {
-                     @Override
-                     public void run() {
-                        exceptionListener.onException(je);
-                     }
-                  }).start();
+                  new Thread(() -> exceptionListener.onException(je)).start();
                }
             } catch (JMSException e) {
                if (!conn.closed) {
@@ -770,12 +762,7 @@ public class ActiveMQConnection extends ActiveMQConnectionForContextImpl impleme
 
                if (failoverListener != null) {
 
-                  conn.failoverListenerExecutor.execute(new Runnable() {
-                     @Override
-                     public void run() {
-                        failoverListener.failoverEvent(eventType);
-                     }
-                  });
+                  conn.failoverListenerExecutor.execute(() -> failoverListener.failoverEvent(eventType));
                }
             } catch (JMSException e) {
                if (!conn.closed) {
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
index b8e89c708f..b4fa3316bb 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
@@ -155,13 +155,10 @@ public class ActiveMQConnectionFactory extends JNDIStorable implements Connectio
 
       if (protocolManagerFactoryStr != null && !protocolManagerFactoryStr.trim().isEmpty() &&
          !protocolManagerFactoryStr.equals("undefined")) {
-         AccessController.doPrivileged(new PrivilegedAction<Object>() {
-            @Override
-            public Object run() {
-               ClientProtocolManagerFactory protocolManagerFactory = (ClientProtocolManagerFactory) ClassloadingUtil.newInstanceFromClassLoader(ActiveMQConnectionFactory.class, protocolManagerFactoryStr, ClientProtocolManagerFactory.class );
-               serverLocator.setProtocolManagerFactory(protocolManagerFactory);
-               return null;
-            }
+         AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
+            ClientProtocolManagerFactory protocolManagerFactory = (ClientProtocolManagerFactory) ClassloadingUtil.newInstanceFromClassLoader(ActiveMQConnectionFactory.class, protocolManagerFactoryStr, ClientProtocolManagerFactory.class );
+            serverLocator.setProtocolManagerFactory(protocolManagerFactory);
+            return null;
          });
 
          this.protocolManagerFactoryStr = protocolManagerFactoryStr;
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionForContextImpl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionForContextImpl.java
index 3ca26be01c..ef91b011ae 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionForContextImpl.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionForContextImpl.java
@@ -28,18 +28,13 @@ import org.apache.activemq.artemis.utils.ReferenceCounterUtil;
 
 public abstract class ActiveMQConnectionForContextImpl implements ActiveMQConnectionForContext {
 
-   final Runnable closeRunnable = new Runnable() {
-      @Override
-      public void run() {
-         try {
-            close();
-         } catch (JMSException e) {
-            throw JmsExceptionUtils.convertToRuntimeException(e);
-         }
+   final ReferenceCounter refCounter = new ReferenceCounterUtil(() -> {
+      try {
+         close();
+      } catch (JMSException e) {
+         throw JmsExceptionUtils.convertToRuntimeException(e);
       }
-   };
-
-   final ReferenceCounter refCounter = new ReferenceCounterUtil(closeRunnable);
+   });
 
    protected final ThreadAwareContext threadAwareContext = new ThreadAwareContext();
 
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/DefaultConnectionProperties.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/DefaultConnectionProperties.java
index d5d3ad959b..03e2e89c8e 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/DefaultConnectionProperties.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/DefaultConnectionProperties.java
@@ -52,17 +52,14 @@ public class DefaultConnectionProperties {
    public static String DEFAULT_PASSWORD_CODEC;
 
    static String getProperty(final String defaultValue, final String... propertyNames) {
-      return AccessController.doPrivileged(new PrivilegedAction<String>() {
-         @Override
-         public String run() {
-            for (String name : propertyNames) {
-               String property = System.getProperty(name);
-               if (property != null && !property.isEmpty()) {
-                  return property;
-               }
+      return AccessController.doPrivileged((PrivilegedAction<String>) () -> {
+         for (String name : propertyNames) {
+            String property = System.getProperty(name);
+            if (property != null && !property.isEmpty()) {
+               return property;
             }
-            return defaultValue;
          }
+         return defaultValue;
       });
    }
 
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
index d35973ac4f..bd24c5f164 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
@@ -347,12 +347,7 @@ public final class JMSBridgeImpl implements JMSBridge {
          stopping = false;
       }
 
-      moduleTccl = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
-         @Override
-         public ClassLoader run() {
-            return Thread.currentThread().getContextClassLoader();
-         }
-      });
+      moduleTccl = AccessController.doPrivileged((PrivilegedAction<ClassLoader>) () -> Thread.currentThread().getContextClassLoader());
 
       locateRecoveryRegistry();
 
@@ -1645,12 +1640,9 @@ public final class JMSBridgeImpl implements JMSBridge {
          public Thread newThread(Runnable r) {
             final Thread thr = new Thread(group, r);
             if (moduleTccl != null) {
-               AccessController.doPrivileged(new PrivilegedAction() {
-                  @Override
-                  public Object run() {
-                     thr.setContextClassLoader(moduleTccl);
-                     return null;
-                  }
+               AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
+                  thr.setContextClassLoader(moduleTccl);
+                  return null;
                });
             }
             return thr;
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFileFactory.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFileFactory.java
index 4631f1f471..fce8766c79 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFileFactory.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFileFactory.java
@@ -244,12 +244,7 @@ public abstract class AbstractSequentialFileFactory implements SequentialFileFac
 
    @Override
    public List<String> listFiles(final String extension) throws Exception {
-      FilenameFilter fnf = new FilenameFilter() {
-         @Override
-         public boolean accept(final File file, final String name) {
-            return name.endsWith("." + extension);
-         }
-      };
+      FilenameFilter fnf = (file, name) -> name.endsWith("." + extension);
 
       String[] fileNames = journalDir.list(fnf);
 
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java
index 005a8a36bc..534d54dec6 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java
@@ -612,12 +612,7 @@ public class JournalFilesRepository {
          return createFile0(keepOpened, multiAIO, init, tmpCompact, fileIdPreSet);
       } else {
          try {
-            return AccessController.doPrivileged(new PrivilegedExceptionAction<JournalFile>() {
-               @Override
-               public JournalFile run() throws Exception {
-                  return createFile0(keepOpened, multiAIO, init, tmpCompact, fileIdPreSet);
-               }
-            });
+            return AccessController.doPrivileged((PrivilegedExceptionAction<JournalFile>) () -> createFile0(keepOpened, multiAIO, init, tmpCompact, fileIdPreSet));
          } catch (PrivilegedActionException e) {
             throw unwrapException(e);
          }
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
index a76f06950d..cb53dd0aca 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
@@ -930,29 +930,26 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
       checkRecordSize(addRecordEncodeSize, record);
 
       final SimpleFuture<Boolean> result = newSyncAndCallbackResult(sync, callback);
-      appendExecutor.execute(new Runnable() {
-         @Override
-         public void run() {
-            journalLock.readLock().lock();
-            try {
-               JournalFile usedFile = appendRecord(addRecord, false, sync, null, callback);
-               records.put(id, new JournalRecord(usedFile, addRecordEncodeSize));
+      appendExecutor.execute(() -> {
+         journalLock.readLock().lock();
+         try {
+            JournalFile usedFile = appendRecord(addRecord, false, sync, null, callback);
+            records.put(id, new JournalRecord(usedFile, addRecordEncodeSize));
 
-               if (logger.isTraceEnabled()) {
-                  logger.trace("appendAddRecord::id={}, userRecordType={}, record = {}, usedFile = {}",
-                               id, recordType, record, usedFile);
-               }
-               result.set(true);
-            } catch (ActiveMQShutdownException e) {
-               result.fail(e);
-               logger.error("Exception during appendAddRecord:", e);
-            } catch (Throwable e) {
-               result.fail(e);
-               setErrorCondition(callback, null, e);
-               logger.error("Exception during appendAddRecord:", e);
-            } finally {
-               journalLock.readLock().unlock();
+            if (logger.isTraceEnabled()) {
+               logger.trace("appendAddRecord::id={}, userRecordType={}, record = {}, usedFile = {}",
+                            id, recordType, record, usedFile);
             }
+            result.set(true);
+         } catch (ActiveMQShutdownException e) {
+            result.fail(e);
+            logger.error("Exception during appendAddRecord:", e);
+         } catch (Throwable e) {
+            result.fail(e);
+            setErrorCondition(callback, null, e);
+            logger.error("Exception during appendAddRecord:", e);
+         } finally {
+            journalLock.readLock().unlock();
          }
       });
 
@@ -1078,64 +1075,61 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
                                            boolean replaceableUpdate,
                                            JournalUpdateCallback updateCallback,
                                            IOCompletion callback) throws InterruptedException, java.util.concurrent.ExecutionException {
-      appendExecutor.execute(new Runnable() {
-         @Override
-         public void run() {
-            journalLock.readLock().lock();
-            try {
-               // compactor will never change while readLock is acquired.
-               // but we are doing this since compactor is volatile, to avoid some extra work from JIT
-               JournalCompactor compactor = JournalImpl.this.compactor;
-               JournalRecord jrnRecord = records.get(id);
-               if (jrnRecord == null) {
-                  if (compactor == null || (!compactor.containsRecord(id))) {
-                     if (updateCallback != null) {
-                        updateCallback.onUpdate(id, false);
-                     }
-                     if (logger.isDebugEnabled()) {
-                        logger.debug("Record {} had not been found", id);
-                     }
+      appendExecutor.execute(() -> {
+         journalLock.readLock().lock();
+         try {
+            // compactor will never change while readLock is acquired.
+            // but we are doing this since compactor is volatile, to avoid some extra work from JIT
+            JournalCompactor compactor = JournalImpl.this.compactor;
+            JournalRecord jrnRecord = records.get(id);
+            if (jrnRecord == null) {
+               if (compactor == null || (!compactor.containsRecord(id))) {
+                  if (updateCallback != null) {
+                     updateCallback.onUpdate(id, false);
+                  }
+                  if (logger.isDebugEnabled()) {
+                     logger.debug("Record {} had not been found", id);
+                  }
 
-                     if (callback != null) {
-                        callback.done();
-                     }
-                     return;
+                  if (callback != null) {
+                     callback.done();
                   }
+                  return;
                }
-               JournalInternalRecord updateRecord = new JournalAddRecord(false, id, recordType, persister, record);
-               JournalFile usedFile = appendRecord(updateRecord, false, sync, null, callback);
+            }
+            JournalInternalRecord updateRecord = new JournalAddRecord(false, id, recordType, persister, record);
+            JournalFile usedFile = appendRecord(updateRecord, false, sync, null, callback);
 
-               if (logger.isTraceEnabled()) {
-                  logger.trace("appendUpdateRecord::id={}, userRecordType={}, usedFile = {}", id, recordType, usedFile);
-               }
+            if (logger.isTraceEnabled()) {
+               logger.trace("appendUpdateRecord::id={}, userRecordType={}, usedFile = {}", id, recordType, usedFile);
+            }
 
-               // record==null here could only mean there is a compactor
-               // computing the delete should be done after compacting is done
-               if (jrnRecord == null) {
-                  if (compactor != null) {
-                     compactor.addCommandUpdate(id, usedFile, updateRecord.getEncodeSize(), replaceableUpdate);
-                  }
-               } else {
-                  jrnRecord.addUpdateFile(usedFile, updateRecord.getEncodeSize(), replaceableUpdate);
+            // record==null here could only mean there is a compactor
+            // computing the delete should be done after compacting is done
+            if (jrnRecord == null) {
+               if (compactor != null) {
+                  compactor.addCommandUpdate(id, usedFile, updateRecord.getEncodeSize(), replaceableUpdate);
                }
+            } else {
+               jrnRecord.addUpdateFile(usedFile, updateRecord.getEncodeSize(), replaceableUpdate);
+            }
 
-               if (updateCallback != null) {
-                  updateCallback.onUpdate(id, true);
-               }
-            } catch (ActiveMQShutdownException e) {
-               if (updateCallback != null) {
-                  updateCallback.onUpdate(id, false);
-               }
-               logger.error("Exception during appendUpdateRecord:", e);
-            } catch (Throwable e) {
-               if (updateCallback != null) {
-                  updateCallback.onUpdate(id, false);
-               }
-               setErrorCondition(callback, null, e);
-               logger.error("Exception during appendUpdateRecord:", e);
-            } finally {
-               journalLock.readLock().unlock();
+            if (updateCallback != null) {
+               updateCallback.onUpdate(id, true);
+            }
+         } catch (ActiveMQShutdownException e) {
+            if (updateCallback != null) {
+               updateCallback.onUpdate(id, false);
             }
+            logger.error("Exception during appendUpdateRecord:", e);
+         } catch (Throwable e) {
+            if (updateCallback != null) {
+               updateCallback.onUpdate(id, false);
+            }
+            setErrorCondition(callback, null, e);
+            logger.error("Exception during appendUpdateRecord:", e);
+         } finally {
+            journalLock.readLock().unlock();
          }
       });
    }
@@ -1187,71 +1181,68 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
                                            JournalUpdateCallback updateCallback,
                                            IOCompletion callback)  {
 
-      appendExecutor.execute(new Runnable() {
-         @Override
-         public void run() {
-            journalLock.readLock().lock();
-            try {
-               // compactor will never change while readLock is acquired.
-               // but we are doing this since compactor is volatile, to avoid some extra work from JIT
-               JournalCompactor compactor = JournalImpl.this.compactor;
-               JournalRecord record = null;
-               if (compactor == null) {
-                  record = records.remove(id);
-                  if (record == null) {
-                     if (updateCallback != null) {
-                        updateCallback.onUpdate(id, false);
-                     }
+      appendExecutor.execute(() -> {
+         journalLock.readLock().lock();
+         try {
+            // compactor will never change while readLock is acquired.
+            // but we are doing this since compactor is volatile, to avoid some extra work from JIT
+            JournalCompactor compactor = JournalImpl.this.compactor;
+            JournalRecord record = null;
+            if (compactor == null) {
+               record = records.remove(id);
+               if (record == null) {
+                  if (updateCallback != null) {
+                     updateCallback.onUpdate(id, false);
+                  }
 
-                     if (callback != null) {
-                        callback.done();
-                     }
-                     return;
+                  if (callback != null) {
+                     callback.done();
                   }
-               } else {
-                  if (!records.containsKey(id) && !compactor.containsRecord(id)) {
-                     if (updateCallback != null) {
-                        updateCallback.onUpdate(id, false);
-                     }
-                     if (callback != null) {
-                        callback.done();
-                     }
-                     return;
+                  return;
+               }
+            } else {
+               if (!records.containsKey(id) && !compactor.containsRecord(id)) {
+                  if (updateCallback != null) {
+                     updateCallback.onUpdate(id, false);
                   }
+                  if (callback != null) {
+                     callback.done();
+                  }
+                  return;
                }
+            }
 
-               JournalInternalRecord deleteRecord = new JournalDeleteRecord(id);
-               JournalFile usedFile = appendRecord(deleteRecord, false, sync, null, callback);
+            JournalInternalRecord deleteRecord = new JournalDeleteRecord(id);
+            JournalFile usedFile = appendRecord(deleteRecord, false, sync, null, callback);
 
-               if (logger.isTraceEnabled()) {
-                  logger.trace("appendDeleteRecord::id={}, usedFile = {}", id, usedFile);
-               }
+            if (logger.isTraceEnabled()) {
+               logger.trace("appendDeleteRecord::id={}, usedFile = {}", id, usedFile);
+            }
 
-               // record==null here could only mean there is a compactor
-               // computing the delete should be done after compacting is done
-               if (record == null) {
-                  // JournalImplTestUni::testDoubleDelete was written to validate this condition:
-                  compactor.addCommandDelete(id, usedFile);
-               } else {
-                  record.delete(usedFile);
-               }
-               if (updateCallback != null) {
-                  updateCallback.onUpdate(id, true);
-               }
-            } catch (ActiveMQShutdownException e) {
-               if (updateCallback != null) {
-                  updateCallback.onUpdate(id, false);
-               }
-               logger.error("Exception during appendDeleteRecord:", e);
-            } catch (Throwable e) {
-               if (updateCallback != null) {
-                  updateCallback.onUpdate(id, false);
-               }
-               logger.error("Exception during appendDeleteRecord:", e);
-               setErrorCondition(callback, null, e);
-            } finally {
-               journalLock.readLock().unlock();
+            // record==null here could only mean there is a compactor
+            // computing the delete should be done after compacting is done
+            if (record == null) {
+               // JournalImplTestUni::testDoubleDelete was written to validate this condition:
+               compactor.addCommandDelete(id, usedFile);
+            } else {
+               record.delete(usedFile);
+            }
+            if (updateCallback != null) {
+               updateCallback.onUpdate(id, true);
+            }
+         } catch (ActiveMQShutdownException e) {
+            if (updateCallback != null) {
+               updateCallback.onUpdate(id, false);
+            }
+            logger.error("Exception during appendDeleteRecord:", e);
+         } catch (Throwable e) {
+            if (updateCallback != null) {
+               updateCallback.onUpdate(id, false);
             }
+            logger.error("Exception during appendDeleteRecord:", e);
+            setErrorCondition(callback, null, e);
+         } finally {
+            journalLock.readLock().unlock();
          }
       });
    }
@@ -1277,33 +1268,29 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
 
       checkRecordSize(encodeSize, record);
 
-      appendExecutor.execute(new Runnable() {
-
-         @Override
-         public void run() {
-            journalLock.readLock().lock();
-
-            final JournalTransaction tx = getTransactionInfo(txID);
+      appendExecutor.execute(() -> {
+         journalLock.readLock().lock();
 
-            try {
-               if (tx != null) {
-                  tx.checkErrorCondition();
-               }
-               // we need to calculate the encodeSize here, as it may use caches that are eliminated once the record is written
-               JournalFile usedFile = appendRecord(addRecord, false, false, tx, null);
+         final JournalTransaction tx = getTransactionInfo(txID);
 
-               if (logger.isTraceEnabled()) {
-                  logger.trace("appendAddRecordTransactional:txID={},id={}, userRecordType={}, record = {}, usedFile = {}",
-                               txID, id, recordType, record, usedFile);
-               }
+         try {
+            if (tx != null) {
+               tx.checkErrorCondition();
+            }
+            // we need to calculate the encodeSize here, as it may use caches that are eliminated once the record is written
+            JournalFile usedFile = appendRecord(addRecord, false, false, tx, null);
 
-               tx.addPositive(usedFile, id, encodeSize, false);
-            } catch (Throwable e) {
-               logger.error("Exception during appendAddRecordTransactional:", e);
-               setErrorCondition(null, tx, e);
-            } finally {
-               journalLock.readLock().unlock();
+            if (logger.isTraceEnabled()) {
+               logger.trace("appendAddRecordTransactional:txID={},id={}, userRecordType={}, record = {}, usedFile = {}",
+                            txID, id, recordType, record, usedFile);
             }
+
+            tx.addPositive(usedFile, id, encodeSize, false);
+         } catch (Throwable e) {
+            logger.error("Exception during appendAddRecordTransactional:", e);
+            setErrorCondition(null, tx, e);
+         } finally {
+            journalLock.readLock().unlock();
          }
       });
    }
@@ -1331,32 +1318,28 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
       checkJournalIsLoaded();
 
 
-      appendExecutor.execute(new Runnable() {
-
-         @Override
-         public void run() {
-            journalLock.readLock().lock();
-
-            final JournalTransaction tx = getTransactionInfo(txID);
+      appendExecutor.execute(() -> {
+         journalLock.readLock().lock();
 
-            try {
-               tx.checkErrorCondition();
+         final JournalTransaction tx = getTransactionInfo(txID);
 
-               JournalInternalRecord updateRecordTX = new JournalAddRecordTX( false, txID, id, recordType, persister, record );
-               JournalFile usedFile = appendRecord( updateRecordTX, false, false, tx, null );
+         try {
+            tx.checkErrorCondition();
 
-               if (logger.isTraceEnabled()) {
-                  logger.trace("appendUpdateRecordTransactional::txID={}, id={}, userRecordType={}, record = {}, usedFile = {}",
-                               txID, id, recordType, record, usedFile );
-               }
+            JournalInternalRecord updateRecordTX = new JournalAddRecordTX( false, txID, id, recordType, persister, record );
+            JournalFile usedFile = appendRecord( updateRecordTX, false, false, tx, null );
 
-               tx.addPositive( usedFile, id, updateRecordTX.getEncodeSize(), false);
-            } catch (Throwable e ) {
-               logger.error("Exception during appendUpdateRecordTransactional:", e );
-               setErrorCondition(null, tx, e );
-            } finally {
-               journalLock.readLock().unlock();
+            if (logger.isTraceEnabled()) {
+               logger.trace("appendUpdateRecordTransactional::txID={}, id={}, userRecordType={}, record = {}, usedFile = {}",
+                            txID, id, recordType, record, usedFile );
             }
+
+            tx.addPositive( usedFile, id, updateRecordTX.getEncodeSize(), false);
+         } catch (Throwable e ) {
+            logger.error("Exception during appendUpdateRecordTransactional:", e );
+            setErrorCondition(null, tx, e );
+         } finally {
+            journalLock.readLock().unlock();
          }
       });
    }
@@ -1371,32 +1354,29 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
 
       checkJournalIsLoaded();
 
-      appendExecutor.execute(new Runnable() {
-         @Override
-         public void run() {
-            journalLock.readLock().lock();
+      appendExecutor.execute(() -> {
+         journalLock.readLock().lock();
 
-            final JournalTransaction tx = getTransactionInfo(txID);
+         final JournalTransaction tx = getTransactionInfo(txID);
 
-            try {
-               if (tx != null) {
-                  tx.checkErrorCondition();
-               }
+         try {
+            if (tx != null) {
+               tx.checkErrorCondition();
+            }
 
-               JournalInternalRecord deleteRecordTX = new JournalDeleteRecordTX(txID, id, record);
-               JournalFile usedFile = appendRecord(deleteRecordTX, false, false, tx, null);
+            JournalInternalRecord deleteRecordTX = new JournalDeleteRecordTX(txID, id, record);
+            JournalFile usedFile = appendRecord(deleteRecordTX, false, false, tx, null);
 
-               if (logger.isTraceEnabled()) {
-                  logger.trace("appendDeleteRecordTransactional::txID={}, id={}, usedFile = {}", txID, id, usedFile);
-               }
-
-               tx.addNegative(usedFile, id);
-            } catch (Throwable e) {
-               logger.error("Exception during appendDeleteRecordTransactional:", e);
-               setErrorCondition(null, tx, e);
-            } finally {
-               journalLock.readLock().unlock();
+            if (logger.isTraceEnabled()) {
+               logger.trace("appendDeleteRecordTransactional::txID={}, id={}, usedFile = {}", txID, id, usedFile);
             }
+
+            tx.addNegative(usedFile, id);
+         } catch (Throwable e) {
+            logger.error("Exception during appendDeleteRecordTransactional:", e);
+            setErrorCondition(null, tx, e);
+         } finally {
+            journalLock.readLock().unlock();
          }
       });
    }
@@ -1426,35 +1406,32 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
 
       final SimpleFuture<JournalTransaction> result = newSyncAndCallbackResult(sync, callback);
 
-      appendExecutor.execute(new Runnable() {
-         @Override
-         public void run() {
-            journalLock.readLock().lock();
-
+      appendExecutor.execute(() -> {
+         journalLock.readLock().lock();
 
-            final JournalTransaction tx = getTransactionInfo(txID);
 
-            try {
-               tx.checkErrorCondition();
-               JournalInternalRecord prepareRecord = new JournalCompleteRecordTX(TX_RECORD_TYPE.PREPARE, txID, transactionData);
-               JournalFile usedFile = appendRecord(prepareRecord, true, sync, tx, callback);
+         final JournalTransaction tx = getTransactionInfo(txID);
 
-               if (logger.isTraceEnabled()) {
-                  logger.trace("appendPrepareRecord::txID={}, usedFile = {}", txID, usedFile);
-               }
+         try {
+            tx.checkErrorCondition();
+            JournalInternalRecord prepareRecord = new JournalCompleteRecordTX(TX_RECORD_TYPE.PREPARE, txID, transactionData);
+            JournalFile usedFile = appendRecord(prepareRecord, true, sync, tx, callback);
 
-               tx.prepare(usedFile);
-            } catch (ActiveMQShutdownException e) {
-               result.fail(e);
-               logger.error("Exception during appendPrepareRecord:", e);
-            } catch (Throwable e) {
-               result.fail(e);
-               logger.error("Exception during appendPrepareRecord:", e);
-               setErrorCondition(callback, tx, e);
-            } finally {
-               journalLock.readLock().unlock();
-               result.set(tx);
+            if (logger.isTraceEnabled()) {
+               logger.trace("appendPrepareRecord::txID={}, usedFile = {}", txID, usedFile);
             }
+
+            tx.prepare(usedFile);
+         } catch (ActiveMQShutdownException e) {
+            result.fail(e);
+            logger.error("Exception during appendPrepareRecord:", e);
+         } catch (Throwable e) {
+            result.fail(e);
+            logger.error("Exception during appendPrepareRecord:", e);
+            setErrorCondition(callback, tx, e);
+         } finally {
+            journalLock.readLock().unlock();
+            result.set(tx);
          }
       });
 
@@ -1506,37 +1483,34 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
 
       final SimpleFuture<JournalTransaction> result = newSyncAndCallbackResult(sync, callback);
 
-      appendExecutor.execute(new Runnable() {
-         @Override
-         public void run() {
-            journalLock.readLock().lock();
-            // cannot remove otherwise compact may get lost
-            final JournalTransaction tx = transactions.remove(txID);
-
-            try {
-               if (tx == null) {
-                  throw new IllegalStateException("Cannot find tx with id " + txID);
-               }
+      appendExecutor.execute(() -> {
+         journalLock.readLock().lock();
+         // cannot remove otherwise compact may get lost
+         final JournalTransaction tx = transactions.remove(txID);
 
-               JournalInternalRecord commitRecord = new JournalCompleteRecordTX(TX_RECORD_TYPE.COMMIT, txID, null);
-               JournalFile usedFile = appendRecord(commitRecord, true, sync, tx, callback);
+         try {
+            if (tx == null) {
+               throw new IllegalStateException("Cannot find tx with id " + txID);
+            }
 
-               if (logger.isTraceEnabled()) {
-                  logger.trace("appendCommitRecord::txID={}, usedFile = {}", txID, usedFile);
-               }
+            JournalInternalRecord commitRecord = new JournalCompleteRecordTX(TX_RECORD_TYPE.COMMIT, txID, null);
+            JournalFile usedFile = appendRecord(commitRecord, true, sync, tx, callback);
 
-               tx.commit(usedFile);
-            } catch (ActiveMQShutdownException e) {
-               result.fail(e);
-               logger.error("Exception during appendCommitRecord:", e);
-            } catch (Throwable e) {
-               result.fail(e);
-               logger.error("Exception during appendCommitRecord:", e);
-               setErrorCondition(callback, tx, e);
-            } finally {
-               journalLock.readLock().unlock();
-               result.set(tx);
+            if (logger.isTraceEnabled()) {
+               logger.trace("appendCommitRecord::txID={}, usedFile = {}", txID, usedFile);
             }
+
+            tx.commit(usedFile);
+         } catch (ActiveMQShutdownException e) {
+            result.fail(e);
+            logger.error("Exception during appendCommitRecord:", e);
+         } catch (Throwable e) {
+            result.fail(e);
+            logger.error("Exception during appendCommitRecord:", e);
+            setErrorCondition(callback, tx, e);
+         } finally {
+            journalLock.readLock().unlock();
+            result.set(tx);
          }
       });
 
@@ -1556,37 +1530,34 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
       }
 
       final SimpleFuture<JournalTransaction> result = newSyncAndCallbackResult(sync, callback);
-      appendExecutor.execute(new Runnable() {
-         @Override
-         public void run() {
-            journalLock.readLock().lock();
+      appendExecutor.execute(() -> {
+         journalLock.readLock().lock();
 
-            final JournalTransaction tx = transactions.remove(txID);
-            try {
-               if (logger.isTraceEnabled()) {
-                  logger.trace("appendRollbackRecord::txID={}", txID);
-               }
+         final JournalTransaction tx = transactions.remove(txID);
+         try {
+            if (logger.isTraceEnabled()) {
+               logger.trace("appendRollbackRecord::txID={}", txID);
+            }
 
-               if (tx == null) {
-                  throw new IllegalStateException("Cannot find tx with id " + txID);
-               }
+            if (tx == null) {
+               throw new IllegalStateException("Cannot find tx with id " + txID);
+            }
 
 
-               JournalInternalRecord rollbackRecord = new JournalRollbackRecordTX(txID);
-               JournalFile usedFile = appendRecord(rollbackRecord, false, sync, tx, callback);
+            JournalInternalRecord rollbackRecord = new JournalRollbackRecordTX(txID);
+            JournalFile usedFile = appendRecord(rollbackRecord, false, sync, tx, callback);
 
-               tx.rollback(usedFile);
-            } catch (ActiveMQShutdownException e) {
-               result.fail(e);
-               logger.error("Exception during appendRollbackRecord:", e);
-            } catch (Throwable e) {
-               result.fail(e);
-               logger.error("Exception during appendRollbackRecord:", e);
-               setErrorCondition(callback, tx, e);
-            }  finally {
-               journalLock.readLock().unlock();
-               result.set(tx);
-            }
+            tx.rollback(usedFile);
+         } catch (ActiveMQShutdownException e) {
+            result.fail(e);
+            logger.error("Exception during appendRollbackRecord:", e);
+         } catch (Throwable e) {
+            result.fail(e);
+            logger.error("Exception during appendRollbackRecord:", e);
+            setErrorCondition(callback, tx, e);
+         }  finally {
+            journalLock.readLock().unlock();
+            result.set(tx);
          }
       });
 
@@ -1743,18 +1714,15 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
 
       // We can't use the executor for the compacting... or we would dead lock because of file open and creation
       // operations (that will use the executor)
-      compactorExecutor.execute(new Runnable() {
-         @Override
-         public void run() {
+      compactorExecutor.execute(() -> {
 
-            try {
-               JournalImpl.this.compact();
-            } catch (Throwable e) {
-               errors.incrementAndGet();
-               ActiveMQJournalLogger.LOGGER.errorCompacting(e);
-            } finally {
-               latch.countDown();
-            }
+         try {
+            JournalImpl.this.compact();
+         } catch (Throwable e) {
+            errors.incrementAndGet();
+            ActiveMQJournalLogger.LOGGER.errorCompacting(e);
+         } finally {
+            latch.countDown();
          }
       });
 
@@ -2645,17 +2613,14 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
 
       // We can't use the executor for the compacting... or we would dead lock because of file open and creation
       // operations (that will use the executor)
-      compactorExecutor.execute(new Runnable() {
-         @Override
-         public void run() {
-            try {
-               JournalImpl.this.compact();
-            } catch (Throwable e) {
-               ActiveMQJournalLogger.LOGGER.errorCompacting(e);
-            } finally {
-               compactorRunning.set(false);
-               logger.debug("JournalImpl::scheduleCompact() done");
-            }
+      compactorExecutor.execute(() -> {
+         try {
+            JournalImpl.this.compact();
+         } catch (Throwable e) {
+            ActiveMQJournalLogger.LOGGER.errorCompacting(e);
+         } finally {
+            compactorRunning.set(false);
+            logger.debug("JournalImpl::scheduleCompact() done");
          }
       });
    }
@@ -2762,14 +2727,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
          final CountDownLatch latch = new CountDownLatch(1);
 
          try {
-            executor.execute(new Runnable() {
-
-               @Override
-               public void run() {
-                  latch.countDown();
-               }
-
-            });
+            executor.execute(latch::countDown);
             latch.await(10, TimeUnit.SECONDS);
          } catch (RejectedExecutionException ignored ) {
             // this is fine
@@ -2883,12 +2841,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
       }
 
       if (providedIOThreadPool == null) {
-         ThreadFactory factory = AccessController.doPrivileged(new PrivilegedAction<ThreadFactory>() {
-            @Override
-            public ThreadFactory run() {
-               return new ActiveMQThreadFactory("ArtemisIOThread", true, JournalImpl.class.getClassLoader());
-            }
-         });
+         ThreadFactory factory = AccessController.doPrivileged((PrivilegedAction<ThreadFactory>) () -> new ActiveMQThreadFactory("ArtemisIOThread", true, JournalImpl.class.getClassLoader()));
 
          threadPool = new ThreadPoolExecutor(0, Integer.MAX_VALUE, 60L,TimeUnit.SECONDS, new SynchronousQueue(), factory);
          ioExecutorFactory = new OrderedExecutorFactory(threadPool);
@@ -3005,20 +2958,17 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
 
       final CountDownLatch done = newLatch(1);
 
-      filesExecutor.execute(new Runnable() {
-         @Override
-         public void run() {
-            try {
-               for (JournalFile file : oldFiles) {
-                  try {
-                     filesRepository.addFreeFile(file, false);
-                  } catch (Throwable e) {
-                     ActiveMQJournalLogger.LOGGER.errorReinitializingFile(file, e);
-                  }
+      filesExecutor.execute(() -> {
+         try {
+            for (JournalFile file : oldFiles) {
+               try {
+                  filesRepository.addFreeFile(file, false);
+               } catch (Throwable e) {
+                  ActiveMQJournalLogger.LOGGER.errorReinitializingFile(file, e);
                }
-            } finally {
-               done.countDown();
             }
+         } finally {
+            done.countDown();
          }
       });
 
@@ -3298,18 +3248,15 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
 
       if (isAutoReclaim() && !compactorRunning.get()) {
          logger.trace("Scheduling reclaim and compactor checks");
-         compactorExecutor.execute(new Runnable() {
-            @Override
-            public void run() {
-               try {
-                  processBackup();
-                  checkReclaimStatus();
-                  checkCompact();
-               } catch (Exception e) {
-                  ActiveMQJournalLogger.LOGGER.errorSchedulingCompacting(e);
-               } finally {
-                  logger.debug("JournalImpl::scheduleReclaim finished");
-               }
+         compactorExecutor.execute(() -> {
+            try {
+               processBackup();
+               checkReclaimStatus();
+               checkCompact();
+            } catch (Exception e) {
+               ActiveMQJournalLogger.LOGGER.errorSchedulingCompacting(e);
+            } finally {
+               logger.debug("JournalImpl::scheduleReclaim finished");
             }
          });
       } else {
diff --git a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCLIPlugin.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCLIPlugin.java
index 8336ced853..5c30b456a8 100644
--- a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCLIPlugin.java
+++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCLIPlugin.java
@@ -94,12 +94,7 @@ public class ArtemisCLIPlugin extends ArtemisAbstractPlugin {
       try {
          if (spawn) {
             final Process process = org.apache.activemq.artemis.cli.process.ProcessBuilder.build(name, location, true, args);
-            Runtime.getRuntime().addShutdownHook(new Thread() {
-               @Override
-               public void run() {
-                  process.destroy();
-               }
-            });
+            Runtime.getRuntime().addShutdownHook(new Thread(() -> process.destroy()));
 
             if (testURI != null) {
                long timeout = System.currentTimeMillis() + spawnTimeout;
diff --git a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisDependencyDocPlugin.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisDependencyDocPlugin.java
index af355e6d59..dc13c2ac80 100644
--- a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisDependencyDocPlugin.java
+++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisDependencyDocPlugin.java
@@ -22,7 +22,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -175,13 +174,10 @@ public class ArtemisDependencyDocPlugin extends ArtemisAbstractPlugin {
 
          List<org.eclipse.aether.artifact.Artifact> artifacts = explodeDependencies(newArtifact(lib));
 
-         Collections.sort(artifacts, new Comparator<Artifact>() {
-            @Override
-            public int compare(Artifact o1, Artifact o2) {
-               String pref1 = getGroupOrder(o1.getGroupId());
-               String pref2 = getGroupOrder(o2.getGroupId());
-               return (pref1 + o1.getGroupId() + o1.getArtifactId()).compareTo(pref2 + o2.getGroupId() + o2.getArtifactId());
-            }
+         Collections.sort(artifacts, (o1, o2) -> {
+            String pref1 = getGroupOrder(o1.getGroupId());
+            String pref2 = getGroupOrder(o2.getGroupId());
+            return (pref1 + o1.getGroupId() + o1.getArtifactId()).compareTo(pref2 + o2.getGroupId() + o2.getArtifactId());
          });
 
          artifacts.forEach((art) -> {
diff --git a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisStopPlugin.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisStopPlugin.java
index 0df21144dd..dbde747a40 100644
--- a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisStopPlugin.java
+++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisStopPlugin.java
@@ -68,12 +68,7 @@ public class ArtemisStopPlugin extends ArtemisAbstractPlugin {
 
       try {
          final Process process = org.apache.activemq.artemis.cli.process.ProcessBuilder.build(name, location, true, new String[] {STOP});
-         Runtime.getRuntime().addShutdownHook(new Thread() {
-            @Override
-            public void run() {
-               process.destroy();
-            }
-         });
+         Runtime.getRuntime().addShutdownHook(new Thread(() -> process.destroy()));
 
          boolean complete = process.waitFor(spawnTimeout, TimeUnit.MILLISECONDS);
          if (!complete) {
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/sasl/GSSAPIServerSASL.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/sasl/GSSAPIServerSASL.java
index 321e8febe8..02cfbb29c2 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/sasl/GSSAPIServerSASL.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/sasl/GSSAPIServerSASL.java
@@ -22,15 +22,12 @@ import java.lang.invoke.MethodHandles;
 
 import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.auth.kerberos.KerberosPrincipal;
 import javax.security.auth.login.LoginContext;
 import javax.security.sasl.AuthorizeCallback;
 import javax.security.sasl.Sasl;
 import javax.security.sasl.SaslException;
 import javax.security.sasl.SaslServer;
-import java.io.IOException;
 import java.security.PrivilegedExceptionAction;
 import java.util.HashMap;
 
@@ -62,15 +59,12 @@ public class GSSAPIServerSASL implements ServerSASL {
          }
 
          if (saslServer == null) {
-            saslServer = Subject.doAs(jaasId, (PrivilegedExceptionAction<SaslServer>) () -> Sasl.createSaslServer(NAME, null, null, new HashMap<String, String>(), new CallbackHandler() {
-               @Override
-               public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-                  for (Callback callback : callbacks) {
-                     if (callback instanceof AuthorizeCallback) {
-                        AuthorizeCallback authorizeCallback = (AuthorizeCallback) callback;
-                        // only ok to authenticate as self
-                        authorizeCallback.setAuthorized(authorizeCallback.getAuthenticationID().equals(authorizeCallback.getAuthorizationID()));
-                     }
+            saslServer = Subject.doAs(jaasId, (PrivilegedExceptionAction<SaslServer>) () -> Sasl.createSaslServer(NAME, null, null, new HashMap<String, String>(), callbacks -> {
+               for (Callback callback : callbacks) {
+                  if (callback instanceof AuthorizeCallback) {
+                     AuthorizeCallback authorizeCallback = (AuthorizeCallback) callback;
+                     // only ok to authenticate as self
+                     authorizeCallback.setAuthorized(authorizeCallback.getAuthenticationID().equals(authorizeCallback.getAuthorizationID()));
                   }
                }
             }));
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/sasl/scram/SCRAMServerSASLFactory.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/sasl/scram/SCRAMServerSASLFactory.java
index 644d2cebdb..ac1e214daa 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/sasl/scram/SCRAMServerSASLFactory.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/sasl/scram/SCRAMServerSASLFactory.java
@@ -16,13 +16,11 @@
  */
 package org.apache.activemq.artemis.protocol.amqp.sasl.scram;
 
-import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 import java.util.Iterator;
 
 import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.auth.login.LoginContext;
@@ -97,23 +95,19 @@ public abstract class SCRAMServerSASLFactory implements ServerSASLFactory {
 
       @Override
       protected UserData aquireUserData(String userName) throws LoginException {
-         loginContext = new LoginContext(loginConfigScope, new CallbackHandler() {
-
-            @Override
-            public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-               for (Callback callback : callbacks) {
-                  if (callback instanceof NameCallback) {
-                     ((NameCallback) callback).setName(userName);
-                  } else if (callback instanceof SCRAMMechanismCallback) {
-                     ((SCRAMMechanismCallback) callback).setMechanism(mechanism.getName());
-                  } else if (callback instanceof DigestCallback) {
-                     ((DigestCallback) callback).setDigest(scram.getDigest());
-                  } else if (callback instanceof HmacCallback) {
-                     ((HmacCallback) callback).setHmac(scram.getHmac());
-                  } else {
-                     throw new UnsupportedCallbackException(callback, "Unrecognized Callback " +
-                              callback.getClass().getSimpleName());
-                  }
+         loginContext = new LoginContext(loginConfigScope, callbacks -> {
+            for (Callback callback : callbacks) {
+               if (callback instanceof NameCallback) {
+                  ((NameCallback) callback).setName(userName);
+               } else if (callback instanceof SCRAMMechanismCallback) {
+                  ((SCRAMMechanismCallback) callback).setMechanism(mechanism.getName());
+               } else if (callback instanceof DigestCallback) {
+                  ((DigestCallback) callback).setDigest(scram.getDigest());
+               } else if (callback instanceof HmacCallback) {
+                  ((HmacCallback) callback).setHmac(scram.getHmac());
+               } else {
+                  throw new UnsupportedCallbackException(callback, "Unrecognized Callback " +
+                           callback.getClass().getSimpleName());
                }
             }
          });
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/util/TLSEncode.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/util/TLSEncode.java
index be6673cdda..11094e538e 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/util/TLSEncode.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/util/TLSEncode.java
@@ -32,12 +32,7 @@ public class TLSEncode {
       }
    }
 
-   private static final ThreadLocal<EncoderDecoderPair> tlsCodec = new ThreadLocal<EncoderDecoderPair>() {
-      @Override
-      protected EncoderDecoderPair initialValue() {
-         return new EncoderDecoderPair();
-      }
-   };
+   private static final ThreadLocal<EncoderDecoderPair> tlsCodec = ThreadLocal.withInitial(() -> new EncoderDecoderPair());
 
    public static EncoderImpl getEncoder() {
       return tlsCodec.get().encoder;
diff --git a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageTest.java b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageTest.java
index 3c917fe349..ea9d8d5728 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageTest.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageTest.java
@@ -341,23 +341,20 @@ public class AMQPMessageTest {
          CountDownLatch latchAlign = new CountDownLatch(threads.length);
          CountDownLatch go = new CountDownLatch(1);
 
-         Runnable run = new Runnable() {
-            @Override
-            public void run() {
-               try {
-
-                  latchAlign.countDown();
-                  go.await();
-
-                  assertNotNull(decoded.getHeader());
-                  // this is a method used by Core Converter
-                  decoded.getProtonMessage();
-                  assertNotNull(decoded.getHeader());
-
-               } catch (Throwable e) {
-                  e.printStackTrace();
-                  failures.incrementAndGet();
-               }
+         Runnable run = () -> {
+            try {
+
+               latchAlign.countDown();
+               go.await();
+
+               assertNotNull(decoded.getHeader());
+               // this is a method used by Core Converter
+               decoded.getProtonMessage();
+               assertNotNull(decoded.getHeader());
+
+            } catch (Throwable e) {
+               e.printStackTrace();
+               failures.incrementAndGet();
             }
          };
 
diff --git a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContextTest.java b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContextTest.java
index 8b327041a7..b965c4a50e 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContextTest.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContextTest.java
@@ -16,25 +16,10 @@
  */
 package org.apache.activemq.artemis.protocol.amqp.proton;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import io.netty.buffer.Unpooled;
 import org.apache.activemq.artemis.api.core.ActiveMQAddressFullException;
 import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.apache.activemq.artemis.api.core.SimpleString;
@@ -62,10 +47,23 @@ import org.apache.qpid.proton.engine.Receiver;
 import org.apache.qpid.proton.message.Message;
 import org.apache.qpid.proton.message.impl.MessageImpl;
 import org.junit.jupiter.api.Test;
-import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import io.netty.buffer.Unpooled;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
 
 public class ProtonServerReceiverContextTest {
 
@@ -113,13 +111,7 @@ public class ProtonServerReceiverContextTest {
 
       AMQPSessionCallback mockSessionSpi = mock(AMQPSessionCallback.class);
       when(mockSessionSpi.getStorageManager()).thenReturn(new NullStorageManager());
-      when(mockSessionSpi.createStandardMessage(any(), any())).thenAnswer(new Answer<AMQPStandardMessage>() {
-
-         @Override
-         public AMQPStandardMessage answer(InvocationOnMock invocation) throws Throwable {
-            return new AMQPStandardMessage(0, createAMQPMessageBuffer(), null, null);
-         }
-      });
+      when(mockSessionSpi.createStandardMessage(any(), any())).thenAnswer((Answer<AMQPStandardMessage>) invocation -> new AMQPStandardMessage(0, createAMQPMessageBuffer(), null, null));
 
       AMQPSessionContext mockProtonContext = mock(AMQPSessionContext.class);
       when(mockProtonContext.getSessionSPI()).thenReturn(mockSessionSpi);
@@ -216,13 +208,7 @@ public class ProtonServerReceiverContextTest {
       when(mockConnContext.getProtocolManager()).thenReturn(mockProtocolManager);
 
       AMQPSessionCallback mockSession = mock(AMQPSessionCallback.class);
-      when(mockSession.createStandardMessage(any(), any())).thenAnswer(new Answer<AMQPStandardMessage>() {
-
-         @Override
-         public AMQPStandardMessage answer(InvocationOnMock invocation) throws Throwable {
-            return new AMQPStandardMessage(0, createAMQPMessageBuffer(), null, null);
-         }
-      });
+      when(mockSession.createStandardMessage(any(), any())).thenAnswer((Answer<AMQPStandardMessage>) invocation -> new AMQPStandardMessage(0, createAMQPMessageBuffer(), null, null));
 
       AMQPSessionContext mockSessionContext = mock(AMQPSessionContext.class);
       when(mockSessionContext.getSessionSPI()).thenReturn(mockSession);
diff --git a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/util/CreditsSemaphoreTest.java b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/util/CreditsSemaphoreTest.java
index e622a5a8f4..48a4ab32db 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/util/CreditsSemaphoreTest.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/util/CreditsSemaphoreTest.java
@@ -36,23 +36,20 @@ public class CreditsSemaphoreTest {
 
    final CountDownLatch waiting = new CountDownLatch(1);
 
-   Thread thread = new Thread() {
-      @Override
-      public void run() {
-         try {
-            for (int i = 0; i < 12; i++) {
-               if (!semaphore.tryAcquire()) {
-                  waiting.countDown();
-                  semaphore.acquire();
-               }
-               acquired.incrementAndGet();
+   Thread thread = new Thread(() -> {
+      try {
+         for (int i = 0; i < 12; i++) {
+            if (!semaphore.tryAcquire()) {
+               waiting.countDown();
+               semaphore.acquire();
             }
-         } catch (Throwable e) {
-            e.printStackTrace();
-            errors.incrementAndGet();
+            acquired.incrementAndGet();
          }
+      } catch (Throwable e) {
+         e.printStackTrace();
+         errors.incrementAndGet();
       }
-   };
+   });
 
    @Test
    public void testSetAndRelease() throws Exception {
diff --git a/artemis-protocols/artemis-hornetq-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/hornetq/PropertiesConversionTest.java b/artemis-protocols/artemis-hornetq-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/hornetq/PropertiesConversionTest.java
index 6f1ca384bc..fc0f96ddb5 100644
--- a/artemis-protocols/artemis-hornetq-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/hornetq/PropertiesConversionTest.java
+++ b/artemis-protocols/artemis-hornetq-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/hornetq/PropertiesConversionTest.java
@@ -74,49 +74,45 @@ public class PropertiesConversionTest {
       AtomicInteger counts = new AtomicInteger(0);
 
       for (int i = 0; i < threads; i++) {
-         t[i] = new Thread() {
-
-            @Override
-            public void run() {
-               try {
-                  for (int i = 0; i < conversions; i++) {
-                     counts.incrementAndGet();
-                     FakeMessagePacket packetSend = new FakeMessagePacket(coreMessage);
-                     if (i == 0) {
-                        barrier.await();
-                     }
-                     hq.intercept(packetSend, null);
-                     FakeMessagePacket packetRec = new FakeMessagePacket(coreMessage);
-                     amq.intercept(packetRec, null);
-
-                     // heads or tails here, I need part of the messages with a big header, part of the messages with a small header
-                     boolean heads = RandomUtil.randomBoolean();
-
-                     // this is playing with a scenario where the horentq interceptor will change the size of the message
-                     if (heads) {
-                        packetRec.getMessage().putStringProperty("propChanges", "looooooooooooooooooooong property text");
-                     } else {
-                        packetRec.getMessage().putStringProperty("propChanges", "short one");
-                     }
+         t[i] = new Thread(() -> {
+            try {
+               for (int i1 = 0; i1 < conversions; i1++) {
+                  counts.incrementAndGet();
+                  FakeMessagePacket packetSend = new FakeMessagePacket(coreMessage);
+                  if (i1 == 0) {
+                     barrier.await();
+                  }
+                  hq.intercept(packetSend, null);
+                  FakeMessagePacket packetRec = new FakeMessagePacket(coreMessage);
+                  amq.intercept(packetRec, null);
+
+                  // heads or tails here, I need part of the messages with a big header, part of the messages with a small header
+                  boolean heads = RandomUtil.randomBoolean();
+
+                  // this is playing with a scenario where the horentq interceptor will change the size of the message
+                  if (heads) {
+                     packetRec.getMessage().putStringProperty("propChanges", "looooooooooooooooooooong property text");
+                  } else {
+                     packetRec.getMessage().putStringProperty("propChanges", "short one");
+                  }
 
-                     SessionReceiveMessage_1X receiveMessage_1X = new SessionReceiveMessage_1X(coreMessage);
-                     ActiveMQBuffer buffer = receiveMessage_1X.encode(null);
-                     buffer.release();
+                  SessionReceiveMessage_1X receiveMessage_1X = new SessionReceiveMessage_1X(coreMessage);
+                  ActiveMQBuffer buffer = receiveMessage_1X.encode(null);
+                  buffer.release();
 
-                     if (i > conversions / 2) {
-                        // I only validate half of the messages
-                        // to give it a chance of Races and Exceptions
-                        // that could happen from reusing the same message on these conversions
-                        assertNotSame(packetRec.getMessage(), coreMessage);
-                        assertNotSame(packetSend.getMessage(), coreMessage);
-                     }
+                  if (i1 > conversions / 2) {
+                     // I only validate half of the messages
+                     // to give it a chance of Races and Exceptions
+                     // that could happen from reusing the same message on these conversions
+                     assertNotSame(packetRec.getMessage(), coreMessage);
+                     assertNotSame(packetSend.getMessage(), coreMessage);
                   }
-               } catch (Throwable e) {
-                  errors.incrementAndGet();
-                  e.printStackTrace();
                }
+            } catch (Throwable e) {
+               errors.incrementAndGet();
+               e.printStackTrace();
             }
-         };
+         });
          t[i].start();
       }
 
@@ -150,45 +146,41 @@ public class PropertiesConversionTest {
       AtomicBoolean running = new AtomicBoolean(true);
 
       for (int i = 0; i < threads; i++) {
-         t[i] = new Thread() {
-
-            @Override
-            public void run() {
-               try {
-                  for (int i = 0; i < conversions; i++) {
-                     counts.incrementAndGet();
-                     if (i == 0) {
-                        barrier.await();
-                     }
-
-                     // heads or tails here, I need part of the messages with a big header, part of the messages with a small header
-                     boolean heads = RandomUtil.randomBoolean();
-
-                     // this is playing with a scenario where the horentq interceptor will change the size of the message
-                     if (heads) {
-                        coreMessage.putStringProperty("propChanges", "looooooooooooooooooooong property text");
-                     } else {
-                        coreMessage.putStringProperty("propChanges", "short one");
-                     }
-
-                     heads = RandomUtil.randomBoolean();
-
-                     if (heads) {
-                        SessionReceiveMessage_1X receiveMessage_1X = new SessionReceiveMessage_1X(coreMessage);
-                        ActiveMQBuffer buffer = receiveMessage_1X.encode(null);
-                        buffer.release();
-                     } else {
-                        SessionReceiveMessage receiveMessage = new SessionReceiveMessage(coreMessage);
-                        ActiveMQBuffer buffer = receiveMessage.encode(null);
-                        buffer.release();
-                     }
+         t[i] = new Thread(() -> {
+            try {
+               for (int i1 = 0; i1 < conversions; i1++) {
+                  counts.incrementAndGet();
+                  if (i1 == 0) {
+                     barrier.await();
+                  }
+
+                  // heads or tails here, I need part of the messages with a big header, part of the messages with a small header
+                  boolean heads = RandomUtil.randomBoolean();
+
+                  // this is playing with a scenario where the horentq interceptor will change the size of the message
+                  if (heads) {
+                     coreMessage.putStringProperty("propChanges", "looooooooooooooooooooong property text");
+                  } else {
+                     coreMessage.putStringProperty("propChanges", "short one");
+                  }
+
+                  heads = RandomUtil.randomBoolean();
+
+                  if (heads) {
+                     SessionReceiveMessage_1X receiveMessage_1X = new SessionReceiveMessage_1X(coreMessage);
+                     ActiveMQBuffer buffer = receiveMessage_1X.encode(null);
+                     buffer.release();
+                  } else {
+                     SessionReceiveMessage receiveMessage = new SessionReceiveMessage(coreMessage);
+                     ActiveMQBuffer buffer = receiveMessage.encode(null);
+                     buffer.release();
                   }
-               } catch (Throwable e) {
-                  errors.incrementAndGet();
-                  e.printStackTrace();
                }
+            } catch (Throwable e) {
+               errors.incrementAndGet();
+               e.printStackTrace();
             }
-         };
+         });
          t[i].start();
       }
 
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
index 2d0a793529..57e90e3dbb 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
@@ -1026,12 +1026,9 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
       this.maxInactivityDuration = inactivityDuration;
 
       if (this.useKeepAlive) {
-         ttlCheck = protocolManager.getScheduledPool().schedule(new Runnable() {
-            @Override
-            public void run() {
-               if (inactivityDuration >= 0) {
-                  connectionEntry.ttl = inactivityDuration;
-               }
+         ttlCheck = protocolManager.getScheduledPool().schedule(() -> {
+            if (inactivityDuration >= 0) {
+               connectionEntry.ttl = inactivityDuration;
             }
          }, inactivityDurationInitialDelay, TimeUnit.MILLISECONDS);
          checkInactivity();
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java
index e47d3e79ba..7022c9c813 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java
@@ -495,12 +495,9 @@ public class AMQConsumer {
                if (timeout <= 0) {
                   latch.countDown();
                } else {
-                  messagePullFuture = scheduledPool.schedule(new Runnable() {
-                     @Override
-                     public void run() {
-                        if (next >= 0) {
-                           handleDeliverNullDispatch();
-                        }
+                  messagePullFuture = scheduledPool.schedule(() -> {
+                     if (next >= 0) {
+                        handleDeliverNullDispatch();
                      }
                   }, timeout, TimeUnit.MILLISECONDS);
                }
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java
index 610254247b..f6ff139851 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java
@@ -259,33 +259,30 @@ public class StompProtocolManager extends AbstractProtocolManager<StompFrame, St
       connection.setValid(false);
 
       // Close the session outside of the lock on the StompConnection, otherwise it could dead lock
-      this.executor.execute(new Runnable() {
-         @Override
-         public void run() {
-            StompSession session = sessions.remove(connection.getID());
-            if (session != null) {
-               try {
-                  session.getCoreSession().stop();
-                  session.getCoreSession().rollback(true);
-                  session.getCoreSession().close(false);
-               } catch (Exception e) {
-                  ActiveMQServerLogger.LOGGER.errorCleaningStompConn(e);
-               }
+      this.executor.execute(() -> {
+         StompSession session = sessions.remove(connection.getID());
+         if (session != null) {
+            try {
+               session.getCoreSession().stop();
+               session.getCoreSession().rollback(true);
+               session.getCoreSession().close(false);
+            } catch (Exception e) {
+               ActiveMQServerLogger.LOGGER.errorCleaningStompConn(e);
             }
-
-            Map<Object, StompSession> sessionMap = getTXMap(connection.getID());
-            sessionMap.values().forEach(ss -> {
-               try {
-                  ss.getCoreSession().rollback(false);
-                  ss.getCoreSession().close(false);
-               } catch (Exception e) {
-                  ActiveMQServerLogger.LOGGER.errorCleaningStompConn(e);
-               }
-            });
-            sessionMap.clear();
-
-            transactedSessions.remove(connection.getID());
          }
+
+         Map<Object, StompSession> sessionMap = getTXMap(connection.getID());
+         sessionMap.values().forEach(ss -> {
+            try {
+               ss.getCoreSession().rollback(false);
+               ss.getCoreSession().close(false);
+            } catch (Exception e) {
+               ActiveMQServerLogger.LOGGER.errorCleaningStompConn(e);
+            }
+         });
+         sessionMap.clear();
+
+         transactedSessions.remove(connection.getID());
       });
    }
 
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRaUtils.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRaUtils.java
index 6b0b256427..2d01ce6376 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRaUtils.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRaUtils.java
@@ -189,19 +189,16 @@ public final class ActiveMQRaUtils {
     * JCA, we use this method to allow a JChannel object to be located.
     */
    public static JChannel locateJGroupsChannel(final String locatorClass, final String name) {
-      return AccessController.doPrivileged(new PrivilegedAction<JChannel>() {
-         @Override
-         public JChannel run() {
-            try {
-               ClassLoader loader = Thread.currentThread().getContextClassLoader();
-               Class<?> aClass = loader.loadClass(locatorClass);
-               Object o = aClass.newInstance();
-               Method m = aClass.getMethod("locateChannel", new Class[]{String.class});
-               return (JChannel) m.invoke(o, name);
-            } catch (Throwable e) {
-               logger.debug(e.getMessage(), e);
-               return null;
-            }
+      return AccessController.doPrivileged((PrivilegedAction<JChannel>) () -> {
+         try {
+            ClassLoader loader = Thread.currentThread().getContextClassLoader();
+            Class<?> aClass = loader.loadClass(locatorClass);
+            Object o = aClass.newInstance();
+            Method m = aClass.getMethod("locateChannel", new Class[]{String.class});
+            return (JChannel) m.invoke(o, name);
+         } catch (Throwable e) {
+            logger.debug(e.getMessage(), e);
+            return null;
          }
       });
    }
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java
index 77d8ca667e..d7f673ee9e 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java
@@ -403,12 +403,9 @@ public class ActiveMQActivation {
             }
          }
 
-         Runnable runTearDown = new Runnable() {
-            @Override
-            public void run() {
-               for (ActiveMQMessageHandler handler : handlersCopy) {
-                  handler.teardown();
-               }
+         Runnable runTearDown = () -> {
+            for (ActiveMQMessageHandler handler : handlersCopy) {
+               handler.teardown();
             }
          };
 
@@ -656,12 +653,7 @@ public class ActiveMQActivation {
       ClassLoader tccl;
 
       try {
-         tccl = AccessController.doPrivileged(new PrivilegedExceptionAction<ClassLoader>() {
-            @Override
-            public ClassLoader run() {
-               return ActiveMQActivation.class.getClassLoader();
-            }
-         });
+         tccl = AccessController.doPrivileged((PrivilegedExceptionAction<ClassLoader>) ActiveMQActivation.class::getClassLoader);
       } catch (Throwable e) {
          logger.warn(e.getMessage(), e);
          tccl = null;
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
index 9fb628b32e..611b2d93ba 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
@@ -23,7 +23,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FilenameFilter;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.PrintWriter;
@@ -565,12 +564,7 @@ public class ConfigurationImpl implements Configuration, Serializable {
                // treat as a directory and parse every property file in alphabetical order
                File dir = new File(fileUrl);
                if (dir.exists()) {
-                  String[] files = dir.list(new FilenameFilter() {
-                     @Override
-                     public boolean accept(File file, String s) {
-                        return s.endsWith(".properties");
-                     }
-                  });
+                  String[] files = dir.list((file, s) -> s.endsWith(".properties"));
                   if (files != null && files.length > 0) {
                      Arrays.sort(files);
                      for (String fileName : files) {
@@ -2993,25 +2987,22 @@ public class ConfigurationImpl implements Configuration, Serializable {
 
    @Override
    public Configuration copy() throws Exception {
-      return AccessController.doPrivileged(new PrivilegedExceptionAction<Configuration>() {
-         @Override
-         public Configuration run() throws Exception {
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            ObjectOutputStream os = new ObjectOutputStream(bos);
-            os.writeObject(ConfigurationImpl.this);
-            Configuration config;
-            try (ObjectInputStream ois = new ObjectInputStreamWithClassLoader(new ByteArrayInputStream(bos.toByteArray()))) {
-               config = (Configuration) ois.readObject();
-            }
+      return AccessController.doPrivileged((PrivilegedExceptionAction<Configuration>) () -> {
+         ByteArrayOutputStream bos = new ByteArrayOutputStream();
+         ObjectOutputStream os = new ObjectOutputStream(bos);
+         os.writeObject(ConfigurationImpl.this);
+         Configuration config;
+         try (ObjectInputStream ois = new ObjectInputStreamWithClassLoader(new ByteArrayInputStream(bos.toByteArray()))) {
+            config = (Configuration) ois.readObject();
+         }
 
-            // this is transient because of possible jgroups integration, we need to copy it manually
-            config.setBroadcastGroupConfigurations(ConfigurationImpl.this.getBroadcastGroupConfigurations());
+         // this is transient because of possible jgroups integration, we need to copy it manually
+         config.setBroadcastGroupConfigurations(ConfigurationImpl.this.getBroadcastGroupConfigurations());
 
-            // this is transient because of possible jgroups integration, we need to copy it manually
-            config.setDiscoveryGroupConfigurations(ConfigurationImpl.this.getDiscoveryGroupConfigurations());
+         // this is transient because of possible jgroups integration, we need to copy it manually
+         config.setDiscoveryGroupConfigurations(ConfigurationImpl.this.getDiscoveryGroupConfigurations());
 
-            return config;
-         }
+         return config;
       });
 
    }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
index e2a0a8874c..c423be3e8a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
@@ -984,12 +984,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
 
       Map<String, String> properties = getMapOfChildPropertyElements(item);
 
-      ActiveMQServerPlugin serverPlugin = AccessController.doPrivileged(new PrivilegedAction<ActiveMQServerPlugin>() {
-         @Override
-         public ActiveMQServerPlugin run() {
-            return (ActiveMQServerPlugin) ClassloadingUtil.newInstanceFromClassLoader(FileConfigurationParser.class, clazz, ActiveMQServerPlugin.class);
-         }
-      });
+      ActiveMQServerPlugin serverPlugin = AccessController.doPrivileged((PrivilegedAction<ActiveMQServerPlugin>) () -> (ActiveMQServerPlugin) ClassloadingUtil.newInstanceFromClassLoader(FileConfigurationParser.class, clazz, ActiveMQServerPlugin.class));
 
       serverPlugin.init(properties);
 
@@ -1065,12 +1060,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
 
       Map<String, String> properties = getMapOfChildPropertyElements(item);
 
-      ActiveMQMetricsPlugin metricsPlugin = AccessController.doPrivileged(new PrivilegedAction<ActiveMQMetricsPlugin>() {
-         @Override
-         public ActiveMQMetricsPlugin run() {
-            return (ActiveMQMetricsPlugin) ClassloadingUtil.newInstanceFromClassLoader(FileConfigurationParser.class, clazz, ActiveMQMetricsPlugin.class);
-         }
-      });
+      ActiveMQMetricsPlugin metricsPlugin = AccessController.doPrivileged((PrivilegedAction<ActiveMQMetricsPlugin>) () -> (ActiveMQMetricsPlugin) ClassloadingUtil.newInstanceFromClassLoader(FileConfigurationParser.class, clazz, ActiveMQMetricsPlugin.class));
 
       ActiveMQServerLogger.LOGGER.initializingMetricsPlugin(clazz, properties.toString());
 
@@ -1272,12 +1262,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
          }
       }
 
-      SecuritySettingPlugin securitySettingPlugin = AccessController.doPrivileged(new PrivilegedAction<SecuritySettingPlugin>() {
-         @Override
-         public SecuritySettingPlugin run() {
-            return (SecuritySettingPlugin) ClassloadingUtil.newInstanceFromClassLoader(FileConfigurationParser.class, clazz, SecuritySettingPlugin.class);
-         }
-      });
+      SecuritySettingPlugin securitySettingPlugin = AccessController.doPrivileged((PrivilegedAction<SecuritySettingPlugin>) () -> (SecuritySettingPlugin) ClassloadingUtil.newInstanceFromClassLoader(FileConfigurationParser.class, clazz, SecuritySettingPlugin.class));
 
       return new Pair<>(securitySettingPlugin, settings);
    }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
index 0e22c913b0..7076a22736 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
@@ -1682,12 +1682,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
       clearIO();
       try {
          final Set<SimpleString> addresses = server.getPostOffice().getAddresses();
-         TreeSet<SimpleString> sortAddress = new TreeSet<>(new Comparator<SimpleString>() {
-            @Override
-            public int compare(SimpleString o1, SimpleString o2) {
-               return o1.toString().compareToIgnoreCase(o2.toString());
-            }
-         });
+         TreeSet<SimpleString> sortAddress = new TreeSet<>((o1, o2) -> o1.toString().compareToIgnoreCase(o2.toString()));
 
          sortAddress.addAll(addresses);
 
@@ -1956,13 +1951,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
 
          Map<Xid, Long> xids = resourceManager.getPreparedTransactionsWithCreationTime();
          ArrayList<Entry<Xid, Long>> xidsSortedByCreationTime = new ArrayList<>(xids.entrySet());
-         Collections.sort(xidsSortedByCreationTime, new Comparator<Entry<Xid, Long>>() {
-            @Override
-            public int compare(final Entry<Xid, Long> entry1, final Entry<Xid, Long> entry2) {
-               // sort by creation time, oldest first
-               return entry1.getValue().compareTo(entry2.getValue());
-            }
-         });
+         Collections.sort(xidsSortedByCreationTime, Entry.comparingByValue());
          String[] s = new String[xidsSortedByCreationTime.size()];
          int i = 0;
          for (Map.Entry<Xid, Long> entry : xidsSortedByCreationTime) {
@@ -1995,13 +1984,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
          }
 
          ArrayList<Entry<Xid, Long>> xidsSortedByCreationTime = new ArrayList<>(xids.entrySet());
-         Collections.sort(xidsSortedByCreationTime, new Comparator<Entry<Xid, Long>>() {
-            @Override
-            public int compare(final Entry<Xid, Long> entry1, final Entry<Xid, Long> entry2) {
-               // sort by creation time, oldest first
-               return entry1.getValue().compareTo(entry2.getValue());
-            }
-         });
+         Collections.sort(xidsSortedByCreationTime, Entry.comparingByValue());
 
          JsonArrayBuilder txDetailListJson = JsonLoader.createArrayBuilder();
          for (Map.Entry<Xid, Long> entry : xidsSortedByCreationTime) {
@@ -4129,16 +4112,13 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
 
       clearIO();
 
-      Thread t = new Thread() {
-         @Override
-         public void run() {
-            try {
-               server.stop(true, true);
-            } catch (Throwable e) {
-               logger.warn(e.getMessage(), e);
-            }
+      Thread t = new Thread(() -> {
+         try {
+            server.stop(true, true);
+         } catch (Throwable e) {
+            logger.warn(e.getMessage(), e);
          }
-      };
+      });
       t.start();
    }
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java
index 8114c4b6e5..cc4678a576 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java
@@ -194,19 +194,16 @@ public class PageCursorProviderImpl implements PageCursorProvider {
 
       scheduledCleanup.incrementAndGet();
 
-      pagingStore.execute(new Runnable() {
-         @Override
-         public void run() {
-            storageManager.setContext(storageManager.newSingleThreadContext());
-            try {
-               if (cleanupEnabled) {
-                  cleanup();
-               }
-            } finally {
-               storageManager.clearContext();
-               scheduledCleanup.decrementAndGet();
-               future.set(true);
+      pagingStore.execute(() -> {
+         storageManager.setContext(storageManager.newSingleThreadContext());
+         try {
+            if (cleanupEnabled) {
+               cleanup();
             }
+         } finally {
+            storageManager.clearContext();
+            scheduledCleanup.decrementAndGet();
+            future.set(true);
          }
       });
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
index 08b23efe4e..769ea1407c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
@@ -353,13 +353,9 @@ public final class PageSubscriptionImpl implements PageSubscription {
 
             @Override
             public void afterCommit(final Transaction tx1) {
-               pageStore.execute(new Runnable() {
-
-                  @Override
-                  public void run() {
-                     if (!completeDelete) {
-                        cursorProvider.scheduleCleanup();
-                     }
+               pageStore.execute(() -> {
+                  if (!completeDelete) {
+                     cursorProvider.scheduleCleanup();
                   }
                });
             }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java
index 6c9b85cbcc..821a9f8131 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java
@@ -42,12 +42,7 @@ final class PageSyncTimer extends ActiveMQScheduledComponent {
 
    private final long timeSync;
 
-   private final Runnable runnable = new Runnable() {
-      @Override
-      public void run() {
-         tick();
-      }
-   };
+   private final Runnable runnable = this::tick;
 
    private final List<OperationContext> syncOperations = new LinkedList<>();
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
index 4afcdb3430..ad4128cac6 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
@@ -1787,12 +1787,7 @@ public abstract class AbstractJournalStorageManager extends CriticalComponentImp
       }
 
       final CountDownLatch latch = new CountDownLatch(1);
-      executor.execute(new Runnable() {
-         @Override
-         public void run() {
-            latch.countDown();
-         }
-      });
+      executor.execute(latch::countDown);
 
       latch.await(30, TimeUnit.SECONDS);
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java
index 2f02439d38..5557bb6e7e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java
@@ -39,7 +39,6 @@ import org.apache.activemq.artemis.core.journal.EncodingSupport;
 import org.apache.activemq.artemis.core.journal.Journal;
 import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
 import org.apache.activemq.artemis.core.journal.RecordInfo;
-import org.apache.activemq.artemis.core.journal.TransactionFailureCallback;
 import org.apache.activemq.artemis.core.journal.impl.JournalFile;
 import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
 import org.apache.activemq.artemis.core.journal.impl.JournalReaderCallback;
@@ -390,22 +389,16 @@ public final class DescribeJournal {
       long preparedMessageCount = 0;
       long preparedLargeMessageCount = 0;
       Map<Long, Count> preparedMessageRefCount = new HashMap<>();
-      journal.load(records, preparedTransactions, new TransactionFailureCallback() {
-
-         @Override
-         public void failedTransaction(long transactionID,
-                                       List<RecordInfo> records1,
-                                       List<RecordInfo> recordsToDelete) {
-            bufferFailingTransactions.append("Transaction " + transactionID + " failed with these records:\n");
-            for (RecordInfo info : records1) {
-               bufferFailingTransactions.append("- " + describeRecord(info, safe) + "\n");
-            }
-
-            for (RecordInfo info : recordsToDelete) {
-               bufferFailingTransactions.append("- " + describeRecord(info, safe) + " <marked to delete>\n");
-            }
+      journal.load(records, preparedTransactions, (transactionID, records1, recordsToDelete) -> {
+         bufferFailingTransactions.append("Transaction " + transactionID + " failed with these records:\n");
+         for (RecordInfo info : records1) {
+            bufferFailingTransactions.append("- " + describeRecord(info, safe) + "\n");
+         }
 
+         for (RecordInfo info : recordsToDelete) {
+            bufferFailingTransactions.append("- " + describeRecord(info, safe) + " <marked to delete>\n");
          }
+
       }, false);
 
       for (RecordInfo info : records) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JDBCJournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JDBCJournalStorageManager.java
index f971a271c6..65d0711232 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JDBCJournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JDBCJournalStorageManager.java
@@ -148,12 +148,7 @@ public class JDBCJournalStorageManager extends JournalStorageManager {
       }
 
       final CountDownLatch latch = new CountDownLatch(1);
-      executor.execute(new Runnable() {
-         @Override
-         public void run() {
-            latch.countDown();
-         }
-      });
+      executor.execute(latch::countDown);
 
       latch.await(30, TimeUnit.SECONDS);
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
index 60a4a834b3..86bcdfe485 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
@@ -272,12 +272,7 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
 
       final CountDownLatch latch = new CountDownLatch(1);
       try {
-         executor.execute(new Runnable() {
-            @Override
-            public void run() {
-               latch.countDown();
-            }
-         });
+         executor.execute(latch::countDown);
 
          latch.await(30, TimeUnit.SECONDS);
       } catch (RejectedExecutionException ignored) {
@@ -465,21 +460,17 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
             }
          }
       }
-      Runnable deleteAction = new Runnable() {
-         @Override
-         public void run() {
-            try {
-               try (ArtemisCloseable lock = closeableReadLock()) {
-                  if (replicator != null) {
-                     replicator.largeMessageDelete(largeServerMessage.toMessage().getMessageID(), JournalStorageManager.this);
-                  }
-                  file.delete();
+      Runnable deleteAction = () -> {
+         try {
+            try (ArtemisCloseable lock = closeableReadLock()) {
+               if (replicator != null) {
+                  replicator.largeMessageDelete(largeServerMessage.toMessage().getMessageID(), JournalStorageManager.this);
                }
-            } catch (Exception e) {
-               ActiveMQServerLogger.LOGGER.journalErrorDeletingMessage(largeServerMessage.toMessage().getMessageID(), e);
+               file.delete();
             }
+         } catch (Exception e) {
+            ActiveMQServerLogger.LOGGER.journalErrorDeletingMessage(largeServerMessage.toMessage().getMessageID(), e);
          }
-
       };
 
       getContext(true).executeOnCompletion(new IOCallback() {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextImpl.java
index a56f90a012..76ba063f4b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextImpl.java
@@ -311,16 +311,13 @@ public class OperationContextImpl implements OperationContext {
    private void execute(final IOCallback task) {
       EXECUTORS_PENDING_UPDATER.incrementAndGet(this);
       try {
-         executor.execute(new Runnable() {
-            @Override
-            public void run() {
-               try {
-                  // If any IO is done inside the callback, it needs to be done on a new context
-                  OperationContextImpl.clearContext();
-                  task.done();
-               } finally {
-                  EXECUTORS_PENDING_UPDATER.decrementAndGet(OperationContextImpl.this);
-               }
+         executor.execute(() -> {
+            try {
+               // If any IO is done inside the callback, it needs to be done on a new context
+               OperationContextImpl.clearContext();
+               task.done();
+            } finally {
+               EXECUTORS_PENDING_UPDATER.decrementAndGet(OperationContextImpl.this);
             }
          });
       } catch (Throwable e) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageManager.java
index 6e09b3f76a..649bb742bb 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageManager.java
@@ -101,12 +101,7 @@ public class NullStorageManager implements StorageManager {
    }
 
    public NullStorageManager() {
-      this(new IOCriticalErrorListener() {
-         @Override
-         public void onIOException(Throwable code, String message, String file) {
-            code.printStackTrace();
-         }
-      });
+      this((code, message, file) -> code.printStackTrace());
    }
 
    public NullStorageManager(int nextId) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreProtocolManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreProtocolManager.java
index 8c5c9a9a99..9f155025b6 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreProtocolManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreProtocolManager.java
@@ -60,7 +60,6 @@ import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.Federation
 import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.Ping;
 import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessage;
 import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessageV2;
-import org.apache.activemq.artemis.core.remoting.CloseListener;
 import org.apache.activemq.artemis.core.remoting.FailureListener;
 import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnection;
 import org.apache.activemq.artemis.core.remoting.impl.netty.ActiveMQFrameDecoder2;
@@ -314,31 +313,28 @@ public class CoreProtocolManager implements ProtocolManager<Interceptor, ActiveM
                      // Using an executor as most of the notifications on the Topology
                      // may come from a channel itself
                      // What could cause deadlocks
-                     entry.connectionExecutor.execute(new Runnable() {
-                        @Override
-                        public void run() {
-                           if (channel0.supports(PacketImpl.CLUSTER_TOPOLOGY_V4)) {
-                              channel0.send(new ClusterTopologyChangeMessage_V4(
-                                 topologyMember.getUniqueEventID(), nodeID,
-                                 topologyMember.getBackupGroupName(),
-                                 topologyMember.getScaleDownGroupName(), connectorPair,
-                                 last, server.getVersion().getIncrementingVersion()));
-                           } else if (channel0.supports(PacketImpl.CLUSTER_TOPOLOGY_V3)) {
-                              channel0.send(new ClusterTopologyChangeMessage_V3(
-                                 topologyMember.getUniqueEventID(), nodeID,
-                                 topologyMember.getBackupGroupName(),
-                                 topologyMember.getScaleDownGroupName(), connectorPair,
-                                 last));
-                           } else if (channel0.supports(PacketImpl.CLUSTER_TOPOLOGY_V2)) {
-                              channel0.send(new ClusterTopologyChangeMessage_V2(
-                                 topologyMember.getUniqueEventID(), nodeID,
-                                 topologyMember.getBackupGroupName(), connectorPair,
-                                 last));
-                           } else {
-                              channel0.send(
-                                 new ClusterTopologyChangeMessage(nodeID, connectorPair,
-                                                                  last));
-                           }
+                     entry.connectionExecutor.execute(() -> {
+                        if (channel0.supports(PacketImpl.CLUSTER_TOPOLOGY_V4)) {
+                           channel0.send(new ClusterTopologyChangeMessage_V4(
+                              topologyMember.getUniqueEventID(), nodeID,
+                              topologyMember.getBackupGroupName(),
+                              topologyMember.getScaleDownGroupName(), connectorPair,
+                              last, server.getVersion().getIncrementingVersion()));
+                        } else if (channel0.supports(PacketImpl.CLUSTER_TOPOLOGY_V3)) {
+                           channel0.send(new ClusterTopologyChangeMessage_V3(
+                              topologyMember.getUniqueEventID(), nodeID,
+                              topologyMember.getBackupGroupName(),
+                              topologyMember.getScaleDownGroupName(), connectorPair,
+                              last));
+                        } else if (channel0.supports(PacketImpl.CLUSTER_TOPOLOGY_V2)) {
+                           channel0.send(new ClusterTopologyChangeMessage_V2(
+                              topologyMember.getUniqueEventID(), nodeID,
+                              topologyMember.getBackupGroupName(), connectorPair,
+                              last));
+                        } else {
+                           channel0.send(
+                              new ClusterTopologyChangeMessage(nodeID, connectorPair,
+                                                               last));
                         }
                      });
                   } catch (RejectedExecutionException ignored) {
@@ -355,16 +351,13 @@ public class CoreProtocolManager implements ProtocolManager<Interceptor, ActiveM
                   // may come from a channel itself
                   // What could cause deadlocks
                   try {
-                     entry.connectionExecutor.execute(new Runnable() {
-                        @Override
-                        public void run() {
-                           if (channel0.supports(PacketImpl.CLUSTER_TOPOLOGY_V2)) {
-                              channel0.send(
-                                 new ClusterTopologyChangeMessage_V2(uniqueEventID,
-                                                                     nodeID));
-                           } else {
-                              channel0.send(new ClusterTopologyChangeMessage(nodeID));
-                           }
+                     entry.connectionExecutor.execute(() -> {
+                        if (channel0.supports(PacketImpl.CLUSTER_TOPOLOGY_V2)) {
+                           channel0.send(
+                              new ClusterTopologyChangeMessage_V2(uniqueEventID,
+                                                                  nodeID));
+                        } else {
+                           channel0.send(new ClusterTopologyChangeMessage(nodeID));
                         }
                      });
                   } catch (RejectedExecutionException ignored) {
@@ -383,33 +376,24 @@ public class CoreProtocolManager implements ProtocolManager<Interceptor, ActiveM
             if (acceptorUsed.getClusterConnection() != null) {
                acceptorUsed.getClusterConnection().addClusterTopologyListener(listener);
 
-               rc.addCloseListener(new CloseListener() {
-                  @Override
-                  public void connectionClosed() {
-                     acceptorUsed.getClusterConnection()
-                        .removeClusterTopologyListener(listener);
-                  }
-               });
+               rc.addCloseListener(() -> acceptorUsed.getClusterConnection().removeClusterTopologyListener(listener));
             } else {
                // if not clustered, we send a single notification to the client containing the node-id where the server is connected to
                // This is done this way so Recovery discovery could also use the node-id for non-clustered setups
-               entry.connectionExecutor.execute(new Runnable() {
-                  @Override
-                  public void run() {
-                     String nodeId = server.getNodeID().toString();
-                     Pair<TransportConfiguration, TransportConfiguration> emptyConfig = new Pair<>(
-                        null, null);
-                     if (channel0.supports(PacketImpl.CLUSTER_TOPOLOGY_V4)) {
-                        channel0.send(new ClusterTopologyChangeMessage_V4(System.currentTimeMillis(), nodeId,
-                           null, null, emptyConfig, true, server.getVersion().getIncrementingVersion()));
-                     } else if (channel0.supports(PacketImpl.CLUSTER_TOPOLOGY_V2)) {
-                        channel0.send(
-                           new ClusterTopologyChangeMessage_V2(System.currentTimeMillis(),
-                                                               nodeId, null, emptyConfig, true));
-                     } else {
-                        channel0.send(
-                           new ClusterTopologyChangeMessage(nodeId, emptyConfig, true));
-                     }
+               entry.connectionExecutor.execute(() -> {
+                  String nodeId = server.getNodeID().toString();
+                  Pair<TransportConfiguration, TransportConfiguration> emptyConfig = new Pair<>(
+                     null, null);
+                  if (channel0.supports(PacketImpl.CLUSTER_TOPOLOGY_V4)) {
+                     channel0.send(new ClusterTopologyChangeMessage_V4(System.currentTimeMillis(), nodeId,
+                        null, null, emptyConfig, true, server.getVersion().getIncrementingVersion()));
+                  } else if (channel0.supports(PacketImpl.CLUSTER_TOPOLOGY_V2)) {
+                     channel0.send(
+                        new ClusterTopologyChangeMessage_V2(System.currentTimeMillis(),
+                                                            nodeId, null, emptyConfig, true));
+                  } else {
+                     channel0.send(
+                        new ClusterTopologyChangeMessage(nodeId, emptyConfig, true));
                   }
                });
             }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMAcceptor.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMAcceptor.java
index 7842c294cd..b124b1ae52 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMAcceptor.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMAcceptor.java
@@ -296,12 +296,9 @@ public final class InVMAcceptor extends AbstractAcceptor {
             listener.connectionDestroyed(connectionID, failed);
 
             // Execute on different thread after all the packets are sent, to avoid deadlocks
-            connection.getExecutor().execute(new Runnable() {
-               @Override
-               public void run() {
-                  // Remove on the other side too
-                  connector.disconnect((String) connectionID);
-               }
+            connection.getExecutor().execute(() -> {
+               // Remove on the other side too
+               connector.disconnect((String) connectionID);
             });
          }
       }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnection.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnection.java
index aac282b59d..be03d72887 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnection.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnection.java
@@ -239,12 +239,7 @@ public class InVMConnection implements Connection {
 
          if (flush && flushEnabled) {
             final CountDownLatch latch = new CountDownLatch(1);
-            executor.execute(new Runnable() {
-               @Override
-               public void run() {
-                  latch.countDown();
-               }
-            });
+            executor.execute(latch::countDown);
 
             try {
                if (!latch.await(10, TimeUnit.SECONDS)) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnector.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnector.java
index 1e46542fa5..e546ee9be5 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnector.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnector.java
@@ -274,24 +274,14 @@ public class InVMConnector extends AbstractConnector {
             acceptor.disconnect((String) connectionID);
 
             // Execute on different thread to avoid deadlocks
-            closeExecutor.execute(new Runnable() {
-               @Override
-               public void run() {
-                  listener.connectionDestroyed(connectionID, failed);
-               }
-            });
+            closeExecutor.execute(() -> listener.connectionDestroyed(connectionID, failed));
          }
       }
 
       @Override
       public void connectionException(final Object connectionID, final ActiveMQException me) {
          // Execute on different thread to avoid deadlocks
-         closeExecutor.execute(new Runnable() {
-            @Override
-            public void run() {
-               listener.connectionException(connectionID, me);
-            }
-         });
+         closeExecutor.execute(() -> listener.connectionException(connectionID, me));
       }
 
       @Override
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
index 8153ec574f..3da273d161 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
@@ -65,6 +65,7 @@ import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslHandler;
 import io.netty.util.ResourceLeakDetector;
+import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
 import io.netty.util.concurrent.GlobalEventExecutor;
 import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
@@ -431,34 +432,19 @@ public class NettyAcceptor extends AbstractAcceptor {
 
          if (useEpoll && CheckDependencies.isEpollAvailable()) {
             channelClazz = EpollServerSocketChannel.class;
-            eventLoopGroup = new EpollEventLoopGroup(remotingThreads, AccessController.doPrivileged(new PrivilegedAction<ActiveMQThreadFactory>() {
-               @Override
-               public ActiveMQThreadFactory run() {
-                  return new ActiveMQThreadFactory("activemq-netty-threads", true, ClientSessionFactoryImpl.class.getClassLoader());
-               }
-            }));
+            eventLoopGroup = new EpollEventLoopGroup(remotingThreads, AccessController.doPrivileged((PrivilegedAction<ActiveMQThreadFactory>) () -> new ActiveMQThreadFactory("activemq-netty-threads", true, ClientSessionFactoryImpl.class.getClassLoader())));
             acceptorType = EPOLL_ACCEPTOR_TYPE;
 
             logger.debug("Acceptor using native epoll");
          } else if (useKQueue && CheckDependencies.isKQueueAvailable()) {
             channelClazz = KQueueServerSocketChannel.class;
-            eventLoopGroup = new KQueueEventLoopGroup(remotingThreads, AccessController.doPrivileged(new PrivilegedAction<ActiveMQThreadFactory>() {
-               @Override
-               public ActiveMQThreadFactory run() {
-                  return new ActiveMQThreadFactory("activemq-netty-threads", true, ClientSessionFactoryImpl.class.getClassLoader());
-               }
-            }));
+            eventLoopGroup = new KQueueEventLoopGroup(remotingThreads, AccessController.doPrivileged((PrivilegedAction<ActiveMQThreadFactory>) () -> new ActiveMQThreadFactory("activemq-netty-threads", true, ClientSessionFactoryImpl.class.getClassLoader())));
             acceptorType = KQUEUE_ACCEPTOR_TYPE;
 
             logger.debug("Acceptor using native kqueue");
          } else {
             channelClazz = NioServerSocketChannel.class;
-            eventLoopGroup = new NioEventLoopGroup(remotingThreads, AccessController.doPrivileged(new PrivilegedAction<ActiveMQThreadFactory>() {
-               @Override
-               public ActiveMQThreadFactory run() {
-                  return new ActiveMQThreadFactory("activemq-netty-threads", true, ClientSessionFactoryImpl.class.getClassLoader());
-               }
-            }));
+            eventLoopGroup = new NioEventLoopGroup(remotingThreads, AccessController.doPrivileged((PrivilegedAction<ActiveMQThreadFactory>) () -> new ActiveMQThreadFactory("activemq-netty-threads", true, ClientSessionFactoryImpl.class.getClassLoader())));
             acceptorType = NIO_ACCEPTOR_TYPE;
             logger.debug("Acceptor using nio");
          }
@@ -933,14 +919,11 @@ public class NettyAcceptor extends AbstractAcceptor {
 
             SslHandler sslHandler = ctx.pipeline().get(SslHandler.class);
             if (sslHandler != null) {
-               sslHandler.handshakeFuture().addListener(new GenericFutureListener<io.netty.util.concurrent.Future<Channel>>() {
-                  @Override
-                  public void operationComplete(final io.netty.util.concurrent.Future<Channel> future) throws Exception {
-                     if (future.isSuccess()) {
-                        active = true;
-                     } else {
-                        future.getNow().close();
-                     }
+               sslHandler.handshakeFuture().addListener((GenericFutureListener<Future<Channel>>) future -> {
+                  if (future.isSuccess()) {
+                     active = true;
+                  } else {
+                     future.getNow().close();
                   }
                });
             } else {
@@ -978,13 +961,7 @@ public class NettyAcceptor extends AbstractAcceptor {
       @Override
       public void connectionException(final Object connectionID, final ActiveMQException me) {
          // Execute on different thread to avoid deadlocks
-         new Thread() {
-            @Override
-            public void run() {
-               listener.connectionException(connectionID, me);
-            }
-         }.start();
-
+         new Thread(() -> listener.connectionException(connectionID, me)).start();
       }
 
       @Override
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java
index bf29b79c68..2b8e177014 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java
@@ -202,14 +202,7 @@ public class RemotingServiceImpl implements RemotingService, ServerConnectionLif
       // This needs to be a different thread pool to the main thread pool especially for OIO where we may need
       // to support many hundreds of connections, but the main thread pool must be kept small for better performance
 
-      ThreadFactory tFactory = AccessController.doPrivileged(new PrivilegedAction<ThreadFactory>() {
-         @Override
-         public ThreadFactory run() {
-            return new ActiveMQThreadFactory("ActiveMQ-remoting-threads-" + server.toString() +
-                                                "-" +
-                                                System.identityHashCode(this), false, Thread.currentThread().getContextClassLoader());
-         }
-      });
+      ThreadFactory tFactory = AccessController.doPrivileged((PrivilegedAction<ThreadFactory>) () -> new ActiveMQThreadFactory("ActiveMQ-remoting-threads-" + server.toString() + "-" + System.identityHashCode(this), false, Thread.currentThread().getContextClassLoader()));
 
       threadPool = Executors.newCachedThreadPool(tFactory);
 
@@ -791,19 +784,16 @@ public class RemotingServiceImpl implements RemotingService, ServerConnectionLif
                   }
 
                   if (flush) {
-                     flushExecutor.execute(new Runnable() {
-                        @Override
-                        public void run() {
-                           try {
-                              // this is using a different thread
-                              // as if anything wrong happens on flush
-                              // failure detection could be affected
-                              conn.scheduledFlush();
-                           } catch (Throwable e) {
-                              ActiveMQServerLogger.LOGGER.failedToFlushOutstandingDataFromTheConnection(e);
-                           }
-
+                     flushExecutor.execute(() -> {
+                        try {
+                           // this is using a different thread
+                           // as if anything wrong happens on flush
+                           // failure detection could be affected
+                           conn.scheduledFlush();
+                        } catch (Throwable e) {
+                           ActiveMQServerLogger.LOGGER.failedToFlushOutstandingDataFromTheConnection(e);
                         }
+
                      });
                   }
                }
@@ -814,12 +804,7 @@ public class RemotingServiceImpl implements RemotingService, ServerConnectionLif
                      // In certain cases (replicationManager for instance) calling fail could take some time
                      // We can't pause the FailureCheckAndFlushThread as that would lead other clients to fail for
                      // missing pings
-                     flushExecutor.execute(new Runnable() {
-                        @Override
-                        public void run() {
-                           conn.fail(ActiveMQMessageBundle.BUNDLE.clientExited(conn.getRemoteAddress(), pair.getB()));
-                        }
-                     });
+                     flushExecutor.execute(() -> conn.fail(ActiveMQMessageBundle.BUNDLE.clientExited(conn.getRemoteAddress(), pair.getB())));
                      removeConnection(pair.getA());
                   }
                }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
index 42a0558803..891f97f733 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
@@ -634,17 +634,14 @@ public final class ReplicationEndpoint implements ChannelHandler, ActiveMQCompon
             }
             message.releaseResources(true, false);
          } else {
-            executor.execute(new Runnable() {
-               @Override
-               public void run() {
-                  try {
-                     if (logger.isTraceEnabled()) {
-                        logger.trace("Deleting LargeMessage {} on the executor @ handleLargeMessageEnd", packet.getMessageId());
-                     }
-                     message.deleteFile();
-                  } catch (Exception e) {
-                     ActiveMQServerLogger.LOGGER.errorDeletingLargeMessage(packet.getMessageId(), e);
+            executor.execute(() -> {
+               try {
+                  if (logger.isTraceEnabled()) {
+                     logger.trace("Deleting LargeMessage {} on the executor @ handleLargeMessageEnd", packet.getMessageId());
                   }
+                  message.deleteFile();
+               } catch (Exception e) {
+                  ActiveMQServerLogger.LOGGER.errorDeletingLargeMessage(packet.getMessageId(), e);
                }
             });
          }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/BackupManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/BackupManager.java
index dd447e54bf..64568af2dd 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/BackupManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/BackupManager.java
@@ -250,62 +250,53 @@ public class BackupManager implements ActiveMQComponent {
       * */
       public void announceBackup() {
          //this has to be done in a separate thread
-         executor.execute(new Runnable() {
-            @Override
-            public void run() {
-               if (stopping) {
+         executor.execute(() -> {
+            if (stopping) {
+               return;
+            }
+
+            try {
+               //make a copy to avoid npe if we are nulled on close
+               ServerLocatorInternal localBackupLocator = backupServerLocator;
+               if (localBackupLocator == null) {
+                  if (!stopping)
+                     ActiveMQServerLogger.LOGGER.errorAnnouncingBackup(this.toString());
                   return;
                }
+               if (logger.isDebugEnabled()) {
+                  logger.debug("{}:: announcing {} to {}", BackupConnector.this, connector, backupServerLocator);
+               }
 
-               try {
-                  //make a copy to avoid npe if we are nulled on close
-                  ServerLocatorInternal localBackupLocator = backupServerLocator;
-                  if (localBackupLocator == null) {
-                     if (!stopping)
-                        ActiveMQServerLogger.LOGGER.errorAnnouncingBackup(this.toString());
-                     return;
-                  }
-                  if (logger.isDebugEnabled()) {
-                     logger.debug("{}:: announcing {} to {}", BackupConnector.this, connector, backupServerLocator);
-                  }
-
-                  announcingBackup = true;
-                  //connect to the cluster
-                  ClientSessionFactoryInternal backupSessionFactory = localBackupLocator.connect();
-                  //send the announce message
-                  if (backupSessionFactory != null) {
-                     ClusterControl clusterControl = clusterManager.getClusterController().connectToNodeInCluster(backupSessionFactory);
-                     clusterControl.authorize();
-                     clusterControl.sendNodeAnnounce(System.currentTimeMillis(), nodeManager.getNodeId().toString(), server.getHAPolicy().getBackupGroupName(), server.getHAPolicy().getScaleDownClustername(), true, connector, null);
-                     ActiveMQServerLogger.LOGGER.backupAnnounced();
-                     backupAnnounced = true;
-                  }
-               } catch (RejectedExecutionException e) {
-                  // assumption is that the whole server is being stopped. So the exception is ignored.
-               } catch (Exception e) {
-                  if (scheduledExecutor.isShutdown())
-                     return;
-                  if (stopping)
-                     return;
-                  ActiveMQServerLogger.LOGGER.errorAnnouncingBackup(e);
-
-                  retryConnection();
-               } finally {
-                  announcingBackup = false;
+               announcingBackup = true;
+               //connect to the cluster
+               ClientSessionFactoryInternal backupSessionFactory = localBackupLocator.connect();
+               //send the announce message
+               if (backupSessionFactory != null) {
+                  ClusterControl clusterControl = clusterManager.getClusterController().connectToNodeInCluster(backupSessionFactory);
+                  clusterControl.authorize();
+                  clusterControl.sendNodeAnnounce(System.currentTimeMillis(), nodeManager.getNodeId().toString(), server.getHAPolicy().getBackupGroupName(), server.getHAPolicy().getScaleDownClustername(), true, connector, null);
+                  ActiveMQServerLogger.LOGGER.backupAnnounced();
+                  backupAnnounced = true;
                }
+            } catch (RejectedExecutionException e) {
+               // assumption is that the whole server is being stopped. So the exception is ignored.
+            } catch (Exception e) {
+               if (scheduledExecutor.isShutdown())
+                  return;
+               if (stopping)
+                  return;
+               ActiveMQServerLogger.LOGGER.errorAnnouncingBackup(e);
+
+               retryConnection();
+            } finally {
+               announcingBackup = false;
             }
          });
       }
 
       /** it will re-schedule the connection after a timeout, using a scheduled executor */
       protected void retryConnection() {
-         scheduledExecutor.schedule(new Runnable() {
-            @Override
-            public void run() {
-               announceBackup();
-            }
-
-         }, config.getRetryInterval(), TimeUnit.MILLISECONDS);
+         scheduledExecutor.schedule(this::announceBackup, config.getRetryInterval(), TimeUnit.MILLISECONDS);
       }
 
       /*
@@ -327,15 +318,12 @@ public class BackupManager implements ActiveMQComponent {
            */
             closeLocator(backupServerLocator);
          }
-         executor.execute(new Runnable() {
-            @Override
-            public void run() {
-               synchronized (BackupConnector.this) {
-                  closeLocator(backupServerLocator);
-                  backupServerLocator = null;
-               }
-
+         executor.execute(() -> {
+            synchronized (BackupConnector.this) {
+               closeLocator(backupServerLocator);
+               backupServerLocator = null;
             }
+
          });
       }
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterManager.java
index 50668350fd..68bf794c65 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterManager.java
@@ -514,16 +514,12 @@ public class ClusterManager implements ActiveMQComponent {
             final ActiveMQException exception = msg.getException();
             if (exception.getType() == ActiveMQExceptionType.CLUSTER_SECURITY_EXCEPTION) {
                ActiveMQServerLogger.LOGGER.clusterManagerAuthenticationError(exception.getMessage());
-               executor.execute(new Runnable() {
-                  @Override
-                  public void run() {
-                     try {
-                        manager.stop();
-                     } catch (Exception e) {
-                        ActiveMQServerLogger.LOGGER.failedToStopClusterManager(e);
-                     }
+               executor.execute(() -> {
+                  try {
+                     manager.stop();
+                  } catch (Exception e) {
+                     ActiveMQServerLogger.LOGGER.failedToStopClusterManager(e);
                   }
-
                });
             }
          }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
index 7e24c96353..f63944a141 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
@@ -329,25 +329,22 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
 
    @Override
    public void disconnect() {
-      executor.execute(new Runnable() {
-         @Override
-         public void run() {
-            if (session != null) {
-               try {
-                  session.cleanUp(false);
-               } catch (Exception dontcare) {
-                  logger.debug(dontcare.getMessage(), dontcare);
-               }
-               session = null;
+      executor.execute(() -> {
+         if (session != null) {
+            try {
+               session.cleanUp(false);
+            } catch (Exception dontcare) {
+               logger.debug(dontcare.getMessage(), dontcare);
             }
-            if (sessionConsumer != null) {
-               try {
-                  sessionConsumer.cleanUp(false);
-               } catch (Exception dontcare) {
-                  logger.debug(dontcare.getMessage(), dontcare);
-               }
-               sessionConsumer = null;
+            session = null;
+         }
+         if (sessionConsumer != null) {
+            try {
+               sessionConsumer.cleanUp(false);
+            } catch (Exception dontcare) {
+               logger.debug(dontcare.getMessage(), dontcare);
             }
+            sessionConsumer = null;
          }
       });
    }
@@ -731,26 +728,23 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
                                     final MessageReference ref,
                                     final LargeServerMessage message,
                                     final Message originalMessage) {
-      executor.execute(new Runnable() {
-         @Override
-         public void run() {
-            try {
-               producer.send(dest, message.toMessage());
-
-               // as soon as we are done sending the large message
-               // we unset the delivery flag and we will call the deliveryAsync on the queue
-               // so the bridge will be able to resume work
-               unsetLargeMessageDelivery();
+      executor.execute(() -> {
+         try {
+            producer.send(dest, message.toMessage());
 
-               if (queue != null) {
-                  queue.deliverAsync();
-               }
-            } catch (final ActiveMQException e) {
-               unsetLargeMessageDelivery();
-               ActiveMQServerLogger.LOGGER.bridgeUnableToSendMessage(ref, e);
+            // as soon as we are done sending the large message
+            // we unset the delivery flag and we will call the deliveryAsync on the queue
+            // so the bridge will be able to resume work
+            unsetLargeMessageDelivery();
 
-               connectionFailed(e, false);
+            if (queue != null) {
+               queue.deliverAsync();
             }
+         } catch (final ActiveMQException e) {
+            unsetLargeMessageDelivery();
+            ActiveMQServerLogger.LOGGER.bridgeUnableToSendMessage(ref, e);
+
+            connectionFailed(e, false);
          }
       });
    }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
index 8ce9c11a79..9cb034c669 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
@@ -463,15 +463,12 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
          Notification notification = new Notification(nodeId == null ? null : nodeId.toString(), CoreNotificationType.CLUSTER_CONNECTION_STOPPED, props);
          managementService.sendNotification(notification);
       }
-      executor.execute(new Runnable() {
-         @Override
-         public void run() {
-            synchronized (ClusterConnectionImpl.this) {
-               closeLocator(serverLocator);
-               serverLocator = null;
-            }
-
+      executor.execute(() -> {
+         synchronized (ClusterConnectionImpl.this) {
+            closeLocator(serverLocator);
+            serverLocator = null;
          }
+
       });
 
       started = false;
@@ -1057,18 +1054,15 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
 
          bridge.stop();
 
-         bridge.getExecutor().execute(new Runnable() {
-            @Override
-            public void run() {
-               try {
-                  if (disconnected) {
-                     targetLocator.cleanup();
-                  } else {
-                     targetLocator.close();
-                  }
-               } catch (Exception ignored) {
-                  logger.debug(ignored.getMessage(), ignored);
+         bridge.getExecutor().execute(() -> {
+            try {
+               if (disconnected) {
+                  targetLocator.cleanup();
+               } else {
+                  targetLocator.close();
                }
+            } catch (Exception ignored) {
+               logger.debug(ignored.getMessage(), ignored);
             }
          });
       }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/files/FileMoveManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/files/FileMoveManager.java
index a11e0b9a41..08c2f57b4d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/files/FileMoveManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/files/FileMoveManager.java
@@ -41,33 +41,25 @@ public class FileMoveManager {
    private int maxFolders;
    public static final String PREFIX = "oldreplica.";
 
-   private static final FilenameFilter isPrefix = new FilenameFilter() {
-      @Override
-      public boolean accept(File dir, String name) {
-         boolean prefixed = name.contains(PREFIX);
-
-         if (prefixed) {
-            try {
-               Integer.parseInt(name.substring(PREFIX.length()));
-            } catch (NumberFormatException e) {
-               // This function is not really used a lot
-               // so I don't really mind about performance here
-               // this is good enough for what we need
-               prefixed = false;
-            }
+   private static final FilenameFilter isPrefix = (dir, name) -> {
+      boolean prefixed = name.contains(PREFIX);
+
+      if (prefixed) {
+         try {
+            Integer.parseInt(name.substring(PREFIX.length()));
+         } catch (NumberFormatException e) {
+            // This function is not really used a lot
+            // so I don't really mind about performance here
+            // this is good enough for what we need
+            prefixed = false;
          }
-
-         return prefixed;
       }
-   };
 
-   private static final FilenameFilter notPrefix = new FilenameFilter() {
-      @Override
-      public boolean accept(File dir, String name) {
-         return !isPrefix.accept(dir, name);
-      }
+      return prefixed;
    };
 
+   private static final FilenameFilter notPrefix = (dir, name) -> !isPrefix.accept(dir, name);
+
    public FileMoveManager(File folder) {
       this(folder, -1);
    }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/GroupHandlingAbstract.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/GroupHandlingAbstract.java
index 4f48eb705b..35d68e43ec 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/GroupHandlingAbstract.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/GroupHandlingAbstract.java
@@ -56,23 +56,15 @@ public abstract class GroupHandlingAbstract implements GroupingHandler {
       if (executor == null) {
          listeners.add(listener);
       } else {
-         executor.execute(new Runnable() {
-            @Override
-            public void run() {
-               listeners.add(listener);
-            }
-         });
+         executor.execute(() -> listeners.add(listener));
       }
    }
 
    protected void fireUnproposed(final SimpleString groupID) {
 
-      Runnable runnable = new Runnable() {
-         @Override
-         public void run() {
-            for (UnproposalListener listener : listeners) {
-               listener.unproposed(groupID);
-            }
+      Runnable runnable = () -> {
+         for (UnproposalListener listener : listeners) {
+            listener.unproposed(groupID);
          }
       };
       if (executor != null) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/LocalGroupingHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/LocalGroupingHandler.java
index 4eefd41a53..d34f587dd8 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/LocalGroupingHandler.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/LocalGroupingHandler.java
@@ -355,37 +355,34 @@ public final class LocalGroupingHandler extends GroupHandlingAbstract {
    private void removeGrouping(final SimpleString clusterName) {
       final List<GroupBinding> list = groupMap.remove(clusterName);
       if (list != null) {
-         executor.execute(new Runnable() {
-            @Override
-            public void run() {
-               long txID = -1;
-
-               for (GroupBinding val : list) {
-                  if (val != null) {
-                     fireUnproposed(val.getGroupId());
-                     map.remove(val.getGroupId());
-
-                     sendUnproposal(val.getGroupId(), clusterName, 0);
-
-                     try {
-                        if (txID < 0) {
-                           txID = storageManager.generateID();
-                        }
-                        storageManager.deleteGrouping(txID, val);
-                     } catch (Exception e) {
-                        ActiveMQServerLogger.LOGGER.unableToDeleteGroupBindings(val.getGroupId(), e);
-                     }
-                  }
-               }
+         executor.execute(() -> {
+            long txID = -1;
+
+            for (GroupBinding val : list) {
+               if (val != null) {
+                  fireUnproposed(val.getGroupId());
+                  map.remove(val.getGroupId());
+
+                  sendUnproposal(val.getGroupId(), clusterName, 0);
 
-               if (txID >= 0) {
                   try {
-                     storageManager.commitBindings(txID);
+                     if (txID < 0) {
+                        txID = storageManager.generateID();
+                     }
+                     storageManager.deleteGrouping(txID, val);
                   } catch (Exception e) {
-                     ActiveMQServerLogger.LOGGER.unableToDeleteGroupBindings(SimpleString.of("TX:" + txID), e);
+                     ActiveMQServerLogger.LOGGER.unableToDeleteGroupBindings(val.getGroupId(), e);
                   }
                }
             }
+
+            if (txID >= 0) {
+               try {
+                  storageManager.commitBindings(txID);
+               } catch (Exception e) {
+                  ActiveMQServerLogger.LOGGER.unableToDeleteGroupBindings(SimpleString.of("TX:" + txID), e);
+               }
+            }
          });
 
       }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 4b77e2458e..eca2376c5f 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -850,16 +850,13 @@ public class ActiveMQServerImpl implements ActiveMQServer {
 
                   // you can't stop from the check thread,
                   // nor can use an executor
-                  Thread stopThread = new Thread() {
-                     @Override
-                     public void run() {
-                        try {
-                           ActiveMQServerImpl.this.stop();
-                        } catch (Throwable e) {
-                           logger.warn(e.getMessage(), e);
-                        }
+                  Thread stopThread = new Thread(() -> {
+                     try {
+                        ActiveMQServerImpl.this.stop();
+                     } catch (Throwable e) {
+                        logger.warn(e.getMessage(), e);
                      }
-                  };
+                  });
                   stopThread.start();
                }
             };
@@ -893,18 +890,15 @@ public class ActiveMQServerImpl implements ActiveMQServer {
       // in case graceful is -1, we will set it to 30 seconds
       long timeout = configuration.getGracefulShutdownTimeout() < 0 ? 30000 : configuration.getGracefulShutdownTimeout();
 
-      Thread notificationSender = new Thread() {
-         @Override
-         public void run() {
-            try {
-               if (hasBrokerCriticalPlugins()) {
-                  callBrokerCriticalPlugins(plugin -> plugin.criticalFailure(criticalComponent));
-               }
-            } catch (Throwable e) {
-               logger.warn(e.getMessage(), e);
+      Thread notificationSender = new Thread(() -> {
+         try {
+            if (hasBrokerCriticalPlugins()) {
+               callBrokerCriticalPlugins(plugin -> plugin.criticalFailure(criticalComponent));
             }
+         } catch (Throwable e) {
+            logger.warn(e.getMessage(), e);
          }
-      };
+      });
 
       // I'm using a different thread here as we need to manage timeouts
       notificationSender.start();
@@ -1037,16 +1031,13 @@ public class ActiveMQServerImpl implements ActiveMQServer {
     * Stops the server in a different thread.
     */
    public final void stopTheServer(final boolean criticalIOError) {
-      Thread thread = new Thread() {
-         @Override
-         public void run() {
-            try {
-               ActiveMQServerImpl.this.stop(false, criticalIOError, false);
-            } catch (Exception e) {
-               ActiveMQServerLogger.LOGGER.errorStoppingServer(e);
-            }
+      Thread thread = new Thread(() -> {
+         try {
+            ActiveMQServerImpl.this.stop(false, criticalIOError, false);
+         } catch (Exception e) {
+            ActiveMQServerLogger.LOGGER.errorStoppingServer(e);
          }
-      };
+      });
 
       thread.start();
    }
@@ -3164,12 +3155,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
        * Executor based on the provided Thread pool.  Otherwise we create a new ThreadPool.
        */
       if (serviceRegistry.getExecutorService() == null) {
-         ThreadFactory tFactory = AccessController.doPrivileged(new PrivilegedAction<ThreadFactory>() {
-            @Override
-            public ThreadFactory run() {
-               return new ActiveMQThreadFactory("ActiveMQ-server-" + this.toString(), false, ClientSessionFactoryImpl.class.getClassLoader());
-            }
-         });
+         ThreadFactory tFactory = AccessController.doPrivileged((PrivilegedAction<ThreadFactory>) ()-> new ActiveMQThreadFactory("ActiveMQ-server-" + this, false, ClientSessionFactoryImpl.class.getClassLoader()));
 
          if (configuration.getThreadPoolMaxSize() == -1) {
             threadPool = new ThreadPoolExecutor(0, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(), tFactory);
@@ -3185,12 +3171,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
       if (serviceRegistry.getIOExecutorService() != null) {
          this.ioExecutorFactory = new OrderedExecutorFactory(serviceRegistry.getIOExecutorService());
       } else {
-         ThreadFactory tFactory = AccessController.doPrivileged(new PrivilegedAction<ThreadFactory>() {
-            @Override
-            public ThreadFactory run() {
-               return new ActiveMQThreadFactory("ActiveMQ-IO-server-" + this.toString(), false, ClientSessionFactoryImpl.class.getClassLoader());
-            }
-         });
+         ThreadFactory tFactory = AccessController.doPrivileged((PrivilegedAction<ThreadFactory>) () -> new ActiveMQThreadFactory("ActiveMQ-IO-server-" + this, false, ClientSessionFactoryImpl.class.getClassLoader()));
 
          // Perhaps getPageMaxConcurrentIO should be deprecated and a new value added
          int maxIO = configuration.getPageMaxConcurrentIO() <= 0 ? Integer.MAX_VALUE : configuration.getPageMaxConcurrentIO();
@@ -3201,12 +3182,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
       if (serviceRegistry.getIOExecutorService() != null) {
          this.ioExecutorFactory = new OrderedExecutorFactory(serviceRegistry.getIOExecutorService());
       } else {
-         ThreadFactory tFactory = AccessController.doPrivileged(new PrivilegedAction<ThreadFactory>() {
-            @Override
-            public ThreadFactory run() {
-               return new ActiveMQThreadFactory("ActiveMQ-IO-server-" + this.toString(), false, ClientSessionFactoryImpl.class.getClassLoader());
-            }
-         });
+         ThreadFactory tFactory = AccessController.doPrivileged((PrivilegedAction<ThreadFactory>) () -> new ActiveMQThreadFactory("ActiveMQ-IO-server-" + this, false, ClientSessionFactoryImpl.class.getClassLoader()));
 
          this.ioExecutorPool = new ThreadPoolExecutor(0, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(), tFactory);
          this.ioExecutorFactory = new OrderedExecutorFactory(ioExecutorPool);
@@ -3231,12 +3207,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
        * Scheduled ExecutorService otherwise we create a new one.
        */
       if (serviceRegistry.getScheduledExecutorService() == null) {
-         ThreadFactory tFactory = AccessController.doPrivileged(new PrivilegedAction<ThreadFactory>() {
-            @Override
-            public ThreadFactory run() {
-               return new ActiveMQThreadFactory("ActiveMQ-scheduled-threads", false, ClientSessionFactoryImpl.class.getClassLoader());
-            }
-         });
+         ThreadFactory tFactory = AccessController.doPrivileged((PrivilegedAction<ThreadFactory>) () -> new ActiveMQThreadFactory("ActiveMQ-scheduled-threads", false, ClientSessionFactoryImpl.class.getClassLoader()));
 
          ScheduledThreadPoolExecutor scheduledPoolExecutor = new ScheduledThreadPoolExecutor(configuration.getScheduledThreadPoolMaxSize(), tFactory);
          scheduledPoolExecutor.setRemoveOnCancelPolicy(true);
@@ -3545,12 +3516,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
       long dumpInfoInterval = configuration.getServerDumpInterval();
 
       if (dumpInfoInterval > 0) {
-         scheduledPool.scheduleWithFixedDelay(new Runnable() {
-            @Override
-            public void run() {
-               ActiveMQServerLogger.LOGGER.dumpServerInfo(dumper.dump());
-            }
-         }, 0, dumpInfoInterval, TimeUnit.MILLISECONDS);
+         scheduledPool.scheduleWithFixedDelay(() -> ActiveMQServerLogger.LOGGER.dumpServerInfo(dumper.dump()), 0, dumpInfoInterval, TimeUnit.MILLISECONDS);
       }
 
       // Deploy the rest of the stuff
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ColocatedActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ColocatedActivation.java
index b0091cf703..381fc66bf6 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ColocatedActivation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ColocatedActivation.java
@@ -29,7 +29,6 @@ import org.apache.activemq.artemis.core.client.impl.Topology;
 import org.apache.activemq.artemis.core.client.impl.TopologyMemberImpl;
 import org.apache.activemq.artemis.core.protocol.core.Channel;
 import org.apache.activemq.artemis.core.protocol.core.ChannelHandler;
-import org.apache.activemq.artemis.core.protocol.core.Packet;
 import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
 import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.BackupRequestMessage;
 import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.BackupResponseMessage;
@@ -117,21 +116,18 @@ public class ColocatedActivation extends PrimaryActivation {
    @Override
    public ChannelHandler getActivationChannelHandler(final Channel channel, final Acceptor acceptorUsed) {
       final ChannelHandler activationChannelHandler = primaryActivation.getActivationChannelHandler(channel, acceptorUsed);
-      return new ChannelHandler() {
-         @Override
-         public void handlePacket(Packet packet) {
-            if (packet.getType() == PacketImpl.BACKUP_REQUEST) {
-               BackupRequestMessage backupRequestMessage = (BackupRequestMessage) packet;
-               boolean started = false;
-               try {
-                  started = colocatedHAManager.activateBackup(backupRequestMessage.getBackupSize(), backupRequestMessage.getJournalDirectory(), backupRequestMessage.getBindingsDirectory(), backupRequestMessage.getLargeMessagesDirectory(), backupRequestMessage.getPagingDirectory(), backupRequestMessage.getNodeID());
-               } catch (Exception e) {
-                  ActiveMQServerLogger.LOGGER.failedToActivateBackup(e);
-               }
-               channel.send(new BackupResponseMessage(started));
-            } else if (activationChannelHandler != null) {
-               activationChannelHandler.handlePacket(packet);
+      return packet -> {
+         if (packet.getType() == PacketImpl.BACKUP_REQUEST) {
+            BackupRequestMessage backupRequestMessage = (BackupRequestMessage) packet;
+            boolean started = false;
+            try {
+               started = colocatedHAManager.activateBackup(backupRequestMessage.getBackupSize(), backupRequestMessage.getJournalDirectory(), backupRequestMessage.getBindingsDirectory(), backupRequestMessage.getLargeMessagesDirectory(), backupRequestMessage.getPagingDirectory(), backupRequestMessage.getNodeID());
+            } catch (Exception e) {
+               ActiveMQServerLogger.LOGGER.failedToActivateBackup(e);
             }
+            channel.send(new BackupResponseMessage(started));
+         } else if (activationChannelHandler != null) {
+            activationChannelHandler.handlePacket(packet);
          }
       };
    }
@@ -193,12 +189,7 @@ public class ColocatedActivation extends PrimaryActivation {
       @Override
       public Pair<String, Integer> getDecision() {
          //sort the nodes by how many backups they have and choose the first
-         Collections.sort(nodes, new Comparator<Pair<String, Integer>>() {
-            @Override
-            public int compare(Pair<String, Integer> o1, Pair<String, Integer> o2) {
-               return o1.getB().compareTo(o2.getB());
-            }
-         });
+         Collections.sort(nodes, Comparator.comparing(Pair::getB));
          return nodes.get(0);
       }
 
@@ -212,24 +203,14 @@ public class ColocatedActivation extends PrimaryActivation {
                boolean backupStarted = colocatedHAManager.requestBackup(member.getConnector(), decision.getB().intValue(), !colocatedPolicy.isSharedStore());
                if (!backupStarted) {
                   nodes.clear();
-                  server.getScheduledPool().schedule(new Runnable() {
-                     @Override
-                     public void run() {
-                        server.getClusterManager().getQuorumManager().vote(new RequestBackupQuorumVote());
-                     }
-                  }, colocatedPolicy.getBackupRequestRetryInterval(), TimeUnit.MILLISECONDS);
+                  server.getScheduledPool().schedule(() -> server.getClusterManager().getQuorumManager().vote(new RequestBackupQuorumVote()), colocatedPolicy.getBackupRequestRetryInterval(), TimeUnit.MILLISECONDS);
                }
             } catch (Exception e) {
                ActiveMQServerLogger.LOGGER.failedToSendRequestToNode(e);
             }
          } else {
             nodes.clear();
-            server.getScheduledPool().schedule(new Runnable() {
-               @Override
-               public void run() {
-                  server.getClusterManager().getQuorumManager().vote(RequestBackupQuorumVote.this);
-               }
-            }, colocatedPolicy.getBackupRequestRetryInterval(), TimeUnit.MILLISECONDS);
+            server.getScheduledPool().schedule(() -> server.getClusterManager().getQuorumManager().vote(RequestBackupQuorumVote.this), colocatedPolicy.getBackupRequestRetryInterval(), TimeUnit.MILLISECONDS);
          }
       }
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index e226390c7a..249c7e44a9 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -1119,15 +1119,12 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
          // this is because a groupID is stored per queue, and only this queue is expiring at this point
          final SimpleString groupIDToRemove = (SimpleString) groupID.subSequence(0, groupID.length() - getName().length() - 1);
          // using an executor so we don't want to hold anyone just because of this
-         getExecutor().execute(new Runnable() {
-            @Override
-            public void run() {
-               synchronized (QueueImpl.this) {
-                  if (groups.remove(groupIDToRemove) != null) {
-                     logger.debug("Removing group after unproposal {} from queue {}", groupID, QueueImpl.this);
-                  } else {
-                     logger.debug("Couldn't remove Removing group {} after unproposal on queue {}", groupIDToRemove, QueueImpl.this);
-                  }
+         getExecutor().execute(() -> {
+            synchronized (QueueImpl.this) {
+               if (groups.remove(groupIDToRemove) != null) {
+                  logger.debug("Removing group after unproposal {} from queue {}", groupID, QueueImpl.this);
+               } else {
+                  logger.debug("Couldn't remove Removing group {} after unproposal on queue {}", groupIDToRemove, QueueImpl.this);
                }
             }
          });
@@ -1394,12 +1391,7 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
 
    @Override
    public void close() throws Exception {
-      getExecutor().execute(new Runnable() {
-         @Override
-         public void run() {
-            cancelRedistributor();
-         }
-      });
+      getExecutor().execute(this::cancelRedistributor);
 
       addressSettingsRepositoryListener.close();
    }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
index f3e744e370..bab579a5c0 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
@@ -695,29 +695,21 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
       promptDelivery();
 
       // JBPAPP-6030 - Using the executor to avoid distributed dead locks
-      messageQueue.getExecutor().execute(new Runnable() {
-         @Override
-         public void run() {
-            try {
-               // We execute this on the same executor to make sure the force delivery message is written after
-               // any delivery is completed
-
-               synchronized (lock) {
-                  if (transferring) {
-                     // Case it's transferring (reattach), we will retry later
-                     messageQueue.getExecutor().execute(new Runnable() {
-                        @Override
-                        public void run() {
-                           forceDelivery(sequence, r);
-                        }
-                     });
-                     return;
-                  }
+      messageQueue.getExecutor().execute(() -> {
+         try {
+            // We execute this on the same executor to make sure the force delivery message is written after
+            // any delivery is completed
+
+            synchronized (lock) {
+               if (transferring) {
+                  // Case it's transferring (reattach), we will retry later
+                  messageQueue.getExecutor().execute(() -> forceDelivery(sequence, r));
+                  return;
                }
-               r.run();
-            } catch (Exception e) {
-               ActiveMQServerLogger.LOGGER.errorSendingForcedDelivery(e);
             }
+            r.run();
+         } catch (Exception e) {
+            ActiveMQServerLogger.LOGGER.errorSendingForcedDelivery(e);
          }
       });
    }
@@ -1253,17 +1245,14 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
       }
    }
 
-   private final Runnable resumeLargeMessageRunnable = new Runnable() {
-      @Override
-      public void run() {
-         synchronized (lock) {
-            try {
-               if (largeMessageDeliverer == null || largeMessageDeliverer.deliver()) {
-                  forceDelivery();
-               }
-            } catch (Exception e) {
-               ActiveMQServerLogger.LOGGER.errorRunningLargeMessageDeliverer(e);
+   private final Runnable resumeLargeMessageRunnable = () -> {
+      synchronized (lock) {
+         try {
+            if (largeMessageDeliverer == null || largeMessageDeliverer.deliver()) {
+               forceDelivery();
             }
+         } catch (Exception e) {
+            ActiveMQServerLogger.LOGGER.errorRunningLargeMessageDeliverer(e);
          }
       }
    };
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
index 6603fb1f38..57f86654a1 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
@@ -249,12 +249,7 @@ public class ServiceRegistryImpl implements ServiceRegistry {
 
    @SuppressWarnings("TypeParameterUnusedInFormals")
    public <T> T loadClass(final String className, Class expectedType) {
-      return AccessController.doPrivileged(new PrivilegedAction<T>() {
-         @Override
-         public T run() {
-            return (T) ClassloadingUtil.newInstanceFromClassLoader(className, expectedType);
-         }
-      });
+      return AccessController.doPrivileged((PrivilegedAction<T>) () -> (T) ClassloadingUtil.newInstanceFromClassLoader(className, expectedType));
    }
 
    private Transformer instantiateTransformer(final TransformerConfiguration transformerConfiguration) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingBackupActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingBackupActivation.java
index 619f494ed7..05af711413 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingBackupActivation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingBackupActivation.java
@@ -246,26 +246,23 @@ public final class SharedNothingBackupActivation extends Activation implements R
 
                final SharedNothingBackupQuorum.BACKUP_ACTIVATION signalToStop = signal;
 
-               Thread startThread = new Thread(new Runnable() {
-                  @Override
-                  public void run() {
-                     try {
-                        logger.trace("Calling activeMQServer.stop() as initialization failed");
-
-                        if (activeMQServer.getState() != ActiveMQServer.SERVER_STATE.STOPPED &&
-                            activeMQServer.getState() != ActiveMQServer.SERVER_STATE.STOPPING) {
-
-                           if (signalToStop == SharedNothingBackupQuorum.BACKUP_ACTIVATION.FAILURE_RETRY) {
-                              activeMQServer.stop(false);
-                              logger.trace("The server was shutdown for a network isolation, we keep retrying");
-                              activeMQServer.start();
-                           } else {
-                              activeMQServer.stop();
-                           }
+               Thread startThread = new Thread(() -> {
+                  try {
+                     logger.trace("Calling activeMQServer.stop() as initialization failed");
+
+                     if (activeMQServer.getState() != ActiveMQServer.SERVER_STATE.STOPPED &&
+                         activeMQServer.getState() != ActiveMQServer.SERVER_STATE.STOPPING) {
+
+                        if (signalToStop == SharedNothingBackupQuorum.BACKUP_ACTIVATION.FAILURE_RETRY) {
+                           activeMQServer.stop(false);
+                           logger.trace("The server was shutdown for a network isolation, we keep retrying");
+                           activeMQServer.start();
+                        } else {
+                           activeMQServer.stop();
                         }
-                     } catch (Exception e) {
-                        ActiveMQServerLogger.LOGGER.errorRestartingBackupServer(activeMQServer, e);
                      }
+                  } catch (Exception e) {
+                     ActiveMQServerLogger.LOGGER.errorRestartingBackupServer(activeMQServer, e);
                   }
                });
                startThread.start();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingPrimaryActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingPrimaryActivation.java
index f82d5abac8..6f56c7cf3a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingPrimaryActivation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingPrimaryActivation.java
@@ -44,7 +44,6 @@ import org.apache.activemq.artemis.core.config.ConfigurationUtils;
 import org.apache.activemq.artemis.core.protocol.core.Channel;
 import org.apache.activemq.artemis.core.protocol.core.ChannelHandler;
 import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection;
-import org.apache.activemq.artemis.core.protocol.core.Packet;
 import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
 import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.BackupRegistrationMessage;
 import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage;
@@ -133,20 +132,17 @@ public class SharedNothingPrimaryActivation extends PrimaryActivation {
 
    @Override
    public ChannelHandler getActivationChannelHandler(final Channel channel, final Acceptor acceptorUsed) {
-      return new ChannelHandler() {
-         @Override
-         public void handlePacket(Packet packet) {
-            if (packet.getType() == PacketImpl.BACKUP_REGISTRATION) {
-               BackupRegistrationMessage msg = (BackupRegistrationMessage) packet;
-               ClusterConnection clusterConnection = acceptorUsed.getClusterConnection();
-               try {
-                  startReplication(channel.getConnection(), clusterConnection, getPair(msg.getConnector(), true), msg.isFailBackRequest());
-               } catch (ActiveMQAlreadyReplicatingException are) {
-                  channel.send(new BackupReplicationStartFailedMessage(BackupReplicationStartFailedMessage.BackupRegistrationProblem.ALREADY_REPLICATING));
-               } catch (ActiveMQException e) {
-                  logger.debug("Failed to process backup registration packet", e);
-                  channel.send(new BackupReplicationStartFailedMessage(BackupReplicationStartFailedMessage.BackupRegistrationProblem.EXCEPTION));
-               }
+      return packet -> {
+         if (packet.getType() == PacketImpl.BACKUP_REGISTRATION) {
+            BackupRegistrationMessage msg = (BackupRegistrationMessage) packet;
+            ClusterConnection clusterConnection = acceptorUsed.getClusterConnection();
+            try {
+               startReplication(channel.getConnection(), clusterConnection, getPair(msg.getConnector(), true), msg.isFailBackRequest());
+            } catch (ActiveMQAlreadyReplicatingException are) {
+               channel.send(new BackupReplicationStartFailedMessage(BackupReplicationStartFailedMessage.BackupRegistrationProblem.ALREADY_REPLICATING));
+            } catch (ActiveMQException e) {
+               logger.debug("Failed to process backup registration packet", e);
+               channel.send(new BackupReplicationStartFailedMessage(BackupReplicationStartFailedMessage.BackupRegistrationProblem.EXCEPTION));
             }
          }
       };
@@ -174,48 +170,45 @@ public class SharedNothingPrimaryActivation extends PrimaryActivation {
          rc.addFailureListener(listener);
          replicationManager = new ReplicationManager(activeMQServer, rc, clusterConnection.getCallTimeout(), replicatedPolicy.getInitialReplicationSyncTimeout(), activeMQServer.getIOExecutorFactory());
          replicationManager.start();
-         Thread t = new Thread(new Runnable() {
-            @Override
-            public void run() {
-               try {
-                  activeMQServer.getStorageManager().startReplication(replicationManager, activeMQServer.getPagingManager(), activeMQServer.getNodeID().toString(), isFailBackRequest && replicatedPolicy.isAllowAutoFailBack(), replicatedPolicy.getInitialReplicationSyncTimeout());
-
-                  clusterConnection.nodeAnnounced(System.currentTimeMillis(), activeMQServer.getNodeID().toString(), replicatedPolicy.getGroupName(), replicatedPolicy.getScaleDownGroupName(), pair, true);
-
-                  //todo, check why this was set here
-                  //backupUpToDate = false;
-
-                  if (isFailBackRequest && replicatedPolicy.isAllowAutoFailBack()) {
-                     BackupTopologyListener listener1 = new BackupTopologyListener(activeMQServer.getNodeID().toString(), clusterConnection.getConnector());
-                     clusterConnection.addClusterTopologyListener(listener1);
-                     if (listener1.waitForBackup()) {
-                        //if we have to many backups kept or are not configured to restart just stop, otherwise restart as a backup
-                        activeMQServer.fail(true);
-                        ActiveMQServerLogger.LOGGER.restartingReplicatedBackupAfterFailback();
-                        //                        activeMQServer.moveServerData(replicatedPolicy.getReplicaPolicy().getMaxSavedReplicatedJournalsSize());
-                        activeMQServer.setHAPolicy(replicatedPolicy.getReplicaPolicy());
-                        activeMQServer.start();
-                     } else {
-                        ActiveMQServerLogger.LOGGER.failbackMissedBackupAnnouncement();
-                     }
-                  }
-               } catch (Exception e) {
-                  if (activeMQServer.getState() == ActiveMQServerImpl.SERVER_STATE.STARTED) {
-                  /*
-                   * The reasoning here is that the exception was either caused by (1) the (interaction with) the
-                   * backup, or (2) by an IO Error at the storage. If (1), we can swallow the exception and ignore the
-                   * replication request. If (2) the primary will crash shortly.
-                   */
-                     ActiveMQServerLogger.LOGGER.errorStartingReplication(e);
+         Thread t = new Thread(() -> {
+            try {
+               activeMQServer.getStorageManager().startReplication(replicationManager, activeMQServer.getPagingManager(), activeMQServer.getNodeID().toString(), isFailBackRequest && replicatedPolicy.isAllowAutoFailBack(), replicatedPolicy.getInitialReplicationSyncTimeout());
+
+               clusterConnection.nodeAnnounced(System.currentTimeMillis(), activeMQServer.getNodeID().toString(), replicatedPolicy.getGroupName(), replicatedPolicy.getScaleDownGroupName(), pair, true);
+
+               //todo, check why this was set here
+               //backupUpToDate = false;
+
+               if (isFailBackRequest && replicatedPolicy.isAllowAutoFailBack()) {
+                  BackupTopologyListener listener1 = new BackupTopologyListener(activeMQServer.getNodeID().toString(), clusterConnection.getConnector());
+                  clusterConnection.addClusterTopologyListener(listener1);
+                  if (listener1.waitForBackup()) {
+                     //if we have to many backups kept or are not configured to restart just stop, otherwise restart as a backup
+                     activeMQServer.fail(true);
+                     ActiveMQServerLogger.LOGGER.restartingReplicatedBackupAfterFailback();
+                     //                        activeMQServer.moveServerData(replicatedPolicy.getReplicaPolicy().getMaxSavedReplicatedJournalsSize());
+                     activeMQServer.setHAPolicy(replicatedPolicy.getReplicaPolicy());
+                     activeMQServer.start();
+                  } else {
+                     ActiveMQServerLogger.LOGGER.failbackMissedBackupAnnouncement();
                   }
-                  try {
-                     ActiveMQServerImpl.stopComponent(replicationManager);
-                  } catch (Exception amqe) {
-                     ActiveMQServerLogger.LOGGER.errorStoppingReplication(amqe);
-                  } finally {
-                     synchronized (replicationLock) {
-                        replicationManager = null;
-                     }
+               }
+            } catch (Exception e) {
+               if (activeMQServer.getState() == ActiveMQServerImpl.SERVER_STATE.STARTED) {
+               /*
+                * The reasoning here is that the exception was either caused by (1) the (interaction with) the
+                * backup, or (2) by an IO Error at the storage. If (1), we can swallow the exception and ignore the
+                * replication request. If (2) the primary will crash shortly.
+                */
+                  ActiveMQServerLogger.LOGGER.errorStartingReplication(e);
+               }
+               try {
+                  ActiveMQServerImpl.stopComponent(replicationManager);
+               } catch (Exception amqe) {
+                  ActiveMQServerLogger.LOGGER.errorStoppingReplication(amqe);
+               } finally {
+                  synchronized (replicationLock) {
+                     replicationManager = null;
                   }
                }
             }
@@ -252,39 +245,33 @@ public class SharedNothingPrimaryActivation extends PrimaryActivation {
       private void handleClose(boolean failed) {
          ExecutorService executorService = activeMQServer.getThreadPool();
          if (executorService != null) {
-            executorService.execute(new Runnable() {
-               @Override
-               public void run() {
-                  synchronized (replicationLock) {
-                     if (replicationManager != null) {
-                        activeMQServer.getStorageManager().stopReplication();
-                        replicationManager = null;
-
-                        if (failed && replicatedPolicy.isVoteOnReplicationFailure()) {
-                           QuorumManager quorumManager = activeMQServer.getClusterManager().getQuorumManager();
-                           final boolean isStillPrimary = quorumManager.isStillActive(activeMQServer.getNodeID().toString(),
-                                                                                   getPrimaryConnector(activeMQServer.getConfiguration()),
-                                                                                   replicatedPolicy.getQuorumSize(),
-                                                                                   5, TimeUnit.SECONDS);
-                           if (!isStillPrimary) {
-                              try {
-                                 Thread startThread = new Thread(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                       try {
-                                          logger.trace("Calling activeMQServer.stop() to stop the server");
-
-                                          activeMQServer.stop();
-                                       } catch (Exception e) {
-                                          ActiveMQServerLogger.LOGGER.errorRestartingBackupServer(activeMQServer, e);
-                                       }
-                                    }
-                                 });
-                                 startThread.start();
-                                 startThread.join();
-                              } catch (Exception e) {
-                                 e.printStackTrace();
-                              }
+            executorService.execute(() -> {
+               synchronized (replicationLock) {
+                  if (replicationManager != null) {
+                     activeMQServer.getStorageManager().stopReplication();
+                     replicationManager = null;
+
+                     if (failed && replicatedPolicy.isVoteOnReplicationFailure()) {
+                        QuorumManager quorumManager = activeMQServer.getClusterManager().getQuorumManager();
+                        final boolean isStillPrimary = quorumManager.isStillActive(activeMQServer.getNodeID().toString(),
+                                                                                getPrimaryConnector(activeMQServer.getConfiguration()),
+                                                                                replicatedPolicy.getQuorumSize(),
+                                                                                5, TimeUnit.SECONDS);
+                        if (!isStillPrimary) {
+                           try {
+                              Thread startThread = new Thread(() -> {
+                                 try {
+                                    logger.trace("Calling activeMQServer.stop() to stop the server");
+
+                                    activeMQServer.stop();
+                                 } catch (Exception e) {
+                                    ActiveMQServerLogger.LOGGER.errorRestartingBackupServer(activeMQServer, e);
+                                 }
+                              });
+                              startThread.start();
+                              startThread.join();
+                           } catch (Exception e) {
+                              e.printStackTrace();
                            }
                         }
                      }
@@ -366,12 +353,7 @@ public class SharedNothingPrimaryActivation extends PrimaryActivation {
          localReplicationManager.sendPrimaryIsStopping(ReplicationPrimaryIsStoppingMessage.PrimaryStopping.STOP_CALLED);
          // Schedule for 10 seconds
          // this pool gets a 'hard' shutdown, no need to manage the Future of this Runnable.
-         activeMQServer.getScheduledPool().schedule(new Runnable() {
-            @Override
-            public void run() {
-               localReplicationManager.clearReplicationTokens();
-            }
-         }, 30, TimeUnit.SECONDS);
+         activeMQServer.getScheduledPool().schedule(localReplicationManager::clearReplicationTokens, 30, TimeUnit.SECONDS);
       }
    }
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java
index 08ae5fa4dd..ed2aabd546 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java
@@ -117,18 +117,15 @@ public final class SharedStoreBackupActivation extends Activation {
             unregisterActiveLockListener(activeMQServer.getNodeManager());
 
             ActiveMQServerLogger.LOGGER.backupServerScaledDown();
-            Thread t = new Thread(new Runnable() {
-               @Override
-               public void run() {
-                  try {
-                     activeMQServer.stop();
-                     //we are shared store but if we were started by a parent server then we shouldn't restart
-                     if (sharedStoreBackupPolicy.isRestartBackup()) {
-                        activeMQServer.start();
-                     }
-                  } catch (Exception e) {
-                     ActiveMQServerLogger.LOGGER.serverRestartWarning(e);
+            Thread t = new Thread(() -> {
+               try {
+                  activeMQServer.stop();
+                  //we are shared store but if we were started by a parent server then we shouldn't restart
+                  if (sharedStoreBackupPolicy.isRestartBackup()) {
+                     activeMQServer.start();
                   }
+               } catch (Exception e) {
+                  ActiveMQServerLogger.LOGGER.serverRestartWarning(e);
                }
             });
             t.start();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/JaasAuthenticator.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/JaasAuthenticator.java
index 233c95f514..3debb87736 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/JaasAuthenticator.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/JaasAuthenticator.java
@@ -20,14 +20,11 @@ import org.apache.activemq.artemis.logs.AuditLogger;
 
 import javax.management.remote.JMXAuthenticator;
 import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
-import java.io.IOException;
 
 public class JaasAuthenticator implements JMXAuthenticator {
 
@@ -47,28 +44,25 @@ public class JaasAuthenticator implements JMXAuthenticator {
       Subject subject = new Subject();
       try {
 
-         LoginContext loginContext = new LoginContext(realm, subject, new CallbackHandler() {
-            @Override
-            public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-               /*
-               * pull out the jmx credentials if they exist if not, guest login module will handle it
-               * */
-               String[] params = null;
-               if (credentials instanceof String[] && ((String[]) credentials).length == 2) {
-                  params = (String[]) credentials;
-               }
-               for (int i = 0; i < callbacks.length; i++) {
-                  if (callbacks[i] instanceof NameCallback) {
-                     if (params != null) {
-                        ((NameCallback) callbacks[i]).setName(params[0]);
-                     }
-                  } else if (callbacks[i] instanceof PasswordCallback) {
-                     if (params != null) {
-                        ((PasswordCallback) callbacks[i]).setPassword((params[1].toCharArray()));
-                     }
-                  } else {
-                     throw new UnsupportedCallbackException(callbacks[i]);
+         LoginContext loginContext = new LoginContext(realm, subject, callbacks -> {
+            /*
+            * pull out the jmx credentials if they exist if not, guest login module will handle it
+            * */
+            String[] params = null;
+            if (credentials instanceof String[] && ((String[]) credentials).length == 2) {
+               params = (String[]) credentials;
+            }
+            for (int i = 0; i < callbacks.length; i++) {
+               if (callbacks[i] instanceof NameCallback) {
+                  if (params != null) {
+                     ((NameCallback) callbacks[i]).setName(params[0]);
+                  }
+               } else if (callbacks[i] instanceof PasswordCallback) {
+                  if (params != null) {
+                     ((PasswordCallback) callbacks[i]).setPassword((params[1].toCharArray()));
                   }
+               } else {
+                  throw new UnsupportedCallbackException(callbacks[i]);
                }
             }
          });
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
index e8e8281283..1e67e990df 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
@@ -2278,21 +2278,18 @@ public class ConfigurationImplTest extends AbstractConfigurationTestBase {
       final CountDownLatch latch = new CountDownLatch(1);
 
 
-      Thread thread = new Thread() {
-         @Override
-         public void run() {
-            latch.countDown();
-            int i = 1;
-            while (running.get()) {
-               properties.remove("key" + i);
-               properties.put("key" + i, "new value " + i);
-               i++;
-               if (i > 200) {
-                  i = 1;
-               }
+      Thread thread = new Thread(() -> {
+         latch.countDown();
+         int i = 1;
+         while (running.get()) {
+            properties.remove("key" + i);
+            properties.put("key" + i, "new value " + i);
+            i++;
+            if (i > 200) {
+               i = 1;
             }
          }
-      };
+      });
 
       thread.start();
       try {
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
index d14cbbe413..31060d31ac 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
@@ -846,18 +846,15 @@ public class FileConfigurationTest extends AbstractConfigurationTestBase {
 
          final ThrowableHolder holder = new ThrowableHolder();
 
-         final Thread webappContextThread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-               FileConfiguration fileConfiguration = new FileConfiguration();
-
-               try {
-                  FileDeploymentManager deploymentManager = new FileDeploymentManager(customConfiguration.getName());
-                  deploymentManager.addDeployable(fileConfiguration);
-                  deploymentManager.readConfiguration();
-               } catch (Exception e) {
-                  holder.t = e;
-               }
+         final Thread webappContextThread = new Thread(() -> {
+            FileConfiguration fileConfiguration = new FileConfiguration();
+
+            try {
+               FileDeploymentManager deploymentManager = new FileDeploymentManager(customConfiguration.getName());
+               deploymentManager.addDeployable(fileConfiguration);
+               deploymentManager.readConfiguration();
+            } catch (Exception e) {
+               holder.t = e;
             }
          });
 
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextUnitTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextUnitTest.java
index e5189d59f4..b9471e2713 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextUnitTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextUnitTest.java
@@ -377,17 +377,14 @@ public class OperationContextUnitTest extends ServerTestBase {
 
       final AtomicInteger numberOfFailures = new AtomicInteger(0);
 
-      Thread t = new Thread() {
-         @Override
-         public void run() {
-            try {
-               impl.waitCompletion(5000);
-            } catch (Throwable e) {
-               e.printStackTrace();
-               numberOfFailures.incrementAndGet();
-            }
+      Thread t = new Thread(() -> {
+         try {
+            impl.waitCompletion(5000);
+         } catch (Throwable e) {
+            e.printStackTrace();
+            numberOfFailures.incrementAndGet();
          }
-      };
+      });
 
       t.start();
 
@@ -421,17 +418,14 @@ public class OperationContextUnitTest extends ServerTestBase {
 
       final AtomicInteger failures = new AtomicInteger(0);
 
-      Thread t = new Thread() {
-         @Override
-         public void run() {
-            try {
-               context.waitCompletion(5000);
-            } catch (Throwable e) {
-               e.printStackTrace();
-               failures.incrementAndGet();
-            }
+      Thread t = new Thread(() -> {
+         try {
+            context.waitCompletion(5000);
+         } catch (Throwable e) {
+            e.printStackTrace();
+            failures.incrementAndGet();
          }
-      };
+      });
 
       t.start();
 
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/reload/ReloadManagerTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/reload/ReloadManagerTest.java
index 9a8eb4b2be..74c42e2d65 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/reload/ReloadManagerTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/reload/ReloadManagerTest.java
@@ -16,12 +16,8 @@
  */
 package org.apache.activemq.artemis.core.reload;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import java.io.File;
 import java.io.IOException;
-import java.net.URL;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -36,6 +32,9 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class ReloadManagerTest extends ServerTestBase {
 
    private ScheduledExecutorService scheduledExecutorService;
@@ -87,12 +86,7 @@ public class ReloadManagerTest extends ServerTestBase {
 
       final ReusableLatch latch = new ReusableLatch(1);
 
-      ReloadCallback reloadCallback = new ReloadCallback() {
-         @Override
-         public void reload(URL uri) {
-            latch.countDown();
-         }
-      };
+      ReloadCallback reloadCallback = uri -> latch.countDown();
       manager.addCallback(parentDir.toURI().toURL(), reloadCallback);
 
       assertFalse(latch.await(1, TimeUnit.SECONDS));
@@ -107,12 +101,7 @@ public class ReloadManagerTest extends ServerTestBase {
    public void testUpdateOnNewNotExistingDirectory() throws Exception {
       final ReusableLatch latch = new ReusableLatch(1);
 
-      ReloadCallback reloadCallback = new ReloadCallback() {
-         @Override
-         public void reload(URL uri) {
-            latch.countDown();
-         }
-      };
+      ReloadCallback reloadCallback = uri -> latch.countDown();
 
       // verify not existing dir is not a problem
       File notExistFile = new File(getTemporaryDir(), "./sub2/not-there");
@@ -136,12 +125,7 @@ public class ReloadManagerTest extends ServerTestBase {
 
       final ReusableLatch latch = new ReusableLatch(1);
 
-      manager.addCallback(file.toURL(), new ReloadCallback() {
-         @Override
-         public void reload(URL uri) {
-            latch.countDown();
-         }
-      });
+      manager.addCallback(file.toURL(), uri -> latch.countDown());
 
       assertFalse(latch.await(1, TimeUnit.SECONDS));
 
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/GuestLoginModuleTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/GuestLoginModuleTest.java
index d555d859ef..593cd974c9 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/GuestLoginModuleTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/GuestLoginModuleTest.java
@@ -16,17 +16,11 @@
  */
 package org.apache.activemq.artemis.core.security.jaas;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
-import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
@@ -36,7 +30,9 @@ import org.apache.activemq.artemis.spi.core.security.jaas.UserPrincipal;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import java.lang.invoke.MethodHandles;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class GuestLoginModuleTest {
 
@@ -60,12 +56,7 @@ public class GuestLoginModuleTest {
 
    @Test
    public void testLogin() throws LoginException {
-      LoginContext context = new LoginContext("GuestLogin", new CallbackHandler() {
-         @Override
-         public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-            assertEquals(0, callbacks.length, "Should have no Callbacks");
-         }
-      });
+      LoginContext context = new LoginContext("GuestLogin", callbacks -> assertEquals(0, callbacks.length, "Should have no Callbacks"));
       context.login();
 
       Subject subject = context.getSubject();
@@ -84,12 +75,7 @@ public class GuestLoginModuleTest {
 
    @Test
    public void testLoginWithDefaults() throws LoginException {
-      LoginContext context = new LoginContext("GuestLoginWithDefaults", new CallbackHandler() {
-         @Override
-         public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-            assertEquals(0, callbacks.length, "Should have no Callbacks");
-         }
-      });
+      LoginContext context = new LoginContext("GuestLoginWithDefaults", callbacks -> assertEquals(0, callbacks.length, "Should have no Callbacks"));
       context.login();
 
       Subject subject = context.getSubject();
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/LDAPModuleRoleExpansionTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/LDAPModuleRoleExpansionTest.java
index cc16ad6cea..1878953fc1 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/LDAPModuleRoleExpansionTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/LDAPModuleRoleExpansionTest.java
@@ -22,14 +22,11 @@ import javax.naming.NamingEnumeration;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;
 import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
-import java.io.IOException;
 import java.security.Principal;
 import java.util.HashSet;
 import java.util.Hashtable;
@@ -100,17 +97,14 @@ public class LDAPModuleRoleExpansionTest extends AbstractLdapTestUnit {
 
    @Test
    public void testRoleExpansion() throws LoginException {
-      LoginContext context = new LoginContext("ExpandedLDAPLogin", new CallbackHandler() {
-         @Override
-         public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-            for (int i = 0; i < callbacks.length; i++) {
-               if (callbacks[i] instanceof NameCallback) {
-                  ((NameCallback) callbacks[i]).setName("first");
-               } else if (callbacks[i] instanceof PasswordCallback) {
-                  ((PasswordCallback) callbacks[i]).setPassword("secret".toCharArray());
-               } else {
-                  throw new UnsupportedCallbackException(callbacks[i]);
-               }
+      LoginContext context = new LoginContext("ExpandedLDAPLogin", callbacks -> {
+         for (int i = 0; i < callbacks.length; i++) {
+            if (callbacks[i] instanceof NameCallback) {
+               ((NameCallback) callbacks[i]).setName("first");
+            } else if (callbacks[i] instanceof PasswordCallback) {
+               ((PasswordCallback) callbacks[i]).setPassword("secret".toCharArray());
+            } else {
+               throw new UnsupportedCallbackException(callbacks[i]);
             }
          }
       });
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImplMockTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImplMockTest.java
index 9ac8462bf2..cc18c056db 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImplMockTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImplMockTest.java
@@ -123,12 +123,7 @@ public class ClusterConnectionImplMockTest extends ServerTestBase {
 
       @Override
       public ExecutorFactory getExecutorFactory() {
-         return new ExecutorFactory() {
-            @Override
-            public ArtemisExecutor getExecutor() {
-               return null;
-            }
-         };
+         return () -> null;
       }
 
       @Override
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImplTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImplTest.java
index 07ee35b301..ad68343179 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImplTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImplTest.java
@@ -16,13 +16,6 @@
  */
 package org.apache.activemq.artemis.core.server.impl;
 
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
 import java.lang.ref.WeakReference;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
@@ -32,6 +25,13 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.apache.activemq.artemis.tests.util.ServerTestBase;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class ActiveMQServerImplTest extends ServerTestBase {
 
    @Test
@@ -88,6 +88,7 @@ public class ActiveMQServerImplTest extends ServerTestBase {
 
       server.start();
 
+      // if this is converted to a lambda or method references the test will fail
       Runnable scheduledRunnable = new Runnable() {
          @Override
          public void run() {
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/journal/JournalStorageManagerConstantTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/journal/JournalStorageManagerConstantTest.java
index ee63506bdb..678e243f4d 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/journal/JournalStorageManagerConstantTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/journal/JournalStorageManagerConstantTest.java
@@ -62,17 +62,7 @@ public class JournalStorageManagerConstantTest {
       assertEquals(11, journal.getFilesRepository().getPoolSize());
    }
 
-   ExecutorFactory dumbExecutor = new ExecutorFactory() {
-      @Override
-      public ArtemisExecutor getExecutor() {
-         return new ArtemisExecutor() {
-            @Override
-            public void execute(Runnable command) {
-               command.run();
-            }
-         };
-      }
-   };
+   ExecutorFactory dumbExecutor = () -> (ArtemisExecutor) command -> command.run();
 
    ScheduledExecutorService dumbScheduler = new ScheduledExecutorService() {
       @Override
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/RepositoryTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/RepositoryTest.java
index 82f3ccee06..e749388040 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/RepositoryTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/RepositoryTest.java
@@ -289,12 +289,7 @@ public class RepositoryTest extends ServerTestBase {
       repository.addMatch("B", "2");
 
       final AtomicInteger called = new AtomicInteger(0);
-      repository.registerListener(new HierarchicalRepositoryChangeListener() {
-         @Override
-         public void onChange() {
-            called.incrementAndGet();
-         }
-      });
+      repository.registerListener(() -> called.incrementAndGet());
 
       assertEquals(1, called.get());
 
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/Krb5LoginModuleTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/Krb5LoginModuleTest.java
index c383f9e4a7..7637716272 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/Krb5LoginModuleTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/Krb5LoginModuleTest.java
@@ -16,18 +16,13 @@
  */
 package org.apache.activemq.artemis.spi.core.security.jaas;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.io.IOException;
-import java.security.Principal;
-
 import javax.security.auth.Subject;
+import java.security.Principal;
 
 import org.junit.jupiter.api.Test;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class Krb5LoginModuleTest {
 
@@ -36,10 +31,7 @@ public class Krb5LoginModuleTest {
       Krb5LoginModule underTest = new Krb5LoginModule();
 
       final Subject subject = new Subject();
-      underTest.initialize(subject, new CallbackHandler() {
-         @Override
-         public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-         }
+      underTest.initialize(subject, callbacks -> {
       }, null, null);
 
       assertFalse(underTest.login());
@@ -50,12 +42,7 @@ public class Krb5LoginModuleTest {
       Krb5LoginModule underTest = new Krb5LoginModule();
 
       final Subject subject = new Subject();
-      underTest.initialize(subject, new CallbackHandler() {
-         @Override
-         public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-            ((PrincipalsCallback) callbacks[0]).setPeerPrincipals(new Principal[] {new UserPrincipal("A")});
-         }
-      }, null, null);
+      underTest.initialize(subject, callbacks -> ((PrincipalsCallback) callbacks[0]).setPeerPrincipals(new Principal[] {new UserPrincipal("A")}), null, null);
 
       assertTrue(underTest.login());
    }
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModuleTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModuleTest.java
index f57479ce04..7b66b9f285 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModuleTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModuleTest.java
@@ -22,8 +22,6 @@ import javax.naming.NamingEnumeration;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;
 import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
@@ -31,7 +29,6 @@ import javax.security.auth.login.FailedLoginException;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
-import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -116,17 +113,14 @@ public class LDAPLoginModuleTest extends AbstractLdapTestUnit {
    public void testLogin() throws Exception {
       logger.info("num session: {}", ldapServer.getLdapSessionManager().getSessions().length);
 
-      LoginContext context = new LoginContext("LDAPLogin", new CallbackHandler() {
-         @Override
-         public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-            for (int i = 0; i < callbacks.length; i++) {
-               if (callbacks[i] instanceof NameCallback) {
-                  ((NameCallback) callbacks[i]).setName("first");
-               } else if (callbacks[i] instanceof PasswordCallback) {
-                  ((PasswordCallback) callbacks[i]).setPassword("secret".toCharArray());
-               } else {
-                  throw new UnsupportedCallbackException(callbacks[i]);
-               }
+      LoginContext context = new LoginContext("LDAPLogin", callbacks -> {
+         for (int i = 0; i < callbacks.length; i++) {
+            if (callbacks[i] instanceof NameCallback) {
+               ((NameCallback) callbacks[i]).setName("first");
+            } else if (callbacks[i] instanceof PasswordCallback) {
+               ((PasswordCallback) callbacks[i]).setPassword("secret".toCharArray());
+            } else {
+               throw new UnsupportedCallbackException(callbacks[i]);
             }
          }
       });
@@ -152,17 +146,14 @@ public class LDAPLoginModuleTest extends AbstractLdapTestUnit {
 
    @Test
    public void testUnauthenticated() throws Exception {
-      LoginContext context = new LoginContext("UnAuthenticatedLDAPLogin", new CallbackHandler() {
-         @Override
-         public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-            for (int i = 0; i < callbacks.length; i++) {
-               if (callbacks[i] instanceof NameCallback) {
-                  ((NameCallback) callbacks[i]).setName("first");
-               } else if (callbacks[i] instanceof PasswordCallback) {
-                  ((PasswordCallback) callbacks[i]).setPassword("secret".toCharArray());
-               } else {
-                  throw new UnsupportedCallbackException(callbacks[i]);
-               }
+      LoginContext context = new LoginContext("UnAuthenticatedLDAPLogin", callbacks -> {
+         for (int i = 0; i < callbacks.length; i++) {
+            if (callbacks[i] instanceof NameCallback) {
+               ((NameCallback) callbacks[i]).setName("first");
+            } else if (callbacks[i] instanceof PasswordCallback) {
+               ((PasswordCallback) callbacks[i]).setPassword("secret".toCharArray());
+            } else {
+               throw new UnsupportedCallbackException(callbacks[i]);
             }
          }
       });
@@ -179,17 +170,14 @@ public class LDAPLoginModuleTest extends AbstractLdapTestUnit {
 
    @Test
    public void testAuthenticatedViaBindOnAnonConnection() throws Exception {
-      LoginContext context = new LoginContext("AnonBindCheckUserLDAPLogin", new CallbackHandler() {
-         @Override
-         public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-            for (int i = 0; i < callbacks.length; i++) {
-               if (callbacks[i] instanceof NameCallback) {
-                  ((NameCallback) callbacks[i]).setName("first");
-               } else if (callbacks[i] instanceof PasswordCallback) {
-                  ((PasswordCallback) callbacks[i]).setPassword("wrongSecret".toCharArray());
-               } else {
-                  throw new UnsupportedCallbackException(callbacks[i]);
-               }
+      LoginContext context = new LoginContext("AnonBindCheckUserLDAPLogin", callbacks -> {
+         for (int i = 0; i < callbacks.length; i++) {
+            if (callbacks[i] instanceof NameCallback) {
+               ((NameCallback) callbacks[i]).setName("first");
+            } else if (callbacks[i] instanceof PasswordCallback) {
+               ((PasswordCallback) callbacks[i]).setPassword("wrongSecret".toCharArray());
+            } else {
+               throw new UnsupportedCallbackException(callbacks[i]);
             }
          }
       });
@@ -203,17 +191,14 @@ public class LDAPLoginModuleTest extends AbstractLdapTestUnit {
 
    @Test
    public void testAuthenticatedOkViaBindOnAnonConnection() throws Exception {
-      LoginContext context = new LoginContext("AnonBindCheckUserLDAPLogin", new CallbackHandler() {
-         @Override
-         public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-            for (int i = 0; i < callbacks.length; i++) {
-               if (callbacks[i] instanceof NameCallback) {
-                  ((NameCallback) callbacks[i]).setName("first");
-               } else if (callbacks[i] instanceof PasswordCallback) {
-                  ((PasswordCallback) callbacks[i]).setPassword("secret".toCharArray());
-               } else {
-                  throw new UnsupportedCallbackException(callbacks[i]);
-               }
+      LoginContext context = new LoginContext("AnonBindCheckUserLDAPLogin", callbacks -> {
+         for (int i = 0; i < callbacks.length; i++) {
+            if (callbacks[i] instanceof NameCallback) {
+               ((NameCallback) callbacks[i]).setName("first");
+            } else if (callbacks[i] instanceof PasswordCallback) {
+               ((PasswordCallback) callbacks[i]).setPassword("secret".toCharArray());
+            } else {
+               throw new UnsupportedCallbackException(callbacks[i]);
             }
          }
       });
@@ -263,17 +248,14 @@ public class LDAPLoginModuleTest extends AbstractLdapTestUnit {
 
    @Test
    public void testEmptyPassword() throws Exception {
-      LoginContext context = new LoginContext("LDAPLogin", new CallbackHandler() {
-         @Override
-         public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-            for (int i = 0; i < callbacks.length; i++) {
-               if (callbacks[i] instanceof NameCallback) {
-                  ((NameCallback) callbacks[i]).setName("first");
-               } else if (callbacks[i] instanceof PasswordCallback) {
-                  ((PasswordCallback) callbacks[i]).setPassword("".toCharArray());
-               } else {
-                  throw new UnsupportedCallbackException(callbacks[i]);
-               }
+      LoginContext context = new LoginContext("LDAPLogin", callbacks -> {
+         for (int i = 0; i < callbacks.length; i++) {
+            if (callbacks[i] instanceof NameCallback) {
+               ((NameCallback) callbacks[i]).setName("first");
+            } else if (callbacks[i] instanceof PasswordCallback) {
+               ((PasswordCallback) callbacks[i]).setPassword("".toCharArray());
+            } else {
+               throw new UnsupportedCallbackException(callbacks[i]);
             }
          }
       });
@@ -288,17 +270,14 @@ public class LDAPLoginModuleTest extends AbstractLdapTestUnit {
 
    @Test
    public void testNullPassword() throws Exception {
-      LoginContext context = new LoginContext("LDAPLogin", new CallbackHandler() {
-         @Override
-         public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-            for (int i = 0; i < callbacks.length; i++) {
-               if (callbacks[i] instanceof NameCallback) {
-                  ((NameCallback) callbacks[i]).setName("first");
-               } else if (callbacks[i] instanceof PasswordCallback) {
-                  ((PasswordCallback) callbacks[i]).setPassword(null);
-               } else {
-                  throw new UnsupportedCallbackException(callbacks[i]);
-               }
+      LoginContext context = new LoginContext("LDAPLogin", callbacks -> {
+         for (int i = 0; i < callbacks.length; i++) {
+            if (callbacks[i] instanceof NameCallback) {
+               ((NameCallback) callbacks[i]).setName("first");
+            } else if (callbacks[i] instanceof PasswordCallback) {
+               ((PasswordCallback) callbacks[i]).setPassword(null);
+            } else {
+               throw new UnsupportedCallbackException(callbacks[i]);
             }
          }
       });
diff --git a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/ServiceUtils.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/ServiceUtils.java
index 6faa5f87fe..7213b74b6d 100644
--- a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/ServiceUtils.java
+++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/ServiceUtils.java
@@ -69,15 +69,12 @@ public class ServiceUtils {
     * Find the <em>first</em> transaction manager loaded from the {@code TransactionManagerLocator} service or {@code null} if none is loaded.
     */
    private static TransactionManager findTransactionManager() {
-      return AccessController.doPrivileged(new PrivilegedAction<TransactionManager>() {
-         @Override
-         public TransactionManager run() {
-            Iterator<TransactionManagerLocator> it = ServiceLoader.load(TransactionManagerLocator.class, ServiceUtils.class.getClassLoader()).iterator();
-            while (it.hasNext() && transactionManager == null) {
-               transactionManager = it.next().getTransactionManager();
-            }
-            return transactionManager;
+      return AccessController.doPrivileged((PrivilegedAction<TransactionManager>) () -> {
+         Iterator<TransactionManagerLocator> it = ServiceLoader.load(TransactionManagerLocator.class, ServiceUtils.class.getClassLoader()).iterator();
+         while (it.hasNext() && transactionManager == null) {
+            transactionManager = it.next().getTransactionManager();
          }
+         return transactionManager;
       });
    }
 
@@ -86,15 +83,12 @@ public class ServiceUtils {
     * use the default {@code ActiveMQXAResourceWrapperFactoryImpl} if none is loaded.
     */
    private static ActiveMQXAResourceWrapperFactory findActiveMQXAResourceWrapperFactory() {
-      return AccessController.doPrivileged(new PrivilegedAction<ActiveMQXAResourceWrapperFactory>() {
-         @Override
-         public ActiveMQXAResourceWrapperFactory run() {
-            Iterator<ActiveMQXAResourceWrapperFactory> iterator = ServiceLoader.load(ActiveMQXAResourceWrapperFactory.class, ServiceUtils.class.getClassLoader()).iterator();
-            if (iterator.hasNext()) {
-               return iterator.next();
-            } else {
-               return new ActiveMQXAResourceWrapperFactoryImpl();
-            }
+      return AccessController.doPrivileged((PrivilegedAction<ActiveMQXAResourceWrapperFactory>) () -> {
+         Iterator<ActiveMQXAResourceWrapperFactory> iterator = ServiceLoader.load(ActiveMQXAResourceWrapperFactory.class, ServiceUtils.class.getClassLoader()).iterator();
+         if (iterator.hasNext()) {
+            return iterator.next();
+         } else {
+            return new ActiveMQXAResourceWrapperFactoryImpl();
          }
       });
    }
diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
index 67c4c3a7f0..7a5a3fb11b 100644
--- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
@@ -68,21 +68,15 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
       String host = null;
       String port = null;
       try {
-         host = AccessController.doPrivileged(new PrivilegedAction<String>() {
-            @Override
-            public String run() {
-               String result = System.getProperty("org.apache.activemq.AMQ_HOST");
-               result = (result == null || result.isEmpty()) ? System.getProperty("AMQ_HOST", "localhost") : result;
-               return result;
-            }
+         host = AccessController.doPrivileged((PrivilegedAction<String>) () -> {
+            String result = System.getProperty("org.apache.activemq.AMQ_HOST");
+            result = (result == null || result.isEmpty()) ? System.getProperty("AMQ_HOST", "localhost") : result;
+            return result;
          });
-         port = AccessController.doPrivileged(new PrivilegedAction<String>() {
-            @Override
-            public String run() {
-               String result = System.getProperty("org.apache.activemq.AMQ_PORT");
-               result = (result == null || result.isEmpty()) ? System.getProperty("AMQ_PORT", "61616") : result;
-               return result;
-            }
+         port = AccessController.doPrivileged((PrivilegedAction<String>) () -> {
+            String result = System.getProperty("org.apache.activemq.AMQ_PORT");
+            result = (result == null || result.isEmpty()) ? System.getProperty("AMQ_PORT", "61616") : result;
+            return result;
          });
       } catch (Throwable e) {
          LOG.debug("Failed to look up System properties for host and port", e);
@@ -100,13 +94,10 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
       String bindURL = null;
 
       try {
-         bindURL = AccessController.doPrivileged(new PrivilegedAction<String>() {
-            @Override
-            public String run() {
-               String result = System.getProperty("org.apache.activemq.BROKER_BIND_URL");
-               result = (result == null || result.isEmpty()) ? System.getProperty("BROKER_BIND_URL", defaultURL) : result;
-               return result;
-            }
+         bindURL = AccessController.doPrivileged((PrivilegedAction<String>) () -> {
+            String result = System.getProperty("org.apache.activemq.BROKER_BIND_URL");
+            result = (result == null || result.isEmpty()) ? System.getProperty("BROKER_BIND_URL", defaultURL) : result;
+            return result;
          });
       } catch (Throwable e) {
          LOG.debug("Failed to look up System properties for host and port", e);
diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
index 8fa65b4afc..b991b7768a 100644
--- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
@@ -499,21 +499,18 @@ public class BrokerService implements Service {
       connector.setLocalUri(this.getConnectURI());
       // Set a connection filter so that the connector does not establish loop
       // back connections.
-      connector.setConnectionFilter(new ConnectionFilter() {
-         @Override
-         public boolean connectTo(URI location) {
-            List<TransportConnector> transportConnectors = getTransportConnectors();
-            for (Iterator<TransportConnector> iter = transportConnectors.iterator(); iter.hasNext(); ) {
-               try {
-                  TransportConnector tc = iter.next();
-                  if (location.equals(tc.getConnectUri())) {
-                     return false;
-                  }
-               } catch (Throwable e) {
+      connector.setConnectionFilter(location -> {
+         List<TransportConnector> transportConnectors = getTransportConnectors();
+         for (Iterator<TransportConnector> iter = transportConnectors.iterator(); iter.hasNext(); ) {
+            try {
+               TransportConnector tc = iter.next();
+               if (location.equals(tc.getConnectUri())) {
+                  return false;
                }
+            } catch (Throwable e) {
             }
-            return true;
          }
+         return true;
       });
 
       networkConnectors.add(connector);
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ActiveMQConnectionFactoryTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ActiveMQConnectionFactoryTest.java
index 969b045031..2db9dcb874 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ActiveMQConnectionFactoryTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ActiveMQConnectionFactoryTest.java
@@ -191,11 +191,7 @@ public class ActiveMQConnectionFactoryTest extends CombinationTestSupport {
       connection = (ActiveMQConnection) cf.createConnection();
       assertNull(connection.getExceptionListener());
 
-      ExceptionListener exListener = new ExceptionListener() {
-         @Override
-         public void onException(JMSException arg0) {
-         }
-      };
+      ExceptionListener exListener = arg0 -> {};
       cf.setExceptionListener(exListener);
       connection.close();
 
@@ -217,11 +213,7 @@ public class ActiveMQConnectionFactoryTest extends CombinationTestSupport {
       connection = (ActiveMQConnection) cf.createConnection();
       assertNull(connection.getClientInternalExceptionListener());
 
-      ClientInternalExceptionListener listener = new ClientInternalExceptionListener() {
-         @Override
-         public void onException(Throwable exception) {
-         }
-      };
+      ClientInternalExceptionListener listener = exception -> {};
       connection.setClientInternalExceptionListener(listener);
       cf.setClientInternalExceptionListener(listener);
       connection.close();
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/AutoFailTestSupport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/AutoFailTestSupport.java
index bd3e94e30f..e3e96f02a8 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/AutoFailTestSupport.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/AutoFailTestSupport.java
@@ -71,26 +71,23 @@ public abstract class AutoFailTestSupport extends TestCase {
    public void startAutoFailThread() {
       setAutoFail(true);
       isTestSuccess = new AtomicBoolean(false);
-      autoFailThread = new Thread(new Runnable() {
-         @Override
-         public void run() {
-            try {
-               // Wait for test to finish successfully
-               Thread.sleep(getMaxTestTime());
-            } catch (InterruptedException e) {
-               // This usually means the test was successful
-            } finally {
-               // Check if the test was able to tear down successfully,
-               // which usually means, it has finished its run.
-               if (!isTestSuccess.get()) {
-                  LOG.error("Test case has exceeded the maximum allotted time to run of: " + getMaxTestTime() + " ms.");
-                  dumpAllThreads(getName());
-                  if (System.getProperty("org.apache.activemq.AutoFailTestSupport.disableSystemExit") == null) {
-                     System.exit(EXIT_ERROR);
-                  } else {
-                     LOG.error("No system.exit as it kills surefire - forkedProcessTimeoutInSeconds (surefire.timeout) will kick in eventually see pom.xml surefire plugin config");
-                     fail("Timeout in AutoFailTestSupport class has been exceeded");
-                  }
+      autoFailThread = new Thread(() -> {
+         try {
+            // Wait for test to finish successfully
+            Thread.sleep(getMaxTestTime());
+         } catch (InterruptedException e) {
+            // This usually means the test was successful
+         } finally {
+            // Check if the test was able to tear down successfully,
+            // which usually means, it has finished its run.
+            if (!isTestSuccess.get()) {
+               LOG.error("Test case has exceeded the maximum allotted time to run of: " + getMaxTestTime() + " ms.");
+               dumpAllThreads(getName());
+               if (System.getProperty("org.apache.activemq.AutoFailTestSupport.disableSystemExit") == null) {
+                  System.exit(EXIT_ERROR);
+               } else {
+                  LOG.error("No system.exit as it kills surefire - forkedProcessTimeoutInSeconds (surefire.timeout) will kick in eventually see pom.xml surefire plugin config");
+                  fail("Timeout in AutoFailTestSupport class has been exceeded");
                }
             }
          }
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ConnectionCloseMultipleTimesConcurrentTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ConnectionCloseMultipleTimesConcurrentTest.java
index 8c16544de1..64d060b0fe 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ConnectionCloseMultipleTimesConcurrentTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ConnectionCloseMultipleTimesConcurrentTest.java
@@ -68,19 +68,16 @@ public class ConnectionCloseMultipleTimesConcurrentTest extends TestCase {
       final CountDownLatch latch = new CountDownLatch(size);
 
       for (int i = 0; i < size; i++) {
-         executor.submit(new Runnable() {
-            @Override
-            public void run() {
-               try {
-                  connection.close();
-
-                  assertFalse(connection.isStarted());
-                  assertTrue(connection.isClosed());
-
-                  latch.countDown();
-               } catch (JMSException e) {
-                  // ignore
-               }
+         executor.submit(() -> {
+            try {
+               connection.close();
+
+               assertFalse(connection.isStarted());
+               assertTrue(connection.isClosed());
+
+               latch.countDown();
+            } catch (JMSException e) {
+               // ignore
             }
          });
       }
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ConsumerReceiveWithTimeoutTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ConsumerReceiveWithTimeoutTest.java
index bb40dd537a..8c5324697e 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ConsumerReceiveWithTimeoutTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ConsumerReceiveWithTimeoutTest.java
@@ -62,20 +62,17 @@ public class ConsumerReceiveWithTimeoutTest extends TestSupport {
       final Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
       final Queue queue = session.createQueue("test");
 
-      Thread t = new Thread() {
-         @Override
-         public void run() {
-            try {
-               // wait for 10 seconds to allow consumer.receive to be run
-               // first
-               Thread.sleep(10000);
-               MessageProducer producer = session.createProducer(queue);
-               producer.send(session.createTextMessage("Hello"));
-            } catch (Exception e) {
-               e.printStackTrace();
-            }
+      Thread t = new Thread(() -> {
+         try {
+            // wait for 10 seconds to allow consumer.receive to be run
+            // first
+            Thread.sleep(10000);
+            MessageProducer producer = session.createProducer(queue);
+            producer.send(session.createTextMessage("Hello"));
+         } catch (Exception e) {
+            e.printStackTrace();
          }
-      };
+      });
 
       t.start();
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java
index f6a8be7464..ab9c3bb766 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java
@@ -88,16 +88,13 @@ public class JMSConsumerTest extends JmsTestSupport {
       Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
       destination = createDestination(session, destinationType);
       ActiveMQMessageConsumer consumer = (ActiveMQMessageConsumer) session.createConsumer(destination);
-      consumer.setMessageListener(new MessageListener() {
-         @Override
-         public void onMessage(Message m) {
-            counter.incrementAndGet();
-            if (counter.get() == 1) {
-               done1.countDown();
-            }
-            if (counter.get() == 2) {
-               done2.countDown();
-            }
+      consumer.setMessageListener(m -> {
+         counter.incrementAndGet();
+         if (counter.get() == 1) {
+            done1.countDown();
+         }
+         if (counter.get() == 2) {
+            done2.countDown();
          }
       });
 
@@ -136,12 +133,9 @@ public class JMSConsumerTest extends JmsTestSupport {
       final ActiveMQMessageConsumer consumer = (ActiveMQMessageConsumer) session.createConsumer(destination);
 
       final Map<Thread, Throwable> exceptions = Collections.synchronizedMap(new HashMap<Thread, Throwable>());
-      Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandler() {
-         @Override
-         public void uncaughtException(Thread t, Throwable e) {
-            LOG.error("Uncaught exception:", e);
-            exceptions.put(t, e);
-         }
+      Thread.setDefaultUncaughtExceptionHandler((t, e) -> {
+         LOG.error("Uncaught exception:", e);
+         exceptions.put(t, e);
       });
 
       final class AckAndClose implements Runnable {
@@ -174,12 +168,9 @@ public class JMSConsumerTest extends JmsTestSupport {
       }
 
       final ExecutorService executor = Executors.newCachedThreadPool();
-      consumer.setMessageListener(new MessageListener() {
-         @Override
-         public void onMessage(Message m) {
-            // ack and close eventually in separate thread
-            executor.execute(new AckAndClose(m));
-         }
+      consumer.setMessageListener(m -> {
+         // ack and close eventually in separate thread
+         executor.execute(new AckAndClose(m));
       });
 
       assertTrue(closeDone.await(20, TimeUnit.SECONDS));
@@ -310,13 +301,10 @@ public class JMSConsumerTest extends JmsTestSupport {
       sendMessages(session, destination, 4);
 
       // See if the message get sent to the listener
-      consumer.setMessageListener(new MessageListener() {
-         @Override
-         public void onMessage(Message m) {
-            counter.incrementAndGet();
-            if (counter.get() == 4) {
-               done.countDown();
-            }
+      consumer.setMessageListener(m -> {
+         counter.incrementAndGet();
+         if (counter.get() == 4) {
+            done.countDown();
          }
       });
 
@@ -340,13 +328,10 @@ public class JMSConsumerTest extends JmsTestSupport {
       connection.start();
       ActiveMQSession session = (ActiveMQSession) connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
       destination = createDestination(session, destinationType);
-      MessageConsumer consumer = session.createConsumer(destination, new MessageListener() {
-         @Override
-         public void onMessage(Message m) {
-            counter.incrementAndGet();
-            if (counter.get() == 4) {
-               done.countDown();
-            }
+      MessageConsumer consumer = session.createConsumer(destination, m -> {
+         counter.incrementAndGet();
+         if (counter.get() == 4) {
+            done.countDown();
          }
       });
       assertNotNull(consumer);
@@ -386,23 +371,20 @@ public class JMSConsumerTest extends JmsTestSupport {
       Session session = connection.createSession(false, ackMode);
       destination = createDestination(session, destinationType);
       MessageConsumer consumer = session.createConsumer(destination);
-      consumer.setMessageListener(new MessageListener() {
-         @Override
-         public void onMessage(Message m) {
-            try {
-               TextMessage tm = (TextMessage) m;
-               LOG.info("Got in first listener: " + tm.getText());
-               assertEquals("" + counter.get(), tm.getText());
-               counter.incrementAndGet();
-               if (counter.get() == 2) {
-                  sendDone.await();
-                  connection.close();
-                  got2Done.countDown();
-               }
-               tm.acknowledge();
-            } catch (Throwable e) {
-               e.printStackTrace();
+      consumer.setMessageListener(m -> {
+         try {
+            TextMessage tm = (TextMessage) m;
+            LOG.info("Got in first listener: " + tm.getText());
+            assertEquals("" + counter.get(), tm.getText());
+            counter.incrementAndGet();
+            if (counter.get() == 2) {
+               sendDone.await();
+               connection.close();
+               got2Done.countDown();
             }
+            tm.acknowledge();
+         } catch (Throwable e) {
+            e.printStackTrace();
          }
       });
 
@@ -424,21 +406,18 @@ public class JMSConsumerTest extends JmsTestSupport {
       final CountDownLatch done2 = new CountDownLatch(1);
       session = connection.createSession(false, ackMode);
       consumer = session.createConsumer(destination);
-      consumer.setMessageListener(new MessageListener() {
-         @Override
-         public void onMessage(Message m) {
-            try {
-               TextMessage tm = (TextMessage) m;
-               LOG.info("Got in second listener: " + tm.getText());
-               // order is not guaranteed as the connection is started before the listener is set.
-               // assertEquals("" + counter.get(), tm.getText());
-               counter.incrementAndGet();
-               if (counter.get() == 4) {
-                  done2.countDown();
-               }
-            } catch (Throwable e) {
-               LOG.error("unexpected ex onMessage: ", e);
+      consumer.setMessageListener(m -> {
+         try {
+            TextMessage tm = (TextMessage) m;
+            LOG.info("Got in second listener: " + tm.getText());
+            // order is not guaranteed as the connection is started before the listener is set.
+            // assertEquals("" + counter.get(), tm.getText());
+            counter.incrementAndGet();
+            if (counter.get() == 4) {
+               done2.countDown();
             }
+         } catch (Throwable e) {
+            LOG.error("unexpected ex onMessage: ", e);
          }
       });
 
@@ -474,23 +453,20 @@ public class JMSConsumerTest extends JmsTestSupport {
       Session session = connection.createSession(false, ackMode);
       destination = createDestination(session, destinationType);
       MessageConsumer consumer = session.createConsumer(destination);
-      consumer.setMessageListener(new MessageListener() {
-         @Override
-         public void onMessage(Message m) {
-            try {
-               TextMessage tm = (TextMessage) m;
-               LOG.info("Got in first listener: " + tm.getText());
-               assertEquals("" + counter.get(), tm.getText());
-               counter.incrementAndGet();
-               m.acknowledge();
-               if (counter.get() == 2) {
-                  sendDone.await();
-                  connection.close();
-                  got2Done.countDown();
-               }
-            } catch (Throwable e) {
-               e.printStackTrace();
+      consumer.setMessageListener(m -> {
+         try {
+            TextMessage tm = (TextMessage) m;
+            LOG.info("Got in first listener: " + tm.getText());
+            assertEquals("" + counter.get(), tm.getText());
+            counter.incrementAndGet();
+            m.acknowledge();
+            if (counter.get() == 2) {
+               sendDone.await();
+               connection.close();
+               got2Done.countDown();
             }
+         } catch (Throwable e) {
+            e.printStackTrace();
          }
       });
 
@@ -512,19 +488,16 @@ public class JMSConsumerTest extends JmsTestSupport {
       final CountDownLatch done2 = new CountDownLatch(1);
       session = connection.createSession(false, ackMode);
       consumer = session.createConsumer(destination);
-      consumer.setMessageListener(new MessageListener() {
-         @Override
-         public void onMessage(Message m) {
-            try {
-               TextMessage tm = (TextMessage) m;
-               LOG.info("Got in second listener: " + tm.getText());
-               counter.incrementAndGet();
-               if (counter.get() == 4) {
-                  done2.countDown();
-               }
-            } catch (Throwable e) {
-               LOG.error("unexpected ex onMessage: ", e);
+      consumer.setMessageListener(m -> {
+         try {
+            TextMessage tm = (TextMessage) m;
+            LOG.info("Got in second listener: " + tm.getText());
+            counter.incrementAndGet();
+            if (counter.get() == 4) {
+               done2.countDown();
             }
+         } catch (Throwable e) {
+            LOG.error("unexpected ex onMessage: ", e);
          }
       });
 
@@ -553,13 +526,10 @@ public class JMSConsumerTest extends JmsTestSupport {
       Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
       destination = createDestination(session, destinationType);
       MessageConsumer consumer = session.createConsumer(destination);
-      consumer.setMessageListener(new MessageListener() {
-         @Override
-         public void onMessage(Message m) {
-            counter.incrementAndGet();
-            if (counter.get() == 4) {
-               done.countDown();
-            }
+      consumer.setMessageListener(m -> {
+         counter.incrementAndGet();
+         if (counter.get() == 4) {
+            done.countDown();
          }
       });
 
@@ -588,13 +558,10 @@ public class JMSConsumerTest extends JmsTestSupport {
       Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
       destination = createDestination(session, destinationType);
       MessageConsumer consumer = session.createConsumer(destination);
-      consumer.setMessageListener(new MessageListener() {
-         @Override
-         public void onMessage(Message m) {
-            counter.incrementAndGet();
-            if (counter.get() == 4) {
-               done.countDown();
-            }
+      consumer.setMessageListener(m -> {
+         counter.incrementAndGet();
+         if (counter.get() == 4) {
+            done.countDown();
          }
       });
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsBenchmark.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsBenchmark.java
index 94efeaaf44..b1243166cc 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsBenchmark.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsBenchmark.java
@@ -96,53 +96,42 @@ public class JmsBenchmark extends JmsTestSupport {
       final AtomicInteger producedMessages = new AtomicInteger(0);
       final AtomicInteger receivedMessages = new AtomicInteger(0);
 
-      final Callable<Object> producer = new Callable<Object>() {
-         @Override
-         public Object call() throws JMSException, InterruptedException {
-            Connection connection = factory.createConnection();
-            connections.add(connection);
-            Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-            MessageProducer producer = session.createProducer(destination);
-            producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
-            BytesMessage message = session.createBytesMessage();
-            message.writeBytes(new byte[1024]);
-            connection.start();
-            connectionsEstablished.release();
-
-            while (!sampleTimeDone.await(0, TimeUnit.MILLISECONDS)) {
-               producer.send(message);
-               producedMessages.incrementAndGet();
-            }
-
-            connection.close();
-            workerDone.release();
-            return null;
+      final Callable<Object> producer = () -> {
+         Connection connection = factory.createConnection();
+         connections.add(connection);
+         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         MessageProducer producer1 = session.createProducer(destination);
+         producer1.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+         BytesMessage message = session.createBytesMessage();
+         message.writeBytes(new byte[1024]);
+         connection.start();
+         connectionsEstablished.release();
+
+         while (!sampleTimeDone.await(0, TimeUnit.MILLISECONDS)) {
+            producer1.send(message);
+            producedMessages.incrementAndGet();
          }
+
+         connection.close();
+         workerDone.release();
+         return null;
       };
 
-      final Callable<Object> consumer = new Callable<Object>() {
-         @Override
-         public Object call() throws JMSException, InterruptedException {
-            Connection connection = factory.createConnection();
-            connections.add(connection);
-            Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-            MessageConsumer consumer = session.createConsumer(destination);
-
-            consumer.setMessageListener(new MessageListener() {
-               @Override
-               public void onMessage(Message msg) {
-                  receivedMessages.incrementAndGet();
-               }
-            });
-            connection.start();
+      final Callable<Object> consumer = () -> {
+         Connection connection = factory.createConnection();
+         connections.add(connection);
+         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         MessageConsumer consumer1 = session.createConsumer(destination);
 
-            connectionsEstablished.release();
-            sampleTimeDone.await();
+         consumer1.setMessageListener(msg -> receivedMessages.incrementAndGet());
+         connection.start();
 
-            connection.close();
-            workerDone.release();
-            return null;
-         }
+         connectionsEstablished.release();
+         sampleTimeDone.await();
+
+         connection.close();
+         workerDone.release();
+         return null;
       };
 
       final Throwable workerError[] = new Throwable[1];
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsConnectionStartStopTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsConnectionStartStopTest.java
index b954c5d854..954bf6cd5d 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsConnectionStartStopTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsConnectionStartStopTest.java
@@ -116,28 +116,22 @@ public class JmsConnectionStartStopTest extends TestSupport {
       ThreadPoolExecutor executor = new ThreadPoolExecutor(50, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<Runnable>());
       final Vector<Throwable> exceptions = new Vector<>();
       final Random rand = new Random();
-      Runnable createSessionTask = new Runnable() {
-         @Override
-         public void run() {
-            try {
-               TimeUnit.MILLISECONDS.sleep(rand.nextInt(10));
-               stoppedConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-            } catch (Exception e) {
-               exceptions.add(e);
-            }
+      Runnable createSessionTask = () -> {
+         try {
+            TimeUnit.MILLISECONDS.sleep(rand.nextInt(10));
+            stoppedConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         } catch (Exception e) {
+            exceptions.add(e);
          }
       };
 
-      Runnable startStopTask = new Runnable() {
-         @Override
-         public void run() {
-            try {
-               TimeUnit.MILLISECONDS.sleep(rand.nextInt(10));
-               stoppedConnection.start();
-               stoppedConnection.stop();
-            } catch (Exception e) {
-               exceptions.add(e);
-            }
+      Runnable startStopTask = () -> {
+         try {
+            TimeUnit.MILLISECONDS.sleep(rand.nextInt(10));
+            stoppedConnection.start();
+            stoppedConnection.stop();
+         } catch (Exception e) {
+            exceptions.add(e);
          }
       };
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsMessageConsumerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsMessageConsumerTest.java
index 0bd98d51a6..63791b4199 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsMessageConsumerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsMessageConsumerTest.java
@@ -117,13 +117,7 @@ public class JmsMessageConsumerTest {
       Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
       Destination destination = session.createQueue(name.getMethodName());
       MessageConsumer consumer = session.createConsumer(destination);
-      consumer.setMessageListener(new MessageListener() {
-
-         @Override
-         public void onMessage(Message message) {
-            received.countDown();
-         }
-      });
+      consumer.setMessageListener(message -> received.countDown());
       MessageProducer producer = session.createProducer(destination);
       producer.setTimeToLive(TimeUnit.SECONDS.toMillis(2));
 
@@ -148,13 +142,7 @@ public class JmsMessageConsumerTest {
       Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
       Destination destination = session.createQueue(name.getMethodName());
       MessageConsumer consumer = session.createConsumer(destination);
-      consumer.setMessageListener(new MessageListener() {
-
-         @Override
-         public void onMessage(Message message) {
-            received.countDown();
-         }
-      });
+      consumer.setMessageListener(message -> received.countDown());
       MessageProducer producer = session.createProducer(destination);
       producer.setTimeToLive(TimeUnit.SECONDS.toMillis(2));
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java
index ed2f4b5dff..d60d041bda 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java
@@ -92,19 +92,16 @@ public class JmsMultipleClientsTestSupport {
          final AtomicInteger producerLock = new AtomicInteger(producerCount);
 
          for (int i = 0; i < producerCount; i++) {
-            Thread t = new Thread(new Runnable() {
-               @Override
-               public void run() {
-                  try {
-                     sendMessages(factory.createConnection(), dest, msgCount);
-                  } catch (Exception e) {
-                     e.printStackTrace();
-                  }
-
-                  synchronized (producerLock) {
-                     producerLock.decrementAndGet();
-                     producerLock.notifyAll();
-                  }
+            Thread t = new Thread(() -> {
+               try {
+                  sendMessages(factory.createConnection(), dest, msgCount);
+               } catch (Exception e) {
+                  e.printStackTrace();
+               }
+
+               synchronized (producerLock) {
+                  producerLock.decrementAndGet();
+                  producerLock.notifyAll();
                }
             });
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java
index c6890b6027..8397e6515d 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java
@@ -64,12 +64,7 @@ public class JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest extends JmsQ
    protected void setUp() throws Exception {
       setAutoFail(true);
       // now lets asynchronously start a broker
-      Thread thread = new Thread() {
-         @Override
-         public void run() {
-            startBroker();
-         }
-      };
+      Thread thread = new Thread(() -> startBroker());
       thread.start();
 
       super.setUp();
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsRedeliveredTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsRedeliveredTest.java
index 498ee77b80..197b253981 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsRedeliveredTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsRedeliveredTest.java
@@ -415,12 +415,7 @@ public class JmsRedeliveredTest extends TestCase {
       producer.send(createTextMessage(session));
       session.commit();
 
-      Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            return ((ActiveMQMessageConsumer) consumer).getMessageSize() == 1;
-         }
-      });
+      Wait.waitFor(() -> ((ActiveMQMessageConsumer) consumer).getMessageSize() == 1);
 
       connection.close();
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java
index 2d195f9543..c10585b579 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java
@@ -166,12 +166,7 @@ public class JmsSendReceiveWithMessageExpirationTest extends TestSupport {
       final DestinationStatistics view = getDestinationStatistics(BrokerRegistry.getInstance().findFirst(), ActiveMQDestination.transform(consumerDestination));
 
       // wait for all to inflight to expire
-      assertTrue("all inflight messages expired ", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            return view.getInflight().getCount() == 0;
-         }
-      }));
+      assertTrue("all inflight messages expired ", Wait.waitFor(() -> view.getInflight().getCount() == 0));
       assertEquals("Wrong inFlightCount: ", 0, view.getInflight().getCount());
 
       LOG.info("Stats: received: " + messages.size() + ", messages: " + view.getMessages().getCount() + ", enqueues: " + view.getEnqueues().getCount() + ", dequeues: " + view.getDequeues().getCount() + ", dispatched: " + view.getDispatched().getCount() + ", inflight: " + view.getInflight().getCount() + ", expired: " + view.getExpired().getCount());
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsSendWithAsyncCallbackTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsSendWithAsyncCallbackTest.java
index 04ca51f79b..9b2941c14e 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsSendWithAsyncCallbackTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsSendWithAsyncCallbackTest.java
@@ -64,11 +64,7 @@ public class JmsSendWithAsyncCallbackTest extends TestSupport {
 
       // setup a consumer to drain messages..
       MessageConsumer consumer = session.createConsumer(queue);
-      consumer.setMessageListener(new MessageListener() {
-         @Override
-         public void onMessage(Message message) {
-         }
-      });
+      consumer.setMessageListener(message -> {});
 
       // warmup...
       for (int i = 0; i < 10; i++) {
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsTempDestinationTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsTempDestinationTest.java
index e89b18bbe0..7c271922cc 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsTempDestinationTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsTempDestinationTest.java
@@ -221,12 +221,7 @@ public class JmsTempDestinationTest {
       final TemporaryQueue queue = tempSession.createTemporaryQueue();
 
       final ActiveMQConnection activeMQConnection = (ActiveMQConnection) connection;
-      Assert.assertTrue("creation advisory received in time with async dispatch", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            return activeMQConnection.activeTempDestinations.containsKey(queue);
-         }
-      }));
+      Assert.assertTrue("creation advisory received in time with async dispatch", Wait.waitFor(() -> activeMQConnection.activeTempDestinations.containsKey(queue)));
 
       // This message delivery should work since the temp connection is still
       // open.
@@ -274,12 +269,7 @@ public class JmsTempDestinationTest {
       final TemporaryQueue queue = tempSession.createTemporaryQueue();
 
       final ActiveMQConnection activeMQConnection = (ActiveMQConnection) connection;
-      Assert.assertTrue("creation advisory received in time with async dispatch", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            return activeMQConnection.activeTempDestinations.containsKey(queue);
-         }
-      }));
+      Assert.assertTrue("creation advisory received in time with async dispatch", Wait.waitFor(() -> activeMQConnection.activeTempDestinations.containsKey(queue)));
 
       // This message delivery should work since the temp connection is still
       // open.
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsTopicRequestReplyTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsTopicRequestReplyTest.java
index 62999cf3e8..5826c9e5d5 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsTopicRequestReplyTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsTopicRequestReplyTest.java
@@ -175,11 +175,8 @@ public class JmsTopicRequestReplyTest extends TestSupport implements MessageList
       if (useAsyncConsume) {
          requestConsumer.setMessageListener(this);
       } else {
-         Thread thread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-               syncConsumeLoop(requestConsumer);
-            }
+         Thread thread = new Thread(() -> {
+            syncConsumeLoop(requestConsumer);
          });
          thread.start();
       }
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/MessageListenerRedeliveryTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/MessageListenerRedeliveryTest.java
index b92cb9584d..095bf09798 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/MessageListenerRedeliveryTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/MessageListenerRedeliveryTest.java
@@ -251,23 +251,20 @@ public class MessageListenerRedeliveryTest extends TestCase {
       final AtomicInteger count = new AtomicInteger(0);
       final int maxDeliveries = getRedeliveryPolicy().getMaximumRedeliveries();
       final ArrayList<String> received = new ArrayList<>();
-      consumer.setMessageListener(new MessageListener() {
-         @Override
-         public void onMessage(Message message) {
-            LOG.info("Message Received: " + message);
-            try {
-               received.add(((TextMessage) message).getText());
-            } catch (JMSException e) {
-               e.printStackTrace();
-               fail(e.toString());
-            }
-            if (count.incrementAndGet() < maxDeliveries) {
-               throw new RuntimeException(getName() + " force a redelivery");
-            }
-            // new blood
-            count.set(0);
-            gotMessage.countDown();
+      consumer.setMessageListener(message1 -> {
+         LOG.info("Message Received: " + message1);
+         try {
+            received.add(((TextMessage) message1).getText());
+         } catch (JMSException e) {
+            e.printStackTrace();
+            fail(e.toString());
          }
+         if (count.incrementAndGet() < maxDeliveries) {
+            throw new RuntimeException(getName() + " force a redelivery");
+         }
+         // new blood
+         count.set(0);
+         gotMessage.countDown();
       });
 
       assertTrue("got message before retry expiry", gotMessage.await(20, TimeUnit.SECONDS));
@@ -294,13 +291,10 @@ public class MessageListenerRedeliveryTest extends TestCase {
       ActiveMQDestination dlqDestination = new ActiveMQQueue("ActiveMQ.DLQ");
       MessageConsumer dlqConsumer = session.createConsumer(dlqDestination);
       final CountDownLatch gotDlqMessage = new CountDownLatch(1);
-      dlqConsumer.setMessageListener(new MessageListener() {
-         @Override
-         public void onMessage(Message message) {
-            LOG.info("DLQ Message Received: " + message);
-            dlqMessage[0] = message;
-            gotDlqMessage.countDown();
-         }
+      dlqConsumer.setMessageListener(message12 -> {
+         LOG.info("DLQ Message Received: " + message12);
+         dlqMessage[0] = message12;
+         gotDlqMessage.countDown();
       });
 
       MessageConsumer consumer = session.createConsumer(queue);
@@ -308,13 +302,10 @@ public class MessageListenerRedeliveryTest extends TestCase {
       final int maxDeliveries = getRedeliveryPolicy().getMaximumRedeliveries();
       final CountDownLatch gotMessage = new CountDownLatch(maxDeliveries);
 
-      consumer.setMessageListener(new MessageListener() {
-         @Override
-         public void onMessage(Message message) {
-            LOG.info("Message Received: " + message);
-            gotMessage.countDown();
-            throw new RuntimeException(getName() + " force a redelivery");
-         }
+      consumer.setMessageListener(message1 -> {
+         LOG.info("Message Received: " + message1);
+         gotMessage.countDown();
+         throw new RuntimeException(getName() + " force a redelivery");
       });
 
       assertTrue("got message before retry expiry", gotMessage.await(20, TimeUnit.SECONDS));
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OnePrefetchAsyncConsumerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OnePrefetchAsyncConsumerTest.java
index de456e715b..d50dab6c0e 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OnePrefetchAsyncConsumerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OnePrefetchAsyncConsumerTest.java
@@ -76,13 +76,7 @@ public class OnePrefetchAsyncConsumerTest extends EmbeddedBrokerTestSupport {
 
       session.commit();
 
-      assertTrue("test completed on time", Wait.waitFor(new Wait.Condition() {
-
-         @Override
-         public boolean isSatisified() throws Exception {
-            return completed.get();
-         }
-      }));
+      assertTrue("test completed on time", Wait.waitFor(() -> completed.get()));
 
       assertTrue("Attempted to retrieve more than one ServerSession at a time", success.get());
    }
@@ -175,26 +169,23 @@ public class OnePrefetchAsyncConsumerTest extends EmbeddedBrokerTestSupport {
       @Override
       public void start() throws JMSException {
          // use a separate thread to process the message asynchronously
-         new Thread() {
-            @Override
-            public void run() {
-               // let the session deliver the message
-               session.run();
-
-               // commit the tx and return ServerSession to pool
-               LOG.debug("Waiting on pool");
-               synchronized (pool) {
-                  try {
-                     LOG.debug("About to call session.commit");
-                     session.commit();
-                     LOG.debug("Commit completed");
-                  } catch (JMSException e) {
-                     LOG.error("In start", e);
-                  }
-                  pool.serverSessionInUse = false;
+         new Thread(() -> {
+            // let the session deliver the message
+            session.run();
+
+            // commit the tx and return ServerSession to pool
+            LOG.debug("Waiting on pool");
+            synchronized (pool) {
+               try {
+                  LOG.debug("About to call session.commit");
+                  session.commit();
+                  LOG.debug("Commit completed");
+               } catch (JMSException e) {
+                  LOG.error("In start", e);
                }
+               pool.serverSessionInUse = false;
             }
-         }.start();
+         }).start();
       }
    }
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OptimizedAckTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OptimizedAckTest.java
index 15bd5f5396..4ad335e493 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OptimizedAckTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OptimizedAckTest.java
@@ -68,12 +68,7 @@ public class OptimizedAckTest extends TestSupport {
       Binding binding = broker.getServer().getPostOffice().getBinding(SimpleString.of("test"));
 
       final QueueImpl coreQueue = (QueueImpl) binding.getBindable();
-      assertTrue("delivering count is 10", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            return 10 == coreQueue.getDeliveringCount();
-         }
-      }));
+      assertTrue("delivering count is 10", Wait.waitFor(() -> 10 == coreQueue.getDeliveringCount()));
 
       for (int i = 0; i < 6; i++) {
          javax.jms.Message msg = consumer.receive(4000);
@@ -85,12 +80,7 @@ public class OptimizedAckTest extends TestSupport {
          javax.jms.Message msg = consumer.receive(4000);
          assertNotNull(msg);
 
-         assertTrue("most are acked but 3 remain", Wait.waitFor(new Wait.Condition() {
-            @Override
-            public boolean isSatisified() throws Exception {
-               return 3 == coreQueue.getDeliveringCount();
-            }
-         }));
+         assertTrue("most are acked but 3 remain", Wait.waitFor(() -> 3 == coreQueue.getDeliveringCount()));
       }
 
    }
@@ -110,12 +100,7 @@ public class OptimizedAckTest extends TestSupport {
       Binding binding = broker.getServer().getPostOffice().getBinding(SimpleString.of("test"));
 
       final QueueImpl coreQueue = (QueueImpl) binding.getBindable();
-      assertTrue("prefetch full", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            return 10 == coreQueue.getDeliveringCount();
-         }
-      }));
+      assertTrue("prefetch full", Wait.waitFor(() -> 10 == coreQueue.getDeliveringCount()));
 
       for (int i = 0; i < 6; i++) {
          Thread.sleep(400);
@@ -129,12 +114,7 @@ public class OptimizedAckTest extends TestSupport {
          javax.jms.Message msg = consumer.receive(4000);
          assertNotNull(msg);
 
-         assertTrue("most are acked but 3 remain", Wait.waitFor(new Wait.Condition() {
-            @Override
-            public boolean isSatisified() throws Exception {
-               return 3 == coreQueue.getDeliveringCount();
-            }
-         }));
+         assertTrue("most are acked but 3 remain", Wait.waitFor(() -> 3 == coreQueue.getDeliveringCount()));
       }
 
    }
@@ -154,12 +134,7 @@ public class OptimizedAckTest extends TestSupport {
       Binding binding = broker.getServer().getPostOffice().getBinding(SimpleString.of("test"));
 
       final QueueImpl coreQueue = (QueueImpl) binding.getBindable();
-      assertTrue("prefetch full", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            return 10 == coreQueue.getDeliveringCount();
-         }
-      }));
+      assertTrue("prefetch full", Wait.waitFor(() -> 10 == coreQueue.getDeliveringCount()));
 
       for (int i = 0; i < 6; i++) {
          javax.jms.Message msg = consumer.receive(4000);
@@ -170,20 +145,12 @@ public class OptimizedAckTest extends TestSupport {
       for (int i = 6; i < 10; i++) {
          javax.jms.Message msg = consumer.receive(4000);
          assertNotNull(msg);
-         assertTrue("most are acked but 3 remain", Wait.waitFor(new Wait.Condition() {
-            @Override
-            public boolean isSatisified() throws Exception {
-               return 3 == coreQueue.getDeliveringCount();
-            }
-         }));
+         assertTrue("most are acked but 3 remain", Wait.waitFor(() -> 3 == coreQueue.getDeliveringCount()));
       }
 
-      assertTrue("After delay the scheduled ack should ack all inflight.", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            LOG.info("inflight count: " + coreQueue.getDeliveringCount());
-            return 0 == coreQueue.getDeliveringCount();
-         }
+      assertTrue("After delay the scheduled ack should ack all inflight.", Wait.waitFor(() -> {
+         LOG.info("inflight count: " + coreQueue.getDeliveringCount());
+         return 0 == coreQueue.getDeliveringCount();
       }));
    }
 }
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/RedeliveryPolicyTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/RedeliveryPolicyTest.java
index 595f7aca9b..16bd4310a3 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/RedeliveryPolicyTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/RedeliveryPolicyTest.java
@@ -462,18 +462,15 @@ public class RedeliveryPolicyTest extends JmsTestSupport {
          MessageConsumer consumer = session.createConsumer(destination);
          final CountDownLatch done = new CountDownLatch(1);
 
-         consumer.setMessageListener(new MessageListener() {
-            @Override
-            public void onMessage(Message message) {
-               try {
-                  ActiveMQTextMessage m = (ActiveMQTextMessage) message;
-                  assertEquals("1st", m.getText());
-                  assertEquals(receivedCount.get(), m.getRedeliveryCounter());
-                  receivedCount.incrementAndGet();
-                  done.countDown();
-               } catch (Exception ignored) {
-                  ignored.printStackTrace();
-               }
+         consumer.setMessageListener(message -> {
+            try {
+               ActiveMQTextMessage m = (ActiveMQTextMessage) message;
+               assertEquals("1st", m.getText());
+               assertEquals(receivedCount.get(), m.getRedeliveryCounter());
+               receivedCount.incrementAndGet();
+               done.countDown();
+            } catch (Exception ignored) {
+               ignored.printStackTrace();
             }
          });
 
@@ -527,43 +524,32 @@ public class RedeliveryPolicyTest extends JmsTestSupport {
          final CountDownLatch done = new CountDownLatch(1);
 
          final ActiveMQSession session = (ActiveMQSession) connection.createSession(true, Session.SESSION_TRANSACTED);
-         session.setMessageListener(new MessageListener() {
-            @Override
-            public void onMessage(Message message) {
-               try {
-                  ActiveMQTextMessage m = (ActiveMQTextMessage) message;
-                  assertEquals("1st", m.getText());
-                  assertEquals(receivedCount.get(), m.getRedeliveryCounter());
-                  receivedCount.incrementAndGet();
-                  done.countDown();
-               } catch (Exception ignored) {
-                  ignored.printStackTrace();
-               }
+         session.setMessageListener(message -> {
+            try {
+               ActiveMQTextMessage m = (ActiveMQTextMessage) message;
+               assertEquals("1st", m.getText());
+               assertEquals(receivedCount.get(), m.getRedeliveryCounter());
+               receivedCount.incrementAndGet();
+               done.countDown();
+            } catch (Exception ignored) {
+               ignored.printStackTrace();
             }
          });
 
-         connection.createConnectionConsumer(destination, null, new ServerSessionPool() {
+         connection.createConnectionConsumer(destination, null, () -> new ServerSession() {
             @Override
-            public ServerSession getServerSession() throws JMSException {
-               return new ServerSession() {
-                  @Override
-                  public Session getSession() throws JMSException {
-                     return session;
-                  }
-
-                  @Override
-                  public void start() throws JMSException {
-                  }
-               };
+            public Session getSession() throws JMSException {
+               return session;
             }
-         }, 100, false);
 
-         Wait.waitFor(new Wait.Condition() {
             @Override
-            public boolean isSatisified() throws Exception {
-               session.run();
-               return done.await(10, TimeUnit.MILLISECONDS);
+            public void start() throws JMSException {
             }
+         }, 100, false);
+
+         Wait.waitFor(() -> {
+            session.run();
+            return done.await(10, TimeUnit.MILLISECONDS);
          });
 
          if (i <= maxRedeliveries) {
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java
index 605f1cc598..9d05e311d3 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java
@@ -79,62 +79,58 @@ public class BrokerBenchmark extends BrokerTestSupport {
 
       final AtomicInteger receiveCounter = new AtomicInteger(0);
       for (int i = 0; i < consumerCount; i++) {
-         new Thread() {
-            @Override
-            public void run() {
-               try {
-
-                  // Consume the messages
-                  StubConnection connection = new StubConnection(broker);
-                  ConnectionInfo connectionInfo = createConnectionInfo();
-                  connection.send(connectionInfo);
-
-                  SessionInfo sessionInfo = createSessionInfo(connectionInfo);
-                  ConsumerInfo consumerInfo = createConsumerInfo(sessionInfo, destination);
-                  consumerInfo.setPrefetchSize(1000);
-                  connection.send(sessionInfo);
-                  connection.send(consumerInfo);
-
-                  consumersStarted.release();
-
-                  while (receiveCounter.get() < consumeCount) {
-
-                     int counter = 0;
-                     // Get a least 1 message.
-                     Message msg = receiveMessage(connection, 2000);
-                     if (msg != null) {
-                        printer.increment();
-                        receiveCounter.incrementAndGet();
+         new Thread(() -> {
+            try {
 
-                        counter++;
+               // Consume the messages
+               StubConnection connection = new StubConnection(broker);
+               ConnectionInfo connectionInfo = createConnectionInfo();
+               connection.send(connectionInfo);
 
-                        // Try to piggy back a few extra message acks if
-                        // they are ready.
-                        Message extra = null;
-                        while ((extra = receiveMessage(connection, 0)) != null) {
-                           msg = extra;
-                           printer.increment();
-                           receiveCounter.incrementAndGet();
-                           counter++;
-                        }
-                     }
+               SessionInfo sessionInfo = createSessionInfo(connectionInfo);
+               ConsumerInfo consumerInfo = createConsumerInfo(sessionInfo, destination);
+               consumerInfo.setPrefetchSize(1000);
+               connection.send(sessionInfo);
+               connection.send(consumerInfo);
+
+               consumersStarted.release();
+
+               while (receiveCounter.get() < consumeCount) {
+
+                  int counter = 0;
+                  // Get a least 1 message.
+                  Message msg = receiveMessage(connection, 2000);
+                  if (msg != null) {
+                     printer.increment();
+                     receiveCounter.incrementAndGet();
+
+                     counter++;
 
-                     if (msg != null) {
-                        connection.send(createAck(consumerInfo, msg, counter, MessageAck.STANDARD_ACK_TYPE));
-                     } else if (receiveCounter.get() < consumeCount) {
-                        LOG.info("Consumer stall, waiting for message #" + receiveCounter.get() + 1);
+                     // Try to piggy back a few extra message acks if
+                     // they are ready.
+                     Message extra = null;
+                     while ((extra = receiveMessage(connection, 0)) != null) {
+                        msg = extra;
+                        printer.increment();
+                        receiveCounter.incrementAndGet();
+                        counter++;
                      }
                   }
 
-                  connection.send(closeConsumerInfo(consumerInfo));
-               } catch (Throwable e) {
-                  e.printStackTrace();
-               } finally {
-                  consumersFinished.release();
+                  if (msg != null) {
+                     connection.send(createAck(consumerInfo, msg, counter, MessageAck.STANDARD_ACK_TYPE));
+                  } else if (receiveCounter.get() < consumeCount) {
+                     LOG.info("Consumer stall, waiting for message #" + receiveCounter.get() + 1);
+                  }
                }
-            }
 
-         }.start();
+               connection.send(closeConsumerInfo(consumerInfo));
+            } catch (Throwable e) {
+               e.printStackTrace();
+            } finally {
+               consumersFinished.release();
+            }
+         }).start();
       }
 
       // Make sure that the consumers are started first to avoid sending
@@ -144,33 +140,30 @@ public class BrokerBenchmark extends BrokerTestSupport {
 
       // Send the messages in an async thread.
       for (int i = 0; i < prodcuerCount; i++) {
-         new Thread() {
-            @Override
-            public void run() {
-               try {
-                  StubConnection connection = new StubConnection(broker);
-                  ConnectionInfo connectionInfo = createConnectionInfo();
-                  connection.send(connectionInfo);
-
-                  SessionInfo sessionInfo = createSessionInfo(connectionInfo);
-                  ProducerInfo producerInfo = createProducerInfo(sessionInfo);
-                  connection.send(sessionInfo);
-                  connection.send(producerInfo);
-
-                  for (int i = 0; i < produceCount / prodcuerCount; i++) {
-                     Message message = createMessage(producerInfo, destination);
-                     message.setPersistent(deliveryMode);
-                     message.setResponseRequired(false);
-                     connection.send(message);
-                     printer.increment();
-                  }
-               } catch (Throwable e) {
-                  e.printStackTrace();
-               } finally {
-                  producersFinished.release();
+         new Thread(() -> {
+            try {
+               StubConnection connection = new StubConnection(broker);
+               ConnectionInfo connectionInfo = createConnectionInfo();
+               connection.send(connectionInfo);
+
+               SessionInfo sessionInfo = createSessionInfo(connectionInfo);
+               ProducerInfo producerInfo = createProducerInfo(sessionInfo);
+               connection.send(sessionInfo);
+               connection.send(producerInfo);
+
+               for (int i1 = 0; i1 < produceCount / prodcuerCount; i1++) {
+                  Message message = createMessage(producerInfo, destination);
+                  message.setPersistent(deliveryMode);
+                  message.setResponseRequired(false);
+                  connection.send(message);
+                  printer.increment();
                }
+            } catch (Throwable e) {
+               e.printStackTrace();
+            } finally {
+               producersFinished.release();
             }
-         }.start();
+         }).start();
       }
 
       producersFinished.acquire();
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/openwire/BooleanStreamTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/openwire/BooleanStreamTest.java
index 391bb5579e..d2e11c9aab 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/openwire/BooleanStreamTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/openwire/BooleanStreamTest.java
@@ -40,39 +40,19 @@ public class BooleanStreamTest extends TestCase {
    }
 
    public void testBooleanMarshallingUsingAllTrue() throws Exception {
-      testBooleanStream(numberOfBytes, new BooleanValueSet() {
-         @Override
-         public boolean getBooleanValueFor(int index, int count) {
-            return true;
-         }
-      });
+      testBooleanStream(numberOfBytes, (index, count) -> true);
    }
 
    public void testBooleanMarshallingUsingAllFalse() throws Exception {
-      testBooleanStream(numberOfBytes, new BooleanValueSet() {
-         @Override
-         public boolean getBooleanValueFor(int index, int count) {
-            return false;
-         }
-      });
+      testBooleanStream(numberOfBytes, (index, count) -> false);
    }
 
    public void testBooleanMarshallingUsingOddAlternateTrueFalse() throws Exception {
-      testBooleanStream(numberOfBytes, new BooleanValueSet() {
-         @Override
-         public boolean getBooleanValueFor(int index, int count) {
-            return (index & 1) == 0;
-         }
-      });
+      testBooleanStream(numberOfBytes, (index, count) -> (index & 1) == 0);
    }
 
    public void testBooleanMarshallingUsingEvenAlternateTrueFalse() throws Exception {
-      testBooleanStream(numberOfBytes, new BooleanValueSet() {
-         @Override
-         public boolean getBooleanValueFor(int index, int count) {
-            return (index & 1) != 0;
-         }
-      });
+      testBooleanStream(numberOfBytes, (index, count) -> (index & 1) != 0);
    }
 
    protected void testBooleanStream(int numberOfBytes, BooleanValueSet valueSet) throws Exception {
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.java
index 9413c7a3ed..ba4a89d0a1 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.java
@@ -77,18 +77,15 @@ public class ConnectionHangOnStartupTest extends OpenwireArtemisBaseTest {
       final AtomicReference<Connection> conn = new AtomicReference<>();
       final CountDownLatch connStarted = new CountDownLatch(1);
 
-      Thread t = new Thread() {
-         @Override
-         public void run() {
-            try {
-               conn.set(createConnectionFactory().createConnection());
-               conn.get().start();
-            } catch (Exception ex) {
-               LOG.error("could not create or start connection", ex);
-            }
-            connStarted.countDown();
+      Thread t = new Thread(() -> {
+         try {
+            conn.set(createConnectionFactory().createConnection());
+            conn.get().start();
+         } catch (Exception ex) {
+            LOG.error("could not create or start connection", ex);
          }
-      };
+         connStarted.countDown();
+      });
       t.start();
       createPrimary();
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverBackupLeakTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverBackupLeakTest.java
index 18675c8a59..5b5295d0e7 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverBackupLeakTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverBackupLeakTest.java
@@ -96,21 +96,9 @@ public class FailoverBackupLeakTest extends OpenwireArtemisBaseTest {
          buildConnection(factory);
       }
 
-      assertTrue(connectionProperties + " broker1 connection count not zero: was[" + getConnectionCount(s1) + "]", Wait.waitFor(new Wait.Condition() {
+      assertTrue(connectionProperties + " broker1 connection count not zero: was[" + getConnectionCount(s1) + "]", Wait.waitFor(() -> getConnectionCount(s1) == initCount1));
 
-         @Override
-         public boolean isSatisified() throws Exception {
-            return getConnectionCount(s1) == initCount1;
-         }
-      }));
-
-      assertTrue(connectionProperties + " broker2 connection count not zero: was[" + getConnectionCount(s2) + "]", Wait.waitFor(new Wait.Condition() {
-
-         @Override
-         public boolean isSatisified() throws Exception {
-            return getConnectionCount(s2) == initCount2;
-         }
-      }));
+      assertTrue(connectionProperties + " broker2 connection count not zero: was[" + getConnectionCount(s2) + "]", Wait.waitFor(() -> getConnectionCount(s2) == initCount2));
    }
 
    private int getConnectionCount(EmbeddedJMS server) throws Exception {
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java
index a7397984df..7e0a651304 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.activemq.transport.failover;
 
+import javax.jms.IllegalStateException;
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
@@ -111,40 +112,33 @@ public class FailoverConsumerOutstandingCommitTest extends OpenwireArtemisBaseTe
 
       final MessageConsumer testConsumer = consumerSession.createConsumer(destination);
       doByteman.set(true);
-      testConsumer.setMessageListener(new MessageListener() {
+      testConsumer.setMessageListener(message -> {
+         LOG.info("consume one and commit");
 
-         @Override
-         public void onMessage(Message message) {
-            LOG.info("consume one and commit");
+         assertNotNull("got message", message);
 
-            assertNotNull("got message", message);
-
-            try {
-               consumerSession.commit();
-            } catch (JMSException e) {
-               e.printStackTrace();
-            }
-            commitDoneLatch.countDown();
-            messagesReceived.countDown();
-            LOG.info("done commit");
+         try {
+            consumerSession.commit();
+         } catch (JMSException e) {
+            e.printStackTrace();
          }
+         commitDoneLatch.countDown();
+         messagesReceived.countDown();
+         LOG.info("done commit");
       });
 
       // may block if broker shutodwn happens quickly
-      new Thread() {
-         @Override
-         public void run() {
-            LOG.info("producer started");
-            try {
-               produceMessage(producerSession, destination, prefetch * 2);
-            } catch (javax.jms.IllegalStateException SessionClosedExpectedOnShutdown) {
-            } catch (JMSException e) {
-               e.printStackTrace();
-               fail("unexpceted ex on producer: " + e);
-            }
-            LOG.info("producer done");
+      new Thread(() -> {
+         LOG.info("producer started");
+         try {
+            produceMessage(producerSession, destination, prefetch * 2);
+         } catch (IllegalStateException SessionClosedExpectedOnShutdown) {
+         } catch (JMSException e) {
+            e.printStackTrace();
+            fail("unexpceted ex on producer: " + e);
          }
-      }.start();
+         LOG.info("producer done");
+      }).start();
 
       // will be stopped by the plugin
       brokerStopLatch.await();
@@ -231,19 +225,16 @@ public class FailoverConsumerOutstandingCommitTest extends OpenwireArtemisBaseTe
 
    public static void stopServerInTransaction() {
       if (doByteman.get()) {
-         new Thread() {
-            @Override
-            public void run() {
-               LOG.info("Stopping broker in transaction...");
-               try {
-                  server.stop();
-               } catch (Exception e) {
-                  e.printStackTrace();
-               } finally {
-                  brokerStopLatch.countDown();
-               }
+         new Thread(() -> {
+            LOG.info("Stopping broker in transaction...");
+            try {
+               server.stop();
+            } catch (Exception e) {
+               e.printStackTrace();
+            } finally {
+               brokerStopLatch.countDown();
             }
-         }.start();
+         }).start();
       }
    }
 }
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java
index 02a0d442a2..3517d34866 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java
@@ -141,59 +141,47 @@ public class FailoverConsumerUnconsumedTest extends OpenwireArtemisBaseTest {
 
       final Vector<TestConsumer> testConsumers = new Vector<>();
       TestConsumer testConsumer = new TestConsumer(consumerSession, destination, connection);
-      testConsumer.setMessageListener(new MessageListener() {
-         @Override
-         public void onMessage(Message message) {
-            try {
-               LOG.info("onMessage:" + message.getJMSMessageID());
-            } catch (JMSException e) {
-               e.printStackTrace();
-            }
+      testConsumer.setMessageListener(message -> {
+         try {
+            LOG.info("onMessage:" + message.getJMSMessageID());
+         } catch (JMSException e) {
+            e.printStackTrace();
          }
       });
       testConsumers.add(testConsumer);
 
       produceMessage(consumerSession, destination, maxConsumers * prefetch);
 
-      assertTrue("add messages are delivered", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            int totalDelivered = 0;
-            for (TestConsumer testConsumer : testConsumers) {
-               long delivered = testConsumer.deliveredSize();
-               LOG.info(testConsumer.getConsumerId() + " delivered: " + delivered);
-               totalDelivered += delivered;
-            }
-            return totalDelivered == maxConsumers * prefetch;
+      assertTrue("add messages are delivered", Wait.waitFor(() -> {
+         int totalDelivered = 0;
+         for (TestConsumer testConsumer13 : testConsumers) {
+            long delivered = testConsumer13.deliveredSize();
+            LOG.info(testConsumer13.getConsumerId() + " delivered: " + delivered);
+            totalDelivered += delivered;
          }
+         return totalDelivered == maxConsumers * prefetch;
       }));
 
       final CountDownLatch shutdownConsumerAdded = new CountDownLatch(1);
 
-      new Thread() {
-         @Override
-         public void run() {
-            try {
-               LOG.info("add last consumer...");
-               TestConsumer testConsumer = new TestConsumer(consumerSession, destination, connection);
-               testConsumer.setMessageListener(new MessageListener() {
-                  @Override
-                  public void onMessage(Message message) {
-                     try {
-                        LOG.info("onMessage:" + message.getJMSMessageID());
-                     } catch (JMSException e) {
-                        e.printStackTrace();
-                     }
-                  }
-               });
-               testConsumers.add(testConsumer);
-               shutdownConsumerAdded.countDown();
-               LOG.info("done add last consumer");
-            } catch (Exception e) {
-               e.printStackTrace();
-            }
+      new Thread(() -> {
+         try {
+            LOG.info("add last consumer...");
+            TestConsumer testConsumer12 = new TestConsumer(consumerSession, destination, connection);
+            testConsumer12.setMessageListener(message -> {
+               try {
+                  LOG.info("onMessage:" + message.getJMSMessageID());
+               } catch (JMSException e) {
+                  e.printStackTrace();
+               }
+            });
+            testConsumers.add(testConsumer12);
+            shutdownConsumerAdded.countDown();
+            LOG.info("done add last consumer");
+         } catch (Exception e) {
+            e.printStackTrace();
          }
-      }.start();
+      }).start();
 
       brokerStopLatch.await();
       doByteman.set(false);
@@ -204,17 +192,14 @@ public class FailoverConsumerUnconsumedTest extends OpenwireArtemisBaseTest {
       assertTrue("consumer added through failover", shutdownConsumerAdded.await(30, TimeUnit.SECONDS));
 
       // each should again get prefetch messages - all unacked deliveries should be rolledback
-      assertTrue("after restart all messages are re dispatched", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            int totalDelivered = 0;
-            for (TestConsumer testConsumer : testConsumers) {
-               long delivered = testConsumer.deliveredSize();
-               LOG.info(testConsumer.getConsumerId() + " delivered: " + delivered);
-               totalDelivered += delivered;
-            }
-            return totalDelivered == maxConsumers * prefetch;
+      assertTrue("after restart all messages are re dispatched", Wait.waitFor(() -> {
+         int totalDelivered = 0;
+         for (TestConsumer testConsumer1 : testConsumers) {
+            long delivered = testConsumer1.deliveredSize();
+            LOG.info(testConsumer1.getConsumerId() + " delivered: " + delivered);
+            totalDelivered += delivered;
          }
+         return totalDelivered == maxConsumers * prefetch;
       }));
 
       connection.close();
@@ -247,47 +232,38 @@ public class FailoverConsumerUnconsumedTest extends OpenwireArtemisBaseTest {
 
       produceMessage(consumerSession, destination, maxConsumers * prefetch);
 
-      assertTrue("add messages are dispatched", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            int totalUnconsumed = 0;
-            for (TestConsumer testConsumer : testConsumers) {
-               long unconsumed = testConsumer.unconsumedSize();
-               LOG.info(testConsumer.getConsumerId() + " unconsumed: " + unconsumed);
-               totalUnconsumed += unconsumed;
-            }
-            return totalUnconsumed == (maxConsumers - 1) * prefetch;
+      assertTrue("add messages are dispatched", Wait.waitFor(() -> {
+         int totalUnconsumed = 0;
+         for (TestConsumer testConsumer : testConsumers) {
+            long unconsumed = testConsumer.unconsumedSize();
+            LOG.info(testConsumer.getConsumerId() + " unconsumed: " + unconsumed);
+            totalUnconsumed += unconsumed;
          }
+         return totalUnconsumed == (maxConsumers - 1) * prefetch;
       }));
 
       final CountDownLatch shutdownConsumerAdded = new CountDownLatch(1);
 
-      new Thread() {
-         @Override
-         public void run() {
-            try {
-               LOG.info("add last consumer...");
-               testConsumers.add(new TestConsumer(consumerSession, destination, connection));
-               shutdownConsumerAdded.countDown();
-               LOG.info("done add last consumer");
-            } catch (Exception e) {
-               e.printStackTrace();
-            }
+      new Thread(() -> {
+         try {
+            LOG.info("add last consumer...");
+            testConsumers.add(new TestConsumer(consumerSession, destination, connection));
+            shutdownConsumerAdded.countDown();
+            LOG.info("done add last consumer");
+         } catch (Exception e) {
+            e.printStackTrace();
          }
-      }.start();
+      }).start();
 
       // verify interrupt
-      assertTrue("add messages dispatched and unconsumed are cleaned up", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            int totalUnconsumed = 0;
-            for (TestConsumer testConsumer : testConsumers) {
-               long unconsumed = testConsumer.unconsumedSize();
-               LOG.info(testConsumer.getConsumerId() + " unconsumed: " + unconsumed);
-               totalUnconsumed += unconsumed;
-            }
-            return totalUnconsumed == 0;
+      assertTrue("add messages dispatched and unconsumed are cleaned up", Wait.waitFor(() -> {
+         int totalUnconsumed = 0;
+         for (TestConsumer testConsumer : testConsumers) {
+            long unconsumed = testConsumer.unconsumedSize();
+            LOG.info(testConsumer.getConsumerId() + " unconsumed: " + unconsumed);
+            totalUnconsumed += unconsumed;
          }
+         return totalUnconsumed == 0;
       }));
 
       brokerStopLatch.await();
@@ -299,17 +275,14 @@ public class FailoverConsumerUnconsumedTest extends OpenwireArtemisBaseTest {
       assertTrue("consumer added through failover", shutdownConsumerAdded.await(30, TimeUnit.SECONDS));
 
       // each should again get prefetch messages - all unconsumed deliveries should be rolledback
-      assertTrue("after start all messages are re dispatched", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            int totalUnconsumed = 0;
-            for (TestConsumer testConsumer : testConsumers) {
-               long unconsumed = testConsumer.unconsumedSize();
-               LOG.info(testConsumer.getConsumerId() + " after restart: unconsumed: " + unconsumed);
-               totalUnconsumed += unconsumed;
-            }
-            return totalUnconsumed == (maxConsumers) * prefetch;
+      assertTrue("after start all messages are re dispatched", Wait.waitFor(() -> {
+         int totalUnconsumed = 0;
+         for (TestConsumer testConsumer : testConsumers) {
+            long unconsumed = testConsumer.unconsumedSize();
+            LOG.info(testConsumer.getConsumerId() + " after restart: unconsumed: " + unconsumed);
+            totalUnconsumed += unconsumed;
          }
+         return totalUnconsumed == (maxConsumers) * prefetch;
       }));
 
       connection.close();
@@ -356,17 +329,14 @@ public class FailoverConsumerUnconsumedTest extends OpenwireArtemisBaseTest {
       if (doByteman.get()) {
          if (consumerCount.incrementAndGet() == maxConsumers) {
             context.getContext().setDontSendReponse(true);
-            new Thread() {
-               @Override
-               public void run() {
-                  try {
-                     broker.stop();
-                     brokerStopLatch.countDown();
-                  } catch (Exception e) {
-                     e.printStackTrace();
-                  }
+            new Thread(() -> {
+               try {
+                  broker.stop();
+                  brokerStopLatch.countDown();
+               } catch (Exception e) {
+                  e.printStackTrace();
                }
-            }.start();
+            }).start();
          }
       }
    }
@@ -375,18 +345,15 @@ public class FailoverConsumerUnconsumedTest extends OpenwireArtemisBaseTest {
       if (doByteman.get()) {
          if (consumerCount.incrementAndGet() == maxConsumers + (watchTopicAdvisories.get() ? 1 : 0)) {
             context.getContext().setDontSendReponse(true);
-            new Thread() {
-               @Override
-               public void run() {
-                  try {
-                     broker.stop();
-                     Assert.assertEquals(1, brokerStopLatch.getCount());
-                     brokerStopLatch.countDown();
-                  } catch (Exception e) {
-                     e.printStackTrace();
-                  }
+            new Thread(() -> {
+               try {
+                  broker.stop();
+                  Assert.assertEquals(1, brokerStopLatch.getCount());
+                  brokerStopLatch.countDown();
+               } catch (Exception e) {
+                  e.printStackTrace();
                }
-            }.start();
+            }).start();
          }
       }
    }
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDuplicateTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDuplicateTest.java
index d06b2cc306..de37dc3101 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDuplicateTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDuplicateTest.java
@@ -108,12 +108,9 @@ public class FailoverDuplicateTest extends OpenwireArtemisBaseTest {
       final Queue destination = sendSession.createQueue(QUEUE_NAME);
 
       final AtomicInteger receivedCount = new AtomicInteger();
-      MessageListener listener = new MessageListener() {
-         @Override
-         public void onMessage(Message message) {
-            gotMessageLatch.countDown();
-            receivedCount.incrementAndGet();
-         }
+      MessageListener listener = message -> {
+         gotMessageLatch.countDown();
+         receivedCount.incrementAndGet();
       };
       Connection receiveConnection;
       Session receiveSession = null;
@@ -124,20 +121,17 @@ public class FailoverDuplicateTest extends OpenwireArtemisBaseTest {
 
       final CountDownLatch sendDoneLatch = new CountDownLatch(1);
       // broker will die on send reply so this will hang till restart
-      new Thread() {
-         @Override
-         public void run() {
-            LOG.info("doing async send...");
-            try {
-               produceMessage(sendSession, destination, "will resend", 1);
-            } catch (JMSException e) {
-               LOG.error("got send exception: ", e);
-               Assert.fail("got unexpected send exception" + e);
-            }
-            sendDoneLatch.countDown();
-            LOG.info("done async send");
+      new Thread(() -> {
+         LOG.info("doing async send...");
+         try {
+            produceMessage(sendSession, destination, "will resend", 1);
+         } catch (JMSException e) {
+            LOG.error("got send exception: ", e);
+            Assert.fail("got unexpected send exception" + e);
          }
-      }.start();
+         sendDoneLatch.countDown();
+         LOG.info("done async send");
+      }).start();
 
       Assert.assertTrue("one message got through on time", gotMessageLatch.await(20, TimeUnit.SECONDS));
       // send more messages, blow producer audit
@@ -156,12 +150,9 @@ public class FailoverDuplicateTest extends OpenwireArtemisBaseTest {
 
       Assert.assertTrue("message sent complete through failover", sendDoneLatch.await(30, TimeUnit.SECONDS));
 
-      Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            LOG.info("received count:" + receivedCount.get());
-            return totalSent <= receivedCount.get();
-         }
+      Wait.waitFor(() -> {
+         LOG.info("received count:" + receivedCount.get());
+         return totalSent <= receivedCount.get();
       });
       Assert.assertEquals("we got all produced messages", totalSent, receivedCount.get());
       sendConnection.close();
@@ -207,20 +198,17 @@ public class FailoverDuplicateTest extends OpenwireArtemisBaseTest {
       if (doByteman.get()) {
          if (first.compareAndSet(false, true)) {
             context.getContext().setDontSendReponse(true);
-            new Thread() {
-               @Override
-               public void run() {
-                  try {
-                     LOG.info("Waiting for recepit");
-                     Assert.assertTrue("message received on time", gotMessageLatch.await(60, TimeUnit.SECONDS));
-                     Assert.assertTrue("new producers done on time", producersDone.await(120, TimeUnit.SECONDS));
-                     LOG.info("Stopping connection post send and receive and multiple producers");
-                     context.getContext().getConnection().fail(null, "test Failoverduplicatetest");
-                  } catch (Exception e) {
-                     e.printStackTrace();
-                  }
+            new Thread(() -> {
+               try {
+                  LOG.info("Waiting for recepit");
+                  Assert.assertTrue("message received on time", gotMessageLatch.await(60, TimeUnit.SECONDS));
+                  Assert.assertTrue("new producers done on time", producersDone.await(120, TimeUnit.SECONDS));
+                  LOG.info("Stopping connection post send and receive and multiple producers");
+                  context.getContext().getConnection().fail(null, "test Failoverduplicatetest");
+               } catch (Exception e) {
+                  e.printStackTrace();
                }
-            }.start();
+            }).start();
          }
       }
    }
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java
index 8e3233ec49..42a513e96b 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java
@@ -98,22 +98,19 @@ public class FailoverPrefetchZeroTest extends OpenwireArtemisBaseTest {
 
       final CountDownLatch receiveDone = new CountDownLatch(1);
       final Vector<Message> received = new Vector<>();
-      new Thread() {
-         @Override
-         public void run() {
-            try {
-               LOG.info("receive one...");
-               Message msg = consumer.receive(30000);
-               if (msg != null) {
-                  received.add(msg);
-               }
-               receiveDone.countDown();
-               LOG.info("done receive");
-            } catch (Exception e) {
-               e.printStackTrace();
+      new Thread(() -> {
+         try {
+            LOG.info("receive one...");
+            Message msg = consumer.receive(30000);
+            if (msg != null) {
+               received.add(msg);
             }
+            receiveDone.countDown();
+            LOG.info("done receive");
+         } catch (Exception e) {
+            e.printStackTrace();
          }
-      }.start();
+      }).start();
 
       // will be stopped by the plugin
       assertTrue("pull completed on broker", pullDone.await(30, TimeUnit.SECONDS));
@@ -143,18 +140,15 @@ public class FailoverPrefetchZeroTest extends OpenwireArtemisBaseTest {
       if (doByteman.get()) {
          context.getContext().setDontSendReponse(true);
          pullDone.countDown();
-         new Thread() {
-            @Override
-            public void run() {
-               try {
-                  broker.stop();
-               } catch (Exception e) {
-                  e.printStackTrace();
-               } finally {
-                  brokerStopLatch.countDown();
-               }
+         new Thread(() -> {
+            try {
+               broker.stop();
+            } catch (Exception e) {
+               e.printStackTrace();
+            } finally {
+               brokerStopLatch.countDown();
             }
-         }.start();
+         }).start();
       }
    }
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
index a30b49c082..e58e728d22 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
@@ -161,20 +161,17 @@ public class FailoverTransactionTest extends OpenwireArtemisBaseTest {
 
       final CountDownLatch commitDoneLatch = new CountDownLatch(1);
       // broker will die on commit reply so this will hang till restart
-      new Thread() {
-         @Override
-         public void run() {
-            LOG.info("doing async commit...");
-            try {
-               session.commit();
-            } catch (JMSException e) {
-               Assert.assertTrue(e instanceof TransactionRolledBackException);
-               LOG.info("got commit exception: ", e);
-            }
-            commitDoneLatch.countDown();
-            LOG.info("done async commit");
+      new Thread(() -> {
+         LOG.info("doing async commit...");
+         try {
+            session.commit();
+         } catch (JMSException e) {
+            Assert.assertTrue(e instanceof TransactionRolledBackException);
+            LOG.info("got commit exception: ", e);
          }
-      }.start();
+         commitDoneLatch.countDown();
+         LOG.info("done async commit");
+      }).start();
 
       // will be stopped by the plugin
       brokerStopLatch.await(60, TimeUnit.SECONDS);
@@ -249,21 +246,18 @@ public class FailoverTransactionTest extends OpenwireArtemisBaseTest {
       MessageConsumer consumer = session.createConsumer(destination);
       final CountDownLatch sendDoneLatch = new CountDownLatch(1);
       // broker will die on send reply so this will hang till restart
-      new Thread() {
-         @Override
-         public void run() {
-            LOG.info("doing async send...");
-            try {
-               produceMessage(session, destination);
-            } catch (JMSException e) {
-               //assertTrue(e instanceof TransactionRolledBackException);
-               LOG.error("got send exception: ", e);
-               Assert.fail("got unexpected send exception" + e);
-            }
-            sendDoneLatch.countDown();
-            LOG.info("done async send");
+      new Thread(() -> {
+         LOG.info("doing async send...");
+         try {
+            produceMessage(session, destination);
+         } catch (JMSException e) {
+            //assertTrue(e instanceof TransactionRolledBackException);
+            LOG.error("got send exception: ", e);
+            Assert.fail("got unexpected send exception" + e);
          }
-      }.start();
+         sendDoneLatch.countDown();
+         LOG.info("done async send");
+      }).start();
 
       // will be stopped by the plugin
       brokerStopLatch.await(60, TimeUnit.SECONDS);
@@ -334,20 +328,17 @@ public class FailoverTransactionTest extends OpenwireArtemisBaseTest {
       MessageConsumer consumer = session.createConsumer(destination);
       final CountDownLatch sendDoneLatch = new CountDownLatch(1);
       // proxy connection will die on send reply so this will hang on failover reconnect till open
-      new Thread() {
-         @Override
-         public void run() {
-            LOG.info("doing async send...");
-            try {
-               produceMessage(session, destination);
-            } catch (JMSException e) {
-               //assertTrue(e instanceof TransactionRolledBackException);
-               LOG.info("got send exception: ", e);
-            }
-            sendDoneLatch.countDown();
-            LOG.info("done async send");
+      new Thread(() -> {
+         LOG.info("doing async send...");
+         try {
+            produceMessage(session, destination);
+         } catch (JMSException e) {
+            //assertTrue(e instanceof TransactionRolledBackException);
+            LOG.info("got send exception: ", e);
          }
-      }.start();
+         sendDoneLatch.countDown();
+         LOG.info("done async send");
+      }).start();
 
       // will be closed by the plugin
       Assert.assertTrue("proxy was closed", proxy.waitUntilClosed(30));
@@ -463,21 +454,16 @@ public class FailoverTransactionTest extends OpenwireArtemisBaseTest {
          Queue destination = session.createQueue(QUEUE_NAME);
 
          final Session poolSession = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-         connection.createConnectionConsumer(destination, null, new ServerSessionPool() {
+         connection.createConnectionConsumer(destination, null, () -> new ServerSession() {
             @Override
-            public ServerSession getServerSession() throws JMSException {
-               return new ServerSession() {
-                  @Override
-                  public Session getSession() throws JMSException {
-                     return poolSession;
-                  }
+            public Session getSession() throws JMSException {
+               return poolSession;
+            }
 
-                  @Override
-                  public void start() throws JMSException {
-                     connectionConsumerGotOne.countDown();
-                     poolSession.run();
-                  }
-               };
+            @Override
+            public void start() throws JMSException {
+               connectionConsumerGotOne.countDown();
+               poolSession.run();
             }
          }, 1);
 
@@ -754,22 +740,19 @@ public class FailoverTransactionTest extends OpenwireArtemisBaseTest {
                LOG.error("Transport interrupted: " + failoverTransport, new RuntimeException("HERE"));
                for (int i = 0; i < consumerCount && !consumers.isEmpty(); i++) {
 
-                  executorService.execute(new Runnable() {
-                     @Override
-                     public void run() {
-                        MessageConsumer localConsumer = null;
-                        try {
-                           synchronized (delegate) {
-                              localConsumer = consumers.pop();
-                           }
-                           localConsumer.receive(1);
-
-                           LOG.info("calling close() " + ((ActiveMQMessageConsumer) localConsumer).getConsumerId());
-                           localConsumer.close();
-                        } catch (NoSuchElementException nse) {
-                        } catch (Exception ignored) {
-                           LOG.error("Ex on: " + ((ActiveMQMessageConsumer) localConsumer).getConsumerId(), ignored);
+                  executorService.execute(() -> {
+                     MessageConsumer localConsumer = null;
+                     try {
+                        synchronized (delegate) {
+                           localConsumer = consumers.pop();
                         }
+                        localConsumer.receive(1);
+
+                        LOG.info("calling close() " + ((ActiveMQMessageConsumer) localConsumer).getConsumerId());
+                        localConsumer.close();
+                     } catch (NoSuchElementException nse) {
+                     } catch (Exception ignored) {
+                        LOG.error("Ex on: " + ((ActiveMQMessageConsumer) localConsumer).getConsumerId(), ignored);
                      }
                   });
                }
@@ -894,24 +877,21 @@ public class FailoverTransactionTest extends OpenwireArtemisBaseTest {
          final CountDownLatch commitDone = new CountDownLatch(1);
          final CountDownLatch gotException = new CountDownLatch(1);
          // will block pending re-deliveries
-         new Thread() {
-            @Override
-            public void run() {
-               LOG.info("doing async commit...");
-               try {
-                  consumerSession.commit();
-                  commitDone.countDown();
-               }
-               catch (JMSException ignored) {
-                  System.out.println("--->err: got exfeption:");
-                  ignored.printStackTrace();
-                  gotException.countDown();
-               }
-               finally {
-                  commitDone.countDown();
-               }
+         new Thread(() -> {
+            LOG.info("doing async commit...");
+            try {
+               consumerSession.commit();
+               commitDone.countDown();
+            }
+            catch (JMSException ignored) {
+               System.out.println("--->err: got exfeption:");
+               ignored.printStackTrace();
+               gotException.countDown();
             }
-         }.start();
+            finally {
+               commitDone.countDown();
+            }
+         }).start();
 
          broker.stop();
          broker = createBroker();
@@ -959,19 +939,16 @@ public class FailoverTransactionTest extends OpenwireArtemisBaseTest {
       final Vector<Exception> exceptions = new Vector<>();
 
       // commit may fail if other consumer gets the message on restart
-      new Thread() {
-         @Override
-         public void run() {
-            LOG.info("doing async commit...");
-            try {
-               consumerSession.commit();
-            } catch (JMSException ex) {
-               exceptions.add(ex);
-            } finally {
-               commitDone.countDown();
-            }
+      new Thread(() -> {
+         LOG.info("doing async commit...");
+         try {
+            consumerSession.commit();
+         } catch (JMSException ex) {
+            exceptions.add(ex);
+         } finally {
+            commitDone.countDown();
          }
-      }.start();
+      }).start();
 
       Assert.assertTrue("commit completed ", commitDone.await(15, TimeUnit.SECONDS));
 
@@ -1004,20 +981,17 @@ public class FailoverTransactionTest extends OpenwireArtemisBaseTest {
    public static void holdResponseAndStopBroker(final OpenWireConnection.CommandProcessor context) {
       if (doByteman.get()) {
          context.getContext().setDontSendReponse(true);
-         new Thread() {
-            @Override
-            public void run() {
-               LOG.info("Stopping broker post commit...");
-               try {
-                  broker.stop();
-                  broker = null;
-               } catch (Exception e) {
-                  e.printStackTrace();
-               } finally {
-                  brokerStopLatch.countDown();
-               }
+         new Thread(() -> {
+            LOG.info("Stopping broker post commit...");
+            try {
+               broker.stop();
+               broker = null;
+            } catch (Exception e) {
+               e.printStackTrace();
+            } finally {
+               brokerStopLatch.countDown();
             }
-         }.start();
+         }).start();
       }
    }
 
@@ -1026,17 +1000,14 @@ public class FailoverTransactionTest extends OpenwireArtemisBaseTest {
          if (firstSend) {
             firstSend = false;
             context.getContext().setDontSendReponse(true);
-            new Thread() {
-               @Override
-               public void run() {
-                  LOG.info("Stopping connection post send...");
-                  try {
-                     proxy.close();
-                  } catch (Exception e) {
-                     e.printStackTrace();
-                  }
+            new Thread(() -> {
+               LOG.info("Stopping connection post send...");
+               try {
+                  proxy.close();
+               } catch (Exception e) {
+                  e.printStackTrace();
                }
-            }.start();
+            }).start();
          }
       }
    }
@@ -1046,22 +1017,19 @@ public class FailoverTransactionTest extends OpenwireArtemisBaseTest {
       if (doByteman.get()) {
          if (count++ == 1) {
             LOG.info("ok stop broker...");
-            new Thread() {
-               @Override
-               public void run() {
-                  try {
-                     if (broker != null) {
-                        broker.stop();
-                        broker = null;
-                     }
-                     LOG.info("broker stopped.");
-                  } catch (Exception e) {
-                     e.printStackTrace();
-                  } finally {
-                     brokerStopLatch.countDown();
+            new Thread(() -> {
+               try {
+                  if (broker != null) {
+                     broker.stop();
+                     broker = null;
                   }
+                  LOG.info("broker stopped.");
+               } catch (Exception e) {
+                  e.printStackTrace();
+               } finally {
+                  brokerStopLatch.countDown();
                }
-            }.start();
+            }).start();
          }
       }
    }
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBackupsTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBackupsTest.java
index 40207d9245..9ff8444915 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBackupsTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBackupsTest.java
@@ -72,12 +72,9 @@ public class FailoverTransportBackupsTest extends OpenwireArtemisBaseTest {
       assertTrue(failoverTransport.isBackup());
       assertEquals(2, failoverTransport.getBackupPoolSize());
 
-      assertTrue("Timed out waiting for Backups to connect.", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            LOG.debug("Current Backup Count = " + failoverTransport.getCurrentBackups());
-            return failoverTransport.getCurrentBackups() == 2;
-         }
+      assertTrue("Timed out waiting for Backups to connect.", Wait.waitFor(() -> {
+         LOG.debug("Current Backup Count = " + failoverTransport.getCurrentBackups());
+         return failoverTransport.getCurrentBackups() == 2;
       }));
    }
 
@@ -88,22 +85,16 @@ public class FailoverTransportBackupsTest extends OpenwireArtemisBaseTest {
       assertTrue(failoverTransport.isBackup());
       assertEquals(2, failoverTransport.getBackupPoolSize());
 
-      assertTrue("Timed out waiting for Backups to connect.", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            LOG.debug("Current Backup Count = " + failoverTransport.getCurrentBackups());
-            return failoverTransport.getCurrentBackups() == 2;
-         }
+      assertTrue("Timed out waiting for Backups to connect.", Wait.waitFor(() -> {
+         LOG.debug("Current Backup Count = " + failoverTransport.getCurrentBackups());
+         return failoverTransport.getCurrentBackups() == 2;
       }));
 
       servers[0].stop();
 
-      assertTrue("Timed out waiting for Backups to connect.", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            LOG.debug("Current Backup Count = " + failoverTransport.getCurrentBackups());
-            return failoverTransport.getCurrentBackups() == 1;
-         }
+      assertTrue("Timed out waiting for Backups to connect.", Wait.waitFor(() -> {
+         LOG.debug("Current Backup Count = " + failoverTransport.getCurrentBackups());
+         return failoverTransport.getCurrentBackups() == 1;
       }));
 
       assertTrue("Incorrect number of Transport interruptions", transportInterruptions >= 1);
@@ -111,12 +102,9 @@ public class FailoverTransportBackupsTest extends OpenwireArtemisBaseTest {
 
       servers[1].stop();
 
-      assertTrue("Timed out waiting for Backups to connect.", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            LOG.debug("Current Backup Count = " + failoverTransport.getCurrentBackups());
-            return failoverTransport.getCurrentBackups() == 0;
-         }
+      assertTrue("Timed out waiting for Backups to connect.", Wait.waitFor(() -> {
+         LOG.debug("Current Backup Count = " + failoverTransport.getCurrentBackups());
+         return failoverTransport.getCurrentBackups() == 0;
       }));
 
       assertTrue("Incorrect number of Transport interruptions", transportInterruptions >= 2);
@@ -130,32 +118,23 @@ public class FailoverTransportBackupsTest extends OpenwireArtemisBaseTest {
       assertTrue(failoverTransport.isBackup());
       assertEquals(1, failoverTransport.getBackupPoolSize());
 
-      assertTrue("Timed out waiting for Backups to connect.", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            LOG.debug("Current Backup Count = " + failoverTransport.getCurrentBackups());
-            return failoverTransport.getCurrentBackups() == 1;
-         }
+      assertTrue("Timed out waiting for Backups to connect.", Wait.waitFor(() -> {
+         LOG.debug("Current Backup Count = " + failoverTransport.getCurrentBackups());
+         return failoverTransport.getCurrentBackups() == 1;
       }));
 
       servers[0].stop();
 
-      assertTrue("Timed out waiting for Backups to connect.", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            LOG.debug("Current Backup Count = " + failoverTransport.getCurrentBackups());
-            return failoverTransport.getCurrentBackups() == 1;
-         }
+      assertTrue("Timed out waiting for Backups to connect.", Wait.waitFor(() -> {
+         LOG.debug("Current Backup Count = " + failoverTransport.getCurrentBackups());
+         return failoverTransport.getCurrentBackups() == 1;
       }));
 
       servers[1].stop();
 
-      assertTrue("Timed out waiting for Backups to connect.", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            LOG.debug("Current Backup Count = " + failoverTransport.getCurrentBackups());
-            return failoverTransport.getCurrentBackups() == 0;
-         }
+      assertTrue("Timed out waiting for Backups to connect.", Wait.waitFor(() -> {
+         LOG.debug("Current Backup Count = " + failoverTransport.getCurrentBackups());
+         return failoverTransport.getCurrentBackups() == 0;
       }));
    }
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransportTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransportTest.java
index 55caae46e0..39ee4e08d6 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransportTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransportTest.java
@@ -82,12 +82,7 @@ public class FailoverTransportTest {
 
       this.failoverTransport = transport.narrow(FailoverTransport.class);
 
-      assertTrue("no implicit limit of 1000", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            return failoverTransport.getConnectFailures() > 1002;
-         }
-      }));
+      assertTrue("no implicit limit of 1000", Wait.waitFor(() -> failoverTransport.getConnectFailures() > 1002));
    }
 
    @Test(timeout = 30000)
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java
index 83f5d7bbd2..852a74c03f 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java
@@ -199,21 +199,15 @@ public class ReconnectTest extends OpenwireArtemisBaseTest {
             workers[i].failConnection();
          }
 
-         Assert.assertTrue("Timed out waiting for all connections to be interrupted.", Wait.waitFor(new Wait.Condition() {
-            @Override
-            public boolean isSatisified() throws Exception {
-               LOG.debug("Test run waiting for connections to get interrupted.. at: " + interruptedCount.get());
-               return interruptedCount.get() == WORKER_COUNT;
-            }
+         Assert.assertTrue("Timed out waiting for all connections to be interrupted.", Wait.waitFor(() -> {
+            LOG.debug("Test run waiting for connections to get interrupted.. at: " + interruptedCount.get());
+            return interruptedCount.get() == WORKER_COUNT;
          }, TimeUnit.SECONDS.toMillis(60)));
 
          // Wait for the connections to re-establish...
-         Assert.assertTrue("Timed out waiting for all connections to be resumed.", Wait.waitFor(new Wait.Condition() {
-            @Override
-            public boolean isSatisified() throws Exception {
-               LOG.debug("Test run waiting for connections to get resumed.. at: " + resumedCount.get());
-               return resumedCount.get() >= WORKER_COUNT;
-            }
+         Assert.assertTrue("Timed out waiting for all connections to be resumed.", Wait.waitFor(() -> {
+            LOG.debug("Test run waiting for connections to get resumed.. at: " + resumedCount.get());
+            return resumedCount.get() >= WORKER_COUNT;
          }, TimeUnit.SECONDS.toMillis(60)));
 
          // Reset the counters..
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/SlowConnectionTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/SlowConnectionTest.java
index f74e48cbdd..d0813d3593 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/SlowConnectionTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/SlowConnectionTest.java
@@ -48,28 +48,22 @@ public class SlowConnectionTest {
       ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("failover:(" + tcpUri + ")");
       final Connection connection = cf.createConnection();
 
-      new Thread(new Runnable() {
-         @Override
-         public void run() {
-            try {
-               connection.start();
-            } catch (Throwable ignored) {
-            }
+      new Thread(() -> {
+         try {
+            connection.start();
+         } catch (Throwable ignored) {
          }
       }).start();
 
       int count = 0;
-      Assert.assertTrue("Transport count: " + count + ", expected <= 1", Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            int count = 0;
-            for (Thread thread : Thread.getAllStackTraces().keySet()) {
-               if (thread.getName().contains("ActiveMQ Transport")) {
-                  count++;
-               }
+      Assert.assertTrue("Transport count: " + count + ", expected <= 1", Wait.waitFor(() -> {
+         int count1 = 0;
+         for (Thread thread : Thread.getAllStackTraces().keySet()) {
+            if (thread.getName().contains("ActiveMQ Transport")) {
+               count1++;
             }
-            return count == 1;
          }
+         return count1 == 1;
       }));
 
       broker.interrupt();
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java
index 913e0b8502..e8b70a1d5c 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java
@@ -219,18 +219,15 @@ public class FanoutTransportBrokerTest extends OpenwireArtemisBaseTest {
       });
 
       // Send a message (async) as this will block
-      new Thread() {
-         @Override
-         public void run() {
-            // Send the message using the fail over publisher.
-            try {
-               connection3.request(createMessage(producerInfo3, destination, deliveryMode));
-            } catch (Throwable e) {
-               e.printStackTrace();
-            }
-            publishDone.countDown();
+      new Thread(() -> {
+         // Send the message using the fail over publisher.
+         try {
+            connection3.request(createMessage(producerInfo3, destination, deliveryMode));
+         } catch (Throwable e) {
+            e.printStackTrace();
          }
-      }.start();
+         publishDone.countDown();
+      }).start();
 
       // Assert that we block:
       Assert.assertFalse(publishDone.await(3, TimeUnit.SECONDS));
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLConcurrencyTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLConcurrencyTest.java
index 9af071e48f..4f07b0347b 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLConcurrencyTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLConcurrencyTest.java
@@ -122,12 +122,7 @@ public class NIOSSLConcurrencyTest extends TestCase {
          consumers[i] = consumer;
       }
 
-      Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            return failed || getReceived() == PRODUCER_COUNT * MESSAGE_COUNT;
-         }
-      }, 120000);
+      Wait.waitFor(() -> failed || getReceived() == PRODUCER_COUNT * MESSAGE_COUNT, 120000);
 
       assertEquals(PRODUCER_COUNT * MESSAGE_COUNT, getReceived());
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLLoadTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLLoadTest.java
index 125294bf26..db6b33dbb7 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLLoadTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLLoadTest.java
@@ -95,12 +95,7 @@ public class NIOSSLLoadTest extends TestCase {
          consumers[i] = consumer;
       }
 
-      Wait.waitFor(new Wait.Condition() {
-         @Override
-         public boolean isSatisified() throws Exception {
-            return getReceived() == PRODUCER_COUNT * MESSAGE_COUNT;
-         }
-      }, 60000);
+      Wait.waitFor(() -> getReceived() == PRODUCER_COUNT * MESSAGE_COUNT, 60000);
 
       assertEquals(PRODUCER_COUNT * MESSAGE_COUNT, getReceived());
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/reliable/UnreliableUdpTransportTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/reliable/UnreliableUdpTransportTest.java
index 1a91a7891d..7d44f7916b 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/reliable/UnreliableUdpTransportTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/reliable/UnreliableUdpTransportTest.java
@@ -36,15 +36,11 @@ public class UnreliableUdpTransportTest extends UdpTransportTest {
 
    private static final Logger LOG = LoggerFactory.getLogger(UnreliableUdpTransportTest.class);
 
-   protected DropCommandStrategy dropStrategy = new DropCommandStrategy() {
-
-      @Override
-      public boolean shouldDropCommand(int commandId, SocketAddress address, boolean redelivery) {
-         if (redelivery) {
-            return false;
-         }
-         return commandId % 3 == 2;
+   protected DropCommandStrategy dropStrategy = (commandId, address, redelivery) -> {
+      if (redelivery) {
+         return false;
       }
+      return commandId % 3 == 2;
    };
 
    @Override
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java
index bac8cda5c1..14bef1f63f 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java
@@ -241,14 +241,11 @@ public class InactivityMonitorTest extends CombinationTestSupport implements Tra
 
       addCombinationValues("clientInactivityLimit", new Object[]{Long.valueOf(1000)});
       addCombinationValues("serverInactivityLimit", new Object[]{Long.valueOf(1000)});
-      addCombinationValues("serverRunOnCommand", new Object[]{new Runnable() {
-         @Override
-         public void run() {
-            try {
-               LOG.info("Sleeping");
-               Thread.sleep(4000);
-            } catch (InterruptedException e) {
-            }
+      addCombinationValues("serverRunOnCommand", new Object[]{(Runnable) () -> {
+         try {
+            LOG.info("Sleeping");
+            Thread.sleep(4000);
+         } catch (InterruptedException e) {
          }
       }});
    }
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java
index dfbd6705e6..48bbf541e5 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java
@@ -215,16 +215,13 @@ public abstract class JournalImplTestBase extends ActiveMQTestBase {
    protected void startCompact() throws Exception {
       latchDone.setCount(1);
       latchWait.setCount(1);
-      this.compactThread = new Thread() {
-         @Override
-         public void run() {
-            try {
-               journal.testCompact();
-            } catch (Throwable e) {
-               e.printStackTrace();
-            }
+      this.compactThread = new Thread(() -> {
+         try {
+            journal.testCompact();
+         } catch (Throwable e) {
+            e.printStackTrace();
          }
-      };
+      });
 
       this.compactThread.start();
 
@@ -265,12 +262,7 @@ public abstract class JournalImplTestBase extends ActiveMQTestBase {
 
       File dir = new File(getTestDir());
 
-      FilenameFilter fnf = new FilenameFilter() {
-         @Override
-         public boolean accept(final File file, final String name) {
-            return name.endsWith("." + fileExtension);
-         }
-      };
+      FilenameFilter fnf = (file, name) -> name.endsWith("." + fileExtension);
 
       logger.debug("file = {}", dir);
 
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/TcpProxy.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/TcpProxy.java
index cd8585132e..3f28f6fe2e 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/TcpProxy.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/TcpProxy.java
@@ -290,17 +290,14 @@ public final class TcpProxy implements Runnable {
 
       @Override
       public void channelRead(final ChannelHandlerContext ctx, Object msg) {
-         inboundChannel.writeAndFlush(msg).addListener(new ChannelFutureListener() {
-            @Override
-            public void operationComplete(ChannelFuture future) {
-               if (future.isSuccess()) {
-                  if (readable) {
-                     ctx.channel().read();
-                  }
-               } else {
-                  new Exception("Closing").printStackTrace();
-                  future.channel().close();
+         inboundChannel.writeAndFlush(msg).addListener((ChannelFutureListener) future -> {
+            if (future.isSuccess()) {
+               if (readable) {
+                  ctx.channel().read();
                }
+            } else {
+               new Exception("Closing").printStackTrace();
+               future.channel().close();
             }
          });
       }
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/ExecuteUtil.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/ExecuteUtil.java
index 59a19381be..ef5a59f591 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/ExecuteUtil.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/ExecuteUtil.java
@@ -91,26 +91,20 @@ public class ExecuteUtil {
       final ProcessHolder processHolder = new ProcessHolder();
       processHolder.process = processBuilder.start();
 
-      processHolder.inputStreamReader = new Thread() {
-         @Override
-         public void run() {
-            try {
-               readStream(processHolder.process.getInputStream(), true, logOutput);
-            } catch (Exception dontCare) {
+      processHolder.inputStreamReader = new Thread(() -> {
+         try {
+            readStream(processHolder.process.getInputStream(), true, logOutput);
+         } catch (Exception dontCare) {
 
-            }
          }
-      };
-      processHolder.errorStreamReader = new Thread() {
-         @Override
-         public void run() {
-            try {
-               readStream(processHolder.process.getErrorStream(), true, logOutput);
-            } catch (Exception dontCare) {
+      });
+      processHolder.errorStreamReader = new Thread(() -> {
+         try {
+            readStream(processHolder.process.getErrorStream(), true, logOutput);
+         } catch (Exception dontCare) {
 
-            }
          }
-      };
+      });
       processHolder.errorStreamReader.start();
       processHolder.inputStreamReader.start();
       return processHolder;
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java
index c90a0b881c..f52db2ff59 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java
@@ -146,40 +146,37 @@ public class AmqpConnection extends AmqpAbstractResource<Connection> implements
          transport.connect();
 
          final ClientFuture future = new ClientFuture();
-         serializer.execute(new Runnable() {
-            @Override
-            public void run() {
-               if (!noContainerID) {
-                  getEndpoint().setContainer(safeGetContainerId());
-               }
-               getEndpoint().setHostname(remoteURI.getHost());
-               if (!getDesiredCapabilities().isEmpty()) {
-                  getEndpoint().setDesiredCapabilities(getDesiredCapabilities().toArray(new Symbol[0]));
-               }
-               if (!getOfferedCapabilities().isEmpty()) {
-                  getEndpoint().setOfferedCapabilities(getOfferedCapabilities().toArray(new Symbol[0]));
-               }
-               if (!getOfferedProperties().isEmpty()) {
-                  getEndpoint().setProperties(getOfferedProperties());
-               }
-
-               if (getIdleTimeout() > 0) {
-                  protonTransport.setIdleTimeout(getIdleTimeout());
-               }
-               protonTransport.setMaxFrameSize(getMaxFrameSize());
-               protonTransport.setChannelMax(getChannelMax());
-               protonTransport.setEmitFlowEventOnSend(false);
-               protonTransport.bind(getEndpoint());
-               Sasl sasl = protonTransport.sasl();
-               if (sasl != null) {
-                  sasl.client();
-               }
-               authenticator = new SaslAuthenticator(sasl, username, password, authzid, mechanismRestriction);
-               ((TransportImpl) protonTransport).setProtocolTracer(new AmqpProtocolTracer(AmqpConnection.this));
-               open(future);
+         serializer.execute(() -> {
+            if (!noContainerID) {
+               getEndpoint().setContainer(safeGetContainerId());
+            }
+            getEndpoint().setHostname(remoteURI.getHost());
+            if (!getDesiredCapabilities().isEmpty()) {
+               getEndpoint().setDesiredCapabilities(getDesiredCapabilities().toArray(new Symbol[0]));
+            }
+            if (!getOfferedCapabilities().isEmpty()) {
+               getEndpoint().setOfferedCapabilities(getOfferedCapabilities().toArray(new Symbol[0]));
+            }
+            if (!getOfferedProperties().isEmpty()) {
+               getEndpoint().setProperties(getOfferedProperties());
+            }
 
-               pumpToProtonTransport(future);
+            if (getIdleTimeout() > 0) {
+               protonTransport.setIdleTimeout(getIdleTimeout());
+            }
+            protonTransport.setMaxFrameSize(getMaxFrameSize());
+            protonTransport.setChannelMax(getChannelMax());
+            protonTransport.setEmitFlowEventOnSend(false);
+            protonTransport.bind(getEndpoint());
+            Sasl sasl = protonTransport.sasl();
+            if (sasl != null) {
+               sasl.client();
             }
+            authenticator = new SaslAuthenticator(sasl, username, password, authzid, mechanismRestriction);
+            ((TransportImpl) protonTransport).setProtocolTracer(new AmqpProtocolTracer(AmqpConnection.this));
+            open(future);
+
+            pumpToProtonTransport(future);
          });
 
          try {
@@ -209,28 +206,24 @@ public class AmqpConnection extends AmqpAbstractResource<Connection> implements
    public void close() {
       if (closed.compareAndSet(false, true)) {
          final ClientFuture request = new ClientFuture();
-         serializer.execute(new Runnable() {
-
-            @Override
-            public void run() {
-               try {
-
-                  // If we are not connected then there is nothing we can do now
-                  // just signal success.
-                  if (!transport.isConnected()) {
-                     request.onSuccess();
-                  }
+         serializer.execute(() -> {
+            try {
 
-                  if (getEndpoint() != null) {
-                     close(request);
-                  } else {
-                     request.onSuccess();
-                  }
+               // If we are not connected then there is nothing we can do now
+               // just signal success.
+               if (!transport.isConnected()) {
+                  request.onSuccess();
+               }
 
-                  pumpToProtonTransport(request);
-               } catch (Exception e) {
-                  logger.debug("Caught exception while closing proton connection");
+               if (getEndpoint() != null) {
+                  close(request);
+               } else {
+                  request.onSuccess();
                }
+
+               pumpToProtonTransport(request);
+            } catch (Exception e) {
+               logger.debug("Caught exception while closing proton connection");
             }
          });
 
@@ -275,18 +268,14 @@ public class AmqpConnection extends AmqpAbstractResource<Connection> implements
       final AmqpSession session = new AmqpSession(AmqpConnection.this, getNextSessionId());
       final ClientFuture request = new ClientFuture();
 
-      serializer.execute(new Runnable() {
-
-         @Override
-         public void run() {
-            checkClosed();
-            Session protonSession = getEndpoint().session();
-            protonSession.setIncomingCapacity(sessionIncomingCapacity);
-            session.setEndpoint(protonSession);
-            session.setStateInspector(getStateInspector());
-            session.open(request);
-            pumpToProtonTransport(request);
-         }
+      serializer.execute(() -> {
+         checkClosed();
+         Session protonSession = getEndpoint().session();
+         protonSession.setIncomingCapacity(sessionIncomingCapacity);
+         session.setEndpoint(protonSession);
+         session.setStateInspector(getStateInspector());
+         session.open(request);
+         pumpToProtonTransport(request);
       });
 
       request.sync();
@@ -544,36 +533,32 @@ public class AmqpConnection extends AmqpAbstractResource<Connection> implements
       // We need to retain until the serializer gets around to processing it.
       ReferenceCountUtil.retain(incoming);
 
-      serializer.execute(new Runnable() {
-
-         @Override
-         public void run() {
-            ByteBuffer source = incoming.nioBuffer();
-            logger.trace("Client Received from Broker {} bytes:", source.remaining());
+      serializer.execute(() -> {
+         ByteBuffer source = incoming.nioBuffer();
+         logger.trace("Client Received from Broker {} bytes:", source.remaining());
 
-            if (protonTransport.isClosed()) {
-               logger.debug("Ignoring incoming data because transport is closed");
-               return;
-            }
+         if (protonTransport.isClosed()) {
+            logger.debug("Ignoring incoming data because transport is closed");
+            return;
+         }
 
-            do {
-               ByteBuffer buffer = protonTransport.getInputBuffer();
-               int limit = Math.min(buffer.remaining(), source.remaining());
-               ByteBuffer duplicate = source.duplicate();
-               duplicate.limit(source.position() + limit);
-               buffer.put(duplicate);
-               protonTransport.processInput();
-               source.position(source.position() + limit);
-            }
-            while (source.hasRemaining());
+         do {
+            ByteBuffer buffer = protonTransport.getInputBuffer();
+            int limit = Math.min(buffer.remaining(), source.remaining());
+            ByteBuffer duplicate = source.duplicate();
+            duplicate.limit(source.position() + limit);
+            buffer.put(duplicate);
+            protonTransport.processInput();
+            source.position(source.position() + limit);
+         }
+         while (source.hasRemaining());
 
-            ReferenceCountUtil.release(incoming);
+         ReferenceCountUtil.release(incoming);
 
-            // Process the state changes from the latest data and then answer back
-            // any pending updates to the Broker.
-            processUpdates();
-            pumpToProtonTransport();
-         }
+         // Process the state changes from the latest data and then answer back
+         // any pending updates to the Broker.
+         processUpdates();
+         pumpToProtonTransport();
       });
    }
 
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java
index 5af44ed802..dd4404c64e 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java
@@ -164,14 +164,10 @@ public class AmqpReceiver extends AmqpAbstractResource<Receiver> {
    public void close() throws IOException {
       if (closed.compareAndSet(false, true)) {
          final ClientFuture request = new ClientFuture();
-         session.getScheduler().execute(new Runnable() {
-
-            @Override
-            public void run() {
-               checkClosed();
-               close(request);
-               session.pumpToProtonTransport(request);
-            }
+         session.getScheduler().execute(() -> {
+            checkClosed();
+            close(request);
+            session.pumpToProtonTransport(request);
          });
 
          request.sync();
@@ -196,14 +192,10 @@ public class AmqpReceiver extends AmqpAbstractResource<Receiver> {
    public void detach() throws IOException {
       if (closed.compareAndSet(false, true)) {
          final ClientFuture request = new ClientFuture();
-         session.getScheduler().execute(new Runnable() {
-
-            @Override
-            public void run() {
-               checkClosed();
-               detach(request);
-               session.pumpToProtonTransport(request);
-            }
+         session.getScheduler().execute(() -> {
+            checkClosed();
+            detach(request);
+            session.pumpToProtonTransport(request);
          });
 
          request.sync();
@@ -309,56 +301,52 @@ public class AmqpReceiver extends AmqpAbstractResource<Receiver> {
    public AmqpMessage pull(final long timeout, final TimeUnit unit) throws IOException {
       checkClosed();
       final ClientFuture request = new ClientFuture();
-      session.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            checkClosed();
-
-            long timeoutMills = unit.toMillis(timeout);
+      session.getScheduler().execute(() -> {
+         checkClosed();
 
-            try {
-               logger.trace("Pull on Receiver {} with timeout = {}", getSubscriptionName(), timeoutMills);
-               if (timeoutMills < 0) {
-                  // Wait until message arrives. Just give credit if needed.
-                  if (getEndpoint().getCredit() == 0) {
-                     logger.trace("Receiver {} granting 1 additional credit for pull.", getSubscriptionName());
-                     getEndpoint().flow(1);
-                  }
+         long timeoutMills = unit.toMillis(timeout);
 
-                  // Await the message arrival
-                  pullRequest = request;
-               } else if (timeoutMills == 0) {
-                  // If we have no credit then we need to issue some so that we can
-                  // try to fulfill the request, then drain down what is there to
-                  // ensure we consume what is available and remove all credit.
-                  if (getEndpoint().getCredit() == 0) {
-                     logger.trace("Receiver {} granting 1 additional credit for pull.", getSubscriptionName());
-                     getEndpoint().flow(1);
-                  }
+         try {
+            logger.trace("Pull on Receiver {} with timeout = {}", getSubscriptionName(), timeoutMills);
+            if (timeoutMills < 0) {
+               // Wait until message arrives. Just give credit if needed.
+               if (getEndpoint().getCredit() == 0) {
+                  logger.trace("Receiver {} granting 1 additional credit for pull.", getSubscriptionName());
+                  getEndpoint().flow(1);
+               }
 
-                  // Drain immediately and wait for the message(s) to arrive,
-                  // or a flow indicating removal of the remaining credit.
-                  stop(request);
-               } else if (timeoutMills > 0) {
-                  // If we have no credit then we need to issue some so that we can
-                  // try to fulfill the request, then drain down what is there to
-                  // ensure we consume what is available and remove all credit.
-                  if (getEndpoint().getCredit() == 0) {
-                     logger.trace("Receiver {} granting 1 additional credit for pull.", getSubscriptionName());
-                     getEndpoint().flow(1);
-                  }
+               // Await the message arrival
+               pullRequest = request;
+            } else if (timeoutMills == 0) {
+               // If we have no credit then we need to issue some so that we can
+               // try to fulfill the request, then drain down what is there to
+               // ensure we consume what is available and remove all credit.
+               if (getEndpoint().getCredit() == 0) {
+                  logger.trace("Receiver {} granting 1 additional credit for pull.", getSubscriptionName());
+                  getEndpoint().flow(1);
+               }
 
-                  // Wait for the timeout for the message(s) to arrive, then drain if required
-                  // and wait for remaining message(s) to arrive or a flow indicating
-                  // removal of the remaining credit.
-                  stopOnSchedule(timeoutMills, request);
+               // Drain immediately and wait for the message(s) to arrive,
+               // or a flow indicating removal of the remaining credit.
+               stop(request);
+            } else if (timeoutMills > 0) {
+               // If we have no credit then we need to issue some so that we can
+               // try to fulfill the request, then drain down what is there to
+               // ensure we consume what is available and remove all credit.
+               if (getEndpoint().getCredit() == 0) {
+                  logger.trace("Receiver {} granting 1 additional credit for pull.", getSubscriptionName());
+                  getEndpoint().flow(1);
                }
 
-               session.pumpToProtonTransport(request);
-            } catch (Exception e) {
-               request.onFailure(e);
+               // Wait for the timeout for the message(s) to arrive, then drain if required
+               // and wait for remaining message(s) to arrive or a flow indicating
+               // removal of the remaining credit.
+               stopOnSchedule(timeoutMills, request);
             }
+
+            session.pumpToProtonTransport(request);
+         } catch (Exception e) {
+            request.onFailure(e);
          }
       });
 
@@ -392,20 +380,16 @@ public class AmqpReceiver extends AmqpAbstractResource<Receiver> {
    public void flow(final int credit, final boolean deferWrite) throws IOException {
       checkClosed();
       final ClientFuture request = new ClientFuture();
-      session.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            checkClosed();
-            try {
-               getEndpoint().flow(credit);
-               if (!deferWrite) {
-                  session.pumpToProtonTransport(request);
-               }
-               request.onSuccess();
-            } catch (Exception e) {
-               request.onFailure(e);
+      session.getScheduler().execute(() -> {
+         checkClosed();
+         try {
+            getEndpoint().flow(credit);
+            if (!deferWrite) {
+               session.pumpToProtonTransport(request);
             }
+            request.onSuccess();
+         } catch (Exception e) {
+            request.onFailure(e);
          }
       });
 
@@ -423,18 +407,14 @@ public class AmqpReceiver extends AmqpAbstractResource<Receiver> {
    public void drain(final int credit) throws IOException {
       checkClosed();
       final ClientFuture request = new ClientFuture();
-      session.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            checkClosed();
-            try {
-               getEndpoint().drain(credit);
-               session.pumpToProtonTransport(request);
-               request.onSuccess();
-            } catch (Exception e) {
-               request.onFailure(e);
-            }
+      session.getScheduler().execute(() -> {
+         checkClosed();
+         try {
+            getEndpoint().drain(credit);
+            session.pumpToProtonTransport(request);
+            request.onSuccess();
+         } catch (Exception e) {
+            request.onFailure(e);
          }
       });
 
@@ -450,17 +430,13 @@ public class AmqpReceiver extends AmqpAbstractResource<Receiver> {
    public void stop() throws IOException {
       checkClosed();
       final ClientFuture request = new ClientFuture();
-      session.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            checkClosed();
-            try {
-               stop(request);
-               session.pumpToProtonTransport(request);
-            } catch (Exception e) {
-               request.onFailure(e);
-            }
+      session.getScheduler().execute(() -> {
+         checkClosed();
+         try {
+            stop(request);
+            session.pumpToProtonTransport(request);
+         } catch (Exception e) {
+            request.onFailure(e);
          }
       });
 
@@ -549,35 +525,31 @@ public class AmqpReceiver extends AmqpAbstractResource<Receiver> {
       }
 
       final ClientFuture request = new ClientFuture();
-      session.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            checkClosed();
-            try {
-               if (!delivery.isSettled()) {
-                  if (session.isInTransaction()) {
-                     Binary txnId = session.getTransactionId().getRemoteTxId();
-                     if (txnId != null) {
-                        TransactionalState txState = new TransactionalState();
-                        txState.setOutcome(Accepted.getInstance());
-                        txState.setTxnId(txnId);
-                        delivery.disposition(txState);
-                        session.getTransactionContext().registerTxConsumer(AmqpReceiver.this);
-                     }
-                  } else {
-                     delivery.disposition(Accepted.getInstance());
+      session.getScheduler().execute(() -> {
+         checkClosed();
+         try {
+            if (!delivery.isSettled()) {
+               if (session.isInTransaction()) {
+                  Binary txnId = session.getTransactionId().getRemoteTxId();
+                  if (txnId != null) {
+                     TransactionalState txState = new TransactionalState();
+                     txState.setOutcome(Accepted.getInstance());
+                     txState.setTxnId(txnId);
+                     delivery.disposition(txState);
+                     session.getTransactionContext().registerTxConsumer(AmqpReceiver.this);
                   }
+               } else {
+                  delivery.disposition(Accepted.getInstance());
+               }
 
-                  if (settle) {
-                     delivery.settle();
-                  }
+               if (settle) {
+                  delivery.settle();
                }
-               session.pumpToProtonTransport(request);
-               request.onSuccess();
-            } catch (Exception e) {
-               request.onFailure(e);
             }
+            session.pumpToProtonTransport(request);
+            request.onSuccess();
+         } catch (Exception e) {
+            request.onFailure(e);
          }
       });
 
@@ -604,24 +576,20 @@ public class AmqpReceiver extends AmqpAbstractResource<Receiver> {
       }
 
       final ClientFuture request = new ClientFuture();
-      session.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            checkClosed();
-            try {
-               if (!delivery.isSettled()) {
-                  Modified disposition = new Modified();
-                  disposition.setUndeliverableHere(undeliverableHere);
-                  disposition.setDeliveryFailed(deliveryFailed);
-                  delivery.disposition(disposition);
-                  delivery.settle();
-                  session.pumpToProtonTransport(request);
-               }
-               request.onSuccess();
-            } catch (Exception e) {
-               request.onFailure(e);
+      session.getScheduler().execute(() -> {
+         checkClosed();
+         try {
+            if (!delivery.isSettled()) {
+               Modified disposition = new Modified();
+               disposition.setUndeliverableHere(undeliverableHere);
+               disposition.setDeliveryFailed(deliveryFailed);
+               delivery.disposition(disposition);
+               delivery.settle();
+               session.pumpToProtonTransport(request);
             }
+            request.onSuccess();
+         } catch (Exception e) {
+            request.onFailure(e);
          }
       });
 
@@ -644,21 +612,17 @@ public class AmqpReceiver extends AmqpAbstractResource<Receiver> {
       }
 
       final ClientFuture request = new ClientFuture();
-      session.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            checkClosed();
-            try {
-               if (!delivery.isSettled()) {
-                  delivery.disposition(Released.getInstance());
-                  delivery.settle();
-                  session.pumpToProtonTransport(request);
-               }
-               request.onSuccess();
-            } catch (Exception e) {
-               request.onFailure(e);
+      session.getScheduler().execute(() -> {
+         checkClosed();
+         try {
+            if (!delivery.isSettled()) {
+               delivery.disposition(Released.getInstance());
+               delivery.settle();
+               session.pumpToProtonTransport(request);
             }
+            request.onSuccess();
+         } catch (Exception e) {
+            request.onFailure(e);
          }
       });
 
@@ -681,21 +645,17 @@ public class AmqpReceiver extends AmqpAbstractResource<Receiver> {
       }
 
       final ClientFuture request = new ClientFuture();
-      session.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            checkClosed();
-            try {
-               if (!delivery.isSettled()) {
-                  delivery.disposition(new Rejected());
-                  delivery.settle();
-                  session.pumpToProtonTransport(request);
-               }
-               request.onSuccess();
-            } catch (Exception e) {
-               request.onFailure(e);
+      session.getScheduler().execute(() -> {
+         checkClosed();
+         try {
+            if (!delivery.isSettled()) {
+               delivery.disposition(new Rejected());
+               delivery.settle();
+               session.pumpToProtonTransport(request);
             }
+            request.onSuccess();
+         } catch (Exception e) {
+            request.onFailure(e);
          }
       });
 
@@ -1043,15 +1003,11 @@ public class AmqpReceiver extends AmqpAbstractResource<Receiver> {
          if (getDrainTimeout() > 0) {
             // If the remote doesn't respond we will close the consumer and break any
             // blocked receive or stop calls that are waiting.
-            final ScheduledFuture<?> future = getSession().getScheduler().schedule(new Runnable() {
-               @Override
-               public void run() {
-                  logger.trace("Consumer {} drain request timed out", this);
-                  Exception cause = new AmqpOperationTimedOutException("Remote did not respond to a drain request in time");
-                  locallyClosed(session.getConnection(), cause);
-                  stopRequest.onFailure(cause);
-                  session.pumpToProtonTransport(stopRequest);
-               }
+            final ScheduledFuture<?> future = getSession().getScheduler().schedule(() -> {
+               Exception cause = new AmqpOperationTimedOutException("Remote did not respond to a drain request in time");
+               locallyClosed(session.getConnection(), cause);
+               stopRequest.onFailure(cause);
+               session.pumpToProtonTransport(stopRequest);
             }, getDrainTimeout(), TimeUnit.MILLISECONDS);
 
             stopRequest = new ScheduledRequest(future, stopRequest);
@@ -1062,14 +1018,10 @@ public class AmqpReceiver extends AmqpAbstractResource<Receiver> {
    private void stopOnSchedule(long timeout, final AsyncResult request) {
       logger.trace("Receiver {} scheduling stop", this);
       // We need to drain the credit if no message(s) arrive to use it.
-      final ScheduledFuture<?> future = getSession().getScheduler().schedule(new Runnable() {
-         @Override
-         public void run() {
-            logger.trace("Receiver {} running scheduled stop", this);
-            if (getEndpoint().getRemoteCredit() != 0) {
-               stop(request);
-               session.pumpToProtonTransport(request);
-            }
+      final ScheduledFuture<?> future = getSession().getScheduler().schedule(() -> {
+         if (getEndpoint().getRemoteCredit() != 0) {
+            stop(request);
+            session.pumpToProtonTransport(request);
          }
       }, timeout, TimeUnit.MILLISECONDS);
 
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSender.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSender.java
index b9629f588e..17f85749fb 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSender.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSender.java
@@ -187,17 +187,13 @@ public class AmqpSender extends AmqpAbstractResource<Sender> {
       checkClosed();
       final ClientFuture sendRequest = new ClientFuture();
 
-      session.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            try {
-               doSend(message, sendRequest, txId);
-               session.pumpToProtonTransport(sendRequest);
-            } catch (Exception e) {
-               sendRequest.onFailure(e);
-               session.getConnection().fireClientException(e);
-            }
+      session.getScheduler().execute(() -> {
+         try {
+            doSend(message, sendRequest, txId);
+            session.pumpToProtonTransport(sendRequest);
+         } catch (Exception e) {
+            sendRequest.onFailure(e);
+            session.getConnection().fireClientException(e);
          }
       });
 
@@ -218,14 +214,10 @@ public class AmqpSender extends AmqpAbstractResource<Sender> {
    public void close() throws IOException {
       if (closed.compareAndSet(false, true)) {
          final ClientFuture request = new ClientFuture();
-         session.getScheduler().execute(new Runnable() {
-
-            @Override
-            public void run() {
-               checkClosed();
-               close(request);
-               session.pumpToProtonTransport(request);
-            }
+         session.getScheduler().execute(() -> {
+            checkClosed();
+            close(request);
+            session.pumpToProtonTransport(request);
          });
 
          request.sync();
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSession.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSession.java
index 86309eb1cb..f6b5553bb7 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSession.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSession.java
@@ -67,14 +67,10 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
    public void close() throws IOException {
       if (closed.compareAndSet(false, true)) {
          final ClientFuture request = new ClientFuture();
-         getScheduler().execute(new Runnable() {
-
-            @Override
-            public void run() {
-               checkClosed();
-               close(request);
-               pumpToProtonTransport(request);
-            }
+         getScheduler().execute(() -> {
+            checkClosed();
+            close(request);
+            pumpToProtonTransport(request);
          });
 
          request.sync();
@@ -159,15 +155,11 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
       sender.setProperties(properties);
       final ClientFuture request = new ClientFuture();
 
-      connection.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            checkClosed();
-            sender.setStateInspector(getStateInspector());
-            sender.open(request);
-            pumpToProtonTransport(request);
-         }
+      connection.getScheduler().execute(() -> {
+         checkClosed();
+         sender.setStateInspector(getStateInspector());
+         sender.open(request);
+         pumpToProtonTransport(request);
       });
 
       request.sync();
@@ -219,15 +211,11 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
       final AmqpSender sender = new AmqpSender(AmqpSession.this, address, getNextSenderId(), senderMode, receiverMode, outcomes);
       final ClientFuture request = new ClientFuture();
 
-      connection.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            checkClosed();
-            sender.setStateInspector(getStateInspector());
-            sender.open(request);
-            pumpToProtonTransport(request);
-         }
+      connection.getScheduler().execute(() -> {
+         checkClosed();
+         sender.setStateInspector(getStateInspector());
+         sender.open(request);
+         pumpToProtonTransport(request);
       });
 
       request.sync();
@@ -278,15 +266,11 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
       sender.setProperties(properties);
       final ClientFuture request = new ClientFuture();
 
-      connection.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            checkClosed();
-            sender.setStateInspector(getStateInspector());
-            sender.open(request);
-            pumpToProtonTransport(request);
-         }
+      connection.getScheduler().execute(() -> {
+         checkClosed();
+         sender.setStateInspector(getStateInspector());
+         sender.open(request);
+         pumpToProtonTransport(request);
       });
 
       request.sync();
@@ -366,15 +350,11 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
          receiver.setProperties(properties);
       }
 
-      connection.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            checkClosed();
-            receiver.setStateInspector(getStateInspector());
-            receiver.open(request);
-            pumpToProtonTransport(request);
-         }
+      connection.getScheduler().execute(() -> {
+         checkClosed();
+         receiver.setStateInspector(getStateInspector());
+         receiver.open(request);
+         pumpToProtonTransport(request);
       });
 
       request.sync();
@@ -402,15 +382,11 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
       final ClientFuture request = new ClientFuture();
       final AmqpReceiver receiver = new AmqpReceiver(AmqpSession.this, address, getNextReceiverId(), senderMode, receiverMode);
 
-      connection.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            checkClosed();
-            receiver.setStateInspector(getStateInspector());
-            receiver.open(request);
-            pumpToProtonTransport(request);
-         }
+      connection.getScheduler().execute(() -> {
+         checkClosed();
+         receiver.setStateInspector(getStateInspector());
+         receiver.open(request);
+         pumpToProtonTransport(request);
       });
 
       request.sync();
@@ -443,15 +419,11 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
       final ClientFuture request = new ClientFuture();
       final AmqpReceiver receiver = new AmqpReceiver(AmqpSession.this, source, receiverId);
 
-      connection.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            checkClosed();
-            receiver.setStateInspector(getStateInspector());
-            receiver.open(request);
-            pumpToProtonTransport(request);
-         }
+      connection.getScheduler().execute(() -> {
+         checkClosed();
+         receiver.setStateInspector(getStateInspector());
+         receiver.open(request);
+         pumpToProtonTransport(request);
       });
 
       request.sync();
@@ -474,15 +446,11 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
       final AmqpReceiver receiver = new AmqpReceiver(AmqpSession.this, source, receiverId);
       receiver.setSubscriptionName(receiveName);
 
-      connection.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            checkClosed();
-            receiver.setStateInspector(getStateInspector());
-            receiver.open(request);
-            pumpToProtonTransport(request);
-         }
+      connection.getScheduler().execute(() -> {
+         checkClosed();
+         receiver.setStateInspector(getStateInspector());
+         receiver.open(request);
+         pumpToProtonTransport(request);
       });
 
       request.sync();
@@ -503,15 +471,11 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
       final AmqpReceiver receiver = new AmqpReceiver(AmqpSession.this, address, receiverId);
       receiver.setSubscriptionName(receiveName);
 
-      connection.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            checkClosed();
-            receiver.setStateInspector(getStateInspector());
-            receiver.open(request);
-            pumpToProtonTransport(request);
-         }
+      connection.getScheduler().execute(() -> {
+         checkClosed();
+         receiver.setStateInspector(getStateInspector());
+         receiver.open(request);
+         pumpToProtonTransport(request);
       });
 
       request.sync();
@@ -574,15 +538,11 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
          receiver.setSelector(selector);
       }
 
-      connection.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            checkClosed();
-            receiver.setStateInspector(getStateInspector());
-            receiver.open(request);
-            pumpToProtonTransport(request);
-         }
+      connection.getScheduler().execute(() -> {
+         checkClosed();
+         receiver.setStateInspector(getStateInspector());
+         receiver.open(request);
+         pumpToProtonTransport(request);
       });
 
       request.sync();
@@ -608,15 +568,11 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
       final AmqpReceiver receiver = new AmqpReceiver(AmqpSession.this, (String) null, getNextReceiverId());
       receiver.setSubscriptionName(subscriptionName);
 
-      connection.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            checkClosed();
-            receiver.setStateInspector(getStateInspector());
-            receiver.open(request);
-            pumpToProtonTransport(request);
-         }
+      connection.getScheduler().execute(() -> {
+         checkClosed();
+         receiver.setStateInspector(getStateInspector());
+         receiver.open(request);
+         pumpToProtonTransport(request);
       });
 
       request.sync();
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpTransactionContext.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpTransactionContext.java
index 50fbc1c1cb..f78e237830 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpTransactionContext.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpTransactionContext.java
@@ -71,46 +71,42 @@ public class AmqpTransactionContext {
 
       logger.info("Attempting to Begin TX:[{}]", txId);
 
-      session.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            if (coordinator == null || coordinator.isClosed()) {
-               logger.info("Creating new Coordinator for TX:[{}]", txId);
-               coordinator = new AmqpTransactionCoordinator(session);
-               coordinator.open(new AsyncResult() {
-
-                  @Override
-                  public void onSuccess() {
-                     try {
-                        logger.info("Attempting to declare TX:[{}]", txId);
-                        coordinator.declare(txId, request);
-                     } catch (Exception e) {
-                        request.onFailure(e);
-                     }
+      session.getScheduler().execute(() -> {
+         if (coordinator == null || coordinator.isClosed()) {
+            logger.info("Creating new Coordinator for TX:[{}]", txId);
+            coordinator = new AmqpTransactionCoordinator(session);
+            coordinator.open(new AsyncResult() {
+
+               @Override
+               public void onSuccess() {
+                  try {
+                     logger.info("Attempting to declare TX:[{}]", txId);
+                     coordinator.declare(txId, request);
+                  } catch (Exception e) {
+                     request.onFailure(e);
                   }
+               }
 
-                  @Override
-                  public void onFailure(Throwable result) {
-                     request.onFailure(result);
-                  }
+               @Override
+               public void onFailure(Throwable result) {
+                  request.onFailure(result);
+               }
 
-                  @Override
-                  public boolean isComplete() {
-                     return request.isComplete();
-                  }
-               });
-            } else {
-               try {
-                  logger.info("Attempting to declare TX:[{}]", txId);
-                  coordinator.declare(txId, request);
-               } catch (Exception e) {
-                  request.onFailure(e);
+               @Override
+               public boolean isComplete() {
+                  return request.isComplete();
                }
+            });
+         } else {
+            try {
+               logger.info("Attempting to declare TX:[{}]", txId);
+               coordinator.declare(txId, request);
+            } catch (Exception e) {
+               request.onFailure(e);
             }
-
-            session.pumpToProtonTransport(request);
          }
+
+         session.pumpToProtonTransport(request);
       });
 
       request.sync();
@@ -144,17 +140,13 @@ public class AmqpTransactionContext {
       });
 
       logger.debug("Commit on TX[{}] initiated", transactionId);
-      session.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            try {
-               logger.info("Attempting to commit TX:[{}]", transactionId);
-               coordinator.discharge(transactionId, request, true);
-               session.pumpToProtonTransport(request);
-            } catch (Exception e) {
-               request.onFailure(e);
-            }
+      session.getScheduler().execute(() -> {
+         try {
+            logger.info("Attempting to commit TX:[{}]", transactionId);
+            coordinator.discharge(transactionId, request, true);
+            session.pumpToProtonTransport(request);
+         } catch (Exception e) {
+            request.onFailure(e);
          }
       });
 
@@ -189,17 +181,13 @@ public class AmqpTransactionContext {
       });
 
       logger.debug("Rollback on TX[{}] initiated", transactionId);
-      session.getScheduler().execute(new Runnable() {
-
-         @Override
-         public void run() {
-            try {
-               logger.info("Attempting to roll back TX:[{}]", transactionId);
-               coordinator.discharge(transactionId, request, false);
-               session.pumpToProtonTransport(request);
-            } catch (Exception e) {
-               request.onFailure(e);
-            }
+      session.getScheduler().execute(() -> {
+         try {
+            logger.info("Attempting to roll back TX:[{}]", transactionId);
+            coordinator.discharge(transactionId, request, false);
+            session.pumpToProtonTransport(request);
+         } catch (Exception e) {
+            request.onFailure(e);
          }
       });
 
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/TypeConversionSupport.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/TypeConversionSupport.java
index a85dd10898..30248c0917 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/TypeConversionSupport.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/TypeConversionSupport.java
@@ -61,12 +61,7 @@ public final class TypeConversionSupport {
    private static final HashMap<ConversionKey, Converter> CONVERSION_MAP = new HashMap<>();
 
    static {
-      Converter toStringConverter = new Converter() {
-         @Override
-         public Object convert(Object value) {
-            return value.toString();
-         }
-      };
+      Converter toStringConverter = value -> value.toString();
       CONVERSION_MAP.put(new ConversionKey(Boolean.class, String.class), toStringConverter);
       CONVERSION_MAP.put(new ConversionKey(Byte.class, String.class), toStringConverter);
       CONVERSION_MAP.put(new ConversionKey(Short.class, String.class), toStringConverter);
@@ -75,87 +70,27 @@ public final class TypeConversionSupport {
       CONVERSION_MAP.put(new ConversionKey(Float.class, String.class), toStringConverter);
       CONVERSION_MAP.put(new ConversionKey(Double.class, String.class), toStringConverter);
 
-      CONVERSION_MAP.put(new ConversionKey(String.class, Boolean.class), new Converter() {
-         @Override
-         public Object convert(Object value) {
-            return Boolean.valueOf((String) value);
-         }
-      });
-      CONVERSION_MAP.put(new ConversionKey(String.class, Byte.class), new Converter() {
-         @Override
-         public Object convert(Object value) {
-            return Byte.valueOf((String) value);
-         }
-      });
-      CONVERSION_MAP.put(new ConversionKey(String.class, Short.class), new Converter() {
-         @Override
-         public Object convert(Object value) {
-            return Short.valueOf((String) value);
-         }
-      });
-      CONVERSION_MAP.put(new ConversionKey(String.class, Integer.class), new Converter() {
-         @Override
-         public Object convert(Object value) {
-            return Integer.valueOf((String) value);
-         }
-      });
-      CONVERSION_MAP.put(new ConversionKey(String.class, Long.class), new Converter() {
-         @Override
-         public Object convert(Object value) {
-            return Long.valueOf((String) value);
-         }
-      });
-      CONVERSION_MAP.put(new ConversionKey(String.class, Float.class), new Converter() {
-         @Override
-         public Object convert(Object value) {
-            return Float.valueOf((String) value);
-         }
-      });
-      CONVERSION_MAP.put(new ConversionKey(String.class, Double.class), new Converter() {
-         @Override
-         public Object convert(Object value) {
-            return Double.valueOf((String) value);
-         }
-      });
+      CONVERSION_MAP.put(new ConversionKey(String.class, Boolean.class), value -> Boolean.valueOf((String) value));
+      CONVERSION_MAP.put(new ConversionKey(String.class, Byte.class), value -> Byte.valueOf((String) value));
+      CONVERSION_MAP.put(new ConversionKey(String.class, Short.class), value -> Short.valueOf((String) value));
+      CONVERSION_MAP.put(new ConversionKey(String.class, Integer.class), value -> Integer.valueOf((String) value));
+      CONVERSION_MAP.put(new ConversionKey(String.class, Long.class), value -> Long.valueOf((String) value));
+      CONVERSION_MAP.put(new ConversionKey(String.class, Float.class), value -> Float.valueOf((String) value));
+      CONVERSION_MAP.put(new ConversionKey(String.class, Double.class), value -> Double.valueOf((String) value));
 
-      Converter longConverter = new Converter() {
-         @Override
-         public Object convert(Object value) {
-            return ((Number) value).longValue();
-         }
-      };
+      Converter longConverter = value -> ((Number) value).longValue();
       CONVERSION_MAP.put(new ConversionKey(Byte.class, Long.class), longConverter);
       CONVERSION_MAP.put(new ConversionKey(Short.class, Long.class), longConverter);
       CONVERSION_MAP.put(new ConversionKey(Integer.class, Long.class), longConverter);
-      CONVERSION_MAP.put(new ConversionKey(Date.class, Long.class), new Converter() {
-         @Override
-         public Object convert(Object value) {
-            return ((Date) value).getTime();
-         }
-      });
+      CONVERSION_MAP.put(new ConversionKey(Date.class, Long.class), value -> ((Date) value).getTime());
 
-      Converter intConverter = new Converter() {
-         @Override
-         public Object convert(Object value) {
-            return ((Number) value).intValue();
-         }
-      };
+      Converter intConverter = value -> ((Number) value).intValue();
       CONVERSION_MAP.put(new ConversionKey(Byte.class, Integer.class), intConverter);
       CONVERSION_MAP.put(new ConversionKey(Short.class, Integer.class), intConverter);
 
-      CONVERSION_MAP.put(new ConversionKey(Byte.class, Short.class), new Converter() {
-         @Override
-         public Object convert(Object value) {
-            return ((Number) value).shortValue();
-         }
-      });
+      CONVERSION_MAP.put(new ConversionKey(Byte.class, Short.class), value -> ((Number) value).shortValue());
 
-      CONVERSION_MAP.put(new ConversionKey(Float.class, Double.class), new Converter() {
-         @Override
-         public Object convert(Object value) {
-            return ((Number) value).doubleValue();
-         }
-      });
+      CONVERSION_MAP.put(new ConversionKey(Float.class, Double.class), value -> ((Number) value).doubleValue());
    }
 
    public static Object convert(Object value, Class<?> toClass) {
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableProxy.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableProxy.java
index e0bb40a379..641e235a2b 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableProxy.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableProxy.java
@@ -16,9 +16,7 @@
  */
 package org.apache.activemq.transport.amqp.client.util;
 
-import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -110,57 +108,54 @@ public final class UnmodifiableProxy {
    }
 
    private static <T> T wrap(Class<T> type, final Object target) {
-      return type.cast(java.lang.reflect.Proxy.newProxyInstance(type.getClassLoader(), new Class[] {type}, new InvocationHandler() {
-         @Override
-         public Object invoke(Object o, Method method, Object[] objects) throws Throwable {
-            if ("toString".equals(method.getName()) && method.getParameterTypes().length == 0) {
-               return "Unmodifiable proxy -> (" + method.invoke(target, objects) + ")";
-            }
+      return type.cast(java.lang.reflect.Proxy.newProxyInstance(type.getClassLoader(), new Class[] {type}, (o, method, objects) -> {
+         if ("toString".equals(method.getName()) && method.getParameterTypes().length == 0) {
+            return "Unmodifiable proxy -> (" + method.invoke(target, objects) + ")";
+         }
 
-            // Don't let methods that mutate be invoked.
-            if (method.getParameterTypes().length > 0) {
-               throw new UnsupportedOperationException("Cannot mutate outside the Client work thread");
-            }
+         // Don't let methods that mutate be invoked.
+         if (method.getParameterTypes().length > 0) {
+            throw new UnsupportedOperationException("Cannot mutate outside the Client work thread");
+         }
 
-            if (denylist.contains(method.getName())) {
-               throw new UnsupportedOperationException("Cannot mutate outside the Client work thread");
-            }
+         if (denylist.contains(method.getName())) {
+            throw new UnsupportedOperationException("Cannot mutate outside the Client work thread");
+         }
 
-            Class<?> returnType = method.getReturnType();
+         Class<?> returnType = method.getReturnType();
 
-            try {
-               Object result = method.invoke(target, objects);
-               if (result == null) {
-                  return null;
-               }
+         try {
+            Object result = method.invoke(target, objects);
+            if (result == null) {
+               return null;
+            }
 
-               if (returnType.isPrimitive() || returnType.isArray() || Object.class.equals(returnType)) {
-                  // Skip any other checks
-               } else if (returnType.isAssignableFrom(ByteBuffer.class)) {
-                  // Buffers are modifiable but we can just return null to indicate
-                  // there's nothing there to access.
-                  result = null;
-               } else if (returnType.isAssignableFrom(Map.class)) {
-                  // Prevent return of modifiable maps
-                  result = Collections.unmodifiableMap((Map<?, ?>) result);
-               } else if (isProtonType(returnType) && returnType.isInterface()) {
-
-                  // Can't handle the crazy Source / Target types yet as there's two
-                  // different types for Source and Target the result can't be cast to
-                  // the one people actually want to use.
-                  if (!returnType.getName().equals("org.apache.qpid.proton.amqp.transport.Source")
-                     && !returnType.getName().equals("org.apache.qpid.proton.amqp.messaging.Source")
-                     && !returnType.getName().equals("org.apache.qpid.proton.amqp.transport.Target")
-                     && !returnType.getName().equals("org.apache.qpid.proton.amqp.messaging.Target")) {
-
-                     result = wrap(returnType, result);
-                  }
+            if (returnType.isPrimitive() || returnType.isArray() || Object.class.equals(returnType)) {
+               // Skip any other checks
+            } else if (returnType.isAssignableFrom(ByteBuffer.class)) {
+               // Buffers are modifiable but we can just return null to indicate
+               // there's nothing there to access.
+               result = null;
+            } else if (returnType.isAssignableFrom(Map.class)) {
+               // Prevent return of modifiable maps
+               result = Collections.unmodifiableMap((Map<?, ?>) result);
+            } else if (isProtonType(returnType) && returnType.isInterface()) {
+
+               // Can't handle the crazy Source / Target types yet as there's two
+               // different types for Source and Target the result can't be cast to
+               // the one people actually want to use.
+               if (!returnType.getName().equals("org.apache.qpid.proton.amqp.transport.Source")
+                  && !returnType.getName().equals("org.apache.qpid.proton.amqp.messaging.Source")
+                  && !returnType.getName().equals("org.apache.qpid.proton.amqp.transport.Target")
+                  && !returnType.getName().equals("org.apache.qpid.proton.amqp.messaging.Target")) {
+
+                  result = wrap(returnType, result);
                }
-
-               return result;
-            } catch (InvocationTargetException e) {
-               throw e.getTargetException();
             }
+
+            return result;
+         } catch (InvocationTargetException e) {
+            throw e.getTargetException();
          }
       }));
    }
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/netty/NettyTcpTransport.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/netty/NettyTcpTransport.java
index 53445add0c..dfe92800b9 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/netty/NettyTcpTransport.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/netty/NettyTcpTransport.java
@@ -135,7 +135,7 @@ public class NettyTcpTransport implements NettyTransport {
       bootstrap = new Bootstrap();
       bootstrap.group(group);
       bootstrap.channel(NioSocketChannel.class);
-      bootstrap.handler(new ChannelInitializer<Channel>() {
+      bootstrap.handler(new ChannelInitializer<>() {
          @Override
          public void initChannel(Channel connectedChannel) throws Exception {
             configureChannel(connectedChannel, sslHandler);
@@ -145,13 +145,9 @@ public class NettyTcpTransport implements NettyTransport {
       configureNetty(bootstrap, getTransportOptions());
 
       ChannelFuture future = bootstrap.connect(getRemoteHost(), getRemotePort());
-      future.addListener(new ChannelFutureListener() {
-
-         @Override
-         public void operationComplete(ChannelFuture future) throws Exception {
-            if (!future.isSuccess()) {
-               handleException(future.channel(), IOExceptionSupport.create(future.cause()));
-            }
+      future.addListener((ChannelFutureListener) future1 -> {
+         if (!future1.isSuccess()) {
+            handleException(future1.channel(), IOExceptionSupport.create(future1.cause()));
          }
       });
 
@@ -180,13 +176,9 @@ public class NettyTcpTransport implements NettyTransport {
          throw failureCause;
       } else {
          // Connected, allow any held async error to fire now and close the transport.
-         channel.eventLoop().execute(new Runnable() {
-
-            @Override
-            public void run() {
-               if (failureCause != null) {
-                  channel.pipeline().fireExceptionCaught(failureCause);
-               }
+         channel.eventLoop().execute(() -> {
+            if (failureCause != null) {
+               channel.pipeline().fireExceptionCaught(failureCause);
             }
          });
       }
@@ -443,16 +435,13 @@ public class NettyTcpTransport implements NettyTransport {
             handleConnected(context.channel());
          } else {
             SslHandler sslHandler = context.pipeline().get(SslHandler.class);
-            sslHandler.handshakeFuture().addListener(new GenericFutureListener<Future<Channel>>() {
-               @Override
-               public void operationComplete(Future<Channel> future) throws Exception {
-                  if (future.isSuccess()) {
-                     logger.trace("SSL Handshake has completed: {}", channel);
-                     handleConnected(channel);
-                  } else {
-                     logger.trace("SSL Handshake has failed: {}", channel);
-                     handleException(channel, future.cause());
-                  }
+            sslHandler.handshakeFuture().addListener((GenericFutureListener<Future<Channel>>) future -> {
+               if (future.isSuccess()) {
+                  logger.trace("SSL Handshake has completed: {}", channel);
+                  handleConnected(channel);
+               } else {
+                  logger.trace("SSL Handshake has failed: {}", channel);
+                  handleException(channel, future.cause());
                }
             });
          }
diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressConfigTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressConfigTest.java
index 2f4c0afb52..e8ffab3b06 100644
--- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressConfigTest.java
+++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressConfigTest.java
@@ -85,29 +85,23 @@ public class AddressConfigTest extends VersionedBase {
 
       AtomicInteger errors = new AtomicInteger(0);
 
-      Thread t = new Thread() {
-         @Override
-         public void run() {
-            try {
-               evaluate(receiverClassloader, "addressConfig/receiveMessages.groovy", "receive");
-            } catch (Throwable e) {
-               errors.incrementAndGet();
-            }
+      Thread t = new Thread(() -> {
+         try {
+            evaluate(receiverClassloader, "addressConfig/receiveMessages.groovy", "receive");
+         } catch (Throwable e) {
+            errors.incrementAndGet();
          }
-      };
+      });
       t.start();
 
 
-      Thread t2 = new Thread() {
-         @Override
-         public void run() {
-            try {
-               evaluate(senderClassloader, "addressConfig/sendMessagesAddress.groovy", "send");
-            } catch (Throwable e) {
-               errors.incrementAndGet();
-            }
+      Thread t2 = new Thread(() -> {
+         try {
+            evaluate(senderClassloader, "addressConfig/sendMessagesAddress.groovy", "send");
+         } catch (Throwable e) {
+            errors.incrementAndGet();
          }
-      };
+      });
       t2.start();
 
 
diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToQueueTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToQueueTest.java
index d053a19c8f..6b0f5f2072 100644
--- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToQueueTest.java
+++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToQueueTest.java
@@ -82,41 +82,35 @@ public class JmsReplyToQueueTest extends VersionedBase {
       setVariable(receiverClassloader, "consumerCreated", consumerCreated);
 
       AtomicInteger errors = new AtomicInteger(0);
-      Thread t1 = new Thread() {
-         @Override
-         public void run() {
-            try {
-               if (JAKARTAEE.equals(receiver)) {
-                  evaluate(receiverClassloader, "jakartaReplyToQueue/receiveMessages.groovy", receiver);
-               } else {
-                  evaluate(receiverClassloader, "jmsReplyToQueue/receiveMessages.groovy", receiver);
-               }
-            } catch (Throwable e) {
-               e.printStackTrace();
-               errors.incrementAndGet();
+      Thread t1 = new Thread(() -> {
+         try {
+            if (JAKARTAEE.equals(receiver)) {
+               evaluate(receiverClassloader, "jakartaReplyToQueue/receiveMessages.groovy", receiver);
+            } else {
+               evaluate(receiverClassloader, "jmsReplyToQueue/receiveMessages.groovy", receiver);
             }
+         } catch (Throwable e) {
+            e.printStackTrace();
+            errors.incrementAndGet();
          }
-      };
+      });
       t1.start();
 
       assertTrue(consumerCreated.await(10, TimeUnit.SECONDS));
... 12569 lines suppressed ...


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@activemq.apache.org
For additional commands, e-mail: commits-help@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact