manual checkstyle changes

artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java

@@ -1567,8 +1567,7 @@ public class Base64 {
          // Encode?
          if (encode) {
             buffer[position++] = (byte) theByte;
-            if (position >= bufferLength) // Enough to encode.
+            if (position >= bufferLength) { // Enough to encode.
-            {
                out.write(Base64.encode3to4(b4, buffer, bufferLength, options));
 
                lineLength += 4;
@@ -1586,8 +1585,7 @@ public class Base64 {
             // Meaningful Base64 character?
             if (decodabet[theByte & 0x7f] > Base64.WHITE_SPACE_ENC) {
                buffer[position++] = (byte) theByte;
-               if (position >= bufferLength) // Enough to output.
+               if (position >= bufferLength) { // Enough to output.
-               {
                   int len = Base64.decode4to3(buffer, 0, b4, 0, options);
                   out.write(b4, 0, len);
                   // out.write( Base64.decode4to3( buffer ) );

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java

@@ -103,9 +103,7 @@ public class RemotingConnectionImpl extends AbstractRemotingConnection implement
                           final List<Interceptor> incomingInterceptors,
                           final List<Interceptor> outgoingInterceptors,
                           final Executor executor,
-                          final SimpleString nodeID)
+                          final SimpleString nodeID) {
-
-   {
       this(packetDecoder, transportConnection, -1, -1, incomingInterceptors, outgoingInterceptors, false, executor, nodeID);
    }
 
@@ -117,9 +115,7 @@ public class RemotingConnectionImpl extends AbstractRemotingConnection implement
                                   final List<Interceptor> outgoingInterceptors,
                                   final boolean client,
                                   final Executor executor,
-                                  final SimpleString nodeID)
+                                  final SimpleString nodeID) {
-
-   {
       super(transportConnection, executor);
 
       this.packetDecoder = packetDecoder;

artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java

@@ -19,4 +19,5 @@
  */
 @javax.xml.bind.annotation.XmlSchema(
         namespace = "http://activemq.org/schema",
-   elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.activemq.artemis.dto;
+        elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.apache.activemq.artemis.dto;

artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java

@@ -1015,8 +1015,7 @@ public final class JMSBridgeImpl implements JMSBridge {
             sourceConn = createConnection(sourceUsername, sourcePassword, sourceCff, clientID, false, true);
             sourceSession = sourceConn.createSession(true, Session.SESSION_TRANSACTED);
          }
-         else // bridging across different servers
+         else { // bridging across different servers
-         {
             // QoS = ONCE_AND_ONLY_ONCE
             if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) {
                // Create an XASession for consuming from the source
@@ -1027,8 +1026,7 @@ public final class JMSBridgeImpl implements JMSBridge {
                sourceConn = createConnection(sourceUsername, sourcePassword, sourceCff, clientID, true, true);
                sourceSession = ((XAConnection) sourceConn).createXASession();
             }
-            else // QoS = DUPLICATES_OK || AT_MOST_ONCE
+            else { // QoS = DUPLICATES_OK || AT_MOST_ONCE
-            {
                if (JMSBridgeImpl.trace) {
                   ActiveMQJMSBridgeLogger.LOGGER.trace("Creating non XA source session");
                }
@@ -1068,8 +1066,7 @@ public final class JMSBridgeImpl implements JMSBridge {
             targetConn = sourceConn;
             targetSession = sourceSession;
          }
-         else // bridging across different servers
+         else { // bridging across different servers
-         {
             // QoS = ONCE_AND_ONLY_ONCE
             if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) {
                if (JMSBridgeImpl.trace) {
@@ -1082,8 +1079,7 @@ public final class JMSBridgeImpl implements JMSBridge {
 
                targetSession = ((XAConnection) targetConn).createXASession();
             }
-            else // QoS = DUPLICATES_OK || AT_MOST_ONCE
+            else { // QoS = DUPLICATES_OK || AT_MOST_ONCE
-            {
                if (JMSBridgeImpl.trace) {
                   ActiveMQJMSBridgeLogger.LOGGER.trace("Creating non XA dest session");
                }

artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java

@@ -340,9 +340,7 @@ public class JournalTransaction {
    }
 
    private AtomicInteger internalgetCounter(final JournalFile file) {
-      if (lastFile != file)
+      if (lastFile != file) {
-
-      {
          lastFile = file;
          counter.set(0);
       }

artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCreatePlugin.java

@@ -46,9 +46,7 @@ import org.eclipse.aether.resolution.ArtifactResolutionException;
 import org.eclipse.aether.resolution.ArtifactResult;
 
 @Mojo(name = "create", defaultPhase = LifecyclePhase.VERIFY)
-public class ArtemisCreatePlugin extends ArtemisAbstractPlugin
+public class ArtemisCreatePlugin extends ArtemisAbstractPlugin {
-
-{
 
    @Parameter
    String name;

artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java

@@ -58,7 +58,6 @@ public class MQTTProtocolHandler extends ChannelInboundHandlerAdapter {
    private ChannelHandlerContext ctx;
 
    private final MQTTLogger log = MQTTLogger.LOGGER;
-   ;
 
    private boolean stopped = false;
 

artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalclient/SimpleAMQPConnector.java

@@ -59,10 +59,8 @@ public class SimpleAMQPConnector implements Connector {
       final AMQPClientConnectionContext connection = (AMQPClientConnectionContext) ProtonClientConnectionContextFactory.getFactory().createConnection(clientConnectionSPI);
 
       future.channel().pipeline().addLast(new ChannelDuplexHandler() {
-
             @Override
-                                             public void channelRead(final ChannelHandlerContext ctx,
+            public void channelRead(final ChannelHandlerContext ctx, final Object msg) throws Exception {
-                                                                     final Object msg) throws Exception {
                ByteBuf buffer = (ByteBuf) msg;
                connection.inputBuffer(buffer);
             }

artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java

@@ -140,9 +140,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
                          final boolean enableWildCardRouting,
                          final int idCacheSize,
                          final boolean persistIDCache,
-                         final HierarchicalRepository<AddressSettings> addressSettingsRepository)
+                         final HierarchicalRepository<AddressSettings> addressSettingsRepository) {
-
-   {
       this.storageManager = storageManager;
 
       queueFactory = bindableFactory;

artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQSecurityManagerImpl.java

@@ -53,8 +53,7 @@ public class ActiveMQSecurityManagerImpl implements ActiveMQSecurityManager {
       else if (username == null && password == null) {
          return configuration.getDefaultUser() != null;
       }
-      else // the only possible case here is user == null, password != null
+      else { // the only possible case here is user == null, password != null
-      {
          logger.debug("Validating default user against a provided password.  This happens when username=null, password!=null");
          String defaultUsername = configuration.getDefaultUser();
          User defaultUser = configuration.getUser(defaultUsername);

tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java

@@ -107,15 +107,14 @@ public class ClosingConnectionTest extends ActiveMQTestBase {
    * Test for https://bugzilla.redhat.com/show_bug.cgi?id=1193085
    * */
    @Test
-   @BMRules(
+   @BMRules(rules = {
-      rules = {@BMRule(
+         @BMRule(
             name = "rule to kill connection",
             targetClass = "org.apache.activemq.artemis.core.io.nio.NIOSequentialFile",
             targetMethod = "open(int, boolean)",
             targetLocation = "AT INVOKE java.nio.channels.FileChannel.size()",
-         action = "org.apache.activemq.artemis.tests.extras.byteman.ClosingConnectionTest.killConnection();"
+            action = "org.apache.activemq.artemis.tests.extras.byteman.ClosingConnectionTest.killConnection();")
-
+         })
-      )})
    public void testKillConnection() throws Exception {
       locator.setBlockOnNonDurableSend(true).setBlockOnDurableSend(true).setBlockOnAcknowledge(true);
 

tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/OrphanedConsumerTest.java

@@ -119,7 +119,6 @@ public class OrphanedConsumerTest extends ActiveMQTestBase {
          targetLocation = "ENTRY",
          condition = "org.apache.activemq.artemis.tests.extras.byteman.OrphanedConsumerTest.isConditionActive()",
          action = "org.apache.activemq.artemis.tests.extras.byteman.OrphanedConsumerTest.leavingCloseOnTestCountersWhileClosing()")
-
          })
    public void testOrphanedConsumers() throws Exception {
       internalTestOrphanedConsumers(false);
@@ -148,7 +147,6 @@ public class OrphanedConsumerTest extends ActiveMQTestBase {
          targetLocation = "ENTRY",
          condition = "org.apache.activemq.artemis.tests.extras.byteman.OrphanedConsumerTest.isConditionActive()",
          action = "org.apache.activemq.artemis.tests.extras.byteman.OrphanedConsumerTest.leavingCloseOnTestCountersWhileClosing()")
-
          })
    public void testOrphanedConsumersByManagement() throws Exception {
       internalTestOrphanedConsumers(true);

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java

@@ -1061,9 +1061,8 @@ public class ConsumerWindowSizeTest extends ActiveMQTestBase {
 
                   if (count++ == 1) {
                      // it will hold here for a while
-                     if (!latchDone.await(TIMEOUT, TimeUnit.SECONDS)) // a timed wait, so if the test fails, one less
+                     if (!latchDone.await(TIMEOUT, TimeUnit.SECONDS)) {
-                     // thread around
+                        // a timed wait, so if the test fails, one less thread around
-                     {
                         new Exception("ClientConsuemrWindowSizeTest Handler couldn't receive signal in less than 5 seconds").printStackTrace();
                         failed = true;
                      }

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/NotificationTest.java

@@ -252,9 +252,7 @@ public class NotificationTest extends ActiveMQTestBase {
       }
       m = consumer.receiveImmediate();
       if (m != null) {
-         for (SimpleString key : m.getPropertyNames())
+         for (SimpleString key : m.getPropertyNames()) {
-
-         {
             System.out.println(key + "=" + m.getObjectProperty(key));
          }
       }

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java

@@ -16,6 +16,9 @@
  */
 package org.apache.activemq.artemis.tests.integration.management;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.apache.activemq.artemis.api.core.SimpleString;
@@ -37,9 +40,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import static org.apache.activemq.artemis.api.core.management.CoreNotificationType.SECURITY_AUTHENTICATION_VIOLATION;
 import static org.apache.activemq.artemis.api.core.management.CoreNotificationType.SECURITY_PERMISSION_VIOLATION;
 
@@ -183,9 +183,7 @@ public class SecurityNotificationTest extends ActiveMQTestBase {
       }
       m = consumer.receiveImmediate();
       if (m != null) {
-         for (SimpleString key : m.getPropertyNames())
+         for (SimpleString key : m.getPropertyNames()) {
-
-         {
             System.out.println(key + "=" + m.getObjectProperty(key));
          }
       }

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer6Test.java

@@ -16,23 +16,22 @@
  */
 package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
 import javax.jms.MessageListener;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.activemq.ActiveMQMessageConsumer;
 import org.apache.activemq.ActiveMQSession;
-import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.command.ActiveMQDestination;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSTestBase.java

@@ -254,9 +254,7 @@ public class JMSTestBase extends ActiveMQTestBase {
       ServiceUtils.setTransactionManager(new DummyTransactionManager());
    }
 
-   protected final void receiveMessages(JMSConsumer consumer, final int start, final int msgCount, final boolean ack)
+   protected final void receiveMessages(JMSConsumer consumer, final int start, final int msgCount, final boolean ack) {
-
-   {
       try {
          for (int i = start; i < msgCount; i++) {
             Message message = consumer.receive(100);

tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/util/ProxyAssertSupport.java

@@ -66,9 +66,7 @@ public class ProxyAssertSupport {
       }
    }
 
-   public static void fail(final java.lang.String string)
+   public static void fail(final java.lang.String string) {
-
-   {
       try {
          Assert.fail(string);
       }