You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@artemis.apache.org by cl...@apache.org on 2026/03/19 00:53:01 UTC

(artemis) branch main updated: ARTEMIS-5957 consistent style for conditionals, etc.

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/artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new 6403e566f7 ARTEMIS-5957 consistent style for conditionals, etc.
6403e566f7 is described below

commit 6403e566f79a85dc958fe86a8f76c57edee7c1f6
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Wed Mar 18 14:49:46 2026 -0500

    ARTEMIS-5957 consistent style for conditionals, etc.
---
 .../activemq/artemis/cli/commands/Create.java      |  4 ++-
 .../artemis/cli/commands/messages/Consumer.java    |  4 ++-
 .../artemis/cli/commands/messages/Producer.java    |  4 ++-
 .../cli/commands/messages/ProducerThread.java      |  3 +-
 .../cli/commands/tools/journal/DecodeJournal.java  |  3 +-
 .../cli/commands/tools/xml/XMLMessageImporter.java |  4 ++-
 .../artemis/cli/commands/util/SyncCalculation.java |  4 ++-
 .../factory/serialize/XMLMessageSerializer.java    |  8 +++--
 .../apache/activemq/cli/test/CliProducerTest.java  |  4 ++-
 .../artemis/api/core/ActiveMQExceptionType.java    |  3 +-
 .../apache/activemq/artemis/logs/AuditLogger.java  |  4 ++-
 .../artemis/utils/ActiveMQThreadPoolExecutor.java  |  3 +-
 .../apache/activemq/artemis/utils/ByteUtil.java    | 27 +++++++++-----
 .../activemq/artemis/utils/ClassloadingUtil.java   | 10 +++---
 .../artemis/utils/PasswordMaskingUtil.java         |  6 ++--
 .../apache/activemq/artemis/utils/RandomUtil.java  |  4 ++-
 .../utils/collections/PriorityCollection.java      | 41 ++++++++++++++--------
 .../utils/collections/SingletonIterator.java       |  3 +-
 .../artemis/utils/collections/TypedProperties.java |  3 +-
 .../artemis/api/core/JGroupsBroadcastEndpoint.java |  3 +-
 .../artemis/api/core/TransportConfiguration.java   |  6 ++--
 .../artemis/api/core/client/ActiveMQClient.java    |  6 ++--
 .../artemis/api/core/jgroups/JChannelWrapper.java  |  3 +-
 .../core/client/impl/ClientSessionFactoryImpl.java | 24 ++++++++-----
 .../client/impl/LargeMessageControllerImpl.java    |  3 +-
 .../core/client/impl/ServerLocatorImpl.java        | 29 +++++++++------
 .../core/impl/ActiveMQClientProtocolManager.java   | 12 ++++---
 .../core/protocol/core/impl/ChannelImpl.java       |  3 +-
 .../impl/ssl/CachingSSLContextFactory.java         |  3 +-
 .../spi/core/remoting/ssl/SSLContextConfig.java    |  3 +-
 .../activemq/artemis/utils/VersionLoader.java      |  3 +-
 .../jdbc/store/file/JDBCSequentialFile.java        | 12 ++++---
 .../jdbc/store/journal/JDBCJournalImpl.java        | 15 +++++---
 .../artemis/jms/client/ActiveMQBytesMessage.java   |  3 +-
 .../jms/client/ActiveMQConnectionFactory.java      |  3 +-
 .../artemis/jms/client/ActiveMQJMSContext.java     | 12 ++++---
 .../artemis/jms/client/ActiveMQJMSProducer.java    |  3 +-
 .../artemis/jms/client/ActiveMQObjectMessage.java  |  3 +-
 .../artemis/jms/client/ActiveMQSession.java        |  6 ++--
 .../artemis/jms/client/ActiveMQTextMessage.java    |  3 +-
 .../artemis/jms/bridge/impl/JMSBridgeImpl.java     |  3 +-
 .../artemis/jms/server/embedded/EmbeddedJMS.java   |  5 +--
 .../jms/server/impl/JMSServerManagerImpl.java      |  3 +-
 .../core/io/aio/AIOSequentialFileFactory.java      |  6 ++--
 .../core/io/mapped/MappedSequentialFile.java       |  3 +-
 .../artemis/core/io/nio/NIOSequentialFile.java     |  3 +-
 .../core/journal/impl/FileWrapperJournal.java      |  3 +-
 .../core/journal/impl/JournalFilesRepository.java  |  6 ++--
 .../artemis/core/journal/impl/JournalImpl.java     |  6 ++--
 .../core/journal/impl/SimpleWaitIOCallback.java    |  3 +-
 .../protocol/amqp/broker/AMQPLargeMessage.java     |  9 +++--
 .../proton/transaction/ProtonTransactionImpl.java  |  3 +-
 .../core/protocol/mqtt/MQTTProtocolManager.java    | 12 ++++---
 .../artemis/core/protocol/stomp/SimpleBytes.java   |  3 +-
 .../core/protocol/stomp/StompConnection.java       |  3 +-
 .../artemis/core/protocol/stomp/StompDecoder.java  |  9 +++--
 .../artemis/core/protocol/stomp/StompSession.java  |  6 ++--
 .../protocol/stomp/v11/StompFrameHandlerV11.java   | 12 ++++---
 .../protocol/stomp/v12/StompFrameHandlerV12.java   |  6 ++--
 .../activemq/artemis/ra/ActiveMQRAProperties.java  |  3 +-
 .../activemq/artemis/ra/ActiveMQRaUtils.java       |  3 +-
 .../artemis/ra/inflow/ActiveMQActivation.java      |  3 +-
 .../artemis/ra/inflow/ActiveMQActivationSpec.java  |  3 +-
 .../artemis/core/config/ConfigurationUtils.java    | 18 ++++++----
 .../artemis/core/config/JaasAppConfiguration.java  |  4 ++-
 .../core/config/JaasAppConfigurationEntry.java     |  4 ++-
 .../management/impl/ActiveMQServerControlImpl.java |  3 +-
 .../core/management/impl/MBeanInfoHelper.java      |  5 +--
 .../view/predicate/ActiveMQFilterPredicate.java    |  3 +-
 .../impl/view/predicate/PredicateFilterPart.java   |  3 +-
 .../view/predicate/QueuePredicateFilterPart.java   |  3 +-
 .../paging/cursor/impl/PageCursorProviderImpl.java |  3 +-
 .../core/paging/cursor/impl/PagePositionImpl.java  |  4 ++-
 .../paging/impl/PagingStoreFactoryDatabase.java    |  4 ++-
 .../journal/AbstractJournalStorageManager.java     |  9 +++--
 .../impl/journal/JDBCJournalStorageManager.java    |  3 +-
 .../impl/journal/JournalStorageManager.java        | 24 ++++++++-----
 .../impl/journal/LargeServerMessageInSync.java     |  9 +++--
 .../artemis/core/postoffice/impl/AddressImpl.java  | 15 +++++---
 .../core/postoffice/impl/PostOfficeImpl.java       | 18 ++++++----
 .../wireformat/ReplicationStartSyncMessage.java    | 12 ++++---
 .../wireformat/ReplicationSyncFileMessage.java     |  9 +++--
 .../remoting/impl/netty/HttpAcceptorHandler.java   |  3 +-
 .../remoting/server/impl/RemotingServiceImpl.java  |  9 +++--
 .../core/replication/ReplicationEndpoint.java      | 15 +++++---
 .../core/replication/ReplicationManager.java       | 21 +++++++----
 .../artemis/core/server/cluster/BackupManager.java | 21 +++++++----
 .../core/server/cluster/ha/ColocatedHAManager.java |  3 +-
 .../server/cluster/ha/StandaloneHAManager.java     |  6 ++--
 .../core/server/cluster/impl/BridgeImpl.java       |  6 ++--
 .../cluster/impl/ClusterConnectionBridge.java      | 18 ++++++----
 .../server/cluster/impl/ClusterConnectionImpl.java |  3 +-
 .../core/server/cluster/quorum/QuorumManager.java  | 12 ++++---
 .../cluster/quorum/QuorumVoteServerConnect.java    |  5 +--
 .../core/server/embedded/EmbeddedActiveMQ.java     |  3 +-
 .../artemis/core/server/federation/Federation.java |  8 +++--
 .../core/server/federation/FederationManager.java  |  8 +++--
 .../server/group/impl/LocalGroupingHandler.java    |  6 ++--
 .../server/group/impl/RemoteGroupingHandler.java   |  6 ++--
 .../core/server/impl/ActiveMQServerImpl.java       | 13 ++++---
 .../core/server/impl/BackupTopologyListener.java   |  3 +-
 .../core/server/impl/FileBasedNodeManager.java     |  3 +-
 .../core/server/impl/FileLockNodeManager.java      |  3 +-
 .../artemis/core/server/impl/InVMNodeManager.java  |  3 +-
 .../core/server/impl/PostOfficeJournalLoader.java  |  3 +-
 .../core/server/impl/PrimaryOnlyActivation.java    |  3 +-
 .../artemis/core/server/impl/QueueImpl.java        |  6 ++--
 .../server/impl/ReplicationBackupActivation.java   |  3 +-
 .../artemis/core/server/impl/ScaleDownHandler.java | 16 +++++----
 .../core/server/impl/ServerSessionImpl.java        |  3 +-
 .../server/impl/SharedNothingBackupActivation.java |  9 +++--
 .../impl/SharedNothingPrimaryActivation.java       |  3 +-
 .../server/impl/SharedStoreBackupActivation.java   |  6 ++--
 .../server/impl/SharedStorePrimaryActivation.java  |  6 ++--
 .../core/server/impl/jdbc/JdbcNodeManager.java     |  3 +-
 .../server/management/ArtemisMBeanServerGuard.java | 12 ++++---
 .../spi/core/security/jaas/LDAPLoginModule.java    |  3 +-
 .../spi/core/security/scram/StringPrep.java        | 32 +++++++++++------
 .../artemis/utils/XMLConfigurationUtil.java        |  3 +-
 .../impl/journal/OperationContextUnitTest.java     | 21 +++++++----
 .../security/jaas/LDAPModuleRoleExpansionTest.java |  6 ++--
 .../cluster/impl/BroadcastGroupImplTest.java       |  9 +++--
 .../server/impl/ScheduledDeliveryHandlerTest.java  |  3 +-
 .../core/security/jaas/LDAPLoginModuleTest.java    |  3 +-
 .../artemis/tests/util/ServerTestBase.java         |  9 +++--
 .../xa/recovery/ActiveMQXAResourceWrapper.java     |  3 +-
 .../tests/extensions/OpenFilesCheckExtension.java  |  7 ++--
 .../artemis/component/WebServerComponent.java      |  9 +++--
 .../activemq/cli/test/WebServerComponentTest.java  |  3 +-
 etc/checkstyle-suppressions.xml                    |  4 +--
 etc/checkstyle.xml                                 |  5 +++
 .../largemessage/LargeMessageTestBase.java         |  3 +-
 .../stomp/util/AbstractClientStompFrame.java       |  3 +-
 .../stomp/util/ClientStompFrameV11.java            |  3 +-
 .../stomp/util/StompClientConnectionV11.java       |  6 ++--
 .../artemis/tests/util/ActiveMQTestBase.java       | 39 +++++++++++++-------
 .../activemq/artemis/tests/util/JMSTestBase.java   |  6 ++--
 .../tests/compatibility/MirroredVersionTest.java   |  4 ++-
 .../artemis/tests/db/paging/PagingTest.java        |  3 +-
 .../integration/amqp/AmqpTransactionTest.java      |  8 +++--
 .../client/ConcurrentCreateDeleteProduceTest.java  |  7 ++--
 .../tests/integration/client/HangConsumerTest.java |  3 +-
 .../tests/integration/client/LargeMessageTest.java |  5 +--
 .../client/RescheduleJDBCDeliveryTest.java         |  3 +-
 .../cluster/bridge/BridgeReconnectTest.java        | 18 ++++++----
 .../integration/cluster/bridge/BridgeTest.java     |  3 +-
 .../integration/cluster/bridge/BridgeTestBase.java |  3 +-
 .../bridge/PageCounterOnBridgeFailoverTest.java    |  7 ++--
 .../cluster/distribution/ClusterTestBase.java      |  6 ++--
 .../distribution/ClusteredGroupingTest.java        | 12 ++++---
 .../cluster/failover/BackupSyncJournalTest.java    |  3 +-
 .../failover/NettyReplicatedFailoverTest.java      |  6 ++--
 .../PageCleanupWhileReplicaCatchupTest.java        |  4 ++-
 .../integration/cluster/util/BackupSyncDelay.java  |  9 +++--
 .../tests/integration/discovery/DiscoveryTest.java |  6 ++--
 .../tests/integration/jms/JmsProducerTest.java     | 21 +++++++----
 .../jms/ManualReconnectionToSingleServerTest.java  |  3 +-
 .../jms/cluster/MultipleThreadsOpeningTest.java    |  3 +-
 .../journal/JournalCompactSplitTest.java           |  4 ++-
 .../integration/mqtt/MQTTSecurityManagerTest.java  | 12 +++++--
 .../mqtt/MQTTSecurityPerAcceptorTest.java          |  4 ++-
 .../tests/integration/mqtt/MQTTSecurityTest.java   | 19 ++++++----
 .../artemis/tests/integration/mqtt/MQTTTest.java   | 10 ++++--
 .../openwire/amq/JmsQueueBrowserTest.java          | 13 +++----
 .../integration/paging/AddressFullLoggingTest.java |  3 +-
 .../paging/MultipleProducersPagingTest.java        |  6 ++--
 .../persistence/StorageManagerTestBase.java        |  3 +-
 .../integration/replication/ReplicationTest.java   |  9 +++--
 .../tests/integration/security/SecurityTest.java   | 20 ++++++-----
 .../tests/integration/server/ScaleDownTest.java    |  5 +--
 .../tests/integration/stomp/v11/StompV11Test.java  |  6 ++--
 .../tests/integration/stomp/v12/StompV12Test.java  |  6 ++--
 .../tests/integration/xa/BasicXaRecoveryTest.java  | 15 +++++---
 .../artemis/jms/tests/message/MessageTestBase.java |  3 +-
 .../performance/sends/MeasureCommitPerfTest.java   |  3 +-
 .../DualMirrorNoContainerTest.java                 |  8 +++--
 .../infinite/InfiniteRedeliverySmokeTest.java      |  8 +++--
 .../replicationflow/SoakReplicatedPagingTest.java  |  7 ++--
 .../artemis/tests/soak/stomp/StompSoakTest.java    |  3 +-
 .../tests/stress/paging/PageCursorStressTest.java  |  9 +++--
 .../timing/jms/bridge/impl/JMSBridgeImplTest.java  |  3 +-
 .../core/journal/impl/AlignedJournalImplTest.java  |  3 +-
 .../impl/JournalFileRepositoryOrderTest.java       |  4 ++-
 .../unit/core/message/impl/MessageImplTest.java    |  3 +-
 .../remoting/impl/netty/NettyAcceptorTest.java     |  6 ++--
 .../unit/ra/ActiveMQXAResourceWrapperTest.java     |  6 ++--
 .../artemis/tests/unit/ra/ResourceAdapterTest.java |  6 ++--
 187 files changed, 900 insertions(+), 444 deletions(-)

diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
index 3e726c4ed9..32f70c1c89 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
@@ -1020,7 +1020,9 @@ public class Create extends InstallAbstract {
       int count = 0;
 
       for (boolean itemB : b) {
-         if (itemB) count++;
+         if (itemB) {
+            count++;
+         }
       }
 
       return count;
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/Consumer.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/Consumer.java
index f5af2227d3..10f15fcb9a 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/Consumer.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/Consumer.java
@@ -138,7 +138,9 @@ public class Consumer extends DestAbstract {
             }
          } catch (InterruptedException e) {
             // Interrupt any sub threads if an interrupt is captured
-            for (Thread t : threadsArray) t.interrupt();
+            for (Thread t : threadsArray) {
+               t.interrupt();
+            }
             throw e;
          }
 
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/Producer.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/Producer.java
index 2b905b3dea..3e44b2a0be 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/Producer.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/Producer.java
@@ -237,7 +237,9 @@ public class Producer extends DestAbstract {
                return messagesProduced;
             } catch (InterruptedException e) {
                // Interrupt any sub threads if an interrupt is captured
-               for (Thread t : threadsArray) t.interrupt();
+               for (Thread t : threadsArray) {
+                  t.interrupt();
+               }
                throw e;
             }
          }
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/ProducerThread.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/ProducerThread.java
index 49a2b6f099..d859f7c8c8 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/ProducerThread.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/ProducerThread.java
@@ -256,8 +256,9 @@ public class ProducerThread extends Thread {
          StringBuilder builder = new StringBuilder();
          while ((count = reader.read(buffer)) != -1) {
             builder.append(buffer, 0, count);
-            if (size > 0)
+            if (size > 0) {
                break;
+            }
          }
          return builder.toString();
       } catch (IOException ioe) {
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/journal/DecodeJournal.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/journal/DecodeJournal.java
index 09ab18b552..1e3f1ab58d 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/journal/DecodeJournal.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/journal/DecodeJournal.java
@@ -102,8 +102,9 @@ public class DecodeJournal extends LockAbstract {
       File journalDir = new File(directory);
 
       if (!journalDir.exists()) {
-         if (!journalDir.mkdirs())
+         if (!journalDir.mkdirs()) {
             System.err.println("Could not create directory " + directory);
+         }
       }
 
       NIOSequentialFileFactory nio = new NIOSequentialFileFactory(new File(directory), null, 1);
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XMLMessageImporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XMLMessageImporter.java
index e4bca3ca6b..ee44ec7f69 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XMLMessageImporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XMLMessageImporter.java
@@ -64,7 +64,9 @@ public class XMLMessageImporter {
    }
 
    public MessageInfo readMessage(boolean decodeUTF8) throws Exception {
-      if (!reader.hasNext()) return null;
+      if (!reader.hasNext()) {
+         return null;
+      }
 
       Byte type = 0;
       Byte priority = 0;
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/util/SyncCalculation.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/util/SyncCalculation.java
index 8743beefb6..42a4732a96 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/util/SyncCalculation.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/util/SyncCalculation.java
@@ -151,7 +151,9 @@ public class SyncCalculation {
                }
             }
 
-            if (!syncWrites) flushLatch(latch);
+            if (!syncWrites) {
+               flushLatch(latch);
+            }
 
             long end = System.currentTimeMillis();
 
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/factory/serialize/XMLMessageSerializer.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/factory/serialize/XMLMessageSerializer.java
index 91dfeb1d25..a469c49073 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/factory/serialize/XMLMessageSerializer.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/factory/serialize/XMLMessageSerializer.java
@@ -51,10 +51,14 @@ public class XMLMessageSerializer implements MessageSerializer {
       reader.getRawXMLReader().nextTag();
 
       // End of document.
-      if (reader.getRawXMLReader().getLocalName().equals("messages")) return null;
+      if (reader.getRawXMLReader().getLocalName().equals("messages")) {
+         return null;
+      }
 
       XMLMessageImporter.MessageInfo messageInfo = reader.readMessage(true);
-      if (messageInfo == null) return null;
+      if (messageInfo == null) {
+         return null;
+      }
 
       // This is a large message
       ActiveMQMessage jmsMessage = new ActiveMQMessage((ClientMessage) messageInfo.message, clientSession);
diff --git a/artemis-cli/src/test/java/org/apache/activemq/cli/test/CliProducerTest.java b/artemis-cli/src/test/java/org/apache/activemq/cli/test/CliProducerTest.java
index e6bd2bb538..bc8071200a 100644
--- a/artemis-cli/src/test/java/org/apache/activemq/cli/test/CliProducerTest.java
+++ b/artemis-cli/src/test/java/org/apache/activemq/cli/test/CliProducerTest.java
@@ -80,7 +80,9 @@ public class CliProducerTest extends CliTestBase {
 
       List<Message> received = consumeMessages(session, address, TEST_MESSAGE_COUNT, CompositeAddress.isFullyQualified(address));
       for (int i = 0; i < TEST_MESSAGE_COUNT; i++) {
-         if (!isCustomMessageBody) messageBody = "test message: " + String.valueOf(i);
+         if (!isCustomMessageBody) {
+            messageBody = "test message: " + String.valueOf(i);
+         }
          assertEquals(messageBody, ((TextMessage) received.get(i)).getText());
       }
    }
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
index 1da9c29505..ab37420c60 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
@@ -310,8 +310,9 @@ public enum ActiveMQExceptionType {
 
    public static ActiveMQExceptionType getType(int code) {
       ActiveMQExceptionType type = TYPE_MAP.get(code);
-      if (type != null)
+      if (type != null) {
          return type;
+      }
       return ActiveMQExceptionType.GENERIC_EXCEPTION;
    }
 }
\ No newline at end of file
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
index 639a7128c4..353911e296 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
@@ -128,7 +128,9 @@ public interface AuditLogger {
    }
 
    static String parametersList(Object value) {
-      if (value == null) return "";
+      if (value == null) {
+         return "";
+      }
 
       final String prefix = "with parameters: ";
 
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ActiveMQThreadPoolExecutor.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ActiveMQThreadPoolExecutor.java
index da7de12925..37cae15997 100755
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ActiveMQThreadPoolExecutor.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ActiveMQThreadPoolExecutor.java
@@ -70,8 +70,9 @@ public class ActiveMQThreadPoolExecutor extends ThreadPoolExecutor {
             retval = super.offer(runnable);
 
             // Only decrement the delta if the task has actually been added to the queue
-            if (retval)
+            if (retval) {
                DELTA_UPDATER.decrementAndGet(this);
+            }
          }
 
          return retval;
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
index 53aace6c86..40c0511e76 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
@@ -342,12 +342,15 @@ public class ByteUtil {
                                 final byte[] right,
                                 final int rightOffset,
                                 final int rightLength) {
-      if (left == right)
+      if (left == right) {
          return true;
-      if (left == null || right == null)
+      }
+      if (left == null || right == null) {
          return false;
-      if (left.length != rightLength)
+      }
+      if (left.length != rightLength) {
          return false;
+      }
       if (PlatformDependent.isUnaligned() && PlatformDependent.hasUnsafe()) {
          return equalsUnsafe(left, right, rightOffset, rightLength);
       } else {
@@ -356,9 +359,11 @@ public class ByteUtil {
    }
 
    private static boolean equalsSafe(byte[] left, byte[] right, int rightOffset, int rightLength) {
-      for (int i = 0; i < rightLength; i++)
-         if (left[i] != right[rightOffset + i])
+      for (int i = 0; i < rightLength; i++) {
+         if (left[i] != right[rightOffset + i]) {
             return false;
+         }
+      }
       return true;
    }
 
@@ -410,8 +415,9 @@ public class ByteUtil {
     * starting right after the length field.}
     */
    public static boolean equals(final byte[] bytes, final ByteBuf byteBuf, final int offset, final int length) {
-      if (bytes.length != length)
+      if (bytes.length != length) {
          return false;
+      }
       if (PlatformDependent.isUnaligned() && PlatformDependent.hasUnsafe()) {
          if ((offset + length) > byteBuf.writerIndex()) {
             throw new IndexOutOfBoundsException();
@@ -426,11 +432,14 @@ public class ByteUtil {
    }
 
    private static boolean equalsOnHeap(final byte[] bytes, final ByteBuf byteBuf, final int offset, final int length) {
-      if (bytes.length != length)
+      if (bytes.length != length) {
          return false;
-      for (int i = 0; i < length; i++)
-         if (bytes[i] != byteBuf.getByte(offset + i))
+      }
+      for (int i = 0; i < length; i++) {
+         if (bytes[i] != byteBuf.getByte(offset + i)) {
             return false;
+         }
+      }
       return true;
    }
 
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
index 2c284a6109..5a3158c34e 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
@@ -51,9 +51,9 @@ public final class ClassloadingUtil {
             System.out.println(INSTANTIATION_EXCEPTION_MESSAGE);
          }
          loader = Thread.currentThread().getContextClassLoader();
-         if (loader == null)
+         if (loader == null) {
             throw new RuntimeException("No local context classloader", t);
-
+         }
          try {
             return getInstanceWithTypeCheck(className, expectedType, loader);
          } catch (InstantiationException e) {
@@ -97,14 +97,16 @@ public final class ClassloadingUtil {
    public static URL findResource(ClassLoader loader, final String resourceName) {
       try {
          URL resource = loader.getResource(resourceName);
-         if (resource != null)
+         if (resource != null) {
             return resource;
+         }
       } catch (Throwable t) {
       }
 
       loader = Thread.currentThread().getContextClassLoader();
-      if (loader == null)
+      if (loader == null) {
          return null;
+      }
 
       return loader.getResource(resourceName);
    }
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java
index 430351c085..00336d35b3 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java
@@ -170,8 +170,9 @@ public final class PasswordMaskingUtil {
 
       // semi colons
       String[] parts = codecDesc.split(";");
-      if (parts.length < 1)
+      if (parts.length < 1) {
          throw new ActiveMQException(ActiveMQExceptionType.ILLEGAL_STATE, "Invalid PasswordCodec value: " + codecDesc);
+      }
 
       final String codecClassName = parts[0];
 
@@ -205,8 +206,9 @@ public final class PasswordMaskingUtil {
       if (parts.length > 1) {
          for (int i = 1; i < parts.length; i++) {
             String[] keyVal = parts[i].split("=");
-            if (keyVal.length != 2)
+            if (keyVal.length != 2) {
                throw ActiveMQUtilBundle.BUNDLE.invalidProperty(parts[i]);
+            }
             props.put(keyVal[0], keyVal[1]);
          }
       }
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/RandomUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/RandomUtil.java
index b1d7b032fe..9b83175fed 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/RandomUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/RandomUtil.java
@@ -123,7 +123,9 @@ public class RandomUtil {
    }
 
    public static int randomInterval(final int min, final int max) {
-      if (min == max) return max;
+      if (min == max) {
+         return max;
+      }
       return min + random.nextInt(max - min);
    }
 
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/PriorityCollection.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/PriorityCollection.java
index 3d76c1abeb..eccaa4abf6 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/PriorityCollection.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/PriorityCollection.java
@@ -138,12 +138,13 @@ public class PriorityCollection<E extends PriorityAware> extends AbstractCollect
          int mid = (low + high) >>> 1;
          PriorityHolder<E> midVal = current[mid];
 
-         if (midVal.getPriority() > priority)
+         if (midVal.getPriority() > priority) {
             low = mid + 1;
-         else if (midVal.getPriority() < priority)
+         } else if (midVal.getPriority() < priority) {
             high = mid - 1;
-         else
+         } else {
             return midVal.getValues(); //key found
+         }
       }
 
       if (createIfMissing) {
@@ -163,14 +164,18 @@ public class PriorityCollection<E extends PriorityAware> extends AbstractCollect
 
    @Override
    public synchronized boolean add(E e) {
-      if (size() == Integer.MAX_VALUE) return false;
+      if (size() == Integer.MAX_VALUE) {
+         return false;
+      }
       boolean result = addInternal(e);
       calcSize();
       return result;
    }
 
    private boolean addInternal(E e) {
-      if (e == null) return false;
+      if (e == null) {
+         return false;
+      }
       Collection<E> priority = getCollection(e.getPriority(), true);
       return priority.add(e);
    }
@@ -205,11 +210,11 @@ public class PriorityCollection<E extends PriorityAware> extends AbstractCollect
          int mid = (low + high) >>> 1;
          PriorityHolder<E> midVal = current[mid];
 
-         if (midVal.getPriority() > priority)
+         if (midVal.getPriority() > priority) {
             low = mid + 1;
-         else if (midVal.getPriority() < priority)
+         } else if (midVal.getPriority() < priority) {
             high = mid - 1;
-         else {
+         } else {
             PriorityHolder<E>[] newArray = newPrioritySetArrayInstance(len - 1);
             System.arraycopy(current, 0, newArray, 0, mid);
             System.arraycopy(current, mid + 1, newArray, mid, len - mid - 1);
@@ -223,20 +228,26 @@ public class PriorityCollection<E extends PriorityAware> extends AbstractCollect
    @Override
    public boolean containsAll(Collection<?> c) {
       Objects.requireNonNull(c);
-      for (Object e : c)
-         if (!contains(e))
+      for (Object e : c) {
+         if (!contains(e)) {
             return false;
+         }
+      }
       return true;
    }
 
    @Override
    public synchronized boolean addAll(Collection<? extends E> c) {
       Objects.requireNonNull(c);
-      if (size() >= Integer.MAX_VALUE - c.size()) return false;
+      if (size() >= Integer.MAX_VALUE - c.size()) {
+         return false;
+      }
       boolean modified = false;
-      for (E e : c)
-         if (addInternal(e))
+      for (E e : c) {
+         if (addInternal(e)) {
             modified = true;
+         }
+      }
       calcSize();
       return modified;
    }
@@ -286,7 +297,9 @@ public class PriorityCollection<E extends PriorityAware> extends AbstractCollect
    }
 
    public boolean contains(PriorityAware priorityAware) {
-      if (priorityAware == null) return false;
+      if (priorityAware == null) {
+         return false;
+      }
       Collection<E> prioritySet = getCollection(priorityAware.getPriority(), false);
       return prioritySet != null && prioritySet.contains(priorityAware);
    }
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/SingletonIterator.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/SingletonIterator.java
index 956e045e23..7c23c0f9ae 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/SingletonIterator.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/SingletonIterator.java
@@ -55,7 +55,8 @@ public class SingletonIterator<E> implements Iterator<E> {
 
    @Override
    public void forEachRemaining(Consumer<? super E> action) {
-      if (value != null)
+      if (value != null) {
          action.accept(value);
+      }
    }
 }
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/TypedProperties.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/TypedProperties.java
index d8d8c84db9..40ee98d556 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/TypedProperties.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/TypedProperties.java
@@ -298,8 +298,9 @@ public class TypedProperties {
 
    public Float getFloatProperty(final SimpleString key) throws ActiveMQPropertyConversionException {
       Object value = doGetProperty(key);
-      if (value == null)
+      if (value == null) {
          return Float.valueOf(null);
+      }
       if (value instanceof Float floatValue) {
          return floatValue;
       }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
index 51f0454afd..141a7843e3 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
@@ -107,8 +107,9 @@ public abstract class JGroupsBroadcastEndpoint implements BroadcastEndpoint {
 
    @Override
    public synchronized void openBroadcaster() throws Exception {
-      if (broadcastOpened)
+      if (broadcastOpened) {
          return;
+      }
       internalOpen();
       broadcastOpened = true;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
index c4c83e112e..f64836177b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
@@ -223,10 +223,12 @@ public class TransportConfiguration implements Serializable {
    }
 
    public boolean isSameParams(TransportConfiguration that) {
-      if (!factoryClassName.equals(that.factoryClassName))
+      if (!factoryClassName.equals(that.factoryClassName)) {
          return false;
-      if (!Objects.equals(params, that.params))
+      }
+      if (!Objects.equals(params, that.params)) {
          return false;
+      }
 
       return true;
    }
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 748042f907..bb08feeeb6 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
@@ -232,8 +232,9 @@ public final class ActiveMQClient {
    public static synchronized void injectPools(ExecutorService globalThreadPool,
                                                ScheduledExecutorService scheduledThreadPool,
                                                ExecutorService flowControlThreadPool) {
-      if (globalThreadPool == null || scheduledThreadPool == null || flowControlThreadPool == null)
+      if (globalThreadPool == null || scheduledThreadPool == null || flowControlThreadPool == null) {
          throw new IllegalArgumentException("thread pools must not be null");
+      }
 
       // We call clearThreadPools as that will shutdown any previously used executor
       clearThreadPools();
@@ -317,8 +318,9 @@ public final class ActiveMQClient {
     */
    public static void setGlobalThreadPoolProperties(int globalThreadMaxPoolSize, int globalScheduledThreadPoolSize, int globalFlowControlThreadPoolSize) {
 
-      if (globalThreadMaxPoolSize < 2 && globalThreadMaxPoolSize != -1)
+      if (globalThreadMaxPoolSize < 2 && globalThreadMaxPoolSize != -1) {
          globalThreadMaxPoolSize = 2;
+      }
 
       ActiveMQClient.globalScheduledThreadPoolSize = globalScheduledThreadPoolSize;
       ActiveMQClient.globalThreadPoolSize = globalThreadMaxPoolSize;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java
index 6cb677d5a6..4b23e4e6fe 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java
@@ -95,8 +95,9 @@ public class JChannelWrapper {
    }
 
    public void removeReceiver(JGroupsReceiver receiver) {
-      if (logger.isTraceEnabled())
+      if (logger.isTraceEnabled()) {
          logger.trace("{}::removeReceiver: {} on {}", this, receiver, channelName, new Exception("Trace"));
+      }
       synchronized (receivers) {
          receivers.remove(receiver);
       }
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 edce730c62..421ee4ee4d 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
@@ -493,10 +493,11 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
       // called
       for (ClientSessionInternal session : sessionsToClose) {
          try {
-            if (close)
+            if (close) {
                session.close();
-            else
+            } else {
                session.cleanUp(false);
+            }
          } catch (Exception e1) {
             ActiveMQClientLogger.LOGGER.unableToCloseSession(e1);
          }
@@ -590,8 +591,9 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
       }
 
       Set<ClientSessionInternal> sessionsToClose = null;
-      if (!clientProtocolManager.isAlive())
+      if (!clientProtocolManager.isAlive()) {
          return;
+      }
       Lock localFailoverLock = lockFailover();
       try {
          if (connection == null || !connection.getID().equals(connectionID) || !clientProtocolManager.isAlive()) {
@@ -891,9 +893,9 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
                                      final RemotingConnection oldConnection,
                                      final ActiveMQException cause) {
       if (connection == null) {
-         if (!clientProtocolManager.isAlive())
+         if (!clientProtocolManager.isAlive()) {
             ActiveMQClientLogger.LOGGER.failedToConnectToServer();
-
+         }
          return false;
       }
 
@@ -931,8 +933,9 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
    }
 
    private int getConnectionWithRetry(final int reconnectAttempts, RemotingConnection oldConnection) {
-      if (!clientProtocolManager.isAlive())
+      if (!clientProtocolManager.isAlive()) {
          return 0;
+      }
       if (logger.isTraceEnabled()) {
          logger.trace("getConnectionWithRetry::{} with retryInterval = {} multiplier = {}",
                       reconnectAttempts, retryInterval, retryIntervalMultiplier, new Exception("trace"));
@@ -972,8 +975,9 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
                   logger.trace("Waiting {} milliseconds before next retry. RetryInterval={} and multiplier={}", interval, retryInterval, retryIntervalMultiplier);
                }
 
-               if (waitForRetry(interval))
+               if (waitForRetry(interval)) {
                   return count;
+               }
 
                interval = serverLocator.getNextRetryInterval(interval, retryIntervalMultiplier, maxRetryInterval);
             } else {
@@ -1042,10 +1046,12 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
    //updated properly.
    @Override
    public RemotingConnection getConnection() {
-      if (closed)
+      if (closed) {
          throw new IllegalStateException("ClientSessionFactory is closed!");
-      if (!clientProtocolManager.isAlive())
+      }
+      if (!clientProtocolManager.isAlive()) {
          return null;
+      }
       synchronized (connectionLock) {
          if (connection != null) {
             // a connection already exists, so returning the same one
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
index 5c3caf54b4..7d4580b074 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
@@ -136,8 +136,9 @@ public class LargeMessageControllerImpl implements LargeMessageController {
    @Override
    public void discardUnusedPackets() {
       if (outStream == null) {
-         if (originallyRegular)
+         if (originallyRegular) {
             return;
+         }
          try {
             checkForPacket(totalSize - 1);
          } catch (Throwable ignored) {
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 4019afaff2..b8d05736b4 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
@@ -237,8 +237,9 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
    @Override
    public synchronized boolean setThreadPools(Executor threadPool, ScheduledExecutorService scheduledThreadPool, Executor flowControlThreadPool) {
 
-      if (threadPool == null || scheduledThreadPool == null)
+      if (threadPool == null || scheduledThreadPool == null) {
          return false;
+      }
 
       if (this.threadPool == null && this.scheduledThreadPool == null && this.flowControlThreadPool == null) {
          config.useGlobalPools = false;
@@ -264,11 +265,13 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
 
    @Override
    public synchronized void initialize() throws ActiveMQException {
-      if (state == STATE.INITIALIZED)
+      if (state == STATE.INITIALIZED) {
          return;
+      }
       synchronized (stateGuard) {
-         if (state == STATE.CLOSING)
+         if (state == STATE.CLOSING) {
             throw new ActiveMQIllegalStateException();
+         }
          try {
             state = STATE.INITIALIZED;
             latch = new CountDownLatch(1);
@@ -1245,8 +1248,9 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
 
    @Override
    public TransportConfiguration[] getStaticTransportConfigurations() {
-      if (initialConnectors == null)
-         return new TransportConfiguration[]{};
+      if (initialConnectors == null) {
+         return new TransportConfiguration[] {};
+      }
       return Arrays.copyOf(initialConnectors, initialConnectors.length);
    }
 
@@ -1344,8 +1348,9 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
    }
 
    private int getNumInitialConnectors() {
-      if (initialConnectors == null)
+      if (initialConnectors == null) {
          return 0;
+      }
       return initialConnectors.length;
    }
 
@@ -1407,8 +1412,9 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
 
          state = STATE.CLOSING;
       }
-      if (latch != null)
+      if (latch != null) {
          latch.countDown();
+      }
 
       synchronized (connectingFactories) {
          for (ClientSessionFactoryInternal csf : connectingFactories) {
@@ -1807,18 +1813,21 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
                   break;
                }
 
-               if (latch.await(config.retryInterval, TimeUnit.MILLISECONDS))
+               if (latch.await(config.retryInterval, TimeUnit.MILLISECONDS)) {
                   return null;
+               }
             }
 
          } catch (RejectedExecutionException e) {
-            if (isClosed() || skipWarnings)
+            if (isClosed() || skipWarnings) {
                return null;
+            }
             logger.trace("Rejected execution", e);
             throw e;
          } catch (Exception e) {
-            if (isClosed() || skipWarnings)
+            if (isClosed() || skipWarnings) {
                return null;
+            }
             ActiveMQClientLogger.LOGGER.errorConnectingToNodes(e);
             throw ActiveMQClientMessageBundle.BUNDLE.cannotConnectToStaticConnectors(e);
          }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
index 1b3671e8e0..97ff1fbd43 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
@@ -204,8 +204,9 @@ public class ActiveMQClientProtocolManager implements ClientProtocolManager {
       alive = false;
 
       synchronized (inCreateSessionGuard) {
-         if (inCreateSessionLatch != null)
+         if (inCreateSessionLatch != null) {
             inCreateSessionLatch.countDown();
+         }
       }
 
       Channel channel1 = getChannel1();
@@ -273,8 +274,9 @@ public class ActiveMQClientProtocolManager implements ClientProtocolManager {
                                               int minLargeMessageSize,
                                               int confirmationWindowSize,
                                               String clientID) throws ActiveMQException {
-      if (!isAlive())
+      if (!isAlive()) {
          throw ActiveMQClientMessageBundle.BUNDLE.clientSessionClosed();
+      }
 
       Channel sessionChannel = null;
       CreateSessionResponseMessage response = null;
@@ -291,8 +293,9 @@ public class ActiveMQClientProtocolManager implements ClientProtocolManager {
 
             // We now set a flag saying createSession is executing
             synchronized (inCreateSessionGuard) {
-               if (!isAlive())
+               if (!isAlive()) {
                   throw ActiveMQClientMessageBundle.BUNDLE.clientSessionClosed();
+               }
                inCreateSession = true;
                inCreateSessionLatch = new CountDownLatch(1);
             }
@@ -305,8 +308,9 @@ public class ActiveMQClientProtocolManager implements ClientProtocolManager {
                // channel1 reference here has to go away
                response = (CreateSessionResponseMessage) getChannel1().sendBlocking(request, PacketImpl.CREATESESSION_RESP);
             } catch (ActiveMQException cause) {
-               if (!isAlive())
+               if (!isAlive()) {
                   throw cause;
+               }
 
                if (cause.getType() == ActiveMQExceptionType.UNBLOCKED ||
                        cause.getType() == ActiveMQExceptionType.ROUTING_EXCEPTION) {
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
index feb47505f5..bc33403ed6 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
@@ -104,8 +104,9 @@ public final class ChannelImpl implements Channel {
 
       protected static String idToString(long code) {
          for (CHANNEL_ID channel : EnumSet.allOf(CHANNEL_ID.class)) {
-            if (channel.id == code)
+            if (channel.id == code) {
                return channel.toString();
+            }
          }
          return Long.toString(code);
       }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/CachingSSLContextFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/CachingSSLContextFactory.java
index e283ac1b6e..45cc04643c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/CachingSSLContextFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/CachingSSLContextFactory.java
@@ -65,8 +65,9 @@ public class CachingSSLContextFactory extends DefaultSSLContextFactory {
     */
    protected Object getCacheKey(final SSLContextConfig config, final Map<String, Object> additionalOpts) {
       final Object cacheKey = ConfigurationHelper.getStringProperty(TransportConstants.SSL_CONTEXT_PROP_NAME, null, additionalOpts);
-      if (cacheKey != null)
+      if (cacheKey != null) {
          return cacheKey;
+      }
 
       return config;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/SSLContextConfig.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/SSLContextConfig.java
index e4367446b3..34cc1557ce 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/SSLContextConfig.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/SSLContextConfig.java
@@ -48,8 +48,9 @@ public final class SSLContextConfig {
       }
 
       public Builder from(final SSLContextConfig config) {
-         if (config == null)
+         if (config == null) {
             return this;
+         }
 
          keystorePath = config.getKeystorePath();
          keystoreType = config.getKeystoreType();
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 b2eb254267..ca7ad1ef80 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
@@ -124,8 +124,9 @@ public final class VersionLoader {
          }
       } finally {
          try {
-            if (in != null)
+            if (in != null) {
                in.close();
+            }
          } catch (Throwable ignored) {
          }
       }
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java
index f06c5f2d21..8488a5cce3 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java
@@ -201,13 +201,15 @@ public class JDBCSequentialFile implements SequentialFile {
             if (logger.isTraceEnabled()) {
                logger.trace("Write: ID: {} FileName: {}{}", getId(), getFileName(), size());
             }
-            if (callback != null)
+            if (callback != null) {
                callback.done();
+            }
             return noBytes;
          }
       } catch (Exception e) {
-         if (callback != null)
+         if (callback != null) {
             callback.onError(ActiveMQExceptionType.IO_ERROR.getCode(), e.getClass() + " during JDBC write:" + e.getMessage());
+         }
          fileFactory.onIOError(e, "Error writing to JDBC file.", this);
       }
       return 0;
@@ -367,12 +369,14 @@ public class JDBCSequentialFile implements SequentialFile {
          try {
             int read = dbDriver.readFromFile(this, bytes);
             readPosition += read;
-            if (callback != null)
+            if (callback != null) {
                callback.done();
+            }
             return read;
          } catch (SQLException e) {
-            if (callback != null)
+            if (callback != null) {
                callback.onError(ActiveMQExceptionType.IO_ERROR.getCode(), e.getClass() + " during JDBC read:" + e.getMessage());
+            }
             fileFactory.onIOError(e, "Error reading from JDBC file.", this);
          }
          return 0;
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 f6a6c8f5fd..af1ac7b737 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
@@ -179,8 +179,9 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
 
    public synchronized void stop(boolean sync) throws SQLException {
       if (started) {
-         if (sync)
+         if (sync) {
             sync();
+         }
          started = false;
          super.stop();
       }
@@ -347,12 +348,16 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
 
    private void checkStatus(IOCompletion callback) throws Exception {
       if (!started) {
-         if (callback != null) callback.onError(-1, "JDBC Journal is not loaded");
+         if (callback != null) {
+            callback.onError(-1, "JDBC Journal is not loaded");
+         }
          throw new ActiveMQShutdownException("JDBCJournal is not loaded");
       }
 
       if (failed.get()) {
-         if (callback != null) callback.onError(-1, "JDBC Journal failed");
+         if (callback != null) {
+            callback.onError(-1, "JDBC Journal failed");
+         }
          throw new ActiveMQException("JDBCJournal Failed");
       }
    }
@@ -390,7 +395,9 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
       }
 
       syncTimer.delay();
-      if (callback != null) callback.waitCompletion();
+      if (callback != null) {
+         callback.waitCompletion();
+      }
    }
 
    private synchronized void addTxRecord(JDBCJournalRecord record) throws Exception {
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
index a3a14189ab..3ef1b93324 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
@@ -365,8 +365,9 @@ public class ActiveMQBytesMessage extends ActiveMQMessage implements BytesMessag
 
    @Override
    protected <T> T getBodyInternal(Class<T> c) {
-      if (bodyLength == 0)
+      if (bodyLength == 0) {
          return null;
+      }
       byte[] dst = new byte[bodyLength];
       message.getBodyBuffer().getBytes(CoreMessage.BODY_OFFSET, dst);
       return (T) dst;
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 145ebea422..f28eaf994d 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
@@ -891,8 +891,9 @@ public class ActiveMQConnectionFactory extends JNDIStorable implements Connectio
    @Override
    public void close() {
       ServerLocator locator0 = serverLocator;
-      if (locator0 != null)
+      if (locator0 != null) {
          locator0.close();
+      }
    }
 
    public ServerLocator getServerLocator() {
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSContext.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSContext.java
index ec8d96eaf2..c3b2f3b53b 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSContext.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSContext.java
@@ -128,8 +128,9 @@ public class ActiveMQJMSContext implements JMSContext {
    private void checkSession() {
       if (session == null) {
          synchronized (this) {
-            if (closed)
+            if (closed) {
                throw new IllegalStateRuntimeException("Context is closed");
+            }
             if (session == null) {
                try {
                   if (xa) {
@@ -225,8 +226,9 @@ public class ActiveMQJMSContext implements JMSContext {
       threadAwareContext.assertNotMessageListenerThreadRuntime();
       try {
          synchronized (this) {
-            if (session != null)
+            if (session != null) {
                session.close();
+            }
             connection.closeFromContext();
             closed = true;
          }
@@ -547,8 +549,9 @@ public class ActiveMQJMSContext implements JMSContext {
    @Override
    public void acknowledge() {
       checkSession();
-      if (closed)
+      if (closed) {
          throw new IllegalStateRuntimeException("Context is closed");
+      }
       try {
          if (lastMessagesWaitingAck != null) {
             lastMessagesWaitingAck.acknowledge();
@@ -567,8 +570,9 @@ public class ActiveMQJMSContext implements JMSContext {
    }
 
    private synchronized void checkAutoStart() throws JMSException {
-      if (closed)
+      if (closed) {
          throw new IllegalStateRuntimeException("Context is closed");
+      }
       if (autoStart) {
          connection.start();
       }
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSProducer.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSProducer.java
index 73479df416..eff885b991 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSProducer.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSProducer.java
@@ -479,8 +479,9 @@ public final class ActiveMQJMSProducer implements JMSProducer {
    public String getStringProperty(String name) {
       try {
          SimpleString prop = properties.getSimpleStringProperty(SimpleString.of(name));
-         if (prop == null)
+         if (prop == null) {
             return null;
+         }
          return prop.toString();
       } catch (ActiveMQPropertyConversionException ce) {
          throw new MessageFormatRuntimeException(ce.getMessage());
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
index d65b71160f..5de7452e9a 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
@@ -172,8 +172,9 @@ public class ActiveMQObjectMessage extends ActiveMQMessage implements ObjectMess
 
    @Override
    public boolean isBodyAssignableTo(Class c) {
-      if (data == null) // we have no body
+      if (data == null) { // we have no body
          return true;
+      }
       try {
          return Serializable.class == c || Object.class == c || c.isInstance(getObject());
       } catch (JMSException e) {
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
index 5c41de449f..37c23f7788 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
@@ -941,8 +941,9 @@ public class ActiveMQSession implements QueueSession, TopicSession {
             SimpleString queueName;
 
             if (subscriptionName == null) {
-               if (durability != ConsumerDurability.NON_DURABLE)
+               if (durability != ConsumerDurability.NON_DURABLE) {
                   throw new RuntimeException("Subscription name cannot be null for durable topic consumer");
+               }
                // Non durable sub
 
 
@@ -957,8 +958,9 @@ public class ActiveMQSession implements QueueSession, TopicSession {
                autoDeleteQueueName = queueName;
             } else {
                // Durable sub
-               if (durability != ConsumerDurability.DURABLE)
+               if (durability != ConsumerDurability.DURABLE) {
                   throw new RuntimeException("Subscription name must be null for non-durable topic consumer");
+               }
                if (connection.getClientID() == null) {
                   throw new IllegalStateException("Cannot create durable subscription - client ID has not been set");
                }
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
index 70d0f4bf89..382cf3f370 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
@@ -112,8 +112,9 @@ public class ActiveMQTextMessage extends ActiveMQMessage implements TextMessage
    @Override
    @SuppressWarnings("unchecked")
    public boolean isBodyAssignableTo(Class c) {
-      if (text == null)
+      if (text == null) {
          return true;
+      }
       return c.isAssignableFrom(java.lang.String.class);
    }
 }
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 420818289b..29e3bbabd4 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
@@ -493,8 +493,9 @@ public final class JMSBridgeImpl implements JMSBridge {
 
    private void stop(boolean isFailureHandler) throws Exception {
       synchronized (stoppingGuard) {
-         if (stopping)
+         if (stopping) {
             return;
+         }
          stopping = true;
       }
 
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/embedded/EmbeddedJMS.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/embedded/EmbeddedJMS.java
index a597706a0e..dcf57a35ca 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/embedded/EmbeddedJMS.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/embedded/EmbeddedJMS.java
@@ -114,10 +114,11 @@ public class EmbeddedJMS extends EmbeddedActiveMQ {
       }
 
       if (registry == null) {
-         if (context != null)
+         if (context != null) {
             registry = new JndiBindingRegistry(context);
-         else
+         } else {
             registry = new MapBindingRegistry();
+         }
       }
       serverManager.setRegistry(registry);
       serverManager.start();
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
index 0090c421ef..ee134f30ad 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
@@ -1444,8 +1444,9 @@ public class JMSServerManagerImpl extends CleaningActivateCallback implements JM
          return true;
       } else {
          ActiveMQJMSServerLogger.LOGGER.serverCachingCommand(runnable);
-         if (!cachedCommands.contains(runnable))
+         if (!cachedCommands.contains(runnable)) {
             cachedCommands.add(runnable);
+         }
          return false;
       }
    }
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFileFactory.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFileFactory.java
index 6917a0013f..40dabfc235 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFileFactory.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFileFactory.java
@@ -166,11 +166,13 @@ public final class AIOSequentialFileFactory extends AbstractSequentialFileFactor
          // plain Java but not using AIO
          try {
             if (!aioTestFile.exists()) {
-               if (!aioTestFile.createNewFile())
+               if (!aioTestFile.createNewFile()) {
                   return true;
+               }
             }
-            if (!aioTestFile.delete())
+            if (!aioTestFile.delete()) {
                return true;
+            }
          } catch (Exception ie) {
             // we can not even create the test file using plain java
             return true;
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/MappedSequentialFile.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/MappedSequentialFile.java
index 8f124ae070..a1fdc9771a 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/MappedSequentialFile.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/MappedSequentialFile.java
@@ -350,8 +350,9 @@ final class MappedSequentialFile implements SequentialFile {
    @Override
    public void close(boolean waitOnSync, boolean block) {
       if (this.mappedFile != null) {
-         if (waitOnSync && factory.isDatasync())
+         if (waitOnSync && factory.isDatasync()) {
             this.mappedFile.force();
+         }
          this.mappedFile.close();
          this.mappedFile = null;
       }
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java
index 98d157513a..20e779f8af 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java
@@ -214,8 +214,9 @@ public class NIOSequentialFile extends AbstractSequentialFile {
       try {
          try {
             if (channel != null) {
-               if (waitSync && factory.isDatasync())
+               if (waitSync && factory.isDatasync()) {
                   channel.force(false);
+               }
                channel.close();
             }
          } finally {
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/FileWrapperJournal.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/FileWrapperJournal.java
index 2ecd8aeecd..d9cc6c314a 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/FileWrapperJournal.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/FileWrapperJournal.java
@@ -77,8 +77,9 @@ public final class FileWrapperJournal extends JournalBase {
 
    @Override
    public void stop() throws Exception {
-      if (currentFile.getFile().isOpen())
+      if (currentFile.getFile().isOpen()) {
          currentFile.getFile().close();
+      }
    }
 
    @Override
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 9823f7bbe1..14e04894b7 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
@@ -201,11 +201,13 @@ public class JournalFilesRepository {
    public void setNextFileID(final long targetUpdate) {
       while (true) {
          final long current = nextFileID.get();
-         if (current >= targetUpdate)
+         if (current >= targetUpdate) {
             return;
+         }
 
-         if (nextFileID.compareAndSet(current, targetUpdate))
+         if (nextFileID.compareAndSet(current, targetUpdate)) {
             return;
+         }
       }
    }
 
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 c000ab35b9..d81e6f2175 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
@@ -1771,8 +1771,9 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
 
             dataFilesToProcess = getDataListToCompact();
 
-            if (dataFilesToProcess == null)
+            if (dataFilesToProcess == null) {
                return;
+            }
 
             Collections.sort(dataFilesToProcess, JOURNAL_FILE_COMPARATOR);
 
@@ -3395,8 +3396,9 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
 
       currentFile = filesRepository.pollLastDataFile();
       if (currentFile != null) {
-         if (!currentFile.getFile().isOpen())
+         if (!currentFile.getFile().isOpen()) {
             currentFile.getFile().open();
+         }
          currentFile.getFile().position(currentFile.getFile().calculateBlockStart(lastDataPos));
       } else {
          currentFile = filesRepository.getFreeFile();
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SimpleWaitIOCallback.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SimpleWaitIOCallback.java
index 8c414550cf..7d9a60cfa4 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SimpleWaitIOCallback.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SimpleWaitIOCallback.java
@@ -58,8 +58,9 @@ public final class SimpleWaitIOCallback extends SyncIOCompletion {
    @Override
    public void waitCompletion() throws InterruptedException, ActiveMQException {
       while (true) {
-         if (latch.await(2, TimeUnit.SECONDS))
+         if (latch.await(2, TimeUnit.SECONDS)) {
             break;
+         }
       }
 
       if (errorMessage != null) {
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
index 24c3b4c129..99dbe2d8ad 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
@@ -567,12 +567,15 @@ public class AMQPLargeMessage extends AMQPMessage implements LargeServerMessage
 
       if (bufferNewHeader != null) {
          TLSEncode.getEncoder().setByteBuffer(new NettyWritable(bufferNewHeader));
-         if (headerCopy != null)
+         if (headerCopy != null) {
             TLSEncode.getEncoder().writeObject(headerCopy);
-         if (messageAnnotationsRef != null)
+         }
+         if (messageAnnotationsRef != null) {
             TLSEncode.getEncoder().writeObject(messageAnnotationsRef);
-         if (propertiesCopy != null)
+         }
+         if (propertiesCopy != null) {
             TLSEncode.getEncoder().writeObject(propertiesCopy);
+         }
       }
       return bufferNewHeader;
    }
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/transaction/ProtonTransactionImpl.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/transaction/ProtonTransactionImpl.java
index c03ff13d4b..22142cc5f8 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/transaction/ProtonTransactionImpl.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/transaction/ProtonTransactionImpl.java
@@ -65,8 +65,9 @@ public class ProtonTransactionImpl extends TransactionImpl {
          connection.runNow(() -> {
             // Settle all unsettled deliveries if commit is successful
             for (Pair<Delivery, ProtonServerSenderContext> p : protonTransaction.deliveries.values()) {
-               if (!p.getA().isSettled())
+               if (!p.getA().isSettled()) {
                   p.getB().settle(p.getA());
+               }
             }
             connection.flush();
             protonTransaction.deliveries.forEach((a, b) -> b.getA().setContext(null));
diff --git a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolManager.java b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolManager.java
index 9411e10d69..575efccbde 100644
--- a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolManager.java
+++ b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolManager.java
@@ -166,19 +166,22 @@ public class MQTTProtocolManager extends AbstractProtocolManager<MqttMessage, MQ
 
    @Override
    public void onNotification(Notification notification) {
-      if (!(notification.getType() instanceof CoreNotificationType type))
+      if (!(notification.getType() instanceof CoreNotificationType type)) {
          return;
+      }
 
-      if (type != CoreNotificationType.SESSION_CREATED)
+      if (type != CoreNotificationType.SESSION_CREATED) {
          return;
+      }
 
       TypedProperties props = notification.getProperties();
 
       SimpleString protocolName = props.getSimpleStringProperty(ManagementHelper.HDR_PROTOCOL_NAME);
 
       //Only process SESSION_CREATED notifications for the MQTT protocol
-      if (protocolName == null || !protocolName.toString().startsWith(MQTTProtocolManagerFactory.MQTT_PROTOCOL_NAME))
+      if (protocolName == null || !protocolName.toString().startsWith(MQTTProtocolManagerFactory.MQTT_PROTOCOL_NAME)) {
          return;
+      }
 
       int distance = props.getIntProperty(ManagementHelper.HDR_DISTANCE);
 
@@ -303,8 +306,9 @@ public class MQTTProtocolManager extends AbstractProtocolManager<MqttMessage, MQ
    private boolean validateRemainingLength(ByteBuf buffer) {
       byte msb = (byte) 0b10000000;
       for (byte i = 0; i < 4; i++) {
-         if ((readByte(buffer) & msb) != msb)
+         if ((readByte(buffer) & msb) != msb) {
             return true;
+         }
       }
       return false;
    }
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/SimpleBytes.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/SimpleBytes.java
index 68f633fdff..7e90379ed3 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/SimpleBytes.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/SimpleBytes.java
@@ -31,8 +31,9 @@ public class SimpleBytes {
    }
 
    public String getString() {
-      if (index == 0)
+      if (index == 0) {
          return "";
+      }
 
       return new String(contents, 0, index, StandardCharsets.UTF_8);
    }
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
index eacc3fc307..3f7636226d 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
@@ -118,8 +118,9 @@ public final class StompConnection extends AbstractRemotingConnection {
       } catch (ActiveMQStompException e) {
          switch (e.getCode()) {
             case ActiveMQStompException.INVALID_EOL_V10:
-               if (version != null)
+               if (version != null) {
                   throw e;
+               }
                frameHandler = new StompFrameHandlerV12(this, scheduledExecutorService, executorFactory);
                buffer.resetReaderIndex();
                frame = decode(buffer);
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java
index 32c9269062..e8b70277aa 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java
@@ -242,12 +242,14 @@ public class StompDecoder {
 
       if (content != null) {
          if (data > pos) {
-            if (workingBuffer[pos] == NEW_LINE)
+            if (workingBuffer[pos] == NEW_LINE) {
                pos++;
+            }
 
-            if (data > pos)
+            if (data > pos) {
                // More data still in the buffer from the next packet
                System.arraycopy(workingBuffer, pos, workingBuffer, 0, data - pos);
+            }
          }
 
          data = data - pos;
@@ -363,8 +365,9 @@ public class StompDecoder {
          if (workingBuffer[offset] == NEW_LINE) {
             nextChar = false;
          } else if (workingBuffer[offset] == CR) {
-            if (nextChar)
+            if (nextChar) {
                throw BUNDLE.invalidTwoCRs().setHandler(handler);
+            }
             nextChar = true;
          } else {
             break;
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java
index dd85ac6bd2..9444ee58eb 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java
@@ -163,8 +163,9 @@ public class StompSession implements SessionCallback {
       try {
          StompSubscription subscription = subscriptions.get(consumer.getID());
          // subscription might be null if the consumer was closed
-         if (subscription == null)
+         if (subscription == null) {
             return 0;
+         }
          StompFrame frame;
 
          frame = connection.createStompMessage(message, subscription, consumer, deliveryCount);
@@ -246,8 +247,9 @@ public class StompSession implements SessionCallback {
 
    private static Pair<Long, Long> splitAndParse(String stompMessageID) {
       int separatorPosition = stompMessageID.indexOf(MESSAGE_ID_SEPARATOR);
-      if (separatorPosition == -1)
+      if (separatorPosition == -1) {
          return null;
+      }
       long consumerID = Long.parseLong(stompMessageID, 0, separatorPosition, 10);
       long messageID = Long.parseLong(stompMessageID, separatorPosition + 1, stompMessageID.length(), 10);
       return new Pair<>(consumerID, messageID);
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java
index a75573feda..d87a6c3f41 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java
@@ -399,15 +399,17 @@ public class StompFrameHandlerV11 extends VersionedStompFrameHandler implements
                //client ping
                nextChar = false;
             } else if (workingBuffer[offset] == CR) {
-               if (nextChar)
+               if (nextChar) {
                   throw BUNDLE.invalidTwoCRs().setHandler(handler);
+               }
                nextChar = true;
             } else {
                break;
             }
             offset++;
-            if (offset == data)
+            if (offset == data) {
                return false; //no more bytes
+            }
          }
 
          if (nextChar) {
@@ -734,12 +736,14 @@ public class StompFrameHandlerV11 extends VersionedStompFrameHandler implements
 
          if (content != null) {
             if (data > pos) {
-               if (workingBuffer[pos] == NEW_LINE)
+               if (workingBuffer[pos] == NEW_LINE) {
                   pos++;
+               }
 
-               if (data > pos)
+               if (data > pos) {
                   // More data still in the buffer from the next packet
                   System.arraycopy(workingBuffer, pos, workingBuffer, 0, data - pos);
+               }
             }
 
             data = data - pos;
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v12/StompFrameHandlerV12.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v12/StompFrameHandlerV12.java
index 9bd9a987c8..4bde7609cb 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v12/StompFrameHandlerV12.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v12/StompFrameHandlerV12.java
@@ -291,12 +291,14 @@ public class StompFrameHandlerV12 extends StompFrameHandlerV11 {
 
          if (content != null) {
             if (data > pos) {
-               if (workingBuffer[pos] == NEW_LINE)
+               if (workingBuffer[pos] == NEW_LINE) {
                   pos++;
+               }
 
-               if (data > pos)
+               if (data > pos) {
                   // More data still in the buffer from the next packet
                   System.arraycopy(workingBuffer, pos, workingBuffer, 0, data - pos);
+               }
             }
 
             data = data - pos;
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAProperties.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAProperties.java
index 52193d8ecd..0560179d50 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAProperties.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAProperties.java
@@ -178,8 +178,9 @@ public class ActiveMQRAProperties extends ConnectionFactoryProperties implements
    }
 
    public synchronized void init() throws ActiveMQException {
-      if (initialized)
+      if (initialized) {
          return;
+      }
 
       if (password != null) {
          try {
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 1f9f4271d5..4f5b8aca8f 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
@@ -215,8 +215,9 @@ public final class ActiveMQRaUtils {
             } catch (Throwable t) {
                try {
                   loader = Thread.currentThread().getContextClassLoader();
-                  if (loader != null)
+                  if (loader != null) {
                      return loader.loadClass(className).getDeclaredConstructor().newInstance();
+                  }
                } catch (RuntimeException e) {
                   throw e;
                } catch (Exception e) {
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 6a3ff1b13d..3639c5ac99 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
@@ -623,8 +623,9 @@ public class ActiveMQActivation {
       long setupInterval = spec.getSetupInterval();
 
       // Only enter the reconnect loop once
-      if (inReconnect.getAndSet(true))
+      if (inReconnect.getAndSet(true)) {
          return;
+      }
       try {
          Throwable lastException = failure;
          while (deliveryActive.get() && (setupAttempts == -1 || reconnectCount < setupAttempts)) {
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
index 17e86acd88..b4af61bc67 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
@@ -397,8 +397,9 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
       if (value < 1) {
          maxSession = 1;
          ActiveMQRALogger.LOGGER.invalidNumberOfMaxSession(value, maxSession);
-      } else
+      } else {
          maxSession = value;
+      }
    }
 
    public Boolean isSingleConnection() {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java
index 8b9494b8c9..7992c144d1 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java
@@ -55,11 +55,13 @@ public final class ConfigurationUtils {
 
    public static ClusterConnectionConfiguration getReplicationClusterConfiguration(Configuration conf,
                                                                                    String replicationCluster) throws ActiveMQIllegalStateException {
-      if (replicationCluster == null || replicationCluster.isEmpty())
+      if (replicationCluster == null || replicationCluster.isEmpty()) {
          return conf.getClusterConfigurations().get(0);
+      }
       for (ClusterConnectionConfiguration clusterConf : conf.getClusterConfigurations()) {
-         if (replicationCluster.equals(clusterConf.getName()))
+         if (replicationCluster.equals(clusterConf.getName())) {
             return clusterConf;
+         }
       }
       throw new ActiveMQIllegalStateException("Missing cluster-configuration for replication-clustername '" + replicationCluster + "'.");
    }
@@ -206,21 +208,25 @@ public final class ConfigurationUtils {
    }
 
    private static void compareTTLWithCheckPeriod(Configuration configuration) {
-      for (ClusterConnectionConfiguration c : configuration.getClusterConfigurations())
+      for (ClusterConnectionConfiguration c : configuration.getClusterConfigurations()) {
          compareTTLWithCheckPeriod(c.getName(), c.getConnectionTTL(), configuration.getConnectionTTLOverride(), c.getClientFailureCheckPeriod());
+      }
 
-      for (BridgeConfiguration c : configuration.getBridgeConfigurations())
+      for (BridgeConfiguration c : configuration.getBridgeConfigurations()) {
          compareTTLWithCheckPeriod(c.getName(), c.getConnectionTTL(), configuration.getConnectionTTLOverride(), c.getClientFailureCheckPeriod());
+      }
    }
 
    private static void compareTTLWithCheckPeriod(String name,
                                                  long connectionTTL,
                                                  long connectionTTLOverride,
                                                  long checkPeriod) {
-      if (connectionTTLOverride == checkPeriod)
+      if (connectionTTLOverride == checkPeriod) {
          ActiveMQServerLogger.LOGGER.connectionTTLEqualsCheckPeriod(name, "connection-ttl-override", "check-period");
+      }
 
-      if (connectionTTL == checkPeriod)
+      if (connectionTTL == checkPeriod) {
          ActiveMQServerLogger.LOGGER.connectionTTLEqualsCheckPeriod(name, "connection-ttl", "check-period");
+      }
    }
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/JaasAppConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/JaasAppConfiguration.java
index 73ad330389..62a14ed453 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/JaasAppConfiguration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/JaasAppConfiguration.java
@@ -66,7 +66,9 @@ public class JaasAppConfiguration implements Serializable {
 
    @Override
    public boolean equals(Object o) {
-      if (o == null || getClass() != o.getClass()) return false;
+      if (o == null || getClass() != o.getClass()) {
+         return false;
+      }
       JaasAppConfiguration that = (JaasAppConfiguration) o;
       return Objects.equals(name, that.name) && Objects.equals(modules, that.modules);
    }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/JaasAppConfigurationEntry.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/JaasAppConfigurationEntry.java
index 934ec57eee..66cf458bda 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/JaasAppConfigurationEntry.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/JaasAppConfigurationEntry.java
@@ -88,7 +88,9 @@ public class JaasAppConfigurationEntry implements Serializable {
 
    @Override
    public boolean equals(Object o) {
-      if (o == null || getClass() != o.getClass()) return false;
+      if (o == null || getClass() != o.getClass()) {
+         return false;
+      }
       JaasAppConfigurationEntry that = (JaasAppConfigurationEntry) o;
       return Objects.equals(name, that.name) && Objects.equals(loginModuleClass, that.loginModuleClass) && Objects.equals(controlFlag, that.controlFlag) && Objects.equals(params, that.params);
    }
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 83be85e376..4ae62bcb4d 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
@@ -4450,8 +4450,9 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
       if (broadcaster == null) {
          return;
       }
-      if (!(notification.getType() instanceof CoreNotificationType type))
+      if (!(notification.getType() instanceof CoreNotificationType type)) {
          return;
+      }
       if (type == CoreNotificationType.SESSION_CREATED) {
          TypedProperties props = notification.getProperties();
          /*
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java
index 5e10722dfa..264383c9b7 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java
@@ -166,10 +166,11 @@ public class MBeanInfoHelper {
    private static String getAttributeName(Method operation) {
       String name = operation.getName();
 
-      if (isGetterMethod(operation) || isSetterMethod(operation))
+      if (isGetterMethod(operation) || isSetterMethod(operation)) {
          name = operation.getName().substring(3);
-      else if (isIsBooleanMethod(operation))
+      } else if (isIsBooleanMethod(operation)) {
          name = operation.getName().substring(2);
+      }
 
       return name;
    }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/ActiveMQFilterPredicate.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/ActiveMQFilterPredicate.java
index ceda159124..1bcc89ebf8 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/ActiveMQFilterPredicate.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/ActiveMQFilterPredicate.java
@@ -33,8 +33,9 @@ public abstract class ActiveMQFilterPredicate<T, V extends PredicateFilterPart<T
 
    @Override
    public boolean test(T input) {
-      if (filterParts.isEmpty())
+      if (filterParts.isEmpty()) {
          return true;
+      }
       try {
          boolean matches = true;
          for (V filterPart : filterParts) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/PredicateFilterPart.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/PredicateFilterPart.java
index b1f3ff0183..eb1e2753f5 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/PredicateFilterPart.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/PredicateFilterPart.java
@@ -149,8 +149,9 @@ public class PredicateFilterPart<T> {
    }
    public boolean matchAny(Collection objects) {
       for (Object o : objects) {
-         if (matches(o))
+         if (matches(o)) {
             return true;
+         }
       }
       return false;
    }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/QueuePredicateFilterPart.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/QueuePredicateFilterPart.java
index abb7d4a3a7..f1a622b041 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/QueuePredicateFilterPart.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/QueuePredicateFilterPart.java
@@ -48,8 +48,9 @@ public class QueuePredicateFilterPart extends PredicateFilterPart<QueueControl>
          case CONSUMER_ID -> {
             Queue q = server.locateQueue(SimpleString.of(queue.getName()));
             for (Consumer consumer : q.getConsumers()) {
-               if (matchesLong(consumer.sequentialID()))
+               if (matchesLong(consumer.sequentialID())) {
                   yield true;
+               }
             }
             yield false;
          }
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 47c44ea6a6..346d0fe80f 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
@@ -273,8 +273,9 @@ public class PageCursorProviderImpl implements PageCursorProvider {
             if (pagingStore.writeLock(1_000)) {
                break;
             }
-            if (!pagingStore.isStarted())
+            if (!pagingStore.isStarted()) {
                return;
+            }
          }
 
          logger.trace(">>>> Cleanup {}", this.pagingStore.getAddress());
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PagePositionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PagePositionImpl.java
index 230b8f96b8..18e8277cc1 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PagePositionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PagePositionImpl.java
@@ -83,7 +83,9 @@ public class PagePositionImpl implements PagePosition {
          return 1;
       } else if (pageNr < o.getPageNr()) {
          return -1;
-      } else return Long.compare(recordID, o.getRecordID());
+      } else {
+         return Long.compare(recordID, o.getRecordID());
+      }
    }
 
    @Override
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java
index 69710d5cc4..9d10d3833c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java
@@ -243,7 +243,9 @@ public class PagingStoreFactoryDatabase implements PagingStoreFactory {
       SimpleString simpleString = SimpleString.of(directoryName);
       ActiveMQBuffer buffer = ActiveMQBuffers.fixedBuffer(simpleString.sizeof());
       buffer.writeSimpleString(simpleString);
-      if (writeToDirectory) directoryList.write(buffer, true);
+      if (writeToDirectory) {
+         directoryList.write(buffer, true);
+      }
       directoryList.close();
 
       final SQLProvider sqlProvider;
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 fbb3cad237..1389395b3e 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
@@ -165,10 +165,12 @@ public abstract class AbstractJournalStorageManager extends CriticalComponentImp
       }
 
       public static JournalContent getType(byte type) {
-         if (MESSAGES.typeByte == type)
+         if (MESSAGES.typeByte == type) {
             return MESSAGES;
-         if (BINDINGS.typeByte == type)
+         }
+         if (BINDINGS.typeByte == type) {
             return BINDINGS;
+         }
          throw new InvalidParameterException("invalid byte: " + type);
       }
    }
@@ -1783,8 +1785,9 @@ public abstract class AbstractJournalStorageManager extends CriticalComponentImp
       if (!ioCriticalError) {
          performCachedLargeMessageDeletes();
          // Must call close to make sure last id is persisted
-         if (journalLoaded && idGenerator != null)
+         if (journalLoaded && idGenerator != null) {
             idGenerator.persistCurrentID();
+         }
       }
 
       final CountDownLatch latch = new CountDownLatch(1);
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 d97bd7ff98..a2383f637a 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
@@ -143,8 +143,9 @@ public class JDBCJournalStorageManager extends JournalStorageManager {
       if (!ioCriticalError) {
          performCachedLargeMessageDeletes();
          // Must call close to make sure last id is persisted
-         if (journalLoaded && idGenerator != null)
+         if (journalLoaded && idGenerator != null) {
             idGenerator.persistCurrentID();
+         }
       }
 
       final CountDownLatch latch = new CountDownLatch(1);
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 8823927a89..bc0823bec2 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
@@ -274,8 +274,9 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
    public void stop(boolean ioCriticalError, boolean sendFailover) throws Exception {
       try (ArtemisCloseable critical = measureCritical(CRITICAL_STOP)) {
          synchronized (this) {
-            if (internalStop(ioCriticalError, sendFailover))
+            if (internalStop(ioCriticalError, sendFailover)) {
                return;
+            }
          }
       }
    }
@@ -288,8 +289,9 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
       if (!ioCriticalError) {
          performCachedLargeMessageDeletes();
          // Must call stop to make sure last id is persisted
-         if (journalLoaded && idGenerator != null)
+         if (journalLoaded && idGenerator != null) {
             idGenerator.stop();
+         }
       }
 
       final CountDownLatch latch = new CountDownLatch(1);
@@ -394,8 +396,9 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
    public void pageClosed(final SimpleString storeName, final long pageNumber) {
       if (isReplicated()) {
          try (ArtemisCloseable lock = closeableReadLock()) {
-            if (isReplicated())
+            if (isReplicated()) {
                replicator.pageClosed(storeName, pageNumber);
+            }
          }
       }
    }
@@ -404,8 +407,9 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
    public void pageDeleted(final SimpleString storeName, final long pageNumber) {
       if (isReplicated()) {
          try (ArtemisCloseable lock = closeableReadLock()) {
-            if (isReplicated())
+            if (isReplicated()) {
                replicator.pageDeleted(storeName, pageNumber);
+            }
          }
       }
    }
@@ -575,8 +579,9 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
     */
    private void sendJournalFile(JournalFile[] journalFiles, JournalContent type) throws Exception {
       for (JournalFile jf : journalFiles) {
-         if (!started)
+         if (!started) {
             return;
+         }
 
          ReplicationManager replicatorInUse = replicator;
          if (replicatorInUse == null) {
@@ -707,8 +712,9 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
          final long id = entry.getKey();
          long size = entry.getValue().getB();
          SequentialFile seqFile = largeMessagesFactory.createSequentialFile(fileName);
-         if (!seqFile.exists())
+         if (!seqFile.exists()) {
             continue;
+         }
 
          ReplicationManager replicatorInUse = replicator;
          if (replicatorInUse == null) {
@@ -781,8 +787,9 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
    private void sendPagesToBackup(Map<SimpleString, Collection<Integer>> pageFilesToSync,
                                   PagingManager manager) throws Exception {
       for (Map.Entry<SimpleString, Collection<Integer>> entry : pageFilesToSync.entrySet()) {
-         if (!started)
+         if (!started) {
             return;
+         }
 
          ReplicationManager replicatorInUse = replicator;
          if (replicatorInUse == null) {
@@ -806,8 +813,9 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
       logger.trace("stopReplication()");
       storageManagerLock.writeLock().lock();
       try {
-         if (replicator == null)
+         if (replicator == null) {
             return;
+         }
          bindingsJournal = originalBindingsJournal;
          messageJournal = originalMessageJournal;
          try {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageInSync.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageInSync.java
index e61644eca3..91ef56c12a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageInSync.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageInSync.java
@@ -47,8 +47,9 @@ public final class LargeServerMessageInSync implements ReplicatedLargeMessage {
    }
 
    public synchronized void joinSyncedData(ByteBuffer buffer) throws Exception {
-      if (deleted)
+      if (deleted) {
          return;
+      }
       SequentialFile mainSeqFile = mainLM.getAppendFile();
       if (!mainSeqFile.isOpen()) {
          mainSeqFile.open();
@@ -124,16 +125,18 @@ public final class LargeServerMessageInSync implements ReplicatedLargeMessage {
 
    private void deleteAppendFile() throws Exception {
       if (appendFile != null) {
-         if (appendFile.isOpen())
+         if (appendFile.isOpen()) {
             appendFile.close();
+         }
          appendFile.delete();
       }
    }
 
    @Override
    public synchronized void addBytes(byte[] bytes) throws Exception {
-      if (deleted)
+      if (deleted) {
          return;
+      }
 
       if (syncDone) {
          if (logger.isTraceEnabled()) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/AddressImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/AddressImpl.java
index ffdbfa3f0a..9d6be3027d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/AddressImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/AddressImpl.java
@@ -70,11 +70,13 @@ public class AddressImpl implements Address {
     */
    @Override
    public boolean matches(final Address otherAddr) {
-      if (otherAddr == null)
+      if (otherAddr == null) {
          return false;
+      }
 
-      if (address.equals(otherAddr.getAddress()))
+      if (address.equals(otherAddr.getAddress())) {
          return true;
+      }
 
       final char sepAnyWords = wildcardConfiguration.getAnyWords();
       final char sepSingleWord = wildcardConfiguration.getSingleWord();
@@ -117,8 +119,9 @@ public class AddressImpl implements Address {
          if (otherCurrPartIsSingleChar && otherCurr.charAt(0) == sepAnyWords) {
 
             // if last part of otherAddr is any-words wildcard report a match
-            if (otherIdx == otherAddrPartsLastIdx)
+            if (otherIdx == otherAddrPartsLastIdx) {
                return true;
+            }
 
             SimpleString thisNext;
             // check if this address has more parts to check
@@ -140,15 +143,17 @@ public class AddressImpl implements Address {
                thisNext = thisAddrPartsLastIdx > thisIdx ? addressParts[thisIdx + 1] : null;
             }
             // if no further part in this address matched the next part in otherAddr report a mismatch
-            if (thisCurr == null)
+            if (thisCurr == null) {
                return false;
+            }
             otherIdx++;
             continue;
          }
 
          // compare current parts of bothaddresses and report mismatch if they differ
-         if (!thisCurr.equals(otherCurr))
+         if (!thisCurr.equals(otherCurr)) {
             return false;
+         }
 
          thisIdx++;
          otherIdx++;
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
index be46fde8ab..8d629689f9 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
@@ -203,8 +203,9 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
 
    @Override
    public synchronized void start() throws Exception {
-      if (started)
+      if (started) {
          return;
+      }
 
       managementService.addNotificationListener(this);
 
@@ -223,11 +224,13 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
 
       managementService.removeNotificationListener(this);
 
-      if (expiryReaperRunnable != null)
+      if (expiryReaperRunnable != null) {
          expiryReaperRunnable.stop();
+      }
 
-      if (addressQueueReaperRunnable != null)
+      if (addressQueueReaperRunnable != null) {
          addressQueueReaperRunnable.stop();
+      }
 
       addressManager.clear();
 
@@ -283,8 +286,9 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
 
    @Override
    public void onNotification(final Notification notification) {
-      if (!(notification.getType() instanceof CoreNotificationType))
+      if (!(notification.getType() instanceof CoreNotificationType)) {
          return;
+      }
 
       logger.trace("Receiving notification : {} on server {}", notification, server);
 
@@ -1938,8 +1942,9 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
    @Override
    public synchronized void startExpiryScanner() {
       if (expiryReaperPeriod > 0) {
-         if (expiryReaperRunnable != null)
+         if (expiryReaperRunnable != null) {
             expiryReaperRunnable.stop();
+         }
          expiryReaperRunnable = new ExpiryReaper(server.getScheduledPool(), server.getExecutorFactory().getExecutor(), expiryReaperPeriod, TimeUnit.MILLISECONDS, false);
 
          expiryReaperRunnable.start();
@@ -1951,8 +1956,9 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
       reapAddresses(true); // we need to check for empty auto-created queues before the acceptors are on
                                       // empty auto-created queues and addresses should be removed right away
       if (addressQueueReaperPeriod > 0) {
-         if (addressQueueReaperRunnable != null)
+         if (addressQueueReaperRunnable != null) {
             addressQueueReaperRunnable.stop();
+         }
          addressQueueReaperRunnable = new AddressQueueReaper(server.getScheduledPool(), server.getExecutorFactory().getExecutor(), addressQueueReaperPeriod, TimeUnit.MILLISECONDS, false);
 
          addressQueueReaperRunnable.start();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java
index b6118587ac..5726af56fd 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java
@@ -58,14 +58,18 @@ public class ReplicationStartSyncMessage extends PacketImpl {
       }
 
       public static SyncDataType getDataType(byte code) {
-         if (code == JournalBindings.code)
+         if (code == JournalBindings.code) {
             return JournalBindings;
-         if (code == JournalMessages.code)
+         }
+         if (code == JournalMessages.code) {
             return JournalMessages;
-         if (code == LargeMessages.code)
+         }
+         if (code == LargeMessages.code) {
             return LargeMessages;
-         if (code == ActivationSequence.code)
+         }
+         if (code == ActivationSequence.code) {
             return ActivationSequence;
+         }
 
          throw new InvalidParameterException("invalid byte: " + code);
       }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java
index c9961d809d..4f2c6863a2 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java
@@ -64,8 +64,9 @@ public final class ReplicationSyncFileMessage extends PacketImpl {
        */
       public static FileType getFileType(byte readByte) {
          for (FileType type : ALL_OF) {
-            if (type.code == readByte)
+            if (type.code == readByte) {
                return type;
+            }
          }
          throw new InternalError("Unsupported byte value for " + FileType.class);
       }
@@ -104,8 +105,9 @@ public final class ReplicationSyncFileMessage extends PacketImpl {
       int size = PACKET_HEADERS_SIZE +
                  DataConstants.SIZE_LONG; // buffer.writeLong(fileId);
 
-      if (fileId == -1)
+      if (fileId == -1) {
          return size;
+      }
 
       size += DataConstants.SIZE_BYTE; // buffer.writeByte(fileType.code);
       switch (fileType) {
@@ -134,8 +136,9 @@ public final class ReplicationSyncFileMessage extends PacketImpl {
    @Override
    public void encodeRest(final ActiveMQBuffer buffer) {
       buffer.writeLong(fileId);
-      if (fileId == -1)
+      if (fileId == -1) {
          return;
+      }
       buffer.writeByte(fileType.code);
       switch (fileType) {
          case JOURNAL: {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/HttpAcceptorHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/HttpAcceptorHandler.java
index 360eba7a3b..6f20f50726 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/HttpAcceptorHandler.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/HttpAcceptorHandler.java
@@ -110,8 +110,9 @@ public class HttpAcceptorHandler extends ChannelDuplexHandler {
             try {
                response = responses.take();
             } catch (InterruptedException e) {
-               if (executor.isShutdown())
+               if (executor.isShutdown()) {
                   return;
+               }
                // otherwise ignore, we'll just try again
             }
          }
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 d9c5780f4c..f367ddf2d4 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
@@ -369,8 +369,9 @@ public class RemotingServiceImpl implements RemotingService, ServerConnectionLif
 
    @Override
    public synchronized void pauseAcceptors() {
-      if (!started)
+      if (!started) {
          return;
+      }
       paused = true;
 
       for (Acceptor acceptor : acceptors.values()) {
@@ -389,8 +390,9 @@ public class RemotingServiceImpl implements RemotingService, ServerConnectionLif
 
    @Override
    public synchronized void freeze(final String scaleDownNodeID, final CoreRemotingConnection connectionToKeepOpen) {
-      if (!started)
+      if (!started) {
          return;
+      }
       failureCheckAndFlushThread.close(false);
       Map<Object, ConnectionEntry> connectionEntries = new HashMap<>(connections);
 
@@ -992,8 +994,9 @@ public class RemotingServiceImpl implements RemotingService, ServerConnectionLif
                   }
                }
 
-               if (latch.await(pauseInterval, TimeUnit.MILLISECONDS))
+               if (latch.await(pauseInterval, TimeUnit.MILLISECONDS)) {
                   return;
+               }
             } catch (Throwable e) {
                ActiveMQServerLogger.LOGGER.errorOnFailureCheck(e);
             }
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 e65eb54ed3..555b5c9a5e 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
@@ -312,8 +312,9 @@ public final class ReplicationEndpoint implements ChannelHandler, ActiveMQCompon
 
          started = true;
       } catch (Exception e) {
-         if (server.isStarted())
+         if (server.isStarted()) {
             throw e;
+         }
       }
    }
 
@@ -348,8 +349,9 @@ public final class ReplicationEndpoint implements ChannelHandler, ActiveMQCompon
       filesReservedForSync.clear();
       if (journals != null) {
          for (Journal j : journals) {
-            if (j instanceof FileWrapperJournal)
+            if (j instanceof FileWrapperJournal) {
                j.stop();
+            }
          }
       }
 
@@ -543,8 +545,9 @@ public final class ReplicationEndpoint implements ChannelHandler, ActiveMQCompon
       logger.trace("handleStartReplicationSynchronization:: nodeID = {}", packet);
 
       ReplicationResponseMessageV2 replicationResponseMessage = new ReplicationResponseMessageV2();
-      if (!started)
+      if (!started) {
          return replicationResponseMessage;
+      }
 
       if (packet.isSynchronizationFinished()) {
          long activationSequence = 0;
@@ -857,10 +860,12 @@ public final class ReplicationEndpoint implements ChannelHandler, ActiveMQCompon
       }
 
       synchronized void close() throws IOException {
-         if (fos != null)
+         if (fos != null) {
             fos.close();
-         if (channel != null)
+         }
+         if (channel != null) {
             channel.close();
+         }
       }
 
       @Override
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
index 09637ddb3a..526dbf5355 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
@@ -681,8 +681,9 @@ public final class ReplicationManager implements ActiveMQComponent {
          ActiveMQServerLogger.LOGGER.replicaSyncFile(file, file.size(), "journal");
          sendLargeFile(content, null, jf.getFileID(), file, Long.MAX_VALUE);
       } finally {
-         if (file.isOpen())
+         if (file.isOpen()) {
             file.close();
+         }
       }
    }
 
@@ -693,8 +694,9 @@ public final class ReplicationManager implements ActiveMQComponent {
    }
 
    public void syncPages(SequentialFile file, long id, SimpleString queueName) throws Exception {
-      if (started)
+      if (started) {
          sendLargeFile(null, queueName, id, file, Long.MAX_VALUE);
+      }
    }
 
    /**
@@ -710,8 +712,9 @@ public final class ReplicationManager implements ActiveMQComponent {
                               final long id,
                               SequentialFile file,
                               long maxBytesToSend) throws Exception {
-      if (!started)
+      if (!started) {
          return;
+      }
       if (!file.isOpen()) {
          file.open();
       }
@@ -758,13 +761,15 @@ public final class ReplicationManager implements ActiveMQComponent {
                }
                packetsSent++;
 
-               if (lastPacket)
+               if (lastPacket) {
                   break;
+               }
             }
          }
       } finally {
-         if (file.isOpen())
+         if (file.isOpen()) {
             file.close();
+         }
          if (pageStore != null) {
             sendReplicatePacket(new ReplicationPageEventMessage(pageStore, id, false, remotingConnection.isVersionUsingLongOnPageReplication()));
          }
@@ -784,8 +789,9 @@ public final class ReplicationManager implements ActiveMQComponent {
                                     AbstractJournalStorageManager.JournalContent contentType,
                                     String nodeID,
                                     boolean allowsAutoFailBack) throws ActiveMQException {
-      if (started)
+      if (started) {
          sendReplicatePacket(new ReplicationStartSyncMessage(datafiles, contentType, nodeID, allowsAutoFailBack));
+      }
    }
 
    /**
@@ -843,8 +849,9 @@ public final class ReplicationManager implements ActiveMQComponent {
       List<Long> idsToSend;
       idsToSend = new ArrayList<>(largeMessages.keySet());
 
-      if (started)
+      if (started) {
          sendReplicatePacket(new ReplicationStartSyncMessage(idsToSend));
+      }
    }
 
    /**
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 0257daec7d..20e0596d97 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
@@ -90,8 +90,9 @@ public class BackupManager implements ActiveMQComponent {
     */
    @Override
    public synchronized void start() throws Exception {
-      if (started)
+      if (started) {
          return;
+      }
       //deploy the backup connectors using the cluster configuration
       for (ClusterConnectionConfiguration config : configuration.getClusterConfigurations()) {
          logger.debug("deploy backup config {}", config);
@@ -116,8 +117,9 @@ public class BackupManager implements ActiveMQComponent {
     */
    @Override
    public synchronized void stop() {
-      if (!started)
+      if (!started) {
          return;
+      }
       for (BackupConnector backupConnector : backupConnectors) {
          backupConnector.close();
       }
@@ -143,14 +145,16 @@ public class BackupManager implements ActiveMQComponent {
 
       TransportConfiguration connector = config.getTransportConfiguration(configuration);
 
-      if (connector == null)
+      if (connector == null) {
          return;
+      }
 
       if (config.getDiscoveryGroupName() != null) {
          DiscoveryGroupConfiguration dg = config.getDiscoveryGroupConfiguration(configuration);
 
-         if (dg == null)
+         if (dg == null) {
             return;
+         }
 
          DiscoveryBackupConnector backupConnector = new DiscoveryBackupConnector(dg, config, connector, clusterManager);
 
@@ -265,8 +269,9 @@ public class BackupManager implements ActiveMQComponent {
                //make a copy to avoid npe if we are nulled on close
                ServerLocatorInternal localBackupLocator = backupServerLocator;
                if (localBackupLocator == null) {
-                  if (!stopping)
+                  if (!stopping) {
                      ActiveMQServerLogger.LOGGER.errorAnnouncingBackup(this.toString());
+                  }
                   return;
                }
                if (logger.isDebugEnabled()) {
@@ -287,10 +292,12 @@ public class BackupManager implements ActiveMQComponent {
             } catch (RejectedExecutionException e) {
                // assumption is that the whole server is being stopped. So the exception is ignored.
             } catch (Exception e) {
-               if (scheduledExecutor.isShutdown())
+               if (scheduledExecutor.isShutdown()) {
                   return;
-               if (stopping)
+               }
+               if (stopping) {
                   return;
+               }
                ActiveMQServerLogger.LOGGER.errorAnnouncingBackup(e);
 
                retryConnection();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ColocatedHAManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ColocatedHAManager.java
index ef44c16309..0a19fc1ef7 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ColocatedHAManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ColocatedHAManager.java
@@ -52,8 +52,9 @@ public class ColocatedHAManager implements HAManager {
 
    @Override
    public void start() {
-      if (started)
+      if (started) {
          return;
+      }
 
       server.getActivation().haStarted();
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/StandaloneHAManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/StandaloneHAManager.java
index edf6554f1a..fabd090679 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/StandaloneHAManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/StandaloneHAManager.java
@@ -37,15 +37,17 @@ public class StandaloneHAManager implements HAManager {
 
    @Override
    public void start() throws Exception {
-      if (isStarted)
+      if (isStarted) {
          return;
+      }
       isStarted = true;
    }
 
    @Override
    public void stop() throws Exception {
-      if (!isStarted)
+      if (!isStarted) {
          return;
+      }
       isStarted = false;
    }
 
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 0c52679a7a..6cce715848 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
@@ -222,8 +222,9 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
    }
 
    private static void cleanUpSessionFactory(ClientSessionFactoryInternal factory) {
-      if (factory != null)
+      if (factory != null) {
          factory.cleanup();
+      }
    }
 
    @Override
@@ -1067,8 +1068,9 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
 
             try {
                if (csf == null || csf.isClosed()) {
-                  if (state == State.STOPPING || state == State.PAUSING)
+                  if (state == State.STOPPING || state == State.PAUSING) {
                      return;
+                  }
                   if (csf != null && csf.isClosed()) {
                      // ensure we release any references to the existing ClientSessionFactory before creating a new one otherwise we will leak
                      serverLocator.factoryClosed(csf);
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
index 93e5314e32..1c67e3fc31 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
@@ -343,28 +343,34 @@ public class ClusterConnectionBridge extends BridgeImpl {
       // Build the address matching part of the selector
       StringBuilder builder = new StringBuilder("(");
       if (!includes.isEmpty()) {
-         if (!excludes.isEmpty())
+         if (!excludes.isEmpty()) {
             builder.append("(");
+         }
          for (int i = 0; i < includes.size(); i++) {
             builder.append("(" + ManagementHelper.HDR_ADDRESS + " LIKE '" + includes.get(i) + "%')");
-            if (i < includes.size() - 1)
+            if (i < includes.size() - 1) {
                builder.append(" OR ");
+            }
          }
-         if (!excludes.isEmpty())
+         if (!excludes.isEmpty()) {
             builder.append(")");
+         }
       }
 
       // Build the address exclusion part of the selector
       if (!excludes.isEmpty()) {
-         if (!includes.isEmpty())
+         if (!includes.isEmpty()) {
             builder.append(" AND (");
+         }
          for (int i = 0; i < excludes.size(); i++) {
             builder.append("(" + ManagementHelper.HDR_ADDRESS + " NOT LIKE '" + excludes.get(i) + "%')");
-            if (i < excludes.size() - 1)
+            if (i < excludes.size() - 1) {
                builder.append(" AND ");
+            }
          }
-         if (!includes.isEmpty())
+         if (!includes.isEmpty()) {
             builder.append(")");
+         }
       }
       builder.append(")");
       return builder.toString();
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 e21bcf3fa9..bfe893926c 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
@@ -513,8 +513,9 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
    }
 
    private void closeLocator(final ServerLocatorInternal locator) {
-      if (locator != null)
+      if (locator != null) {
          locator.close();
+      }
    }
 
    private TopologyMember getLocalMember() {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/quorum/QuorumManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/quorum/QuorumManager.java
index 8b21bbbf8c..eb5bfdc3a6 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/quorum/QuorumManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/quorum/QuorumManager.java
@@ -101,8 +101,9 @@ public final class QuorumManager implements ClusterTopologyListener, ActiveMQCom
     */
    @Override
    public void start() throws Exception {
-      if (started)
+      if (started) {
          return;
+      }
       started = true;
    }
 
@@ -111,8 +112,9 @@ public final class QuorumManager implements ClusterTopologyListener, ActiveMQCom
     */
    @Override
    public void stop() throws Exception {
-      if (!started)
+      if (!started) {
          return;
+      }
       synchronized (voteRunnables) {
          started = false;
          for (VoteRunnableHolder voteRunnableHolder : voteRunnables.values()) {
@@ -241,8 +243,9 @@ public final class QuorumManager implements ClusterTopologyListener, ActiveMQCom
    public void vote(final QuorumVote quorumVote) {
       List<VoteRunnable> runnables = new ArrayList<>();
       synchronized (voteRunnables) {
-         if (!started)
+         if (!started) {
             return;
+         }
          //send a vote to each node
          ActiveMQServerLogger.LOGGER.initiatingQuorumVote(quorumVote.getName());
          for (TopologyMemberImpl tm : clusterController.getDefaultClusterTopology().getMembers()) {
@@ -434,8 +437,9 @@ public final class QuorumManager implements ClusterTopologyListener, ActiveMQCom
       public void run() {
          try {
             Vote vote;
-            if (!started)
+            if (!started) {
                return;
+            }
             //try to connect to the node i want to send a vote to
             clusterControl = clusterController.connectToNode(serverTC);
             clusterControl.authorize();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/quorum/QuorumVoteServerConnect.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/quorum/QuorumVoteServerConnect.java
index fe3504e980..195d9e36e7 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/quorum/QuorumVoteServerConnect.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/quorum/QuorumVoteServerConnect.java
@@ -145,10 +145,11 @@ public class QuorumVoteServerConnect extends QuorumVote<ServerConnectVote, Boole
 
    public void await(int latchTimeout, TimeUnit unit) throws InterruptedException {
       ActiveMQServerLogger.LOGGER.waitingForQuorumVoteResults(latchTimeout, unit.toString().toLowerCase());
-      if (voteCompleted.await(latchTimeout, unit))
+      if (voteCompleted.await(latchTimeout, unit)) {
          ActiveMQServerLogger.LOGGER.receivedAllQuorumVotes();
-      else
+      } else {
          ActiveMQServerLogger.LOGGER.timeoutWaitingForQuorumVoteResponses();
+      }
    }
 
    public boolean isRequestToStayActive() {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java
index 19fd9d27ea..e39f18c62a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java
@@ -130,8 +130,9 @@ public class EmbeddedActiveMQ {
          return;
       }
       if (configuration == null) {
-         if (configResourcePath == null)
+         if (configResourcePath == null) {
             configResourcePath = "broker.xml";
+         }
          FileDeploymentManager deploymentManager = new FileDeploymentManager(configResourcePath);
          FileConfiguration config = new FileConfiguration();
          LegacyJMSConfiguration legacyJMSConfiguration = new LegacyJMSConfiguration(config);
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/Federation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/Federation.java
index a65364347d..af46e57bf1 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/Federation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/Federation.java
@@ -61,7 +61,9 @@ public class Federation {
    }
 
    public synchronized void start() throws ActiveMQException {
-      if (state == FederationManager.State.STARTED) return;
+      if (state == FederationManager.State.STARTED) {
+         return;
+      }
       deploy();
       for (FederationUpstream connection : upstreams.values()) {
          connection.start();
@@ -73,7 +75,9 @@ public class Federation {
    }
 
    public synchronized void stop() {
-      if (state == FederationManager.State.STOPPED) return;
+      if (state == FederationManager.State.STOPPED) {
+         return;
+      }
       state = FederationManager.State.STOPPING;
 
       for (FederationUpstream connection : upstreams.values()) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/FederationManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/FederationManager.java
index ec731eea77..3840dfba01 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/FederationManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/FederationManager.java
@@ -56,7 +56,9 @@ public class FederationManager implements ActiveMQComponent {
 
    @Override
    public synchronized void start() throws ActiveMQException {
-      if (state == State.STARTED) return;
+      if (state == State.STARTED) {
+         return;
+      }
       deploy();
       for (Federation federation : federations.values()) {
          federation.start();
@@ -66,7 +68,9 @@ public class FederationManager implements ActiveMQComponent {
 
    @Override
    public synchronized void stop() {
-      if (state == State.STOPPED) return;
+      if (state == State.STOPPED) {
+         return;
+      }
       state = State.STOPPING;
 
 
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 c224d7e7bb..cc9f0bd131 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
@@ -277,8 +277,9 @@ public final class LocalGroupingHandler extends GroupHandlingAbstract {
 
    @Override
    public void onNotification(final Notification notification) {
-      if (!(notification.getType() instanceof CoreNotificationType))
+      if (!(notification.getType() instanceof CoreNotificationType)) {
          return;
+      }
 
       if (notification.getType() == CoreNotificationType.BINDING_REMOVED) {
          SimpleString clusterName = notification.getProperties().getSimpleStringProperty(ManagementHelper.HDR_CLUSTER_NAME);
@@ -318,8 +319,9 @@ public final class LocalGroupingHandler extends GroupHandlingAbstract {
 
    @Override
    public synchronized void start() throws Exception {
-      if (started)
+      if (started) {
          return;
+      }
 
       lock.lock();
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/RemoteGroupingHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/RemoteGroupingHandler.java
index c5f733c682..99216c4d78 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/RemoteGroupingHandler.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/RemoteGroupingHandler.java
@@ -91,8 +91,9 @@ public final class RemoteGroupingHandler extends GroupHandlingAbstract {
 
    @Override
    public void start() throws Exception {
-      if (started)
+      if (started) {
          return;
+      }
       started = true;
    }
 
@@ -277,8 +278,9 @@ public final class RemoteGroupingHandler extends GroupHandlingAbstract {
 
    @Override
    public void onNotification(final Notification notification) {
-      if (!(notification.getType() instanceof CoreNotificationType))
+      if (!(notification.getType() instanceof CoreNotificationType)) {
          return;
+      }
       // removing the groupid if the binding has been removed
       if (notification.getType() == CoreNotificationType.BINDING_REMOVED) {
          SimpleString clusterName = notification.getProperties().getSimpleStringProperty(ManagementHelper.HDR_CLUSTER_NAME);
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 e687c8de5b..cf56456fc3 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
@@ -1110,7 +1110,9 @@ public class ActiveMQServerImpl implements ActiveMQServer {
       try {
          stop(false, isShutdown);
       } finally {
-         if (isShutdown) networkHealthCheck.stop();
+         if (isShutdown) {
+            networkHealthCheck.stop();
+         }
       }
    }
 
@@ -1394,8 +1396,9 @@ public class ActiveMQServerImpl implements ActiveMQServer {
       // *************************************************************************************************************
 
       final StorageManager storageManager = this.storageManager;
-      if (storageManager != null)
+      if (storageManager != null) {
          storageManager.clearContext();
+      }
 
       //before we stop any components deactivate any callbacks
       callDeActiveCallbacks();
@@ -1501,8 +1504,9 @@ public class ActiveMQServerImpl implements ActiveMQServer {
          shutdownPool(pageExecutorPool);
       }
 
-      if (!scheduledPoolSupplied)
+      if (!scheduledPoolSupplied) {
          scheduledPool = null;
+      }
 
       if (securityStore != null) {
          try {
@@ -3328,8 +3332,9 @@ public class ActiveMQServerImpl implements ActiveMQServer {
     * After optional intermediary steps, this is meant to be followed by {@link #initialisePart2(boolean)}.
     */
    synchronized boolean initialisePart1(boolean scalingDown) throws Exception {
-      if (state == SERVER_STATE.STOPPED)
+      if (state == SERVER_STATE.STOPPED) {
          return false;
+      }
 
 
       ServerStatus.starting(this);
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/BackupTopologyListener.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/BackupTopologyListener.java
index 1a589089ab..0ebc795c14 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/BackupTopologyListener.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/BackupTopologyListener.java
@@ -47,8 +47,9 @@ final class BackupTopologyListener implements ClusterTopologyListener {
 
       final String nodeID = topologyMember.getNodeId();
 
-      if (ownId.equals(nodeID) && topologyMember.getBackup() != null)
+      if (ownId.equals(nodeID) && topologyMember.getBackup() != null) {
          latch.countDown();
+      }
    }
 
    @Override
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileBasedNodeManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileBasedNodeManager.java
index c95d059b01..23cf9fc58b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileBasedNodeManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileBasedNodeManager.java
@@ -225,8 +225,9 @@ public abstract class FileBasedNodeManager extends NodeManager {
    public synchronized void stop() throws Exception {
       FileChannel channelCopy = channel;
       try {
-         if (channelCopy != null)
+         if (channelCopy != null) {
             channelCopy.close();
+         }
       } finally {
          try {
             setNodeActivationSequence(NULL_NODE_ACTIVATION_SEQUENCE);
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileLockNodeManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileLockNodeManager.java
index 6ee91cb0ff..ee765811d0 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileLockNodeManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileLockNodeManager.java
@@ -239,8 +239,9 @@ public class FileLockNodeManager extends FileBasedNodeManager {
          throw new NodeManagerException(e);
       }
       ActiveMQServerLogger.LOGGER.gotBackupLock();
-      if (getUUID() == null)
+      if (getUUID() == null) {
          readNodeId();
+      }
    }
 
    @Override
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/InVMNodeManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/InVMNodeManager.java
index 3b9eb58047..5a48267bf1 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/InVMNodeManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/InVMNodeManager.java
@@ -51,8 +51,9 @@ public final class InVMNodeManager extends FileBasedNodeManager {
 
    public InVMNodeManager(boolean replicatedBackup) {
       this(replicatedBackup, null);
-      if (replicatedBackup)
+      if (replicatedBackup) {
          throw new RuntimeException("if replicated-backup, we need its journal directory");
+      }
    }
 
    public InVMNodeManager(boolean replicatedBackup, File directory) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
index 50dc36a5ce..c39996825d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
@@ -147,8 +147,9 @@ public class PostOfficeJournalLoader implements JournalLoader {
 
          if (queueBindingInfo.getQueueStatusEncodings() != null) {
             for (QueueStatusEncoding encoding : queueBindingInfo.getQueueStatusEncodings()) {
-               if (encoding.getStatus() == AddressQueueStatus.PAUSED)
+               if (encoding.getStatus() == AddressQueueStatus.PAUSED) {
                   queue.reloadPause(encoding.getId());
+               }
             }
          }
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PrimaryOnlyActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PrimaryOnlyActivation.java
index 9de817d634..098d9a1c11 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PrimaryOnlyActivation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PrimaryOnlyActivation.java
@@ -172,8 +172,9 @@ public class PrimaryOnlyActivation extends Activation {
          while (clientSessionFactory == null) {
             Pair<TransportConfiguration, TransportConfiguration> possiblePrimary = null;
             possiblePrimary = nodeLocator.getPrimaryConfiguration();
-            if (possiblePrimary == null)  // we've tried every connector
+            if (possiblePrimary == null) {  // we've tried every connector
                break;
+            }
             try {
                clientSessionFactory = (ClientSessionFactoryInternal) scaleDownServerLocator.createSessionFactory(possiblePrimary.getA(), 0, false);
             } catch (Exception e) {
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 98b93070f9..345f1bb860 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
@@ -2247,8 +2247,9 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
    @Override
    public void deleteQueue(boolean removeConsumers) throws Exception {
       synchronized (this) {
-         if (this.queueDestroyed)
+         if (this.queueDestroyed) {
             return;
+         }
          this.queueDestroyed = true;
       }
 
@@ -3987,8 +3988,9 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
             message = null;
          }
 
-         if (message == null || (queueConfiguration.isNonDestructive() && reason == AckReason.NORMAL))
+         if (message == null || (queueConfiguration.isNonDestructive() && reason == AckReason.NORMAL)) {
             return;
+         }
 
          queue.refDown(ref);
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ReplicationBackupActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ReplicationBackupActivation.java
index 71383b4b67..d46d1f18be 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ReplicationBackupActivation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ReplicationBackupActivation.java
@@ -201,8 +201,9 @@ public final class ReplicationBackupActivation extends Activation implements Dis
             return;
          }
          synchronized (this) {
-            if (closed)
+            if (closed) {
                return;
+            }
          }
 
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java
index d921fbcfff..74bc048914 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java
@@ -499,26 +499,30 @@ public class ScaleDownHandler {
          final int AFTER = 1;
          int result = 0;
 
-         if (queue1 == queue2)
+         if (queue1 == queue2) {
             return EQUAL;
+         }
 
          if (queue1.getMessageCount() == queue2.getMessageCount()) {
             // if it's the same count we will use the ID as a tie breaker:
 
             long tieBreak = queue2.getID() - queue1.getID();
 
-            if (tieBreak > 0)
+            if (tieBreak > 0) {
                return AFTER;
-            else if (tieBreak < 0)
+            } else if (tieBreak < 0) {
                return BEFORE;
-            else
+            } else {
                return EQUAL; // EQUAL here shouldn't really happen... but lets do the check anyways
+            }
 
          }
-         if (queue1.getMessageCount() > queue2.getMessageCount())
+         if (queue1.getMessageCount() > queue2.getMessageCount()) {
             return BEFORE;
-         if (queue1.getMessageCount() < queue2.getMessageCount())
+         }
+         if (queue1.getMessageCount() < queue2.getMessageCount()) {
             return AFTER;
+         }
 
          return result;
       }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
index 815b42057c..6931d08773 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
@@ -2254,8 +2254,9 @@ public class ServerSessionImpl extends CriticalComponentImpl implements ServerSe
        * This can be invoked from Netty (via channelInactive) when the connection has already been closed causing
        * spurious logging about clearing up resources for failed client connections.
        */
-      if (closing)
+      if (closing) {
          return;
+      }
 
       try {
          ActiveMQServerLogger.LOGGER.clientConnectionFailed(name);
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 0498335758..206bfc1d48 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
@@ -327,9 +327,10 @@ public final class SharedNothingBackupActivation extends Activation implements R
          if (logger.isTraceEnabled()) {
             logger.trace("{}, serverStarted={}", e.getMessage(), activeMQServer.isStarted(), e);
          }
-         if ((e instanceof InterruptedException || e instanceof IllegalStateException) && !activeMQServer.isStarted())
+         if ((e instanceof InterruptedException || e instanceof IllegalStateException) && !activeMQServer.isStarted()) {
             // do not log these errors if the server is being stopped.
             return;
+         }
          ActiveMQServerLogger.LOGGER.initializationError(e);
       }
    }
@@ -350,8 +351,9 @@ public final class SharedNothingBackupActivation extends Activation implements R
    @Override
    public void close(final boolean permanently, boolean restarting) throws Exception {
       synchronized (this) {
-         if (backupQuorum != null)
+         if (backupQuorum != null) {
             backupQuorum.causeExit(STOP);
+         }
          replicationEndpoint = null;
          closed = true;
       }
@@ -485,8 +487,9 @@ public final class SharedNothingBackupActivation extends Activation implements R
       }
 
       private synchronized ReplicationEndpoint connectToReplicationEndpoint(final ClusterControl control) throws Exception {
-         if (!activeMQServer.isStarted())
+         if (!activeMQServer.isStarted()) {
             return null;
+         }
          if (!activeMQServer.getHAPolicy().isBackup()) {
             throw ActiveMQMessageBundle.BUNDLE.serverNotBackupServer();
          }
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 bc1e63be39..97475f40b7 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
@@ -295,8 +295,9 @@ public class SharedNothingPrimaryActivation extends PrimaryActivation {
     * This can happen in case of a successful fail-over followed by the primary's restart (attempting a fail-back).
     */
    private boolean isNodeIdUsed() throws Exception {
-      if (activeMQServer.getConfiguration().getClusterConfigurations().isEmpty())
+      if (activeMQServer.getConfiguration().getClusterConfigurations().isEmpty()) {
          return false;
+      }
       SimpleString nodeId0;
       try {
          nodeId0 = activeMQServer.getNodeManager().readNodeId();
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 ed2aabd546..b19573ff86 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
@@ -84,8 +84,9 @@ public final class SharedStoreBackupActivation extends Activation {
 
          boolean scalingDown = scaleDownPolicy != null && scaleDownPolicy.isEnabled();
 
-         if (!activeMQServer.initialisePart1(scalingDown))
+         if (!activeMQServer.initialisePart1(scalingDown)) {
             return;
+         }
 
          activeMQServer.getBackupManager().start();
 
@@ -297,8 +298,9 @@ public final class SharedStoreBackupActivation extends Activation {
                      }
 
                      synchronized (failbackCheckerGuard) {
-                        if (cancelFailBackChecker || !sharedStoreBackupPolicy.isRestartBackup())
+                        if (cancelFailBackChecker || !sharedStoreBackupPolicy.isRestartBackup()) {
                            return;
+                        }
 
                         activeMQServer.setHAPolicy(sharedStoreBackupPolicy);
                         logger.debug("{}::Starting backup node now after failback", activeMQServer);
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStorePrimaryActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStorePrimaryActivation.java
index 48c6f42138..1589bcf2c6 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStorePrimaryActivation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStorePrimaryActivation.java
@@ -63,8 +63,9 @@ public final class SharedStorePrimaryActivation extends PrimaryActivation {
 
          logger.debug("First part initialization on {}", this);
 
-         if (!activeMQServer.initialisePart1(false))
+         if (!activeMQServer.initialisePart1(false)) {
             return;
+         }
 
          if (activeMQServer.getNodeManager().isBackupActive()) {
             /*
@@ -75,8 +76,9 @@ public final class SharedStorePrimaryActivation extends PrimaryActivation {
 
             activeMQServer.getBackupManager().start();
 
-            if (!sharedStorePrimaryPolicy.isWaitForActivation())
+            if (!sharedStorePrimaryPolicy.isWaitForActivation()) {
                activeMQServer.setState(ActiveMQServerImpl.SERVER_STATE.STARTED);
+            }
 
             activeMQServer.getBackupManager().announceBackup();
          }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/jdbc/JdbcNodeManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/jdbc/JdbcNodeManager.java
index c8f9a4230e..e90f67cd63 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/jdbc/JdbcNodeManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/jdbc/JdbcNodeManager.java
@@ -437,8 +437,9 @@ public final class JdbcNodeManager extends NodeManager {
          lock(scheduledBackupLock.lock());
          scheduledBackupLock.start();
          ActiveMQServerLogger.LOGGER.gotBackupLock();
-         if (getUUID() == null)
+         if (getUUID() == null) {
             readNodeId();
+         }
       } catch (InterruptedException ie) {
          throw ie;
       } catch (ActiveMQLockAcquisitionTimeoutException | IllegalStateException e) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ArtemisMBeanServerGuard.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ArtemisMBeanServerGuard.java
index 791347da88..f7cd7c3dc6 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ArtemisMBeanServerGuard.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ArtemisMBeanServerGuard.java
@@ -49,11 +49,13 @@ public class ArtemisMBeanServerGuard implements GuardInvocationHandler {
 
    @Override
    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-      if (method.getParameterTypes().length == 0)
+      if (method.getParameterTypes().length == 0) {
          return null;
+      }
 
-      if (!ObjectName.class.isAssignableFrom(method.getParameterTypes()[0]))
+      if (!ObjectName.class.isAssignableFrom(method.getParameterTypes()[0])) {
          return null;
+      }
 
       ObjectName objectName = (ObjectName) args[0];
       if ("getAttribute".equals(method.getName())) {
@@ -106,8 +108,9 @@ public class ArtemisMBeanServerGuard implements GuardInvocationHandler {
          }
       }
 
-      if (dataType == null)
+      if (dataType == null) {
          throw new IllegalStateException("Attribute data type can not be found");
+      }
 
       handleInvoke(objectName, "set" + attribute.getName());
    }
@@ -165,8 +168,9 @@ public class ArtemisMBeanServerGuard implements GuardInvocationHandler {
       }
       List<String> requiredRoles = getRequiredRoles(objectName, operationName);
       for (String role : requiredRoles) {
-         if (currentUserHasRole(role))
+         if (currentUserHasRole(role)) {
             return;
+         }
       }
       if (AuditLogger.isResourceLoggingEnabled()) {
          AuditLogger.objectInvokedFailure(objectName, operationName);
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModule.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModule.java
index 6118cca888..0175e58fc3 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModule.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModule.java
@@ -760,10 +760,11 @@ public class LDAPLoginModule implements AuditLoginModule {
    }
 
    private String getLDAPPropertyValue(ConfigKey key) {
-      for (LDAPLoginProperty conf : config)
+      for (LDAPLoginProperty conf : config) {
          if (conf.getPropertyName().equals(key.getName())) {
             return conf.getPropertyValue();
          }
+      }
       return null;
    }
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/scram/StringPrep.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/scram/StringPrep.java
index 2ead6eff25..127ec5e940 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/scram/StringPrep.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/scram/StringPrep.java
@@ -48,16 +48,18 @@ public class StringPrep {
 
       static CharClass fromList(int[] charMap) {
          SortedMap<Integer, Integer> mapping = new TreeMap<>();
-         for (int element : charMap)
+         for (int element : charMap) {
             mapping.put(element, 1);
+         }
 
          return new CharClass(mapping);
       }
 
       static CharClass fromRanges(int[] charMap) {
          // There must be an even number of tuples in RANGES tables.
-         if ((charMap.length % 2) != 0)
+         if ((charMap.length % 2) != 0) {
             throw new IllegalArgumentException("Invalid character list size");
+         }
 
          SortedMap<Integer, Integer> mapping = new TreeMap<>();
          for (int i = 0; i < charMap.length; i += 2) {
@@ -124,8 +126,9 @@ public class StringPrep {
          // -pos - 1 is the lowest index where tupleStart[pos] > c. If this is the
          // first entry, then c is below all entries in the class.
          pos = -pos - 1;
-         if (pos == 0)
+         if (pos == 0) {
             return false;
+         }
          --pos;
 
          // tupleStart[pos] is <= c.
@@ -2063,10 +2066,11 @@ public class StringPrep {
       for (int i = 0; i < s.length();) {
          int c = Character.codePointAt(s, i);
          int charCount = Character.charCount(c);
-         if (mapFrom.isCharInClass(c))
+         if (mapFrom.isCharInClass(c)) {
             result.append(mapTo);
-         else
+         } else {
             result.append(s, i, i + charCount);
+         }
          i += charCount;
       }
 
@@ -2080,8 +2084,9 @@ public class StringPrep {
    static int containsCharacterInClass(String s, CharClass charClass) {
       for (int i = 0; i < s.length();) {
          int c = Character.codePointAt(s, i);
-         if (charClass.isCharInClass(c))
+         if (charClass.isCharInClass(c)) {
             return i;
+         }
 
          i += Character.charCount(c);
       }
@@ -2098,16 +2103,19 @@ public class StringPrep {
          // 2) If a string contains any RandALCat character, the string MUST NOT
          // contain any LCat character.
          int containsL = containsCharacterInClass(s, D2);
-         if (containsL != -1)
+         if (containsL != -1) {
             throw new StringPrepRTLErrorBothRALandL();
+         }
          // 3) If a string contains any RandALCat character, a RandALCat
          // character MUST be the first character of the string
-         if (containsRAL != 0)
+         if (containsRAL != 0) {
             throw new StringPrepRTLErrorRALWithoutPrefix();
+         }
 
          // ... and a RandALCat character MUST be the last character of the string.
-         if (!D1.isCharInClass(s.charAt(s.length() - 1)))
+         if (!D1.isCharInClass(s.charAt(s.length() - 1))) {
             throw new StringPrepRTLErrorRALWithoutSuffix();
+         }
       }
    }
 
@@ -2123,8 +2131,9 @@ public class StringPrep {
       // This profile specifies the [StringPrep, A.1] table as its list of unassigned
       // code points.
       int containsUnassignedCodepoint = containsCharacterInClass(s, A1);
-      if (containsUnassignedCodepoint != -1)
+      if (containsUnassignedCodepoint != -1) {
          throw new StringPrepUnassignedCodepoint();
+      }
       return s;
    }
 
@@ -2147,8 +2156,9 @@ public class StringPrep {
 
       // 3) Prohibit
       int idx = containsCharacterInClass(s, saslProhibited);
-      if (idx != -1)
+      if (idx != -1) {
          throw new StringPrepProhibitedCharacter();
+      }
 
       // 4) Check bidi
       verifyRTL(s);
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/utils/XMLConfigurationUtil.java b/artemis-server/src/main/java/org/apache/activemq/artemis/utils/XMLConfigurationUtil.java
index 3ea9395250..6f09714a6e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/utils/XMLConfigurationUtil.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/utils/XMLConfigurationUtil.java
@@ -37,8 +37,9 @@ public class XMLConfigurationUtil {
 
    public static final String getTrimmedTextContent(Node element) {
       String content = element.getTextContent();
-      if (content == null)
+      if (content == null) {
          return null;
+      }
       return content.trim();
    }
 
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 271a42ccb7..e137eb6f95 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
@@ -64,10 +64,12 @@ public class OperationContextUnitTest extends ServerTestBase {
 
          assertTrue(latch1.await(10, TimeUnit.SECONDS));
 
-         for (int i = 0; i < 10; i++)
+         for (int i = 0; i < 10; i++) {
             impl.storeLineUp();
-         for (int i = 0; i < 3; i++)
+         }
+         for (int i = 0; i < 3; i++) {
             impl.pageSyncLineUp();
+         }
 
          impl.executeOnCompletion(new IOCallback() {
 
@@ -83,10 +85,12 @@ public class OperationContextUnitTest extends ServerTestBase {
 
          assertFalse(latch2.await(1, TimeUnit.MILLISECONDS));
 
-         for (int i = 0; i < 9; i++)
+         for (int i = 0; i < 9; i++) {
             impl.done();
-         for (int i = 0; i < 2; i++)
+         }
+         for (int i = 0; i < 2; i++) {
             impl.pageSyncDone();
+         }
 
          assertFalse(latch2.await(1, TimeUnit.MILLISECONDS));
 
@@ -146,10 +150,12 @@ public class OperationContextUnitTest extends ServerTestBase {
          impl.done();
          assertTrue(latch3.await(10, TimeUnit.SECONDS));
 
-         for (int i = 0; i < 10; i++)
+         for (int i = 0; i < 10; i++) {
             impl.storeLineUp();
-         for (int i = 0; i < 3; i++)
+         }
+         for (int i = 0; i < 3; i++) {
             impl.pageSyncLineUp();
+         }
 
          impl.executeOnCompletion(new IOCallback() {
 
@@ -165,8 +171,9 @@ public class OperationContextUnitTest extends ServerTestBase {
 
          assertFalse(latch2.await(1, TimeUnit.MILLISECONDS));
 
-         for (int i = 0; i < 9; i++)
+         for (int i = 0; i < 9; i++) {
             impl.done();
+         }
 
          assertFalse(latch2.await(1, TimeUnit.MILLISECONDS));
 
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 2e0d6de3ac..b46ebc9acf 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
@@ -115,10 +115,12 @@ public class LDAPModuleRoleExpansionTest extends AbstractLdapTestUnit {
       boolean isUser = false;
       for (Principal principal : subject.getPrincipals()) {
          if (principal instanceof RolePrincipal rolePrincipal) {
-            if (rolePrincipal.getName().equalsIgnoreCase("admins"))
+            if (rolePrincipal.getName().equalsIgnoreCase("admins")) {
                isAdmin = true;
-            if (rolePrincipal.getName().equalsIgnoreCase("users"))
+            }
+            if (rolePrincipal.getName().equalsIgnoreCase("users")) {
                isUser = true;
+            }
          }
       }
       // Should be in users by virtue of being in admins
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/cluster/impl/BroadcastGroupImplTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/cluster/impl/BroadcastGroupImplTest.java
index 1afd107d8d..e8e8bd2961 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/cluster/impl/BroadcastGroupImplTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/cluster/impl/BroadcastGroupImplTest.java
@@ -67,12 +67,15 @@ public class BroadcastGroupImplTest extends ServerTestBase {
 
       @Override
       public void broadcast(byte[] data) throws Exception {
-         if (data == null)
+         if (data == null) {
             fail("Attempted to send datagram with null content");
-         if (data.length == 0)
+         }
+         if (data.length == 0) {
             fail("Attempted to send datagram with blank content");
-         if (data.length > 1500) // Common MTU size, not specification!
+         }
+         if (data.length > 1500) { // Common MTU size, not specification!
             fail("Attempted to send a datagram with " + data.length + " bytes");
+         }
          factory.sent++;
       }
 
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
index c4e0e0f7b9..5f76ab1dbb 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
@@ -83,8 +83,9 @@ public class ScheduledDeliveryHandlerTest {
 
       for (int i = 0; i < NUMBER_OF_SEQUENCES; i++) {
          int numberOfMessages = RandomUtil.randomInt() % 10;
-         if (numberOfMessages == 0)
+         if (numberOfMessages == 0) {
             numberOfMessages = 1;
+         }
 
          long nextScheduledTime = RandomUtil.randomPositiveLong();
 
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 d782cbcd95..8bc29fb3fa 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
@@ -457,8 +457,9 @@ public class LDAPLoginModuleTest extends AbstractLdapTestUnit {
 
    private boolean presentIn(Set<LDAPLoginProperty> ldapProps, String propertyName) {
       for (LDAPLoginProperty conf : ldapProps) {
-         if (conf.getPropertyName().equals(propertyName) && (conf.getPropertyValue() != null && !"".equals(conf.getPropertyValue())))
+         if (conf.getPropertyName().equals(propertyName) && (conf.getPropertyValue() != null && !"".equals(conf.getPropertyValue()))) {
             return true;
+         }
       }
       return false;
    }
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ServerTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ServerTestBase.java
index 150eda011d..2cef9f8f69 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ServerTestBase.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ServerTestBase.java
@@ -455,8 +455,9 @@ public abstract class ServerTestBase extends ArtemisTestCase {
    }
 
    private static String directoryNameSuffix(int index, boolean backup) {
-      if (index == -1)
+      if (index == -1) {
          return "";
+      }
       return index + "-" + (backup ? "B" : "L");
    }
 
@@ -629,8 +630,9 @@ public abstract class ServerTestBase extends ArtemisTestCase {
    }
 
    protected static final void stopComponent(ActiveMQComponent component) {
-      if (component == null)
+      if (component == null) {
          return;
+      }
       try {
          component.stop();
       } catch (Exception e) {
@@ -639,8 +641,9 @@ public abstract class ServerTestBase extends ArtemisTestCase {
    }
 
    protected static final void stopComponentOutputExceptions(ActiveMQComponent component) {
-      if (component == null)
+      if (component == null) {
          return;
+      }
       try {
          component.stop();
       } catch (Exception e) {
diff --git a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java
index ee3c9dd485..b2b7b30c62 100644
--- a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java
+++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java
@@ -300,8 +300,9 @@ public class ActiveMQXAResourceWrapper implements XAResource, SessionFailureList
             logger.debug(e.getMessage(), e);
 
             try {
-               if (serverLocator != null)
+               if (serverLocator != null) {
                   serverLocator.close();
+               }
             } catch (Throwable ignored) {
                logger.trace(e.getMessage(), ignored);
             }
diff --git a/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/tests/extensions/OpenFilesCheckExtension.java b/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/tests/extensions/OpenFilesCheckExtension.java
index 79e2909746..fa03b427c3 100644
--- a/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/tests/extensions/OpenFilesCheckExtension.java
+++ b/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/tests/extensions/OpenFilesCheckExtension.java
@@ -84,8 +84,9 @@ public class OpenFilesCheckExtension implements Extension, AfterAllCallback {
          try (BufferedReader processInput = new BufferedReader(new InputStreamReader(child.getInputStream()))) {
             processInput.readLine();
             while ((outputLine = processInput.readLine()) != null) {
-               if (!filtered || (!outputLine.endsWith(".jar") && !outputLine.endsWith(".so") && !outputLine.contains("type=STREAM")))
+               if (!filtered || (!outputLine.endsWith(".jar") && !outputLine.endsWith(".so") && !outputLine.contains("type=STREAM"))) {
                   openFiles.add(outputLine);
+               }
             }
          }
       } catch (Exception ignore) {
@@ -110,7 +111,9 @@ public class OpenFilesCheckExtension implements Extension, AfterAllCallback {
       PrintWriter printWriter = new PrintWriter(stringWriter);
       boolean first = true;
       for (String str : openFiles) {
-         if (!first) printWriter.print("\n");
+         if (!first) {
+            printWriter.print("\n");
+         }
          first = false;
          printWriter.print(str);
       }
diff --git a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
index c5af6026bd..5b7f122f44 100644
--- a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
+++ b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
@@ -373,18 +373,21 @@ public class WebServerComponent implements ExternalComponent, WebServerComponent
 
    private File getStoreFile(String storeFilename) {
       File storeFile = new File(storeFilename);
-      if (!storeFile.exists())
+      if (!storeFile.exists()) {
          throw new IllegalArgumentException("Store file does not exist: " + storeFilename);
-      if (storeFile.isDirectory())
+      }
+      if (storeFile.isDirectory()) {
          throw new IllegalArgumentException("Expected store file not directory: " + storeFilename);
+      }
 
       return storeFile;
    }
 
    private File getParentStoreFile(File storeFile) {
       File parentFile = storeFile.getParentFile();
-      if (!parentFile.exists() || !parentFile.isDirectory())
+      if (!parentFile.exists() || !parentFile.isDirectory()) {
          throw new IllegalArgumentException("Error obtaining store dir for " + storeFile);
+      }
 
       return parentFile;
    }
diff --git a/artemis-web/src/test/java/org/apache/activemq/cli/test/WebServerComponentTest.java b/artemis-web/src/test/java/org/apache/activemq/cli/test/WebServerComponentTest.java
index a6134483ce..86a2281cca 100644
--- a/artemis-web/src/test/java/org/apache/activemq/cli/test/WebServerComponentTest.java
+++ b/artemis-web/src/test/java/org/apache/activemq/cli/test/WebServerComponentTest.java
@@ -1109,8 +1109,9 @@ public class WebServerComponentTest extends ArtemisTestCase {
          byte[] buffer = new byte[1024];
          while (true) {
             int count = input.read(buffer);
-            if (count == -1)
+            if (count == -1) {
                break;
+            }
             target.write(buffer, 0, count);
          }
          target.closeEntry();
diff --git a/etc/checkstyle-suppressions.xml b/etc/checkstyle-suppressions.xml
index 6b47d76183..32b2f780b2 100644
--- a/etc/checkstyle-suppressions.xml
+++ b/etc/checkstyle-suppressions.xml
@@ -27,7 +27,7 @@ under the License.
 <suppressions>
 
    <!-- Suppress unfixable violations in JavaCC generated sources -->
-   <suppress checks="MethodParamPad|FileTabCharacter|Indentation|Whitespace|Curly|Modifier|AvoidStarImport|RedundantImport|UnusedImports|EmptyStatement|ArrayTypeStyle|RegexpSingleline" files="[\\/]generated-sources[\\/]javacc[\\/]"/>
-   <suppress checks="MethodParamPad|FileTabCharacter|Indentation|Whitespace|Curly|Modifier|AvoidStarImport|RedundantImport|UnusedImports|EmptyStatement|ArrayTypeStyle|RegexpSingleline" files="[\\/]generated-sources[\\/]annotations[\\/]"/>
+   <suppress checks="MethodParamPad|FileTabCharacter|Indentation|Whitespace|Curly|Modifier|AvoidStarImport|RedundantImport|UnusedImports|EmptyStatement|ArrayTypeStyle|RegexpSingleline|NeedBraces" files="[\\/]generated-sources[\\/]javacc[\\/]"/>
+   <suppress checks="MethodParamPad|FileTabCharacter|Indentation|Whitespace|Curly|Modifier|AvoidStarImport|RedundantImport|UnusedImports|EmptyStatement|ArrayTypeStyle|RegexpSingleline|NeedBraces" files="[\\/]generated-sources[\\/]annotations[\\/]"/>
 
 </suppressions>
diff --git a/etc/checkstyle.xml b/etc/checkstyle.xml
index 5162446b73..89f5e8d8d3 100644
--- a/etc/checkstyle.xml
+++ b/etc/checkstyle.xml
@@ -119,6 +119,11 @@ under the License.
 
       <module name="UnnecessarySemicolonInTryWithResources"/>
 
+      <module name="NeedBraces">
+         <property name="tokens" value="LITERAL_IF, LITERAL_ELSE, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO"/>
+         <property name="allowSingleLineStatement" value="false"/>
+      </module>
+
       <!-- begin Sevntu checks, http://sevntu-checkstyle.github.io/sevntu.checkstyle/ -->
       <module name="DiamondOperatorForVariableDefinition"/>
       <module name="RequiredParameterForAnnotation">
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java
index 1644cade2e..916a5a5d48 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java
@@ -685,8 +685,9 @@ public abstract class LargeMessageTestBase extends ActiveMQTestBase {
 
       @Override
       public int read() throws IOException {
-         if (pos == size)
+         if (pos == size) {
             return -1;
+         }
          pos++;
 
          return getChar(pos - 1);
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractClientStompFrame.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractClientStompFrame.java
index dde58ef0b1..84b330b1ba 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractClientStompFrame.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractClientStompFrame.java
@@ -58,8 +58,9 @@ public abstract class AbstractClientStompFrame implements ClientStompFrame {
    }
 
    public AbstractClientStompFrame(String command, boolean validate) {
-      if (validate && (!validate(command)))
+      if (validate && (!validate(command))) {
          throw new IllegalArgumentException("Invalid command " + command);
+      }
       this.command = command;
    }
 
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV11.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV11.java
index 4d8d1e031d..0b72f473ac 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV11.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV11.java
@@ -44,8 +44,9 @@ public class ClientStompFrameV11 extends ClientStompFrameV10 {
 
    @Override
    public boolean needsReply() {
-      if (forceOneway)
+      if (forceOneway) {
          return false;
+      }
 
       if (Stomp.Commands.STOMP.equals(command)) {
          return true;
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java
index e71210c13c..5515784c8b 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java
@@ -58,8 +58,9 @@ public class StompClientConnectionV11 extends StompClientConnectionV10 {
 
       if (Stomp.Responses.CONNECTED.equals(response.getCommand())) {
          String version = response.getHeader(Stomp.Headers.Connected.VERSION);
-         if (!version.equals(getVersion()))
+         if (!version.equals(getVersion())) {
             throw new IllegalStateException("incorrect version!");
+         }
 
          this.username = username;
          this.passcode = passcode;
@@ -83,8 +84,9 @@ public class StompClientConnectionV11 extends StompClientConnectionV10 {
 
       if (Stomp.Responses.CONNECTED.equals(response.getCommand())) {
          String version = response.getHeader(Stomp.Headers.Connected.VERSION);
-         if (!version.equals(getVersion()))
+         if (!version.equals(getVersion())) {
             throw new IllegalStateException("incorrect version!");
+         }
 
          this.username = username;
          this.passcode = passcode;
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
index 8fa7e16b7b..e59e39e97f 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
@@ -900,8 +900,9 @@ public abstract class ActiveMQTestBase extends ArtemisTestCase {
    }
 
    private static String directoryNameSuffix(int index, boolean backup) {
-      if (index == -1)
+      if (index == -1) {
          return "";
+      }
       return index + "-" + (backup ? "B" : "L");
    }
 
@@ -1215,8 +1216,9 @@ public abstract class ActiveMQTestBase extends ArtemisTestCase {
             className = INVM_CONNECTOR_FACTORY;
          }
       }
-      if (params == null)
+      if (params == null) {
          params = new HashMap<>();
+      }
       return new TransportConfiguration(className, params, name, new HashMap<String, Object>());
    }
 
@@ -1225,8 +1227,9 @@ public abstract class ActiveMQTestBase extends ArtemisTestCase {
    }
 
    protected void waitForServerToStart(ActiveMQServer server, boolean activation) throws InterruptedException {
-      if (server == null)
+      if (server == null) {
          return;
+      }
       final long wait = 5000;
       long timetowait = System.currentTimeMillis() + wait;
       while (!server.isStarted() && System.currentTimeMillis() < timetowait) {
@@ -1240,15 +1243,17 @@ public abstract class ActiveMQTestBase extends ArtemisTestCase {
 
       if (activation) {
          if (!server.getHAPolicy().isBackup()) {
-            if (!server.waitForActivation(wait, TimeUnit.MILLISECONDS))
+            if (!server.waitForActivation(wait, TimeUnit.MILLISECONDS)) {
                fail("Server didn't initialize: " + server);
+            }
          }
       }
    }
 
    protected void waitForServerToStop(ActiveMQServer server) throws InterruptedException {
-      if (server == null)
+      if (server == null) {
          return;
+      }
       final long wait = 5000;
       long timetowait = System.currentTimeMillis() + wait;
       while (server.isStarted() && System.currentTimeMillis() < timetowait) {
@@ -1713,13 +1718,15 @@ public abstract class ActiveMQTestBase extends ArtemisTestCase {
          assertNotNull(message, "Expecting a message " + i);
          // sendCallNumber is just a debugging measure.
          Object prop = message.getObjectProperty(SEND_CALL_NUMBER);
-         if (prop == null)
+         if (prop == null) {
             prop = -1;
+         }
          final int actual = message.getIntProperty("counter");
          assertEquals(i, actual, "expected=" + i + ". Got: property['counter']=" + actual + " sendNumber=" + prop);
          assertMessageBody(i, message);
-         if (ack)
+         if (ack) {
             message.acknowledge();
+         }
       }
    }
 
@@ -2233,8 +2240,9 @@ public abstract class ActiveMQTestBase extends ArtemisTestCase {
    }
 
    protected static final void stopComponent(ActiveMQComponent component) {
-      if (component == null)
+      if (component == null) {
          return;
+      }
       try {
          component.stop();
       } catch (Exception e) {
@@ -2243,8 +2251,9 @@ public abstract class ActiveMQTestBase extends ArtemisTestCase {
    }
 
    protected static final void stopComponentOutputExceptions(ActiveMQComponent component) {
-      if (component == null)
+      if (component == null) {
          return;
+      }
       try {
          component.stop();
       } catch (Exception e) {
@@ -2324,8 +2333,9 @@ public abstract class ActiveMQTestBase extends ArtemisTestCase {
    private void assertAllClientConsumersAreClosed() {
       synchronized (clientConsumers) {
          for (ClientConsumer cc : clientConsumers) {
-            if (cc == null)
+            if (cc == null) {
                continue;
+            }
             assertTrue(cc.isClosed());
          }
          clientConsumers.clear();
@@ -2335,8 +2345,9 @@ public abstract class ActiveMQTestBase extends ArtemisTestCase {
    private void assertAllClientSessionsAreClosed() {
       synchronized (clientSessions) {
          for (final ClientSession cs : clientSessions) {
-            if (cs == null)
+            if (cs == null) {
                continue;
+            }
             assertTrue(cs.isClosed());
          }
          clientSessions.clear();
@@ -2365,8 +2376,9 @@ public abstract class ActiveMQTestBase extends ArtemisTestCase {
    }
 
    public static final void closeServerLocator(ServerLocator locator) {
-      if (locator == null)
+      if (locator == null) {
          return;
+      }
       try {
          locator.close();
       } catch (Exception e) {
@@ -2375,8 +2387,9 @@ public abstract class ActiveMQTestBase extends ArtemisTestCase {
    }
 
    public static final void closeSessionFactory(final ClientSessionFactory sf) {
-      if (sf == null)
+      if (sf == null) {
          return;
+      }
       try {
          sf.close();
       } catch (Exception e) {
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/JMSTestBase.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/JMSTestBase.java
index 3d8ca65d94..7c7d20cda7 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/JMSTestBase.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/JMSTestBase.java
@@ -171,8 +171,9 @@ public class JMSTestBase extends ActiveMQTestBase {
          contextSet.clear();
       }
       try {
-         if (conn != null)
+         if (conn != null) {
             conn.close();
+         }
       } catch (Exception e) {
          // no-op
       }
@@ -272,8 +273,9 @@ public class JMSTestBase extends ActiveMQTestBase {
             assertNotNull(message, "Expecting a message " + i);
             final int actual = message.getIntProperty("counter");
             assertEquals(i, actual, "expected=" + i + ". Got: property['counter']=" + actual);
-            if (ack)
+            if (ack) {
                message.acknowledge();
+            }
          }
       } catch (JMSException cause) {
          throw new JMSRuntimeException(cause.getMessage(), cause.getErrorCode(), cause);
diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MirroredVersionTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MirroredVersionTest.java
index 9d07a00bcc..3a52d0dec1 100644
--- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MirroredVersionTest.java
+++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MirroredVersionTest.java
@@ -155,7 +155,9 @@ public class MirroredVersionTest extends ClasspathBase {
          connection.start();
          for (int i = 0; i < 10; i++) {
             TextMessage message = (TextMessage) consumer.receive(5000);
-            if (message == null) break;
+            if (message == null) {
+               break;
+            }
          }
          session.rollback();
       }
diff --git a/tests/db-tests/src/test/java/org/apache/activemq/artemis/tests/db/paging/PagingTest.java b/tests/db-tests/src/test/java/org/apache/activemq/artemis/tests/db/paging/PagingTest.java
index 25e680258f..40fe18b77c 100644
--- a/tests/db-tests/src/test/java/org/apache/activemq/artemis/tests/db/paging/PagingTest.java
+++ b/tests/db-tests/src/test/java/org/apache/activemq/artemis/tests/db/paging/PagingTest.java
@@ -5120,8 +5120,9 @@ public class PagingTest extends ParameterDBTestBase {
          ClientMessage message = null;
 
          for (int i = 0; i < numberOfMessages; i++) {
-            if (i % 10 == 0)
+            if (i % 10 == 0) {
                logger.debug("send message #{}", i);
+            }
             message = session.createMessage(true);
 
             message.putStringProperty("id", "str" + i);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTransactionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTransactionTest.java
index 40d1057294..409bdb693f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTransactionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTransactionTest.java
@@ -903,7 +903,9 @@ public class AmqpTransactionTest extends AmqpClientTestSupport {
                   }
 
                   if (i % 100 == 0) {
-                     if (i % 1000 == 0) logger.debug("Read message {}", i);
+                     if (i % 1000 == 0) {
+                        logger.debug("Read message {}", i);
+                     }
                      consumerSession.commit();
                   }
                }
@@ -927,7 +929,9 @@ public class AmqpTransactionTest extends AmqpClientTestSupport {
          for (int i = 0; i < MESSAGE_COUNT; i++) {
             producer.send(sendingSession.createTextMessage("message " + i), DeliveryMode.PERSISTENT, Message.DEFAULT_PRIORITY, Message.DEFAULT_TIME_TO_LIVE);
             if (i % 100 == 0) {
-               if (i % 1000 == 0) logger.debug("Sending {}", i);
+               if (i % 1000 == 0) {
+                  logger.debug("Sending {}", i);
+               }
                sendingSession.commit();
             }
          }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConcurrentCreateDeleteProduceTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConcurrentCreateDeleteProduceTest.java
index 6e7ca5e6f5..1202d6db99 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConcurrentCreateDeleteProduceTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConcurrentCreateDeleteProduceTest.java
@@ -125,8 +125,11 @@ public class ConcurrentCreateDeleteProduceTest extends ActiveMQTestBase {
                while (running) {
                   ClientMessage msg = consumer.receive(500);
                   if (msg == null) {
-                     if (running) continue;
-                     else break;
+                     if (running) {
+                        continue;
+                     } else {
+                        break;
+                     }
                   }
                   if (msgcount++ == 500) {
                      msgcount = 0;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
index b8fe187d73..35bc20b83a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
@@ -430,8 +430,9 @@ public class HangConsumerTest extends ActiveMQTestBase {
 
             logger.debug("Bindings: {}", bindings);
             messagesJournal.stop();
-            if (i < 4)
+            if (i < 4) {
                server.start();
+            }
          }
       } finally {
          try {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
index 6614921518..41549e727b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
@@ -2170,10 +2170,11 @@ public class LargeMessageTest extends LargeMessageTestBase {
                assertEquals(getSamplebyte(bi), body[bi]);
             }
 
-            if (i < 4)
+            if (i < 4) {
                session.rollback();
-            else
+            } else {
                session.commit();
+            }
          }
 
          for (int i = 0; i < 5; i++) {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RescheduleJDBCDeliveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RescheduleJDBCDeliveryTest.java
index 6455abb87b..a7f921789a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RescheduleJDBCDeliveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RescheduleJDBCDeliveryTest.java
@@ -169,8 +169,9 @@ public class RescheduleJDBCDeliveryTest extends ActiveMQTestBase {
             for (int i = 1; i <= columnCount; i++) {
                Object value = result.getObject(i);
                line.append(metaData.getColumnLabel(i) + " = " + value);
-               if (i + 1 <= columnCount)
+               if (i + 1 <= columnCount) {
                   line.append(", ");
+               }
             }
             logger.info(line.toString());
          }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeReconnectTest.java
index b3859460bb..515bbb2a49 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeReconnectTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeReconnectTest.java
@@ -655,12 +655,15 @@ public class BridgeReconnectTest extends BridgeTestBase {
    }
 
    private void closeServers() throws Exception {
-      if (session0 != null)
+      if (session0 != null) {
          session0.close();
-      if (session1 != null)
+      }
+      if (session1 != null) {
          session1.close();
-      if (session2 != null)
+      }
+      if (session2 != null) {
          session2.close();
+      }
 
       if (locator != null) {
          locator.close();
@@ -668,15 +671,17 @@ public class BridgeReconnectTest extends BridgeTestBase {
 
       server0.stop();
       server1.stop();
-      if (server2 != null)
+      if (server2 != null) {
          server2.stop();
+      }
    }
 
    private void assertNoMoreConnections() {
       assertEquals(0, server0.getRemotingService().getConnections().size());
       assertEquals(0, server1.getRemotingService().getConnections().size());
-      if (server2 != null)
+      if (server2 != null) {
          assertEquals(0, server2.getRemotingService().getConnections().size());
+      }
    }
 
    @TestTemplate
@@ -849,8 +854,9 @@ public class BridgeReconnectTest extends BridgeTestBase {
    }
 
    private void startServers() throws Exception {
-      if (server2 != null)
+      if (server2 != null) {
          server2.start();
+      }
       server1.start();
       server0.start();
    }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
index 388e2278ba..65b9264648 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
@@ -1572,8 +1572,9 @@ public class BridgeTest extends ActiveMQTestBase {
 
             msgCount.incrementAndGet();
 
-            if (i % 500 == 0)
+            if (i % 500 == 0) {
                logger.debug("received {}", i);
+            }
          }
 
          boolean failed = false;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTestBase.java
index 4c850d4412..49c39a621b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTestBase.java
@@ -105,7 +105,8 @@ public abstract class BridgeTestBase extends ActiveMQTestBase {
    }
 
    protected void waitForServerStart(ActiveMQServer server) throws Exception {
-      if (!server.waitForActivation(5000L, TimeUnit.MILLISECONDS))
+      if (!server.waitForActivation(5000L, TimeUnit.MILLISECONDS)) {
          throw new IllegalStateException("Timed out waiting for server starting = " + server);
+      }
    }
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/PageCounterOnBridgeFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/PageCounterOnBridgeFailoverTest.java
index 3c54162c03..70a30849de 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/PageCounterOnBridgeFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/PageCounterOnBridgeFailoverTest.java
@@ -72,8 +72,11 @@ public class PageCounterOnBridgeFailoverTest extends FailoverTestBase {
             ClientProducer producerServer1 = session1.createProducer(queueName0);
             for (int i = 0; i < messageSent; i++) {
                ClientMessage msg = session1.createMessage(true);
-               if (i % 2 == 0) setLargeMessageBody(0, msg);
-               else setBody(i, msg);
+               if (i % 2 == 0) {
+                  setLargeMessageBody(0, msg);
+               } else {
+                  setBody(i, msg);
+               }
                producerServer1.send(msg);
             }
             session1.commit();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
index 0e1f5522ec..34c00f58df 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
@@ -688,8 +688,9 @@ public abstract class ClusterTestBase extends ActiveMQTestBase {
    }
 
    protected void closeAllConsumers() {
-      if (consumers == null)
+      if (consumers == null) {
          return;
+      }
       for (int i = 0; i < consumers.length; i++) {
          ConsumerHolder holder = consumers[i];
 
@@ -1964,8 +1965,9 @@ public abstract class ClusterTestBase extends ActiveMQTestBase {
             }
          }
       }
-      if (exception != null)
+      if (exception != null) {
          throw exception;
+      }
    }
 
    protected boolean isFileStorage() {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java
index d54b3bb8c2..ee24e961d7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java
@@ -85,15 +85,17 @@ public class ClusteredGroupingTest extends ClusterTestBase {
       final CountDownLatch latch = new CountDownLatch(4);
 
       getServer(1).getManagementService().addNotificationListener(notification -> {
-         if (!(notification.getType() instanceof CoreNotificationType))
+         if (!(notification.getType() instanceof CoreNotificationType)) {
             return;
+         }
          if (notification.getType() == CoreNotificationType.UNPROPOSAL) {
             latch.countDown();
          }
       });
       getServer(2).getManagementService().addNotificationListener(notification -> {
-         if (!(notification.getType() instanceof CoreNotificationType))
+         if (!(notification.getType() instanceof CoreNotificationType)) {
             return;
+         }
          if (notification.getType() == CoreNotificationType.UNPROPOSAL) {
             latch.countDown();
          }
@@ -175,15 +177,17 @@ public class ClusteredGroupingTest extends ClusterTestBase {
       final CountDownLatch latch = new CountDownLatch(4);
 
       getServer(1).getManagementService().addNotificationListener(notification -> {
-         if (!(notification.getType() instanceof CoreNotificationType))
+         if (!(notification.getType() instanceof CoreNotificationType)) {
             return;
+         }
          if (notification.getType() == CoreNotificationType.UNPROPOSAL) {
             latch.countDown();
          }
       });
       getServer(2).getManagementService().addNotificationListener(notification -> {
-         if (!(notification.getType() instanceof CoreNotificationType))
+         if (!(notification.getType() instanceof CoreNotificationType)) {
             return;
+         }
          if (notification.getType() == CoreNotificationType.UNPROPOSAL) {
             latch.countDown();
          }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java
index 6184ebc513..3e986aea81 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java
@@ -341,8 +341,9 @@ public class BackupSyncJournalTest extends FailoverTestBase {
    protected void createProducer() throws ActiveMQException {
       session = addClientSession(sessionFactory.createSession(true, true));
       session.createQueue(QueueConfiguration.of(ADDRESS));
-      if (producer != null)
+      if (producer != null) {
          producer.close();
+      }
       producer = addClientProducer(session.createProducer(ADDRESS));
    }
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java
index cdcbc65bd1..2aea629048 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java
@@ -244,8 +244,9 @@ public class NettyReplicatedFailoverTest extends NettyFailoverInVMTest {
             } catch (Exception e) {
                // this is our retry
                try {
-                  if (!producer.isClosed())
+                  if (!producer.isClosed()) {
                      producer.send(message);
+                  }
                } catch (ActiveMQException e1) {
                   e1.printStackTrace();
                }
@@ -833,8 +834,9 @@ public class NettyReplicatedFailoverTest extends NettyFailoverInVMTest {
       ClientConsumer consumer2 = session2.createConsumer(FailoverTestBase.ADDRESS);
       final boolean replication = primaryServer.getServer().getHAPolicy() instanceof ReplicatedPolicy ||
          primaryServer.getServer().getHAPolicy() instanceof ReplicationPrimaryPolicy;
-      if (replication)
+      if (replication) {
          receiveMessages(consumer2, 0, NUM_MESSAGES, true);
+      }
       assertNoMoreMessages(consumer2);
       session2.commit();
    }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PageCleanupWhileReplicaCatchupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PageCleanupWhileReplicaCatchupTest.java
index 512365409c..4473acb6f0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PageCleanupWhileReplicaCatchupTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PageCleanupWhileReplicaCatchupTest.java
@@ -163,7 +163,9 @@ public class PageCleanupWhileReplicaCatchupTest extends FailoverTestBase {
                   startFlag.await(1, TimeUnit.SECONDS);
                } catch (Throwable ignored) {
                }
-               if (!running) break;
+               if (!running) {
+                  break;
+               }
                try (Connection connection = factory.createConnection()) {
                   Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
                   connection.start();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/BackupSyncDelay.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/BackupSyncDelay.java
index 9c1faed7a1..0adb3e21bf 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/BackupSyncDelay.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/BackupSyncDelay.java
@@ -70,8 +70,9 @@ public class BackupSyncDelay implements Interceptor {
 
    public void deliverUpToDateMsg() {
       live.getRemotingService().removeIncomingInterceptor(this);
-      if (backup.isStarted())
+      if (backup.isStarted()) {
          handler.deliver();
+      }
    }
 
    /**
@@ -133,10 +134,12 @@ public class BackupSyncDelay implements Interceptor {
 
       public synchronized void deliver() {
          deliver = true;
-         if (!receivedUpToDate)
+         if (!receivedUpToDate) {
             return;
-         if (delivered)
+         }
+         if (delivered) {
             return;
+         }
 
          Objects.requireNonNull(onHold, "Don't have the 'sync is done' packet to deliver");
          // Use wrapper to avoid sending a response
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryTest.java
index 447a3808b2..cf7e48b91a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryTest.java
@@ -376,11 +376,13 @@ public class DiscoveryTest extends DiscoveryBaseTest {
          }
       } finally {
          try {
-            if (broadcaster != null)
+            if (broadcaster != null) {
                broadcaster.close(true);
+            }
 
-            if (client != null)
+            if (client != null) {
                client.close(false);
+            }
          } catch (Exception ignored) {
             ignored.printStackTrace();
          }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java
index d86f5784fa..884b4c66a0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java
@@ -210,8 +210,9 @@ public class JmsProducerTest extends JMSTestBase {
                fail("non existent byte property expects exception, but got value: " + value1);
             }
          } catch (Throwable t) {
-            if (expected == null)
+            if (expected == null) {
                throw t;
+            }
             if (!t.getClass().equals(expected.getClass())) {
                throw new Exception("Expected exception: " + expected.getClass().getName() +
                                       " but got: " + t.getClass(), t);
@@ -238,8 +239,9 @@ public class JmsProducerTest extends JMSTestBase {
                fail("non existent boolean property expects exception, but got value: " + value1);
             }
          } catch (Throwable t) {
-            if (expected == null)
+            if (expected == null) {
                throw t;
+            }
             if (!t.getClass().equals(expected.getClass())) {
                throw new Exception("Expected exception: " + expected.getClass().getName() +
                                       " but got: " + t.getClass(), t);
@@ -266,8 +268,9 @@ public class JmsProducerTest extends JMSTestBase {
                fail("non existent double property expects exception, but got value: " + value1);
             }
          } catch (Throwable t) {
-            if (expected == null)
+            if (expected == null) {
                throw t;
+            }
             if (!t.getClass().equals(expected.getClass())) {
                throw new Exception("Expected exception: " + expected.getClass().getName() +
                                       " but got: " + t.getClass(), t);
@@ -294,8 +297,9 @@ public class JmsProducerTest extends JMSTestBase {
                fail("non existent double property expects exception, but got value: " + value1);
             }
          } catch (Throwable t) {
-            if (expected == null)
+            if (expected == null) {
                throw t;
+            }
             if (!t.getClass().equals(expected.getClass())) {
                throw new Exception("Expected exception: " + expected.getClass().getName() +
                                       " but got: " + t.getClass(), t);
@@ -322,8 +326,9 @@ public class JmsProducerTest extends JMSTestBase {
                fail("non existent double property expects exception, but got value: " + value1);
             }
          } catch (Throwable t) {
-            if (expected == null)
+            if (expected == null) {
                throw t;
+            }
             if (!t.getClass().equals(expected.getClass())) {
                throw new Exception("Expected exception: " + expected.getClass().getName() +
                                       " but got: " + t.getClass(), t);
@@ -350,8 +355,9 @@ public class JmsProducerTest extends JMSTestBase {
                fail("non existent double property expects exception, but got value: " + value1);
             }
          } catch (Throwable t) {
-            if (expected == null)
+            if (expected == null) {
                throw t;
+            }
             if (!t.getClass().equals(expected.getClass())) {
                throw new Exception("Expected exception: " + expected.getClass().getName() +
                                       " but got: " + t.getClass(), t);
@@ -378,8 +384,9 @@ public class JmsProducerTest extends JMSTestBase {
                fail("non existent double property expects exception, but got value: " + value1);
             }
          } catch (Throwable t) {
-            if (expected == null)
+            if (expected == null) {
                throw t;
+            }
             if (!t.getClass().equals(expected.getClass())) {
                throw new Exception("Expected exception: " + expected.getClass().getName() +
                                       " but got: " + t.getClass(), t);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java
index 3a7ebfb65a..79c9a9af9e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java
@@ -178,8 +178,9 @@ public class ManualReconnectionToSingleServerTest extends ActiveMQTestBase {
                cf = new ActiveMQConnectionFactory(BROKER_URL);
                break;
             } catch (Exception e) {
-               if (retries++ > retryLimit)
+               if (retries++ > retryLimit) {
                   throw e;
+               }
                // retry until server is up
                Thread.sleep(100);
             }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java
index 1582998fa6..a2a1525114 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java
@@ -82,8 +82,9 @@ public class MultipleThreadsOpeningTest extends JMSClusteredTestBase {
                flagStartRace.await();
 
                for (int i = 0; i < numberOfOpens; i++) {
-                  if (i > 0 && i % 100 == 0)
+                  if (i > 0 && i % 100 == 0) {
                      logger.debug("connections created on Thread {} {}", Thread.currentThread(), i);
+                  }
                   Connection conn = cf1.createConnection();
                   Session sess = conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
                   sess.close();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalCompactSplitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalCompactSplitTest.java
index 9d28ef5889..b2c24bcda0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalCompactSplitTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalCompactSplitTest.java
@@ -118,7 +118,9 @@ public class JournalCompactSplitTest extends ActiveMQTestBase {
          JournalAddRecord record = new JournalAddRecord(true, i, JournalImpl.ADD_RECORD, EncoderPersister.getInstance(), new ByteArrayEncoding(z));
          record.setFileID(1);
          compactCount--;
-         if (compactCount < 0) compactCount = 10;
+         if (compactCount < 0) {
+            compactCount = 10;
+         }
 
          // this test is playing with the order of compact count
          record.setCompactCount(compactCount);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTSecurityManagerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTSecurityManagerTest.java
index f3047e1d9b..183663f474 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTSecurityManagerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTSecurityManagerTest.java
@@ -118,7 +118,9 @@ public class MQTTSecurityManagerTest extends MQTTTestSupport {
             assertEquals(clientID, state.getClientId());
          }
       } finally {
-         if (connection != null && connection.isConnected()) connection.disconnect();
+         if (connection != null && connection.isConnected()) {
+            connection.disconnect();
+         }
       }
    }
 
@@ -162,7 +164,9 @@ public class MQTTSecurityManagerTest extends MQTTTestSupport {
             assertEquals(clientID, state.getClientId());
          }
       } finally {
-         if (connection1 != null && connection1.isConnected()) connection1.disconnect();
+         if (connection1 != null && connection1.isConnected()) {
+            connection1.disconnect();
+         }
       }
    }
 
@@ -184,7 +188,9 @@ public class MQTTSecurityManagerTest extends MQTTTestSupport {
             assertEquals(CONNACK.Code.CONNECTION_REFUSED_IDENTIFIER_REJECTED, e.connack.code());
          }
       } finally {
-         if (connection != null && connection.isConnected()) connection.disconnect();
+         if (connection != null && connection.isConnected()) {
+            connection.disconnect();
+         }
       }
    }
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTSecurityPerAcceptorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTSecurityPerAcceptorTest.java
index 9a44e05cff..049c80f440 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTSecurityPerAcceptorTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTSecurityPerAcceptorTest.java
@@ -90,7 +90,9 @@ public class MQTTSecurityPerAcceptorTest extends MQTTTestSupport {
                assertTrue(Wait.waitFor(() -> finalConnection.isConnected(), 2000, 100), "Should be connected");
             }
          } finally {
-            if (connection != null && connection.isConnected()) connection.disconnect();
+            if (connection != null && connection.isConnected()) {
+               connection.disconnect();
+            }
          }
       }
    }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTSecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTSecurityTest.java
index 29ada93b5f..46b2d2d0c7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTSecurityTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTSecurityTest.java
@@ -106,7 +106,9 @@ public class MQTTSecurityTest extends MQTTTestSupport {
             BlockingConnection finalConnection = connection;
             assertTrue(Wait.waitFor(() -> finalConnection.isConnected(), 5000, 100), "Should be connected");
          } finally {
-            if (connection != null && connection.isConnected()) connection.disconnect();
+            if (connection != null && connection.isConnected()) {
+               connection.disconnect();
+            }
          }
       }
    }
@@ -131,8 +133,9 @@ public class MQTTSecurityTest extends MQTTTestSupport {
          } catch (Exception e) {
             fail("Should have caught an MQTTException");
          } finally {
-            if (connection != null && connection.isConnected())
+            if (connection != null && connection.isConnected()) {
                connection.disconnect();
+            }
          }
       }
    }
@@ -160,8 +163,9 @@ public class MQTTSecurityTest extends MQTTTestSupport {
             e.printStackTrace();
             fail("Should not have caught an Exception");
          } finally {
-            if (connection != null && connection.isConnected())
+            if (connection != null && connection.isConnected()) {
                connection.disconnect();
+            }
          }
 
          assertFalse(loggerHandler.findTrace("does not have permission"));
@@ -189,8 +193,9 @@ public class MQTTSecurityTest extends MQTTTestSupport {
          e.printStackTrace();
          fail("Should not have caught an Exception");
       } finally {
-         if (connection != null && connection.isConnected())
+         if (connection != null && connection.isConnected()) {
             connection.disconnect();
+         }
       }
    }
 
@@ -214,8 +219,9 @@ public class MQTTSecurityTest extends MQTTTestSupport {
          e.printStackTrace();
          fail("Should not have caught an Exception");
       } finally {
-         if (connection != null && connection.isConnected())
+         if (connection != null && connection.isConnected()) {
             connection.disconnect();
+         }
       }
    }
 
@@ -238,8 +244,9 @@ public class MQTTSecurityTest extends MQTTTestSupport {
             e.printStackTrace();
             fail("Should not have caught an Exception");
          } finally {
-            if (connection != null && connection.isConnected())
+            if (connection != null && connection.isConnected()) {
                connection.disconnect();
+            }
          }
       }
    }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTTest.java
index 2e979fa707..7bb92f9257 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTTest.java
@@ -125,7 +125,9 @@ public class MQTTTest extends MQTTTestSupport {
             BlockingConnection finalConnection = connection;
             assertTrue(Wait.waitFor(() -> finalConnection.isConnected(), 5000, 100), "Should be connected");
          } finally {
-            if (connection != null && connection.isConnected()) connection.disconnect();
+            if (connection != null && connection.isConnected()) {
+               connection.disconnect();
+            }
          }
       }
    }
@@ -2233,10 +2235,12 @@ public class MQTTTest extends MQTTTestSupport {
       } catch (Exception e) {
          fail("Connections should have worked.");
       } finally {
-         if (connection1.isConnected())
+         if (connection1.isConnected()) {
             connection1.disconnect();
-         if (connection2.isConnected())
+         }
+         if (connection2.isConnected()) {
             connection2.disconnect();
+         }
       }
    }
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsQueueBrowserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsQueueBrowserTest.java
index 8256a1dace..1191998154 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsQueueBrowserTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsQueueBrowserTest.java
@@ -158,11 +158,9 @@ public class JmsQueueBrowserTest extends BasicOpenWireTest {
       connection.start();
 
       TextMessage[] outbound = new TextMessage[10];
-      for (int i = 0; i < 10; i++)
-      {
+      for (int i = 0; i < 10; i++) {
          outbound[i] = session.createTextMessage(i + " Message");
       }
-      ;
 
       // lets consume any outstanding messages from previous test runs
       while (consumer.receive(1000) != null)
@@ -190,18 +188,15 @@ public class JmsQueueBrowserTest extends BasicOpenWireTest {
 
       // lets browse
       CompositeData[] compdatalist = proxy.browse();
-      if (compdatalist.length == 0)
-      {
+      if (compdatalist.length == 0) {
          fail("There is no message in the queue:");
       }
       String[] messageIDs = new String[compdatalist.length];
 
-      for (int i = 0; i < compdatalist.length; i++)
-      {
+      for (int i = 0; i < compdatalist.length; i++) {
          CompositeData cdata = compdatalist[i];
 
-         if (i == 0)
-         {
+         if (i == 0) {
             System.out.println("Columns: " + cdata.getCompositeType().keySet());
          }
          messageIDs[i] = (String) cdata.get("JMSMessageID");
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/AddressFullLoggingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/AddressFullLoggingTest.java
index 2a35a94636..21dd2bdd44 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/AddressFullLoggingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/AddressFullLoggingTest.java
@@ -139,8 +139,9 @@ public class AddressFullLoggingTest extends ActiveMQTestBase {
          ClientConsumer consumer = session.createConsumer(MY_QUEUE);
          for (int i = 0; i < sendCount; i++) {
             ClientMessage msg = consumer.receive(250);
-            if (msg == null)
+            if (msg == null) {
                break;
+            }
             msg.acknowledge();
          }
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/MultipleProducersPagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/MultipleProducersPagingTest.java
index d05bd6f6dd..239734bbde 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/MultipleProducersPagingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/MultipleProducersPagingTest.java
@@ -119,8 +119,9 @@ public class MultipleProducersPagingTest extends ActiveMQTestBase {
             barrierLatch.await();
             while (true) {
                Message msg = consumer.receive(CONSUMER_WAIT_TIME_MS);
-               if (msg == null)
+               if (msg == null) {
                   break;
+               }
                msgReceived.incrementAndGet();
             }
          } catch (Exception e) {
@@ -161,8 +162,9 @@ public class MultipleProducersPagingTest extends ActiveMQTestBase {
          conn.close();
       }
       connections.clear();
-      if (server != null)
+      if (server != null) {
          server.stop();
+      }
       super.tearDown();
    }
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java
index 467e0a216a..0395621270 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java
@@ -80,8 +80,9 @@ public abstract class StorageManagerTestBase extends ActiveMQTestBase {
       scheduledExecutorService.shutdown();
 
       super.tearDown();
-      if (exception != null)
+      if (exception != null) {
          throw exception;
+      }
    }
 
    protected void createStorage() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
index a177679a7f..1d15a1f83b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
@@ -206,8 +206,9 @@ public final class ReplicationTest extends ActiveMQTestBase {
    }
 
    private void waitForReplication(int count) throws InterruptedException {
-      if (liveServer == null)
+      if (liveServer == null) {
          return;
+      }
 
       while (liveServer.getReplicationManager() == null && count < 10) {
          Thread.sleep(50);
@@ -357,10 +358,12 @@ public final class ReplicationTest extends ActiveMQTestBase {
          }
       } finally {
          TestInterceptor.value.set(false);
-         if (!session.isClosed())
+         if (!session.isClosed()) {
             session.close();
-         if (!session2.isClosed())
+         }
+         if (!session2.isClosed()) {
             session2.close();
+         }
       }
    }
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java
index 702c275cbd..21fafdb48f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java
@@ -2526,15 +2526,17 @@ public class SecurityTest extends ActiveMQTestBase {
                if (username.equals("all")) {
                   return username;
                } else if (username.equals("foo")) {
-                  if (address.equals("test.queue") && checkType == CheckType.CONSUME)
+                  if (address.equals("test.queue") && checkType == CheckType.CONSUME) {
                      return username;
-                  else
+                  } else {
                      return null;
+                  }
                } else if (username.equals("bar")) {
-                  if (address.equals("test.queue") && checkType == CheckType.SEND)
+                  if (address.equals("test.queue") && checkType == CheckType.SEND) {
                      return username;
-                  else
+                  } else {
                      return null;
+                  }
                } else {
                   return null;
                }
@@ -2662,15 +2664,17 @@ public class SecurityTest extends ActiveMQTestBase {
                if (username.equals("all")) {
                   return username;
                } else if (username.equals("foo")) {
-                  if (address.equals("test.queue") && checkType == CheckType.CONSUME)
+                  if (address.equals("test.queue") && checkType == CheckType.CONSUME) {
                      return username;
-                  else
+                  } else {
                      return null;
+                  }
                } else if (username.equals("bar")) {
-                  if (address.equals("test.queue") && checkType == CheckType.SEND)
+                  if (address.equals("test.queue") && checkType == CheckType.SEND) {
                      return username;
-                  else
+                  } else {
                      return null;
+                  }
                } else {
                   return null;
                }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java
index 2d722e8b46..d20e5f6fcd 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java
@@ -742,10 +742,11 @@ public class ScaleDownTest extends ClusterTestBase {
 
       for (int i = 0; i < TEST_SIZE; i++) {
          Message message = session.createMessage(false);
-         if (i % 2 == 0)
+         if (i % 2 == 0) {
             message.putStringProperty(ClusterTestBase.FILTER_PROP, SimpleString.of("0"));
-         else
+         } else {
             message.putStringProperty(ClusterTestBase.FILTER_PROP, SimpleString.of("1"));
+         }
          producer.send(message);
       }
       session.commit();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
index 3337cc7159..e309c4daca 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
@@ -632,8 +632,9 @@ public class StompV11Test extends StompTestBase {
          // unsub
          unsubscribe(newConn, "a-sub");
       } finally {
-         if (newConn != null)
+         if (newConn != null) {
             newConn.disconnect();
+         }
          conn.disconnect();
       }
    }
@@ -735,8 +736,9 @@ public class StompV11Test extends StompTestBase {
          // unsub
          unsubscribe(newConn, "a-sub");
       } finally {
-         if (newConn != null)
+         if (newConn != null) {
             newConn.disconnect();
+         }
          conn.disconnect();
       }
    }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
index 9d9465bf1a..c8f656f600 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
@@ -758,8 +758,9 @@ public class StompV12Test extends StompTestBase {
          // unsub
          unsubscribe(newConn, "a-sub");
       } finally {
-         if (newConn != null)
+         if (newConn != null) {
             newConn.disconnect();
+         }
          conn.disconnect();
       }
    }
@@ -861,8 +862,9 @@ public class StompV12Test extends StompTestBase {
          // unsub
          unsubscribe(newConn, "a-sub");
       } finally {
-         if (newConn != null)
+         if (newConn != null) {
             newConn.disconnect();
+         }
          conn.disconnect();
       }
    }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaRecoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaRecoveryTest.java
index b9bc307218..cf1cf467e4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaRecoveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaRecoveryTest.java
@@ -237,21 +237,24 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
 
    @TestTemplate
    public void testPagingServerRestarted() throws Exception {
-      if (storeType == StoreConfiguration.StoreType.DATABASE)
+      if (storeType == StoreConfiguration.StoreType.DATABASE) {
          return;
+      }
       verifyPaging(true);
    }
 
    @TestTemplate
    public void testPaging() throws Exception {
-      if (storeType == StoreConfiguration.StoreType.DATABASE)
+      if (storeType == StoreConfiguration.StoreType.DATABASE) {
          return;
+      }
       verifyPaging(false);
    }
 
    public void verifyPaging(final boolean restartServer) throws Exception {
-      if (storeType == StoreConfiguration.StoreType.DATABASE)
+      if (storeType == StoreConfiguration.StoreType.DATABASE) {
          return;
+      }
       Xid xid = new XidImpl("xa1".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes());
 
       SimpleString pageQueue = SimpleString.of("pagequeue");
@@ -316,15 +319,17 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
 
    @TestTemplate
    public void testRollbackPaging() throws Exception {
-      if (storeType == StoreConfiguration.StoreType.DATABASE)
+      if (storeType == StoreConfiguration.StoreType.DATABASE) {
          return;
+      }
       testRollbackPaging(false);
    }
 
    @TestTemplate
    public void testRollbackPagingServerRestarted() throws Exception {
-      if (storeType == StoreConfiguration.StoreType.DATABASE)
+      if (storeType == StoreConfiguration.StoreType.DATABASE) {
          return;
+      }
       testRollbackPaging(true);
    }
 
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageTestBase.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageTestBase.java
index 10d7b8ccd2..173dfbc706 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageTestBase.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageTestBase.java
@@ -66,8 +66,9 @@ public abstract class MessageTestBase extends ActiveMQServerTestCase {
    @Override
    @AfterEach
    public void tearDown() throws Exception {
-      if (conn != null)
+      if (conn != null) {
          conn.close();
+      }
    }
 
    @Test
diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/MeasureCommitPerfTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/MeasureCommitPerfTest.java
index d3b35b1410..2066070a80 100644
--- a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/MeasureCommitPerfTest.java
+++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/MeasureCommitPerfTest.java
@@ -48,8 +48,9 @@ public class MeasureCommitPerfTest extends AbstractSendReceivePerfTest {
 
          s.commit();
          commits++;
-         if (start > 0 && commits % 1000 == 0)
+         if (start > 0 && commits % 1000 == 0) {
             printCommitsSecond(start, commits);
+         }
       }
       printCommitsSecond(start, commits);
 
diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DualMirrorNoContainerTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DualMirrorNoContainerTest.java
index 7280c35431..4dc292752d 100644
--- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DualMirrorNoContainerTest.java
+++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DualMirrorNoContainerTest.java
@@ -375,14 +375,18 @@ public class DualMirrorNoContainerTest extends SmokeTestBase {
          assertNotNull(message);
          assertEquals("message " + i, message.getText());
       }
-      if (tx) session.commit();
+      if (tx) {
+         session.commit();
+      }
    }
 
    private void sendMessages(boolean tx, Session session, MessageProducer producer, int start, int end) throws JMSException {
       for (int i = start; i <= end; i++) {
          producer.send(session.createTextMessage("message " + i));
       }
-      if (tx) session.commit();
+      if (tx) {
+         session.commit();
+      }
    }
 
 }
diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/infinite/InfiniteRedeliverySmokeTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/infinite/InfiniteRedeliverySmokeTest.java
index b99bc14fb4..1c38c06268 100644
--- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/infinite/InfiniteRedeliverySmokeTest.java
+++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/infinite/InfiniteRedeliverySmokeTest.java
@@ -95,7 +95,9 @@ public class InfiniteRedeliverySmokeTest extends SmokeTestBase {
       SequentialFileFactory fileFactory = new NIOSequentialFileFactory(journalLocation, 1);
 
       for (int i = 0; i < 500; i++) {
-         if (i % 10 == 0) logger.debug("Redelivery {}", i);
+         if (i % 10 == 0) {
+            logger.debug("Redelivery {}", i);
+         }
          for (int j = 0; j < 5000; j++) {
             assertNotNull(consumer.receive(5000));
          }
@@ -142,7 +144,9 @@ public class InfiniteRedeliverySmokeTest extends SmokeTestBase {
       connection.start();
       MessageConsumer consumer = session.createConsumer(queue);
       for (int i = 0; i < 500; i++) {
-         if (i % 10 == 0) logger.debug("Rollback send {}", i);
+         if (i % 10 == 0) {
+            logger.debug("Rollback send {}", i);
+         }
          for (int j = 0; j < 5000; j++) {
             producer.send(message);
          }
diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicationflow/SoakReplicatedPagingTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicationflow/SoakReplicatedPagingTest.java
index dc0db51b52..4ae081ec78 100644
--- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicationflow/SoakReplicatedPagingTest.java
+++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicationflow/SoakReplicatedPagingTest.java
@@ -353,7 +353,9 @@ public class SoakReplicatedPagingTest extends SoakTestBase {
             messageConsumer = session.createConsumer(address);
          }
 
-         if (LAG_CONSUMER_TIME > 0) Thread.sleep(LAG_CONSUMER_TIME);
+         if (LAG_CONSUMER_TIME > 0) {
+            Thread.sleep(LAG_CONSUMER_TIME);
+         }
 
          latch.countDown();
          connection.start();
@@ -363,8 +365,9 @@ public class SoakReplicatedPagingTest extends SoakTestBase {
          while (true) {
             Message m = messageConsumer.receive(1000);
             consumed.incrementAndGet();
-            if (m == null)
+            if (m == null) {
                logger.debug("Consumer{} received null", index);
+            }
             i++;
             if (i % 100 == 0) {
                logger.debug("Consumer{} received {} messages", index, i);
diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/stomp/StompSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/stomp/StompSoakTest.java
index cc9aed2920..cbae319f28 100644
--- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/stomp/StompSoakTest.java
+++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/stomp/StompSoakTest.java
@@ -169,8 +169,9 @@ public class StompSoakTest extends SoakTestBase {
       Assertions.assertTrue(done.await(10, TimeUnit.MINUTES));
 
       try {
-         if (c != null)
+         if (c != null) {
             c.close();
+         }
          if (cc != null) {
             cc.closeTransport();
             cc.disconnect();
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageCursorStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageCursorStressTest.java
index 0c61eb742f..fda378e755 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageCursorStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageCursorStressTest.java
@@ -385,8 +385,9 @@ public class PageCursorStressTest extends ActiveMQTestBase {
       iterator = cursor.iterator();
 
       for (int i = 0; i < NUM_MESSAGES * 2; i++) {
-         if (i % 100 == 0)
+         if (i % 100 == 0) {
             System.out.println("Paged " + i);
+         }
 
          if (i >= NUM_MESSAGES) {
 
@@ -415,8 +416,9 @@ public class PageCursorStressTest extends ActiveMQTestBase {
       iterator = cursor.iterator();
 
       for (int i = 0; i < NUM_MESSAGES * 3; i++) {
-         if (i % 100 == 0)
+         if (i % 100 == 0) {
             System.out.println("Paged " + i);
+         }
 
          if (i >= NUM_MESSAGES * 2 - 1) {
 
@@ -714,8 +716,9 @@ public class PageCursorStressTest extends ActiveMQTestBase {
       RoutingContext ctx = generateCTX();
 
       for (int i = start; i < start + numMessages; i++) {
-         if (i % 100 == 0)
+         if (i % 100 == 0) {
             System.out.println("Paged " + i);
+         }
          ActiveMQBuffer buffer = RandomUtil.randomBuffer(messageSize, i + 1L);
 
          Message msg = new CoreMessage(i, buffer.writerIndex());
diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
index 6f151cf4a1..2c89a5ab10 100644
--- a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
+++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
@@ -654,8 +654,9 @@ public class JMSBridgeImplTest extends ActiveMQTestBase {
          assertFalse(bridge.isStarted());
          assertTrue(tcclClassFound.get());
       } finally {
-         if (mockTccl != null)
+         if (mockTccl != null) {
             unsetMockTCCL(mockTccl);
+         }
       }
    }
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
index 1554113634..3c24442c0c 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
@@ -1279,8 +1279,9 @@ public class AlignedJournalImplTest extends ActiveMQTestBase {
    @AfterEach
    public void tearDown() throws Exception {
       stopComponent(journalImpl);
-      if (factory != null)
+      if (factory != null) {
          factory.stop();
+      }
       records = null;
 
       transactions = null;
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalFileRepositoryOrderTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalFileRepositoryOrderTest.java
index 8b7920487d..5bdec5e1e6 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalFileRepositoryOrderTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalFileRepositoryOrderTest.java
@@ -59,7 +59,9 @@ public class JournalFileRepositoryOrderTest extends ActiveMQTestBase {
                   Wait.waitFor(() -> !running.get() || dataFiles.size() > 10, 1000, 1);
                   while (running.get()) {
                      JournalFile file = dataFiles.poll();
-                     if (file == null) break;
+                     if (file == null) {
+                        break;
+                     }
                      repository.addFreeFile(file, false);
                   }
                } catch (Throwable e) {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java
index 50e81f6d7a..5f71e883e1 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java
@@ -248,8 +248,9 @@ public class MessageImplTest extends ActiveMQTestBase {
    @Test
    public void testMessageCopyIssue() throws Exception {
       for (long i = 0; i < 300; i++) {
-         if (i % 10 == 0)
+         if (i % 10 == 0) {
             logger.debug("#test {}", i);
+         }
          internalMessageCopy();
       }
    }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
index c2e8faf3c6..eca09dba47 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
@@ -60,11 +60,13 @@ public class NettyAcceptorTest extends ActiveMQTestBase {
    @Override
    @AfterEach
    public void tearDown() throws Exception {
-      if (pool3 != null)
+      if (pool3 != null) {
          pool3.shutdown();
+      }
 
-      if (pool2 != null)
+      if (pool2 != null) {
          pool2.shutdownNow();
+      }
 
       super.tearDown();
    }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQXAResourceWrapperTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQXAResourceWrapperTest.java
index 3b3dedd65e..3257489b7d 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQXAResourceWrapperTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQXAResourceWrapperTest.java
@@ -75,10 +75,12 @@ public class ActiveMQXAResourceWrapperTest extends ActiveMQTestBase {
          cs = (ClientSession) res;
          assertEquals(60000L, cs.getSessionFactory().getServerLocator().getConnectionTTL());
       } finally {
-         if (cs != null)
+         if (cs != null) {
             cs.close();
-         if (ra != null)
+         }
+         if (ra != null) {
             ra.stop();
+         }
          server.stop();
       }
    }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java
index 2134b5d912..6ff073c3a8 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java
@@ -648,10 +648,12 @@ public class ResourceAdapterTest extends ActiveMQTestBase {
 
          assertEquals(0, server.getRemotingService().getConnections().size());
       } finally {
-         if (activation != null)
+         if (activation != null) {
             activation.stop();
-         if (ra != null)
+         }
+         if (ra != null) {
             ra.stop();
+         }
          server.stop();
       }
    }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@artemis.apache.org
For additional commands, e-mail: commits-help@artemis.apache.org