ARTEMIS-5233 make style for commas consistent

This commit enforces a consistent style for commas, namely that a space
should follow a comma. Futhermore, it update all the code that violates
this styling up to date so that the code is styled consistently across
the entire code-base.

artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java

@@ -790,7 +790,7 @@ public Object run(ActionContext context) throws Exception {
       if (noMqttAcceptor) {
          filters.put("${mqtt-acceptor}", "");
       } else {
-         filters.put("${mqtt-acceptor}",readTextFile(ETC_MQTT_ACCEPTOR_TXT, filters));
+         filters.put("${mqtt-acceptor}", readTextFile(ETC_MQTT_ACCEPTOR_TXT, filters));
       }
 
       if (noStompAcceptor) {

artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/perf/LiveStatistics.java

@@ -249,7 +249,7 @@ private void appendJsonIntervalSampleOnFile(final boolean warmup, final ReportIn
       jsonBuilder.add("sampleType", "interval");
       jsonBuilder.add("warmup", warmup);
       jsonBuilder.add("time", sampleTime);
-      addRate(jsonBuilder,"sent", sentMsg, interval);
+      addRate(jsonBuilder, "sent", sentMsg, interval);
       addRate(jsonBuilder, "delayed", blockedMsg, interval);
       addRate(jsonBuilder, "completed", completedMsg, interval);
       addRate(jsonBuilder, "received", receivedMsg, interval);

artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java

@@ -2288,7 +2288,7 @@ private String getStoredPassword(String user, File userFile, boolean basicSecuri
    }
 
    private boolean checkPassword(String user, String password, File userFile) throws Exception {
-      return checkPassword(user, password, userFile,false);
+      return checkPassword(user, password, userFile, false);
    }
 
    private boolean checkPassword(String user, String password, File userFile, boolean basicSecurityManager) throws Exception {

artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffers.java

@@ -41,7 +41,7 @@ public static ActiveMQBuffer dynamicBuffer(final int size) {
    }
 
    public static ActiveMQBuffer pooledBuffer(final int size) {
-      return new ChannelBufferWrapper(ALLOCATOR.heapBuffer(size),true, true);
+      return new ChannelBufferWrapper(ALLOCATOR.heapBuffer(size), true, true);
    }
 
    /**

artemis-commons/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ChannelBufferWrapper.java

@@ -398,10 +398,10 @@ public ActiveMQBuffer readSlice(final int length) {
          int read = fromBuffer.readerIndex();
          int writ = fromBuffer.writerIndex();
          fromBuffer.readerIndex(0);
-         fromBuffer.readBytes(newNettyBuffer,0,writ);
-         newNettyBuffer.setIndex(read,writ);
-         ActiveMQBuffer returnBuffer = new ChannelBufferWrapper(newNettyBuffer,releasable,false);
-         returnBuffer.setIndex(read,writ);
+         fromBuffer.readBytes(newNettyBuffer, 0, writ);
+         newNettyBuffer.setIndex(read, writ);
+         ActiveMQBuffer returnBuffer = new ChannelBufferWrapper(newNettyBuffer, releasable, false);
+         returnBuffer.setIndex(read, writ);
          return returnBuffer;
       }
       return new ChannelBufferWrapper(buffer.readSlice(length), releasable, isPooled);

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

@@ -229,7 +229,7 @@ protected String getFromEnv(final String envVarName) {
    }
 
    public static String envVarNameFromSystemPropertyName(final String systemPropertyName) {
-      return systemPropertyName.replace(".","_").toUpperCase(Locale.getDefault());
+      return systemPropertyName.replace(".", "_").toUpperCase(Locale.getDefault());
    }
 
    private static class PBKDF2Algorithm extends CodecAlgorithm {

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

@@ -31,13 +31,13 @@
  * @param <K> the key type.
  * @param <V> the value type.
  */
-public class NoOpMap<K,V> extends AbstractMap<K,V> {
+public class NoOpMap<K, V> extends AbstractMap<K, V> {
 
    private static final Map NO_OP_MAP = new NoOpMap<>();
 
    @SuppressWarnings("unchecked")
-   public static <K,V> Map<K,V> instance() {
-      return (Map<K,V>) NO_OP_MAP;
+   public static <K, V> Map<K, V> instance() {
+      return (Map<K, V>) NO_OP_MAP;
    }
 
    private NoOpMap() {
@@ -84,7 +84,7 @@ public Collection<V> values() {
    }
 
    @Override
-   public Set<Entry<K,V>> entrySet() {
+   public Set<Entry<K, V>> entrySet() {
       return Collections.emptySet();
    }
 

artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SizeAwareMetricTest.java

@@ -231,7 +231,7 @@ public void testMultipleSizeAdd() throws Exception {
 
    @Test
    public void testMaxElements() {
-      SizeAwareMetric metric = new SizeAwareMetric(10000, 500, 10,10);
+      SizeAwareMetric metric = new SizeAwareMetric(10000, 500, 10, 10);
 
       AtomicBoolean over = new AtomicBoolean(false);
       metric.setOverCallback(() -> over.set(true));
@@ -255,8 +255,8 @@ public void testMaxElements() {
    }
    @Test
    public void testMaxElementsReleaseNonSizeParentMetric() {
-      SizeAwareMetric metricMain = new SizeAwareMetric(10000, 500, 10,10);
-      SizeAwareMetric metric = new SizeAwareMetric(10000, 500, 1000,1000);
+      SizeAwareMetric metricMain = new SizeAwareMetric(10000, 500, 10, 10);
+      SizeAwareMetric metric = new SizeAwareMetric(10000, 500, 1000, 1000);
 
       metric.setOnSizeCallback(metricMain::addSize);
 
@@ -303,7 +303,7 @@ public void testMaxElementsReleaseNonSizeParentMetric() {
 
    @Test
    public void testMaxElementsReleaseNonSize() {
-      SizeAwareMetric metric = new SizeAwareMetric(10000, 500, 10,10);
+      SizeAwareMetric metric = new SizeAwareMetric(10000, 500, 10, 10);
 
       AtomicBoolean over = new AtomicBoolean(false);
       metric.setOverCallback(() -> over.set(true));

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

@@ -628,7 +628,7 @@ public ClientSessionFactory createSessionFactory(final TransportConfiguration tr
 
       initialize();
 
-      ClientSessionFactoryInternal factory = new ClientSessionFactoryImpl(this, transportConfiguration, config, reconnectAttempts, threadPool, scheduledThreadPool, flowControlThreadPool,incomingInterceptors, outgoingInterceptors);
+      ClientSessionFactoryInternal factory = new ClientSessionFactoryImpl(this, transportConfiguration, config, reconnectAttempts, threadPool, scheduledThreadPool, flowControlThreadPool, incomingInterceptors, outgoingInterceptors);
 
       addToConnecting(factory);
       try {
@@ -1855,7 +1855,7 @@ private synchronized void createConnectors() {
          connectors = new ArrayList<>();
          if (initialConnectors != null) {
             for (TransportConfiguration initialConnector : initialConnectors) {
-               ClientSessionFactoryInternal factory = new ClientSessionFactoryImpl(ServerLocatorImpl.this, initialConnector, config, config.reconnectAttempts, threadPool, scheduledThreadPool,flowControlThreadPool, incomingInterceptors, outgoingInterceptors);
+               ClientSessionFactoryInternal factory = new ClientSessionFactoryImpl(ServerLocatorImpl.this, initialConnector, config, config.reconnectAttempts, threadPool, scheduledThreadPool, flowControlThreadPool, incomingInterceptors, outgoingInterceptors);
 
                connectors.add(new Connector(initialConnector, factory));
             }

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

@@ -73,7 +73,7 @@ public SessionQueueQueryResponseMessage_V3(final QueueQueryResult result) {
    }
 
    public SessionQueueQueryResponseMessage_V3() {
-      this(null, null, false, false, null, 0, 0, false, false, false, false, RoutingType.MULTICAST, -1, null, null,null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+      this(null, null, false, false, null, 0, 0, false, false, false, false, RoutingType.MULTICAST, -1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
    }
 
    private SessionQueueQueryResponseMessage_V3(final SimpleString name,

artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/AutoCreateUtil.java

@@ -52,7 +52,7 @@ public static  void autoCreateQueue(ClientSession session, SimpleString destAddr
                QueueConfiguration queueConfiguration = QueueConfiguration.of(queueName)
                      .setAutoCreated(true)
                      .setAddress(destAddress);
-               setRequiredQueueConfigurationIfNotSet(queueConfiguration,response, RoutingType.ANYCAST, selectorString, true);
+               setRequiredQueueConfigurationIfNotSet(queueConfiguration, response, RoutingType.ANYCAST, selectorString, true);
                session.createQueue(queueConfiguration);
                logger.debug("The queue {} was created automatically", destAddress);
             } catch (ActiveMQQueueExistsException e) {

artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFile.java

@@ -214,7 +214,7 @@ public void writeDirect(final ByteBuffer bytes, final boolean sync) throws Excep
    }
 
    @Override
-   public void blockingWriteDirect(ByteBuffer bytes,boolean sync, boolean releaseBuffer) throws Exception {
+   public void blockingWriteDirect(ByteBuffer bytes, boolean sync, boolean releaseBuffer) throws Exception {
       logger.trace("Write Direct, Sync: true File: {}", getFileName());
 
       final SimpleWaitIOCallback completion = new SimpleWaitIOCallback();

artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/TimedSequentialFile.java

@@ -103,7 +103,7 @@ public void delete() throws IOException, InterruptedException, ActiveMQException
    }
 
    @Override
-   public void blockingWriteDirect(ByteBuffer bytes,boolean sync, boolean releaseBuffer) throws Exception {
+   public void blockingWriteDirect(ByteBuffer bytes, boolean sync, boolean releaseBuffer) throws Exception {
       this.sequentialFile.blockingWriteDirect(bytes, sync, releaseBuffer);
    }
 

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

@@ -2843,7 +2843,7 @@ public synchronized void start() {
       if (providedIOThreadPool == null) {
          ThreadFactory factory = AccessController.doPrivileged((PrivilegedAction<ThreadFactory>) () -> new ActiveMQThreadFactory("ArtemisIOThread", true, JournalImpl.class.getClassLoader()));
 
-         threadPool = new ThreadPoolExecutor(0, Integer.MAX_VALUE, 60L,TimeUnit.SECONDS, new SynchronousQueue(), factory);
+         threadPool = new ThreadPoolExecutor(0, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue(), factory);
          ioExecutorFactory = new OrderedExecutorFactory(threadPool);
       } else {
          ioExecutorFactory = providedIOThreadPool;

artemis-lockmanager/artemis-lockmanager-ri/src/test/java/org/apache/activemq/artemis/lockmanager/zookeeper/CuratorDistributedLockManagerTest.java

@@ -131,7 +131,7 @@ public void verifyLayoutInZK() throws Exception {
    }
 
    private void dumpZK(ZooKeeper zooKeeper, String path, List<String> entries) throws InterruptedException, KeeperException {
-      List<String> children = ZKPaths.getSortedChildren(zooKeeper,path);
+      List<String> children = ZKPaths.getSortedChildren(zooKeeper, path);
       for (String s: children) {
          if (!s.equals("zookeeper")) {
             String qualifiedPath = (path.endsWith("/") ? path : path + "/") + s;

artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSTransformationSpeedComparisonTest.java

@@ -67,15 +67,15 @@ public void testBodyOnlyMessage() throws Exception {
       // Warm up
       for (int i = 0; i < WARM_CYCLES; ++i) {
          ICoreMessage intermediate = encoded.toCore();
-         encode(AMQPConverter.getInstance().fromCore(intermediate,null));
+         encode(AMQPConverter.getInstance().fromCore(intermediate, null));
       }
 
       long totalDuration = 0;
 
       long startTime = System.nanoTime();
       for (int i = 0; i < PROFILE_CYCLES; ++i) {
          ICoreMessage intermediate = encoded.toCore();
-         encode(AMQPConverter.getInstance().fromCore(intermediate,null));
+         encode(AMQPConverter.getInstance().fromCore(intermediate, null));
       }
       totalDuration += System.nanoTime() - startTime;
 
@@ -97,15 +97,15 @@ public void testMessageWithNoPropertiesOrAnnotations() throws Exception {
       // Warm up
       for (int i = 0; i < WARM_CYCLES; ++i) {
          ICoreMessage intermediate = encoded.toCore();
-         encode(AMQPConverter.getInstance().fromCore(intermediate,null));
+         encode(AMQPConverter.getInstance().fromCore(intermediate, null));
       }
 
       long totalDuration = 0;
 
       long startTime = System.nanoTime();
       for (int i = 0; i < PROFILE_CYCLES; ++i) {
          ICoreMessage intermediate = encoded.toCore();
-         encode(AMQPConverter.getInstance().fromCore(intermediate,null));
+         encode(AMQPConverter.getInstance().fromCore(intermediate, null));
       }
       totalDuration += System.nanoTime() - startTime;
 
@@ -119,15 +119,15 @@ public void testTypicalQpidJMSMessage() throws Exception {
       // Warm up
       for (int i = 0; i < WARM_CYCLES; ++i) {
          ICoreMessage intermediate = encoded.toCore();
-         encode(AMQPConverter.getInstance().fromCore(intermediate,null));
+         encode(AMQPConverter.getInstance().fromCore(intermediate, null));
       }
 
       long totalDuration = 0;
 
       long startTime = System.nanoTime();
       for (int i = 0; i < PROFILE_CYCLES; ++i) {
          ICoreMessage intermediate = encoded.toCore();
-         encode(AMQPConverter.getInstance().fromCore(intermediate,null));
+         encode(AMQPConverter.getInstance().fromCore(intermediate, null));
       }
       totalDuration += System.nanoTime() - startTime;
 
@@ -142,15 +142,15 @@ public void testComplexQpidJMSMessage() throws Exception {
       // Warm up
       for (int i = 0; i < WARM_CYCLES; ++i) {
          ICoreMessage intermediate = encoded.toCore();
-         encode(AMQPConverter.getInstance().fromCore(intermediate,null));
+         encode(AMQPConverter.getInstance().fromCore(intermediate, null));
       }
 
       long totalDuration = 0;
 
       long startTime = System.nanoTime();
       for (int i = 0; i < PROFILE_CYCLES; ++i) {
          ICoreMessage intermediate = encoded.toCore();
-         encode(AMQPConverter.getInstance().fromCore(intermediate,null));
+         encode(AMQPConverter.getInstance().fromCore(intermediate, null));
       }
       totalDuration += System.nanoTime() - startTime;
 
@@ -165,15 +165,15 @@ public void testTypicalQpidJMSMessageInBoundOnly() throws Exception {
       // Warm up
       for (int i = 0; i < WARM_CYCLES; ++i) {
          ICoreMessage intermediate = encoded.toCore();
-         encode(AMQPConverter.getInstance().fromCore(intermediate,null));
+         encode(AMQPConverter.getInstance().fromCore(intermediate, null));
       }
 
       long totalDuration = 0;
 
       long startTime = System.nanoTime();
       for (int i = 0; i < PROFILE_CYCLES; ++i) {
          ICoreMessage intermediate = encoded.toCore();
-         encode(AMQPConverter.getInstance().fromCore(intermediate,null));
+         encode(AMQPConverter.getInstance().fromCore(intermediate, null));
       }
 
       totalDuration += System.nanoTime() - startTime;
@@ -188,15 +188,15 @@ public void testTypicalQpidJMSMessageOutBoundOnly() throws Exception {
       // Warm up
       for (int i = 0; i < WARM_CYCLES; ++i) {
          ICoreMessage intermediate = encoded.toCore();
-         encode(AMQPConverter.getInstance().fromCore(intermediate,null));
+         encode(AMQPConverter.getInstance().fromCore(intermediate, null));
       }
 
       long totalDuration = 0;
 
       long startTime = System.nanoTime();
       for (int i = 0; i < PROFILE_CYCLES; ++i) {
          ICoreMessage intermediate = encoded.toCore();
-         encode(AMQPConverter.getInstance().fromCore(intermediate,null));
+         encode(AMQPConverter.getInstance().fromCore(intermediate, null));
       }
 
       totalDuration += System.nanoTime() - startTime;

artemis-protocols/artemis-openwire-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverterTest.java

@@ -55,7 +55,7 @@ public class OpenWireMessageConverterTest {
 
    final OpenWireFormatFactory formatFactory = new OpenWireFormatFactory();
    final WireFormat openWireFormat =  formatFactory.createWireFormat();
-   final byte[] content = new byte[] {'a','a'};
+   final byte[] content = new byte[] {'a', 'a'};
    final String address = "Q";
    final ActiveMQDestination destination = new ActiveMQQueue(address);
    final UUID nodeUUID = UUIDGenerator.getInstance().generateUUID();

artemis-protocols/artemis-openwire-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/openwire/amq/OpenWireConnectionTest.java

@@ -73,7 +73,7 @@ public void testActorStateVisibility() throws Exception {
       Mockito.doReturn(serverSession).when(server).createSession(Mockito.anyString(), Mockito.any(), Mockito.any(), Mockito.anyInt(), Mockito.any(), Mockito.anyBoolean(), Mockito.anyBoolean(), Mockito.anyBoolean(),
                                                                  Mockito.anyBoolean(), Mockito.any(), Mockito.any(), Mockito.anyBoolean(), Mockito.any(), Mockito.any(), Mockito.anyString(), Mockito.any(), Mockito.anyBoolean());
 
-      OpenWireProtocolManager openWireProtocolManager = new OpenWireProtocolManager(null, server,null, null);
+      OpenWireProtocolManager openWireProtocolManager = new OpenWireProtocolManager(null, server, null, null);
       openWireProtocolManager.setSecurityDomain("securityDomain");
       openWireProtocolManager.setSupportAdvisory(false);
 

artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java

@@ -104,15 +104,15 @@ public static HAPolicy getHAPolicy(HAPolicyConfiguration conf,
             HAPolicy primaryPolicy;
             //if null default to colocated
             if (primaryConfig == null) {
-               primaryPolicy = new ReplicatedPolicy(server.getNetworkHealthCheck(),ActiveMQDefaultConfiguration.getDefaultQuorumVoteWait());
+               primaryPolicy = new ReplicatedPolicy(server.getNetworkHealthCheck(), ActiveMQDefaultConfiguration.getDefaultQuorumVoteWait());
             } else {
                primaryPolicy = getHAPolicy(primaryConfig, server);
             }
             HAPolicyConfiguration backupConf = pc.getBackupConfig();
             BackupPolicy backupPolicy;
             if (backupConf == null) {
                if (primaryPolicy instanceof ReplicatedPolicy) {
-                  backupPolicy = new ReplicaPolicy(server.getNetworkHealthCheck(),ActiveMQDefaultConfiguration.getDefaultQuorumVoteWait());
+                  backupPolicy = new ReplicaPolicy(server.getNetworkHealthCheck(), ActiveMQDefaultConfiguration.getDefaultQuorumVoteWait());
                } else if (primaryPolicy instanceof SharedStorePrimaryPolicy) {
                   backupPolicy = new SharedStoreBackupPolicy();
                } else {

artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java

@@ -971,7 +971,7 @@ protected static String extractPropertyClassName(String property) {
       return property.substring(0, property.length() - PROPERTY_CLASS_SUFFIX.length());
    }
 
-   private void trackError(HashMap<String, String> errors, Map.Entry<String,?> entry, Throwable oops) {
+   private void trackError(HashMap<String, String> errors, Map.Entry<String, ?> entry, Throwable oops) {
       logger.debug("failed to populate property entry({}), reason: {}", entry, oops);
       errors.put(entry.toString(), oops.toString());
    }

artemis-server/src/main/java/org/apache/activemq/artemis/core/config/storage/DatabaseStorageConfiguration.java

@@ -247,7 +247,7 @@ public void addDataSourceProperty(String key, String value) {
       }
    }
 
-   public Map<String,Object> getDataSourceProperties() {
+   public Map<String, Object> getDataSourceProperties() {
       return dataSourceProperties;
    }
 

artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java

@@ -2194,7 +2194,7 @@ private void parseAMQPBrokerConnections(final Element e,
 
             if (nodeType == AMQPBrokerConnectionAddressType.MIRROR) {
                boolean messageAcks = getBooleanAttribute(e2, "message-acknowledgements", true);
-               boolean queueCreation = getBooleanAttribute(e2,"queue-creation", true);
+               boolean queueCreation = getBooleanAttribute(e2, "queue-creation", true);
                boolean durable = getBooleanAttribute(e2, "durable", true);
                boolean queueRemoval = getBooleanAttribute(e2, "queue-removal", true);
                boolean sync = getBooleanAttribute(e2, "sync", false);
@@ -2813,7 +2813,7 @@ private FederationDownstreamConfiguration getDownstream(final Element downstream
       final FederationDownstreamConfiguration downstreamConfiguration =
           getFederationStream(new FederationDownstreamConfiguration(), downstreamNode, mainConfig);
 
-      final String upstreamRef = getString(downstreamNode,"upstream-connector-ref", null, NOT_NULL_OR_EMPTY);
+      final String upstreamRef = getString(downstreamNode, "upstream-connector-ref", null, NOT_NULL_OR_EMPTY);
       downstreamConfiguration.setUpstreamConfigurationRef(upstreamRef);
 
       return downstreamConfiguration;

artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JDBCJournalStorageManager.java

@@ -78,7 +78,7 @@ protected synchronized void init(Configuration config, IOCriticalErrorListener c
                  sqlProviderFactory.create(dbConf.getBindingsTableName(), SQLProvider.DatabaseStoreType.BINDINGS_JOURNAL),
                  scheduledExecutorService,
                  executorFactory.getExecutor(),
-                 criticalErrorListener,dbConf.getJdbcJournalSyncPeriodMillis());
+                 criticalErrorListener, dbConf.getJdbcJournalSyncPeriodMillis());
          messageJournal = new JDBCJournalImpl(
                  connectionProvider,
                  sqlProviderFactory.create(dbConf.getMessageTableName(), SQLProvider.DatabaseStoreType.MESSAGE_JOURNAL),