From c65ea783ead733bfd1ca837a5032001efa0ade05 Mon Sep 17 00:00:00 2001 From: Michael Andre Pearce Date: Mon, 29 May 2017 23:48:50 +0100 Subject: [PATCH] ARTEMIS-1189 - Fix checkstyle violations post checkstyle upgrade After upgrade of checkstyle, resolve violations remove checkstyle override added as temp measure at point of upgrade forced by sevntu --- .../artemis/cli/commands/InputAbstract.java | 9 +++-- .../artemis/logs/AssertionLoggerHandler.java | 3 +- .../apache/activemq/artemis/utils/Base64.java | 3 +- .../artemis/utils/OrderedExecutorFactory.java | 3 +- .../activemq/artemis/utils/UUIDTimer.java | 3 +- .../artemis/api/core/ICoreMessage.java | 2 +- .../api/core/client/ClientSession.java | 4 +-- .../api/core/client/ServerLocator.java | 6 ++-- .../api/core/management/AddressControl.java | 2 +- .../api/core/management/QueueControl.java | 2 +- .../client/impl/ClientConsumerInternal.java | 2 +- .../core/client/impl/ClientProducerImpl.java | 3 +- .../impl/ClientSessionFactoryInternal.java | 2 +- .../client/impl/ClientSessionInternal.java | 2 +- .../client/impl/LargeMessageController.java | 4 +-- .../core/client/impl/ServerLocatorImpl.java | 3 +- .../client/impl/ServerLocatorInternal.java | 2 +- .../artemis/core/protocol/core/Channel.java | 2 +- .../impl/ActiveMQClientProtocolManager.java | 3 +- .../core/impl/ActiveMQSessionContext.java | 3 +- .../protocol/core/impl/PacketDecoder.java | 2 +- .../core/remoting/ClientProtocolManager.java | 14 ++++---- .../spi/core/remoting/SessionContext.java | 30 ++++++++-------- .../remoting/TopologyResponseHandler.java | 12 +++---- .../artemis/jdbc/store/drivers/JDBCUtils.java | 3 +- .../artemis/api/jms/JMSFactoryType.java | 8 ++--- .../jms/bridge/impl/JMSBridgeImpl.java | 3 +- .../jms/server/JMSServerConfigParser.java | 8 ++--- .../artemis/jms/server/JMSServerManager.java | 8 ++--- .../artemis/core/journal/Journal.java | 22 ++++++------ .../journal/ActiveMQJournalLogger.java | 2 +- .../protocol/stomp/StompProtocolManager.java | 3 +- .../artemis/core/config/Configuration.java | 32 ++++++++--------- .../core/paging/PageTransactionInfo.java | 8 ++--- .../artemis/core/paging/PagingStore.java | 4 +-- .../paging/cursor/PageCursorProvider.java | 2 +- .../core/paging/cursor/PageSubscription.java | 4 +-- .../cursor/PageSubscriptionCounter.java | 6 ++-- .../cursor/impl/PageSubscriptionImpl.java | 3 +- .../core/persistence/StorageManager.java | 14 ++++---- .../core/postoffice/DuplicateIDCache.java | 4 +-- .../artemis/core/postoffice/PostOffice.java | 6 ++-- .../impl/netty/ConnectionCreator.java | 2 +- .../impl/netty/HttpAcceptorHandler.java | 6 ++-- .../core/replication/ReplicationManager.java | 4 +-- .../artemis/core/security/CheckType.java | 2 +- .../artemis/core/server/ActiveMQServer.java | 8 ++--- .../activemq/artemis/core/server/Queue.java | 12 +++---- .../artemis/core/server/QueueFactory.java | 4 +-- .../core/server/ScheduledDeliveryHandler.java | 2 +- .../artemis/core/server/ServerConsumer.java | 4 +-- .../artemis/core/server/ServerSession.java | 34 +++++++++---------- .../core/server/cluster/qourum/Vote.java | 4 +-- .../group/impl/RemoteGroupingHandler.java | 3 +- .../core/server/impl/FileLockNodeManager.java | 6 ++-- .../core/server/impl/InVMNodeManager.java | 3 +- .../core/server/impl/ServerConsumerImpl.java | 3 +- .../impl/SharedNothingBackupActivation.java | 3 +- .../server/management/ManagementService.java | 30 ++++++++-------- .../spi/core/protocol/ProtocolManager.java | 2 +- .../security/jaas/CertificateLoginModule.java | 4 +-- .../artemis/tests/util/ActiveMQTestBase.java | 12 ++++--- .../xa/recovery/ActiveMQRegistry.java | 4 +-- etc/checkstyle.xml | 6 ++-- .../transport/amqp/client/AmqpConnection.java | 3 +- .../transport/amqp/client/AmqpReceiver.java | 3 +- ...BMultipleHandlersServerDisconnectTest.java | 3 +- .../client/ConsumerWindowSizeTest.java | 3 +- .../integration/client/SlowConsumerTest.java | 3 +- .../cluster/bridge/BridgeReconnectTest.java | 3 +- .../cluster/distribution/ClusterTestBase.java | 15 +++++--- .../failover/AsynchronousFailoverTest.java | 12 ++++--- .../ClusterWithBackupFailoverTestBase.java | 2 +- .../cluster/failover/FailoverTestBase.java | 2 +- .../failover/GroupingFailoverTestBase.java | 3 +- .../MultipleServerFailoverTestBase.java | 3 +- .../MultiThreadReattachSupportTestBase.java | 5 +-- .../cluster/reattach/RandomReattachTest.java | 5 +-- .../topology/TopologyClusterTestBase.java | 6 ++-- .../jms/cluster/BindingsClusterTest.java | 3 +- .../jms/cluster/JMSFailoverTest.java | 3 +- .../jms/server/management/JMSUtil.java | 3 +- .../management/NotificationTest.java | 3 +- .../management/SecurityNotificationTest.java | 3 +- .../integration/mqtt/imported/MQTTTest.java | 12 ++++--- .../integration/server/ExpiryRunnerTest.java | 6 ++-- .../jms/tests/tools/container/Server.java | 14 ++++---- .../tests/stress/paging/PageStressTest.java | 9 +++-- .../impl/fakes/FakeSequentialFileFactory.java | 2 +- 89 files changed, 304 insertions(+), 244 deletions(-) diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/InputAbstract.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/InputAbstract.java index d4535be334..cadb702cc3 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/InputAbstract.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/InputAbstract.java @@ -59,7 +59,8 @@ public class InputAbstract extends ActionAbstract { case "N": booleanValue = Boolean.FALSE; break; } - } while (booleanValue == null); + } + while (booleanValue == null); return booleanValue.booleanValue(); } @@ -85,7 +86,8 @@ public class InputAbstract extends ActionAbstract { } else { valid = true; } - } while (!valid); + } + while (!valid); return inputStr.trim(); } @@ -116,7 +118,8 @@ public class InputAbstract extends ActionAbstract { } else { valid = true; } - } while (!valid); + } + while (!valid); return inputStr.trim(); } diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java index ac89fc2927..6191e7684f 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java @@ -78,7 +78,8 @@ public class AssertionLoggerHandler extends ExtHandler { if (findText(text)) { return true; } - } while (timeMax > System.currentTimeMillis()); + } + while (timeMax > System.currentTimeMillis()); return false; diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java index ebe18ecaa4..7b7cac45cb 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java @@ -1311,7 +1311,8 @@ public class Base64 { int b = 0; do { b = in.read(); - } while (b >= 0 && decodabet[b & 0x7f] <= Base64.WHITE_SPACE_ENC); + } + while (b >= 0 && decodabet[b & 0x7f] <= Base64.WHITE_SPACE_ENC); if (b < 0) { break; // Reads a -1 if end of stream diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/OrderedExecutorFactory.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/OrderedExecutorFactory.java index c7d5c03166..24fa5e79bb 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/OrderedExecutorFactory.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/OrderedExecutorFactory.java @@ -115,7 +115,8 @@ public final class OrderedExecutorFactory implements ExecutorFactory { //we loop again based on tasks not being empty. Otherwise there is a window where the state is running, //but poll() has returned null, so a submitting thread will believe that it does not need re-execute. //this check fixes the issue - } while (!tasks.isEmpty()); + } + while (!tasks.isEmpty()); } } diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDTimer.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDTimer.java index 0945d233a2..d96313b71a 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDTimer.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDTimer.java @@ -293,6 +293,7 @@ public class UUIDTimer { if (++counter > UUIDTimer.MAX_WAIT_COUNT) { break; } - } while (System.currentTimeMillis() < waitUntil); + } + while (System.currentTimeMillis() < waitUntil); } } diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ICoreMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ICoreMessage.java index 779470ed23..f49ef68f15 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ICoreMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ICoreMessage.java @@ -63,7 +63,7 @@ public interface ICoreMessage extends Message { /** Used on large messages treatment */ - void copyHeadersAndProperties(final Message msg); + void copyHeadersAndProperties(Message msg); /** * @return Returns the message in Map form, useful when encoding to JSON diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java index 16b3cd46cb..c3d6749105 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java @@ -216,7 +216,7 @@ public interface ClientSession extends XAResource, AutoCloseable { * @param autoCreated * @throws ActiveMQException */ - void createAddress(final SimpleString address, Set routingTypes, final boolean autoCreated) throws ActiveMQException; + void createAddress(SimpleString address, Set routingTypes, boolean autoCreated) throws ActiveMQException; /** * Create Address with a single initial routing type @@ -225,7 +225,7 @@ public interface ClientSession extends XAResource, AutoCloseable { * @param autoCreated * @throws ActiveMQException */ - void createAddress(final SimpleString address, RoutingType routingType, final boolean autoCreated) throws ActiveMQException; + void createAddress(SimpleString address, RoutingType routingType, boolean autoCreated) throws ActiveMQException; // Queue Operations ---------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ServerLocator.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ServerLocator.java index db4b6fde34..69e287cfcd 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ServerLocator.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ServerLocator.java @@ -74,7 +74,7 @@ public interface ServerLocator extends AutoCloseable { * @throws Exception if a failure happened in creating the ClientSessionFactory or the * ServerLocator does not know about the passed in transportConfiguration */ - ClientSessionFactory createSessionFactory(final String nodeID) throws Exception; + ClientSessionFactory createSessionFactory(String nodeID) throws Exception; /** * Creates a {@link ClientSessionFactory} to a specific server. The server must already be known @@ -86,7 +86,7 @@ public interface ServerLocator extends AutoCloseable { * @throws Exception if a failure happened in creating the ClientSessionFactory or the * ServerLocator does not know about the passed in transportConfiguration */ - ClientSessionFactory createSessionFactory(final TransportConfiguration transportConfiguration) throws Exception; + ClientSessionFactory createSessionFactory(TransportConfiguration transportConfiguration) throws Exception; /** * Creates a {@link ClientSessionFactory} to a specific server. The server must already be known @@ -100,7 +100,7 @@ public interface ServerLocator extends AutoCloseable { * @throws Exception if a failure happened in creating the ClientSessionFactory or the * ServerLocator does not know about the passed in transportConfiguration */ - ClientSessionFactory createSessionFactory(final TransportConfiguration transportConfiguration, + ClientSessionFactory createSessionFactory(TransportConfiguration transportConfiguration, int reconnectAttempts, boolean failoverOnInitialConnection) throws Exception; diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java index 0dadad10d5..93a2822565 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java @@ -116,7 +116,7 @@ public interface AddressControl { */ @Operation(desc = "Sends a TextMessage to a password-protected address.", impact = MBeanOperationInfo.ACTION) String sendMessage(@Parameter(name = "headers", desc = "The headers to add to the message") Map headers, - @Parameter(name = "type", desc = "A type for the message") final int type, + @Parameter(name = "type", desc = "A type for the message") int type, @Parameter(name = "body", desc = "The body (byte[]) of the message encoded as a string using Base64") String body, @Parameter(name = "durable", desc = "Whether the message is durable") boolean durable, @Parameter(name = "user", desc = "The user to authenticate with") String user, diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java index 1bc28d411c..89517aa1bd 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java @@ -363,7 +363,7 @@ public interface QueueControl { */ @Operation(desc = "Sends a TextMessage to a password-protected destination.", impact = MBeanOperationInfo.ACTION) String sendMessage(@Parameter(name = "headers", desc = "The headers to add to the message") Map headers, - @Parameter(name = "type", desc = "A type for the message") final int type, + @Parameter(name = "type", desc = "A type for the message") int type, @Parameter(name = "body", desc = "The body (byte[]) of the message encoded as a string using Base64") String body, @Parameter(name = "durable", desc = "Whether the message is durable") boolean durable, @Parameter(name = "user", desc = "The user to authenticate with") String user, diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerInternal.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerInternal.java index 82f3dbb33c..cc5f3f1f17 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerInternal.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerInternal.java @@ -37,7 +37,7 @@ public interface ClientConsumerInternal extends ClientConsumer { void handleLargeMessageContinuation(byte[] chunk, int flowControlSize, boolean isContinues) throws Exception; - void flowControl(final int messageBytes, final boolean discountSlowConsumer) throws ActiveMQException; + void flowControl(int messageBytes, boolean discountSlowConsumer) throws ActiveMQException; void clear(boolean waitForOnMessage) throws ActiveMQException; diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java index ce4a8a10fb..5504093a06 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java @@ -457,7 +457,8 @@ public class ClientProducerImpl implements ClientProducerInternal { } pos += numberOfBytesRead; - } while (pos < minLargeMessageSize); + } + while (pos < minLargeMessageSize); totalSize += pos; diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryInternal.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryInternal.java index be98a8e610..f72ca5ea28 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryInternal.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryInternal.java @@ -45,7 +45,7 @@ public interface ClientSessionFactoryInternal extends ClientSessionFactory { int numSessions(); - void removeSession(final ClientSessionInternal session, boolean failingOver); + void removeSession(ClientSessionInternal session, boolean failingOver); void connect(int reconnectAttempts, boolean failoverOnInitialConnection) throws ActiveMQException; diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java index 4e06068818..3c6829af7b 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java @@ -33,7 +33,7 @@ public interface ClientSessionInternal extends ClientSession { void acknowledge(ClientConsumer consumer, Message message) throws ActiveMQException; - void individualAcknowledge(final ClientConsumer consumer, final Message message) throws ActiveMQException; + void individualAcknowledge(ClientConsumer consumer, Message message) throws ActiveMQException; boolean isCacheLargeMessageClient(); diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageController.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageController.java index ced3028e4b..165a4d61b6 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageController.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageController.java @@ -46,13 +46,13 @@ public interface LargeMessageController extends ActiveMQBuffer { /** * Sets the OutputStream of this buffer to the specified output. */ - void setOutputStream(final OutputStream output) throws ActiveMQException; + void setOutputStream(OutputStream output) throws ActiveMQException; /** * Saves this buffer to the specified output. This is just a blocking version of * {@link #setOutputStream(OutputStream)}. */ - void saveBuffer(final OutputStream output) throws ActiveMQException; + void saveBuffer(OutputStream output) throws ActiveMQException; void addPacket(byte[] chunk, int flowControlSize, boolean isContinues); 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 949ef90810..908f91f86d 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 @@ -792,7 +792,8 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery throw e; } } - } while (retry); + } + while (retry); } // ATM topology is never != null. Checking here just to be consistent with diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorInternal.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorInternal.java index d7522b7b98..8219833703 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorInternal.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorInternal.java @@ -29,7 +29,7 @@ public interface ServerLocatorInternal extends ServerLocator { void start(Executor executor) throws Exception; - void factoryClosed(final ClientSessionFactory factory); + void factoryClosed(ClientSessionFactory factory); AfterConnectInternalListener getAfterConnectInternalListener(); diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Channel.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Channel.java index 9771795177..127a69aecc 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Channel.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Channel.java @@ -73,7 +73,7 @@ public interface Channel { * @return false if the packet was rejected by an outgoing interceptor; true if the send was * successful */ - boolean send(Packet packet, final int reconnectID); + boolean send(Packet packet, int reconnectID); /** * Sends a packet on this channel using batching algorithm if appropriate 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 c79fc7079c..1ebc1d0ee3 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 @@ -324,7 +324,8 @@ public class ActiveMQClientProtocolManager implements ClientProtocolManager { inCreateSession = false; inCreateSessionLatch.countDown(); } - } while (retry); + } + while (retry); return newSessionContext(name, confirmationWindowSize, sessionChannel, response); } diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java index 7799395f62..f9af0b1053 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java @@ -676,7 +676,8 @@ public class ActiveMQSessionContext extends SessionContext { throw e; } } - } while (retry && !session.isClosing()); + } + while (retry && !session.isClosing()); } protected CreateSessionMessage newCreateSession(String username, diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketDecoder.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketDecoder.java index e39e16baa1..2755b9adac 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketDecoder.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketDecoder.java @@ -160,7 +160,7 @@ import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SUB public abstract class PacketDecoder implements Serializable { - public abstract Packet decode(final ActiveMQBuffer in); + public abstract Packet decode(ActiveMQBuffer in); public Packet decode(byte packetType) { Packet packet; diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManager.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManager.java index a3f83dc15a..e2c9fc1ee2 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManager.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManager.java @@ -58,13 +58,13 @@ public interface ClientProtocolManager { void ping(long connectionTTL); - SessionContext createSessionContext(final String name, - final String username, - final String password, - final boolean xa, - final boolean autoCommitSends, - final boolean autoCommitAcks, - final boolean preAcknowledge, + SessionContext createSessionContext(String name, + String username, + String password, + boolean xa, + boolean autoCommitSends, + boolean autoCommitAcks, + boolean preAcknowledge, int minLargeMessageSize, int confirmationWindowSize) throws ActiveMQException; diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java index 3fddb8e64e..fe3feb2de1 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java @@ -94,7 +94,7 @@ public abstract class SessionContext { } protected void handleReceiveMessage(ConsumerContext consumerID, - final ClientMessageInternal message) throws Exception { + ClientMessageInternal message) throws Exception { ClientSessionInternal session = this.session; if (session != null) { @@ -102,7 +102,7 @@ public abstract class SessionContext { } } - protected void handleReceiveContinuation(final ConsumerContext consumerID, + protected void handleReceiveContinuation(ConsumerContext consumerID, byte[] chunk, int flowControlSize, boolean isContinues) throws Exception { @@ -159,7 +159,7 @@ public abstract class SessionContext { byte[] chunk, SendAcknowledgementHandler messageHandler) throws ActiveMQException; - public abstract void setSendAcknowledgementHandler(final SendAcknowledgementHandler handler); + public abstract void setSendAcknowledgementHandler(SendAcknowledgementHandler handler); /** * Creates a shared queue using the routing type set by the Address. If the Address supports more than one type of delivery @@ -210,7 +210,7 @@ public abstract class SessionContext { public abstract void forceDelivery(ClientConsumer consumer, long sequence) throws ActiveMQException; - public abstract ClientSession.AddressQuery addressQuery(final SimpleString address) throws ActiveMQException; + public abstract ClientSession.AddressQuery addressQuery(SimpleString address) throws ActiveMQException; public abstract void simpleCommit() throws ActiveMQException; @@ -231,10 +231,10 @@ public abstract class SessionContext { public abstract void sendACK(boolean individual, boolean block, - final ClientConsumer consumer, - final Message message) throws ActiveMQException; + ClientConsumer consumer, + Message message) throws ActiveMQException; - public abstract void expireMessage(final ClientConsumer consumer, Message message) throws ActiveMQException; + public abstract void expireMessage(ClientConsumer consumer, Message message) throws ActiveMQException; public abstract void sessionClose() throws ActiveMQException; @@ -242,7 +242,7 @@ public abstract class SessionContext { public abstract void addUniqueMetaData(String key, String data) throws ActiveMQException; - public abstract void sendProducerCreditsMessage(final int credits, final SimpleString address); + public abstract void sendProducerCreditsMessage(int credits, SimpleString address); public abstract void xaCommit(Xid xid, boolean onePhase) throws XAException, ActiveMQException; @@ -278,13 +278,13 @@ public abstract class SessionContext { public abstract int getServerVersion(); - public abstract void recreateSession(final String username, - final String password, - final int minLargeMessageSize, - final boolean xa, - final boolean autoCommitSends, - final boolean autoCommitAcks, - final boolean preAcknowledge) throws ActiveMQException; + public abstract void recreateSession(String username, + String password, + int minLargeMessageSize, + boolean xa, + boolean autoCommitSends, + boolean autoCommitAcks, + boolean preAcknowledge) throws ActiveMQException; public abstract void recreateConsumerOnServer(ClientConsumerInternal consumerInternal) throws ActiveMQException; diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/TopologyResponseHandler.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/TopologyResponseHandler.java index eda05ee2fe..55e202c94b 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/TopologyResponseHandler.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/TopologyResponseHandler.java @@ -26,12 +26,12 @@ public interface TopologyResponseHandler { void nodeDisconnected(RemotingConnection conn, String nodeID, String scaleDownTargetNodeID); void notifyNodeUp(long uniqueEventID, - final String backupGroupName, - final String scaleDownGroupName, - final String nodeName, - final Pair connectorPair, - final boolean isLast); + String backupGroupName, + String scaleDownGroupName, + String nodeName, + Pair connectorPair, + boolean isLast); // This is sent when any node on the cluster topology is going down - void notifyNodeDown(final long eventTime, final String nodeID); + void notifyNodeDown(long eventTime, String nodeID); } diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java index bbe4865b71..33381de0d1 100644 --- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java +++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java @@ -117,7 +117,8 @@ public class JDBCUtils { formatSqlException(errorMessage, nextEx); nextEx = exception.getNextException(); level++; - } while (nextEx != null); + } + while (nextEx != null); return errorMessage; } diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/JMSFactoryType.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/JMSFactoryType.java index 3e99960f96..e3dfcf1e7b 100644 --- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/JMSFactoryType.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/JMSFactoryType.java @@ -260,7 +260,7 @@ public enum JMSFactoryType { * @param groupConfiguration * @return the ActiveMQConnectionFactory */ - public abstract ActiveMQConnectionFactory createConnectionFactoryWithHA(final DiscoveryGroupConfiguration groupConfiguration); + public abstract ActiveMQConnectionFactory createConnectionFactoryWithHA(DiscoveryGroupConfiguration groupConfiguration); /** * Create an ActiveMQConnectionFactory which creates session factories from a set of live servers, no HA backup information is propagated to the client @@ -270,7 +270,7 @@ public enum JMSFactoryType { * @param groupConfiguration * @return the ActiveMQConnectionFactory */ - public abstract ActiveMQConnectionFactory createConnectionFactoryWithoutHA(final DiscoveryGroupConfiguration groupConfiguration); + public abstract ActiveMQConnectionFactory createConnectionFactoryWithoutHA(DiscoveryGroupConfiguration groupConfiguration); /** * Create an ActiveMQConnectionFactory which will receive cluster topology updates from the cluster @@ -287,7 +287,7 @@ public enum JMSFactoryType { * is made, the cluster topology is downloaded and the rest of the list is ignored. * @return the ActiveMQConnectionFactory */ - public abstract ActiveMQConnectionFactory createConnectionFactoryWithHA(final TransportConfiguration... initialServers); + public abstract ActiveMQConnectionFactory createConnectionFactoryWithHA(TransportConfiguration... initialServers); /** * Create an ActiveMQConnectionFactory which creates session factories using a static list of @@ -299,7 +299,7 @@ public enum JMSFactoryType { * @param transportConfigurations * @return the ActiveMQConnectionFactory */ - public abstract ActiveMQConnectionFactory createConnectionFactoryWithoutHA(final TransportConfiguration... transportConfigurations); + public abstract ActiveMQConnectionFactory createConnectionFactoryWithoutHA(TransportConfiguration... transportConfigurations); /** * Returns the connection factory interface that this JMSFactoryType creates. 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 e06231abba..c8d64fe5eb 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 @@ -1314,7 +1314,8 @@ public final class JMSBridgeImpl implements JMSBridge { ActiveMQJMSBridgeLogger.LOGGER.warn(e.getMessage() + ", retrying TX", e); exHappened = true; } - } while (exHappened); + } + while (exHappened); if (maxBatchSize > 1) { // The sending session is transacted - we need to commit it diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerConfigParser.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerConfigParser.java index 3ca65fe060..e1c5554efa 100644 --- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerConfigParser.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerConfigParser.java @@ -28,12 +28,12 @@ public interface JMSServerConfigParser { /** * Parse the JMS Configuration XML as a JMSConfiguration object */ - JMSConfiguration parseConfiguration(final InputStream stream) throws Exception; + JMSConfiguration parseConfiguration(InputStream stream) throws Exception; /** * Parse the JMS Configuration XML as a JMSConfiguration object */ - JMSConfiguration parseConfiguration(final Node rootnode) throws Exception; + JMSConfiguration parseConfiguration(Node rootnode) throws Exception; /** * Parse the topic node as a TopicConfiguration object @@ -42,7 +42,7 @@ public interface JMSServerConfigParser { * @return {@link TopicConfiguration} parsed from the node * @throws Exception */ - TopicConfiguration parseTopicConfiguration(final Node node) throws Exception; + TopicConfiguration parseTopicConfiguration(Node node) throws Exception; /** * Parse the Queue Configuration node as a QueueConfiguration object @@ -51,5 +51,5 @@ public interface JMSServerConfigParser { * @return {@link JMSQueueConfiguration} parsed from the node * @throws Exception */ - JMSQueueConfiguration parseQueueConfiguration(final Node node) throws Exception; + JMSQueueConfiguration parseQueueConfiguration(Node node) throws Exception; } diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java index ec9532415d..6df68f3263 100644 --- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java @@ -60,11 +60,11 @@ public interface JMSServerManager extends ActiveMQComponent { boolean durable, String... bindings) throws Exception; - boolean addTopicToBindingRegistry(final String topicName, final String binding) throws Exception; + boolean addTopicToBindingRegistry(String topicName, String binding) throws Exception; - boolean addQueueToBindingRegistry(final String queueName, final String binding) throws Exception; + boolean addQueueToBindingRegistry(String queueName, String binding) throws Exception; - boolean addConnectionFactoryToBindingRegistry(final String name, final String binding) throws Exception; + boolean addConnectionFactoryToBindingRegistry(String name, String binding) throws Exception; /** * Creates a JMS Topic @@ -306,7 +306,7 @@ public interface JMSServerManager extends ActiveMQComponent { void addSecurity(String addressMatch, Set roles); - Set getSecurity(final String addressMatch); + Set getSecurity(String addressMatch); BindingRegistry getRegistry(); diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java index ca194b8e90..5c03611f21 100644 --- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java @@ -98,12 +98,12 @@ public interface Journal extends ActiveMQComponent { appendUpdateRecord(id, recordType, EncoderPersister.getInstance(), record, sync, completionCallback); } - void appendUpdateRecord(final long id, - final byte recordType, - final Persister persister, - final Object record, - final boolean sync, - final IOCompletion callback) throws Exception; + void appendUpdateRecord(long id, + byte recordType, + Persister persister, + Object record, + boolean sync, + IOCompletion callback) throws Exception; void appendDeleteRecord(long id, boolean sync) throws Exception; @@ -117,11 +117,11 @@ public interface Journal extends ActiveMQComponent { appendAddRecordTransactional(txID, id, recordType, EncoderPersister.getInstance(), record); } - void appendAddRecordTransactional(final long txID, - final long id, - final byte recordType, - final Persister persister, - final Object record) throws Exception; + void appendAddRecordTransactional(long txID, + long id, + byte recordType, + Persister persister, + Object record) throws Exception; void appendUpdateRecordTransactional(long txID, long id, byte recordType, byte[] record) throws Exception; diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java index db131cf529..5e5ad55776 100644 --- a/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java @@ -271,7 +271,7 @@ public interface ActiveMQJournalLogger extends BasicLogger { @LogMessage(level = Logger.Level.ERROR) @Message(id = 144006, value = "IOError code {0}, {1}", format = Message.Format.MESSAGE_FORMAT) - void ioError(final int errorCode, final String errorMessage); + void ioError(int errorCode, String errorMessage); @LogMessage(level = Logger.Level.WARN) @Message(id = 144007, value = "Ignoring journal file {0}: file is shorter then minimum header size. This file is being removed.", format = Message.Format.MESSAGE_FORMAT) diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java index 365f373cf9..181891ab1f 100644 --- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java @@ -163,7 +163,8 @@ public class StompProtocolManager extends AbstractProtocolManager infos); - Configuration addAcceptorConfiguration(final TransportConfiguration infos); + Configuration addAcceptorConfiguration(TransportConfiguration infos); /** * Add an acceptor to the config @@ -335,9 +335,9 @@ public interface Configuration { */ Configuration setConnectorConfigurations(Map infos); - Configuration addConnectorConfiguration(final String key, final TransportConfiguration info); + Configuration addConnectorConfiguration(String key, TransportConfiguration info); - Configuration addConnectorConfiguration(final String name, final String uri) throws Exception; + Configuration addConnectorConfiguration(String name, String uri) throws Exception; Configuration clearConnectorConfigurations(); @@ -351,7 +351,7 @@ public interface Configuration { */ Configuration setBroadcastGroupConfigurations(List configs); - Configuration addBroadcastGroupConfiguration(final BroadcastGroupConfiguration config); + Configuration addBroadcastGroupConfiguration(BroadcastGroupConfiguration config); /** * Returns the discovery groups configured for this server. @@ -363,7 +363,7 @@ public interface Configuration { */ Configuration setDiscoveryGroupConfigurations(Map configs); - Configuration addDiscoveryGroupConfiguration(final String key, + Configuration addDiscoveryGroupConfiguration(String key, DiscoveryGroupConfiguration discoveryGroupConfiguration); /** @@ -384,7 +384,7 @@ public interface Configuration { /** * Sets the bridges configured for this server. */ - Configuration setBridgeConfigurations(final List configs); + Configuration setBridgeConfigurations(List configs); /** * Returns the diverts configured for this server. @@ -394,9 +394,9 @@ public interface Configuration { /** * Sets the diverts configured for this server. */ - Configuration setDivertConfigurations(final List configs); + Configuration setDivertConfigurations(List configs); - Configuration addDivertConfiguration(final DivertConfiguration config); + Configuration addDivertConfiguration(DivertConfiguration config); /** * Returns the cluster connections configured for this server. @@ -409,9 +409,9 @@ public interface Configuration { /** * Sets the cluster connections configured for this server. */ - Configuration setClusterConfigurations(final List configs); + Configuration setClusterConfigurations(List configs); - Configuration addClusterConfiguration(final ClusterConnectionConfiguration config); + Configuration addClusterConfiguration(ClusterConnectionConfiguration config); ClusterConnectionConfiguration addClusterConfiguration(String name, String uri) throws Exception; @@ -425,9 +425,9 @@ public interface Configuration { /** * Sets the queues configured for this server. */ - Configuration setQueueConfigurations(final List configs); + Configuration setQueueConfigurations(List configs); - Configuration addQueueConfiguration(final CoreQueueConfiguration config); + Configuration addQueueConfiguration(CoreQueueConfiguration config); /** * Returns the addresses configured for this server. @@ -437,12 +437,12 @@ public interface Configuration { /** * Sets the addresses configured for this server. */ - Configuration setAddressConfigurations(final List configs); + Configuration setAddressConfigurations(List configs); /** * Adds an addresses configuration */ - Configuration addAddressConfiguration(final CoreAddressConfiguration config); + Configuration addAddressConfiguration(CoreAddressConfiguration config); /** * Returns the management address of this server.
@@ -938,9 +938,9 @@ public interface Configuration { Configuration addConnectorServiceConfiguration(ConnectorServiceConfiguration config); - Configuration setSecuritySettingPlugins(final List plugins); + Configuration setSecuritySettingPlugins(List plugins); - Configuration addSecuritySettingPlugin(final SecuritySettingPlugin plugin); + Configuration addSecuritySettingPlugin(SecuritySettingPlugin plugin); /** * @return list of {@link ConnectorServiceConfiguration} diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PageTransactionInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PageTransactionInfo.java index ed4297331f..4fb49eabd3 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PageTransactionInfo.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PageTransactionInfo.java @@ -45,10 +45,10 @@ public interface PageTransactionInfo extends EncodingSupport { void storeUpdate(StorageManager storageManager, PagingManager pagingManager, Transaction tx) throws Exception; - void reloadUpdate(final StorageManager storageManager, - final PagingManager pagingManager, - final Transaction tx, - final int increment) throws Exception; + void reloadUpdate(StorageManager storageManager, + PagingManager pagingManager, + Transaction tx, + int increment) throws Exception; // To be used after the update was stored or reload void onUpdate(int update, StorageManager storageManager, PagingManager pagingManager); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java index 2d4c6468e4..4dd8bf832a 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java @@ -93,9 +93,9 @@ public interface PagingStore extends ActiveMQComponent, RefCountMessageListener */ boolean page(Message message, Transaction tx, RouteContextList listCtx, ReadLock readLock) throws Exception; - Page createPage(final int page) throws Exception; + Page createPage(int page) throws Exception; - boolean checkPageFileExists(final int page) throws Exception; + boolean checkPageFileExists(int page) throws Exception; PagingManager getPagingManager(); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageCursorProvider.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageCursorProvider.java index fd20952690..29ce8a0ae4 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageCursorProvider.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageCursorProvider.java @@ -31,7 +31,7 @@ public interface PageCursorProvider { PageCache getPageCache(long pageNr); - PagedReference newReference(final PagePosition pos, final PagedMessage msg, PageSubscription sub); + PagedReference newReference(PagePosition pos, PagedMessage msg, PageSubscription sub); void addPageCache(PageCache cache); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageSubscription.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageSubscription.java index 93e2a8439e..ee05f61621 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageSubscription.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageSubscription.java @@ -64,7 +64,7 @@ public interface PageSubscription { void scheduleCleanupCheck(); - void cleanupEntries(final boolean completeDelete) throws Exception; + void cleanupEntries(boolean completeDelete) throws Exception; void onPageModeCleared(Transaction tx) throws Exception; @@ -118,7 +118,7 @@ public interface PageSubscription { void processReload() throws Exception; - void addPendingDelivery(final PagePosition position); + void addPendingDelivery(PagePosition position); /** * To be used on redeliveries diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageSubscriptionCounter.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageSubscriptionCounter.java index 2e1d7b6b10..37cdb3bca3 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageSubscriptionCounter.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageSubscriptionCounter.java @@ -28,9 +28,9 @@ public interface PageSubscriptionCounter { void increment(Transaction tx, int add) throws Exception; - void loadValue(final long recordValueID, final long value); + void loadValue(long recordValueID, long value); - void loadInc(final long recordInd, final int add); + void loadInc(long recordInd, int add); void applyIncrementOnTX(Transaction tx, long recordID, int add); @@ -54,6 +54,6 @@ public interface PageSubscriptionCounter { // for each queue on the address void delete(Transaction tx) throws Exception; - void cleanupNonTXCounters(final long pageID) throws Exception; + void cleanupNonTXCounters(long pageID) throws Exception; } \ No newline at end of file diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java index f346dc04e8..6ad4f480ae 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java @@ -1257,7 +1257,8 @@ final class PageSubscriptionImpl implements PageSubscription { } else if (!browsing && ignored) { positionIgnored(message.getPosition()); } - } while (!match); + } + while (!match); if (message != null) { lastOperation = lastPosition; diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java index e27ed30e1f..369dba6775 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java @@ -246,7 +246,7 @@ public interface StorageManager extends IDGenerator, ActiveMQComponent { * @param extension the extension to add to the file * @return */ - SequentialFile createFileForLargeMessage(final long messageID, LargeMessageExtension extension); + SequentialFile createFileForLargeMessage(long messageID, LargeMessageExtension extension); void prepare(long txID, Xid xid) throws Exception; @@ -266,14 +266,14 @@ public interface StorageManager extends IDGenerator, ActiveMQComponent { void deletePageTransactional(long recordID) throws Exception; - JournalLoadInformation loadMessageJournal(final PostOffice postOffice, - final PagingManager pagingManager, - final ResourceManager resourceManager, + JournalLoadInformation loadMessageJournal(PostOffice postOffice, + PagingManager pagingManager, + ResourceManager resourceManager, Map queueInfos, - final Map>> duplicateIDMap, - final Set> pendingLargeMessages, + Map>> duplicateIDMap, + Set> pendingLargeMessages, List pendingNonTXPageCounter, - final JournalLoader journalLoader) throws Exception; + JournalLoader journalLoader) throws Exception; long storeHeuristicCompletion(Xid xid, boolean isCommit) throws Exception; diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/DuplicateIDCache.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/DuplicateIDCache.java index 26920f8972..b384896efa 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/DuplicateIDCache.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/DuplicateIDCache.java @@ -25,7 +25,7 @@ public interface DuplicateIDCache { boolean contains(byte[] duplicateID); - boolean atomicVerify(final byte[] duplID, final Transaction tx) throws Exception; + boolean atomicVerify(byte[] duplID, Transaction tx) throws Exception; void addToCache(byte[] duplicateID) throws Exception; @@ -42,7 +42,7 @@ public interface DuplicateIDCache { void load(List> theIds) throws Exception; - void load(final Transaction tx, final byte[] duplID); + void load(Transaction tx, byte[] duplID); void clear() throws Exception; diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java index f682777a74..a65e060c36 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java @@ -119,10 +119,10 @@ public interface PostOffice extends ActiveMQComponent { MessageReference reroute(Message message, Queue queue, Transaction tx) throws Exception; Pair redistribute(Message message, - final Queue originatingQueue, + Queue originatingQueue, Transaction tx) throws Exception; - void processRoute(final Message message, final RoutingContext context, final boolean direct) throws Exception; + void processRoute(Message message, RoutingContext context, boolean direct) throws Exception; DuplicateIDCache getDuplicateIDCache(SimpleString address); @@ -133,7 +133,7 @@ public interface PostOffice extends ActiveMQComponent { // we can't start expiry scanner until the system is load otherwise we may get weird races - https://issues.jboss.org/browse/HORNETQ-1142 void startExpiryScanner(); - boolean isAddressBound(final SimpleString address) throws Exception; + boolean isAddressBound(SimpleString address) throws Exception; Set getAddresses(); } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ConnectionCreator.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ConnectionCreator.java index 6df028c9d1..ab85d21eba 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ConnectionCreator.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ConnectionCreator.java @@ -21,7 +21,7 @@ import io.netty.channel.ChannelHandlerContext; public interface ConnectionCreator extends ChannelHandler { - NettyServerConnection createConnection(final ChannelHandlerContext ctx, + NettyServerConnection createConnection(ChannelHandlerContext ctx, String protocol, boolean httpEnabled) throws Exception; } 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 a910941d5e..22b162cf86 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 @@ -144,7 +144,8 @@ public class HttpAcceptorHandler extends ChannelDuplexHandler { return; // otherwise ignore, we'll just try again } - } while (responseHolder == null); + } + while (responseHolder == null); if (!bogusResponse) { piggyBackResponses(responseHolder.response.content()); responseHolder.response.headers().set(HttpHeaders.Names.CONTENT_LENGTH, String.valueOf(responseHolder.response.content().readableBytes())); @@ -175,7 +176,8 @@ public class HttpAcceptorHandler extends ChannelDuplexHandler { } catch (InterruptedException e) { break; } - } while (responses.isEmpty()); + } + while (responses.isEmpty()); return; } buf.writeBytes(buffer); 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 91dfa98d94..8a624ceaf6 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 @@ -534,8 +534,8 @@ public final class ReplicationManager implements ActiveMQComponent { final ByteBuf buffer = PooledByteBufAllocator.DEFAULT.directBuffer(size, size); try { - try (final FileInputStream fis = new FileInputStream(file.getJavaFile()); - final FileChannel channel = fis.getChannel()) { + try (FileInputStream fis = new FileInputStream(file.getJavaFile()); + FileChannel channel = fis.getChannel()) { // We can afford having a single buffer here for this entire loop // because sendReplicatePacket will encode the packet as a NettyBuffer // through ActiveMQBuffer class leaving this buffer free to be reused on the next copy diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/CheckType.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/CheckType.java index 92e92df161..c4bd70539c 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/CheckType.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/CheckType.java @@ -78,5 +78,5 @@ public enum CheckType { } }; - public abstract boolean hasRole(final Role role); + public abstract boolean hasRole(Role role); } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java index e16557f5aa..42ba7a22fe 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java @@ -296,14 +296,14 @@ public interface ActiveMQServer extends ServiceComponent { * @throws org.apache.activemq.artemis.api.core.ActiveMQInvalidTransientQueueUseException if the shared queue already exists with a different {@code address} or {@code filterString} * @throws NullPointerException if {@code address} is {@code null} */ - void createSharedQueue(final SimpleString address, final RoutingType routingType, final SimpleString name, final SimpleString filterString, - final SimpleString user, boolean durable) throws Exception; + void createSharedQueue(SimpleString address, RoutingType routingType, SimpleString name, SimpleString filterString, + SimpleString user, boolean durable) throws Exception; Queue createQueue(SimpleString address, RoutingType routingType, SimpleString queueName, SimpleString filter, boolean durable, boolean temporary) throws Exception; - Queue createQueue(final SimpleString address, final RoutingType routingType, final SimpleString queueName, final SimpleString user, - final SimpleString filterString, final boolean durable, final boolean temporary) throws Exception; + Queue createQueue(SimpleString address, RoutingType routingType, SimpleString queueName, SimpleString user, + SimpleString filterString, boolean durable, boolean temporary) throws Exception; Queue createQueue(SimpleString address, RoutingType routingType, SimpleString queueName, SimpleString filter, boolean durable, boolean temporary, int maxConsumers, boolean purgeOnNoConsumers, diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java index 340463926d..541b4d888a 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java @@ -87,15 +87,15 @@ public interface Queue extends Bindable { void addHead(MessageReference ref, boolean scheduling); - void addHead(final List refs, boolean scheduling); + void addHead(List refs, boolean scheduling); void acknowledge(MessageReference ref) throws Exception; - void acknowledge(final MessageReference ref, AckReason reason) throws Exception; + void acknowledge(MessageReference ref, AckReason reason) throws Exception; void acknowledge(Transaction tx, MessageReference ref) throws Exception; - void acknowledge(final Transaction tx, final MessageReference ref, AckReason reason) throws Exception; + void acknowledge(Transaction tx, MessageReference ref, AckReason reason) throws Exception; void reacknowledge(Transaction tx, MessageReference ref) throws Exception; @@ -152,7 +152,7 @@ public interface Queue extends Bindable { int deleteAllReferences() throws Exception; - int deleteAllReferences(final int flushLimit) throws Exception; + int deleteAllReferences(int flushLimit) throws Exception; boolean deleteReference(long messageID) throws Exception; @@ -175,7 +175,7 @@ public interface Queue extends Bindable { int sendMessagesToDeadLetterAddress(Filter filter) throws Exception; - void sendToDeadLetterAddress(final Transaction tx, final MessageReference ref) throws Exception; + void sendToDeadLetterAddress(Transaction tx, MessageReference ref) throws Exception; boolean changeReferencePriority(long messageID, byte newPriority) throws Exception; @@ -187,7 +187,7 @@ public interface Queue extends Bindable { int moveReferences(Filter filter, SimpleString toAddress) throws Exception; - int moveReferences(final int flushLimit, + int moveReferences(int flushLimit, Filter filter, SimpleString toAddress, boolean rejectDuplicates) throws Exception; diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueFactory.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueFactory.java index 2557b73833..c2aeba46e3 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueFactory.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueFactory.java @@ -29,14 +29,14 @@ import org.apache.activemq.artemis.core.postoffice.PostOffice; */ public interface QueueFactory { - Queue createQueueWith(final QueueConfig config) throws Exception; + Queue createQueueWith(QueueConfig config) throws Exception; /** * @deprecated Replaced by {@link #createQueueWith} */ @Deprecated Queue createQueue(long persistenceID, - final SimpleString address, + SimpleString address, SimpleString name, Filter filter, PageSubscription pageSubscription, diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ScheduledDeliveryHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ScheduledDeliveryHandler.java index 460e135d57..62fad5ec8d 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ScheduledDeliveryHandler.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ScheduledDeliveryHandler.java @@ -23,7 +23,7 @@ import org.apache.activemq.artemis.core.filter.Filter; public interface ScheduledDeliveryHandler { - boolean checkAndSchedule(MessageReference ref, final boolean tail); + boolean checkAndSchedule(MessageReference ref, boolean tail); int getScheduledCount(); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerConsumer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerConsumer.java index 37232bc689..2fd5a1e464 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerConsumer.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerConsumer.java @@ -92,9 +92,9 @@ public interface ServerConsumer extends Consumer { void individualAcknowledge(Transaction tx, long messageID) throws Exception; - void reject(final long messageID) throws Exception; + void reject(long messageID) throws Exception; - void individualCancel(final long messageID, boolean failed) throws Exception; + void individualCancel(long messageID, boolean failed) throws Exception; void forceDelivery(long sequence); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java index 0ce072847d..7980e6e98a 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java @@ -60,7 +60,7 @@ public interface ServerSession extends SecurityAuth { void individualAcknowledge(long consumerID, long messageID) throws Exception; - void individualCancel(final long consumerID, final long messageID, boolean failed) throws Exception; + void individualCancel(long consumerID, long messageID, boolean failed) throws Exception; void expire(long consumerID, long messageID) throws Exception; @@ -149,13 +149,13 @@ public interface ServerSession extends SecurityAuth { boolean durable, boolean autoCreated) throws Exception; - AddressInfo createAddress(final SimpleString address, + AddressInfo createAddress(SimpleString address, Set routingTypes, - final boolean autoCreated) throws Exception; + boolean autoCreated) throws Exception; - AddressInfo createAddress(final SimpleString address, + AddressInfo createAddress(SimpleString address, RoutingType routingType, - final boolean autoCreated) throws Exception; + boolean autoCreated) throws Exception; void deleteQueue(SimpleString name) throws Exception; @@ -164,12 +164,12 @@ public interface ServerSession extends SecurityAuth { SimpleString filterString, boolean browseOnly) throws Exception; - ServerConsumer createConsumer(final long consumerID, - final SimpleString queueName, - final SimpleString filterString, - final boolean browseOnly, - final boolean supportLargeMessage, - final Integer credits) throws Exception; + ServerConsumer createConsumer(long consumerID, + SimpleString queueName, + SimpleString filterString, + boolean browseOnly, + boolean supportLargeMessage, + Integer credits) throws Exception; QueueQueryResult executeQueueQuery(SimpleString name) throws Exception; @@ -186,11 +186,11 @@ public interface ServerSession extends SecurityAuth { boolean direct, boolean noAutoCreateQueue) throws Exception; - RoutingStatus doSend(final Transaction tx, - final Message msg, - final SimpleString originalAddress, - final boolean direct, - final boolean noAutoCreateQueue) throws Exception; + RoutingStatus doSend(Transaction tx, + Message msg, + SimpleString originalAddress, + boolean direct, + boolean noAutoCreateQueue) throws Exception; RoutingStatus send(Message message, boolean direct, boolean noAutoCreateQueue) throws Exception; @@ -239,7 +239,7 @@ public interface ServerSession extends SecurityAuth { void createSharedQueue(SimpleString address, SimpleString name, - final RoutingType routingType, + RoutingType routingType, boolean durable, SimpleString filterString) throws Exception; diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/Vote.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/Vote.java index 916c63e913..b41af2bfa8 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/Vote.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/Vote.java @@ -31,9 +31,9 @@ public abstract class Vote { return map; } - public abstract void encode(final ActiveMQBuffer buff); + public abstract void encode(ActiveMQBuffer buff); - public abstract void decode(final ActiveMQBuffer buff); + public abstract void decode(ActiveMQBuffer buff); //whether or note we should ask the target server for an answer or decide ourselves, for instance if we couldn't //connect to the node in the first place. 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 bd1d931585..c80f6125da 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 @@ -157,7 +157,8 @@ public final class RemoteGroupingHandler extends GroupHandlingAbstract { if (response != null) { break; } - } while (timeLimit > System.currentTimeMillis()); + } + while (timeLimit > System.currentTimeMillis()); } finally { if (notification != null) { pendingNotifications.remove(notification); 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 09f9fc348a..2b4e2cbf70 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 @@ -139,7 +139,8 @@ public class FileLockNodeManager extends NodeManager { logger.debug("acquired live node lock state = " + (char) state); break; } - } while (true); + } + while (true); } @Override @@ -317,7 +318,8 @@ public class FileLockNodeManager extends NodeManager { interrupted = false; throw new IOException("Lock was interrupted"); } - } while (lock == null); + } + while (lock == null); return lock; } 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 ade34807a4..63fac28b31 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 @@ -84,7 +84,8 @@ public final class InVMNodeManager extends NodeManager { } else if (state == LIVE) { break; } - } while (true); + } + while (true); if (failoverPause > 0L) { Thread.sleep(failoverPause); } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java index 4ace4d4d40..296088b7ba 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java @@ -845,7 +845,8 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener { ref.acknowledge(tx); acks++; - } while (ref.getMessage().getMessageID() != messageID); + } + while (ref.getMessage().getMessageID() != messageID); if (startedTransaction) { tx.commit(); 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 58fe738427..d45abe3a80 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 @@ -293,7 +293,8 @@ public final class SharedNothingBackupActivation extends Activation { replicationEndpoint.getChannel().close(); replicationEndpoint.setChannel(null); } - } while (signal == SharedNothingBackupQuorum.BACKUP_ACTIVATION.ALREADY_REPLICATING); + } + while (signal == SharedNothingBackupQuorum.BACKUP_ACTIVATION.ALREADY_REPLICATING); if (logger.isTraceEnabled()) { logger.trace("Activation loop finished, current signal = " + signal); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ManagementService.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ManagementService.java index 29a2e47711..528920fc4e 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ManagementService.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ManagementService.java @@ -68,29 +68,29 @@ public interface ManagementService extends NotificationService, ActiveMQComponen void setStorageManager(StorageManager storageManager); - ActiveMQServerControlImpl registerServer(final PostOffice postOffice, - final SecurityStore securityStore, - final StorageManager storageManager, - final Configuration configuration, - final HierarchicalRepository addressSettingsRepository, - final HierarchicalRepository> securityRepository, - final ResourceManager resourceManager, - final RemotingService remotingService, - final ActiveMQServer messagingServer, - final QueueFactory queueFactory, - final ScheduledExecutorService scheduledThreadPool, - final PagingManager pagingManager, - final boolean backup) throws Exception; + ActiveMQServerControlImpl registerServer(PostOffice postOffice, + SecurityStore securityStore, + StorageManager storageManager, + Configuration configuration, + HierarchicalRepository addressSettingsRepository, + HierarchicalRepository> securityRepository, + ResourceManager resourceManager, + RemotingService remotingService, + ActiveMQServer messagingServer, + QueueFactory queueFactory, + ScheduledExecutorService scheduledThreadPool, + PagingManager pagingManager, + boolean backup) throws Exception; void unregisterServer() throws Exception; void registerInJMX(ObjectName objectName, Object managedResource) throws Exception; - void unregisterFromJMX(final ObjectName objectName) throws Exception; + void unregisterFromJMX(ObjectName objectName) throws Exception; void registerInRegistry(String resourceName, Object managedResource); - void unregisterFromRegistry(final String resourceName); + void unregisterFromRegistry(String resourceName); void registerAddress(AddressInfo addressInfo) throws Exception; diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ProtocolManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ProtocolManager.java index e29d74d58a..1770a5cbf5 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ProtocolManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ProtocolManager.java @@ -44,7 +44,7 @@ public interface ProtocolManager

{ ConnectionEntry createConnectionEntry(Acceptor acceptorUsed, Connection connection); - void removeHandler(final String name); + void removeHandler(String name); void handleBuffer(RemotingConnection connection, ActiveMQBuffer buffer); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/CertificateLoginModule.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/CertificateLoginModule.java index 0625ba551b..dcbd964aa3 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/CertificateLoginModule.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/CertificateLoginModule.java @@ -154,7 +154,7 @@ public abstract class CertificateLoginModule extends PropertiesLoader implements * @param certs The distinguished name. * @return The unique name if the certificate is recognized, null otherwise. */ - protected abstract String getUserNameForCertificates(final X509Certificate[] certs) throws LoginException; + protected abstract String getUserNameForCertificates(X509Certificate[] certs) throws LoginException; /** * Should return a set of the roles this user belongs to. The roles @@ -164,7 +164,7 @@ public abstract class CertificateLoginModule extends PropertiesLoader implements * getUserNameForDn returned for the user's DN. * @return A Set of the names of the roles this user belongs to. */ - protected abstract Set getUserRoles(final String username) throws LoginException; + protected abstract Set getUserRoles(String username) throws LoginException; protected String getDistinguishedName(final X509Certificate[] certs) { if (certs != null && certs.length > 0 && certs[0] != null) { diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java index 774b5f5e3d..17f2d88396 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java @@ -606,7 +606,8 @@ public abstract class ActiveMQTestBase extends Assert { break; } } - } while (i++ <= 200 && hasValue); + } + while (i++ <= 200 && hasValue); for (WeakReference ref : references) { Assert.assertNull(ref.get()); @@ -1144,7 +1145,8 @@ public abstract class ActiveMQTestBase extends Assert { } Thread.sleep(10); - } while (System.currentTimeMillis() - start < timeout); + } + while (System.currentTimeMillis() - start < timeout); String msg = "Timed out waiting for cluster topology of live=" + liveNodes + ",backup=" + backupNodes + " (received live=" + liveNodesCount + ", backup=" + backupNodesCount + @@ -1175,7 +1177,8 @@ public abstract class ActiveMQTestBase extends Assert { } Thread.sleep(10); - } while (System.currentTimeMillis() - start < timeout); + } + while (System.currentTimeMillis() - start < timeout); String msg = "Timed out waiting for cluster topology of " + nodes + " (received " + @@ -1878,7 +1881,8 @@ public abstract class ActiveMQTestBase extends Assert { } Thread.sleep(10); - } while (System.currentTimeMillis() - start < timeout); + } + while (System.currentTimeMillis() - start < timeout); String msg = "Timed out waiting for bindings (bindingCount = " + bindingCount + " (expecting " + diff --git a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQRegistry.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQRegistry.java index f64c68b105..7a86ae0f54 100644 --- a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQRegistry.java +++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQRegistry.java @@ -19,9 +19,9 @@ package org.apache.activemq.artemis.service.extensions.xa.recovery; public interface ActiveMQRegistry { - void register(final XARecoveryConfig resourceConfig); + void register(XARecoveryConfig resourceConfig); - void unRegister(final XARecoveryConfig resourceConfig); + void unRegister(XARecoveryConfig resourceConfig); void stop(); diff --git a/etc/checkstyle.xml b/etc/checkstyle.xml index c08f585214..f695bef59a 100644 --- a/etc/checkstyle.xml +++ b/etc/checkstyle.xml @@ -46,9 +46,7 @@ under the License. - - - + @@ -73,7 +71,7 @@ under the License. - + diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java index a6959ace75..84e7ba14af 100644 --- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java +++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java @@ -571,7 +571,8 @@ public class AmqpConnection extends AmqpAbstractResource implements buffer.put(duplicate); protonTransport.processInput(); source.position(source.position() + limit); - } while (source.hasRemaining()); + } + while (source.hasRemaining()); ReferenceCountUtil.release(incoming); diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java index c2c721708e..e9fc75bd92 100644 --- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java +++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java @@ -894,7 +894,8 @@ public class AmqpReceiver extends AmqpAbstractResource { } } } - } while (incoming != null); + } + while (incoming != null); super.processDeliveryUpdates(connection, delivery); } diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java index 2b6868f32d..5129253050 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java @@ -380,7 +380,8 @@ public class MDBMultipleHandlersServerDisconnectTest extends ActiveMQRATestBase serverSessions.add(session); } } - } while (running.get() && serverSessions.size() != numberOfSessions && timeout > System.currentTimeMillis()); + } + while (running.get() && serverSessions.size() != numberOfSessions && timeout > System.currentTimeMillis()); System.err.println("Returning " + serverSessions.size() + " sessions"); return serverSessions; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java index b5ce930fe5..5bd3ea014a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java @@ -1354,7 +1354,8 @@ public class ConsumerWindowSizeTest extends ActiveMQTestBase { foundB = consB.getBufferSize() == numberOfMessages / 2; Thread.sleep(10); - } while ((!foundA || !foundB) && System.currentTimeMillis() < timeout); + } + while ((!foundA || !foundB) && System.currentTimeMillis() < timeout); Assert.assertTrue("ConsumerA didn't receive the expected number of messages on buffer (consA=" + consA.getBufferSize() + ", consB=" + diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java index 7552caa9b7..a147d396cf 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java @@ -306,7 +306,8 @@ public class SlowConsumerTest extends ActiveMQTestBase { m.acknowledge(); messagesConsumed++; } - } while (m != null); + } + while (m != null); assertEquals(messagesProduced.longValue(), messagesConsumed); } 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 4c184881fb..4a6fcaa626 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 @@ -710,7 +710,8 @@ public class BridgeReconnectTest extends BridgeTestBase { } Thread.sleep(10); - } while (System.currentTimeMillis() - start < 50000); + } + while (System.currentTimeMillis() - start < 50000); throw new IllegalStateException("Failed to get forwarding connection"); } 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 c31f96f4d4..4075cb5a60 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 @@ -279,7 +279,8 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { break; } Thread.sleep(10); - } while (System.currentTimeMillis() - start < WAIT_TIMEOUT); + } + while (System.currentTimeMillis() - start < WAIT_TIMEOUT); if (!exists) { String msg = "Timed out waiting for cluster topology of " + Arrays.toString(nodes) + " (received " + @@ -367,7 +368,8 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { } Thread.sleep(10); - } while (System.currentTimeMillis() - start < ActiveMQTestBase.WAIT_TIMEOUT); + } + while (System.currentTimeMillis() - start < ActiveMQTestBase.WAIT_TIMEOUT); throw new IllegalStateException("Timed out waiting for messages (messageCount = " + messageCount + ", expecting = " + @@ -1042,7 +1044,8 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { } else { log.info("check receive Consumer " + consumerID + " null message"); } - } while (message != null); + } + while (message != null); } } @@ -1221,7 +1224,8 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { message.acknowledge(); } } - } while (message != null); + } + while (message != null); } for (int messageCount : messageCounts) { @@ -1313,7 +1317,8 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { ints.add(count); } - } while (message != null); + } + while (message != null); int[] res = new int[ints.size()]; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java index a40e2c0e71..c74e2f4a05 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java @@ -253,7 +253,8 @@ public class AsynchronousFailoverTest extends FailoverTestBase { } catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } - } while (retry); + } + while (retry); } // create the consumer with retry if failover occurs during createConsumer call @@ -272,7 +273,8 @@ public class AsynchronousFailoverTest extends FailoverTestBase { } catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } - } while (retry); + } + while (retry); session.start(); @@ -381,7 +383,8 @@ public class AsynchronousFailoverTest extends FailoverTestBase { log.info("#test Exception " + e, e); throw e; } - } while (retry); + } + while (retry); logAndSystemOut("#test Finished sending, starting consumption now"); @@ -481,7 +484,8 @@ public class AsynchronousFailoverTest extends FailoverTestBase { logAndSystemOut(e.getMessage(), e); throw e; } - } while (retry); + } + while (retry); } finally { if (session != null) { session.close(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java index 3f4f4e7f8f..745b84c9e6 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java @@ -34,7 +34,7 @@ public abstract class ClusterWithBackupFailoverTestBase extends ClusterTestBase protected static final String QUEUES_TESTADDRESS = "queues.testaddress"; private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - protected abstract void setupCluster(final MessageLoadBalancingType messageLoadBalancingType) throws Exception; + protected abstract void setupCluster(MessageLoadBalancingType messageLoadBalancingType) throws Exception; protected abstract void setupServers() throws Exception; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java index b08ceb16f4..2a4293876e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java @@ -271,7 +271,7 @@ public abstract class FailoverTestBase extends ActiveMQTestBase { protected abstract TransportConfiguration getAcceptorTransportConfiguration(boolean live); - protected abstract TransportConfiguration getConnectorTransportConfiguration(final boolean live); + protected abstract TransportConfiguration getConnectorTransportConfiguration(boolean live); protected ServerLocatorInternal getServerLocator() throws Exception { return (ServerLocatorInternal) addServerLocator(ActiveMQClient.createServerLocatorWithHA(getConnectorTransportConfiguration(true), getConnectorTransportConfiguration(false))).setRetryInterval(50); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/GroupingFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/GroupingFailoverTestBase.java index 0826077d72..41f0e8f95f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/GroupingFailoverTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/GroupingFailoverTestBase.java @@ -121,7 +121,8 @@ public abstract class GroupingFailoverTestBase extends ClusterTestBase { } Thread.sleep(10); - } while (System.currentTimeMillis() - start < ActiveMQTestBase.WAIT_TIMEOUT); + } + while (System.currentTimeMillis() - start < ActiveMQTestBase.WAIT_TIMEOUT); throw new IllegalStateException("Timed out waiting for backup announce"); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java index bfbe5d5dc2..9a33c57bfc 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java @@ -239,7 +239,8 @@ public abstract class MultipleServerFailoverTestBase extends ActiveMQTestBase { } Thread.sleep(10); - } while (System.currentTimeMillis() - start < timeout); + } + while (System.currentTimeMillis() - start < timeout); throw new Exception(); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java index 027e2b4e21..095b94395e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java @@ -136,7 +136,8 @@ public abstract class MultiThreadReattachSupportTestBase extends ActiveMQTestBas runnable.checkFail(); - } while (!failer.isExecuted()); + } + while (!failer.isExecuted()); InVMConnector.resetFailures(); @@ -189,7 +190,7 @@ public abstract class MultiThreadReattachSupportTestBase extends ActiveMQTestBas } } - public abstract void run(final ClientSessionFactory sf, final int threadNum) throws Exception; + public abstract void run(ClientSessionFactory sf, int threadNum) throws Exception; } private class Failer extends TimerTask { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java index 4d44334d5a..303cbacd03 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java @@ -215,7 +215,8 @@ public class RandomReattachTest extends ActiveMQTestBase { do { runnable.run(sf); - } while (!failer.isExecuted()); + } + while (!failer.isExecuted()); } } @@ -1290,7 +1291,7 @@ public class RandomReattachTest extends ActiveMQTestBase { public abstract class RunnableT { - abstract void run(final ClientSessionFactory sf) throws Exception; + abstract void run(ClientSessionFactory sf) throws Exception; } abstract static class AssertionCheckMessageHandler implements MessageHandler { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/TopologyClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/TopologyClusterTestBase.java index 82bdf32fc9..b2453d83c9 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/TopologyClusterTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/TopologyClusterTestBase.java @@ -135,7 +135,8 @@ public abstract class TopologyClusterTestBase extends ClusterTestBase { if (ok) { return; } - } while (System.currentTimeMillis() - start < 5000); + } + while (System.currentTimeMillis() - start < 5000); Assert.fail("did not contain all expected node ID: " + actual); } @@ -191,7 +192,8 @@ public abstract class TopologyClusterTestBase extends ClusterTestBase { } Thread.sleep(10); - } while (System.currentTimeMillis() - start < ActiveMQTestBase.WAIT_TIMEOUT); + } + while (System.currentTimeMillis() - start < ActiveMQTestBase.WAIT_TIMEOUT); log.error(clusterDescription(servers[node])); Assert.assertEquals("Timed out waiting for cluster connections for server " + node, expected, nodesCount); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/BindingsClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/BindingsClusterTest.java index 982c7d3ccd..ba3e507787 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/BindingsClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/BindingsClusterTest.java @@ -449,7 +449,8 @@ public class BindingsClusterTest extends JMSClusteredTestBase { } Thread.sleep(10); - } while (System.currentTimeMillis() - start < 50000); + } + while (System.currentTimeMillis() - start < 50000); throw new IllegalStateException("Failed to get forwarding connection"); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java index 31ca7724af..4b4e89b1be 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java @@ -419,7 +419,8 @@ public class JMSFailoverTest extends ActiveMQTestBase { } catch (JMSException e) { new Exception("Exception on receive message", e).printStackTrace(); } - } while (retryNrs < 10); + } + while (retryNrs < 10); assertNotNull(message); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSUtil.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSUtil.java index a96d876253..e8af04912b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSUtil.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSUtil.java @@ -331,7 +331,8 @@ public class JMSUtil { break; } Thread.sleep(10); - } while (System.currentTimeMillis() - start < timeToWait); + } + while (System.currentTimeMillis() - start < timeToWait); if (!exists) { String msg = "Timed out waiting for cluster topology of " + backupServer + " (received " + diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/NotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/NotificationTest.java index 2e99da2746..e0e6f4cfb9 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/NotificationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/NotificationTest.java @@ -231,7 +231,8 @@ public class NotificationTest extends ActiveMQTestBase { ClientMessage message = null; do { message = notifConsumer.receive(500); - } while (message != null); + } + while (message != null); } protected static ClientMessage[] consumeMessages(final int expected, diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java index a5f8ec55c2..13208fcbaa 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java @@ -159,7 +159,8 @@ public class SecurityNotificationTest extends ActiveMQTestBase { ClientMessage message = null; do { message = notifConsumer.receive(500); - } while (message != null); + } + while (message != null); } protected static ClientMessage[] consumeMessages(final int expected, diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java index 09477f36fa..3026f97849 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java @@ -465,7 +465,8 @@ public class MQTTTest extends MQTTTestSupport { assertTrue("RETAINED matching " + wildcard + " " + msg.getTopic(), pattern.matcher(msg.getTopic()).matches()); msg.ack(); msg = connection.receive(5000, TimeUnit.MILLISECONDS); - } while (msg != null); + } + while (msg != null); // test non-retained message for (String topic : topics) { @@ -477,7 +478,8 @@ public class MQTTTest extends MQTTTestSupport { assertTrue("Non-retained matching " + wildcard + " " + msg.getTopic(), pattern.matcher(msg.getTopic()).matches()); msg.ack(); msg = connection.receive(1000, TimeUnit.MILLISECONDS); - } while (msg != null); + } + while (msg != null); connection.unsubscribe(new String[]{wildcard}); connection.disconnect(); @@ -769,7 +771,8 @@ public class MQTTTest extends MQTTTestSupport { waitCount++; } msg = connection.receive(5000, TimeUnit.MILLISECONDS); - } while (msg != null && received++ < subs.length * 2); + } + while (msg != null && received++ < subs.length * 2); assertEquals("Unexpected number of messages", subs.length * 2, received + 1); // make sure we received distinct ids for QoS != AT_MOST_ONCE, and 0 for @@ -928,7 +931,8 @@ public class MQTTTest extends MQTTTestSupport { assertEquals(TOPIC, new String(msg.getPayload())); msg.ack(); } - } while (msg != null); + } + while (msg != null); // make sure we received all message ids for (short id = 1; id <= TOTAL_MESSAGES; id++) { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ExpiryRunnerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ExpiryRunnerTest.java index d4a4154303..fa04395ae4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ExpiryRunnerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ExpiryRunnerTest.java @@ -183,7 +183,8 @@ public class ExpiryRunnerTest extends ActiveMQTestBase { m.setExpiration(expiration); producer.send(m); Thread.sleep(100); - } while (System.currentTimeMillis() < sendMessagesUntil); + } + while (System.currentTimeMillis() < sendMessagesUntil); Assert.assertTrue(latch.await(10000, TimeUnit.MILLISECONDS)); consumer.close(); @@ -197,7 +198,8 @@ public class ExpiryRunnerTest extends ActiveMQTestBase { cm.acknowledge(); Assert.assertFalse(dummyMessageHandler.payloads.contains(text)); dummyMessageHandler.payloads.add(text); - } while (true); + } + while (true); for (int i = 0; i < numMessages; i++) { if (dummyMessageHandler.payloads.isEmpty()) { diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/Server.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/Server.java index 7d21289151..e94976a52a 100644 --- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/Server.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/Server.java @@ -144,27 +144,27 @@ public interface Server extends Remote { boolean supportsLoadBalancing, int dupsOkBatchSize, boolean blockOnAcknowledge, - final String... jndiBindings) throws Exception; + String... jndiBindings) throws Exception; void deployConnectionFactory(String objectName, int prefetchSize, int defaultTempQueueFullSize, int defaultTempQueuePageSize, int defaultTempQueueDownCacheSize, - final String... jndiBindings) throws Exception; + String... jndiBindings) throws Exception; void deployConnectionFactory(String objectName, boolean supportsFailover, boolean supportsLoadBalancing, - final String... jndiBindings) throws Exception; + String... jndiBindings) throws Exception; - void deployConnectionFactory(String clientID, String objectName, final String... jndiBindings) throws Exception; + void deployConnectionFactory(String clientID, String objectName, String... jndiBindings) throws Exception; - void deployConnectionFactory(String objectName, int prefetchSize, final String... jndiBindings) throws Exception; + void deployConnectionFactory(String objectName, int prefetchSize, String... jndiBindings) throws Exception; - void deployConnectionFactory(String objectName, final String... jndiBindings) throws Exception; + void deployConnectionFactory(String objectName, String... jndiBindings) throws Exception; - void deployConnectionFactory(String objectName, JMSFactoryType type, final String... jndiBindings) throws Exception; + void deployConnectionFactory(String objectName, JMSFactoryType type, String... jndiBindings) throws Exception; void undeployConnectionFactory(String objectName) throws Exception; diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageStressTest.java index a43958782d..0d07549041 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageStressTest.java @@ -91,7 +91,8 @@ public class PageStressTest extends ActiveMQTestBase { System.out.println("Received " + msgs); } } - } while (msg != null); + } + while (msg != null); session.commit(); @@ -122,7 +123,8 @@ public class PageStressTest extends ActiveMQTestBase { System.out.println("Received " + msgs); } } - } while (msg != null); + } + while (msg != null); System.out.println("msgs second time: " + msgs); @@ -208,7 +210,8 @@ public class PageStressTest extends ActiveMQTestBase { } } - } while (msg != null); + } + while (msg != null); session.commit(); diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java index 1f933fbda3..192454e839 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java @@ -221,7 +221,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory { */ public interface ListenerHoldCallback { - void callbackAdded(final ByteBuffer bytes); + void callbackAdded(ByteBuffer bytes); } private class CallbackRunnable implements Runnable {