From ddb5e3665625681084ad24c86d0d06c5f8eb669f Mon Sep 17 00:00:00 2001 From: Justin Bertram Date: Wed, 13 May 2026 09:42:52 -0500 Subject: [PATCH] ARTEMIS-6058 enforce Checkstyle for double spaces --- .../artemis/cli/commands/Upgrade.java | 2 +- .../artemis/cli/commands/check/NodeCheck.java | 2 +- .../ConnectionConfigurationAbtract.java | 6 +- .../activemq/artemis/util/ServerUtil.java | 2 +- .../cli/factory/BrokerFactoryTest.java | 24 +++--- .../artemis/util/JVMArgumentTest.java | 2 +- .../apache/activemq/cli/test/ArtemisTest.java | 6 +- .../core/ActiveMQDeleteAddressException.java | 2 +- .../activemq/artemis/utils/ByteUtil.java | 2 +- .../artemis/utils/ClassloadingUtil.java | 2 +- .../DefaultSensitiveStringCodecTest.java | 2 +- .../artemis/utils/SizeAwareMetricTest.java | 4 +- .../config/ActiveMQDefaultConfiguration.java | 2 +- .../activemq/artemis/api/core/Message.java | 2 +- .../api/core/client/ActiveMQClient.java | 2 +- .../management/ActiveMQServerControl.java | 4 +- .../api/core/management/QueueControl.java | 2 +- .../api/core/management/SimpleManagement.java | 2 +- .../core/client/impl/ClientProducerImpl.java | 2 +- .../protocol/core/CoreRemotingConnection.java | 18 ++--- .../core/impl/ActiveMQSessionContext.java | 2 +- .../core/protocol/core/impl/PacketImpl.java | 2 +- .../core/impl/RemotingConnectionImpl.java | 2 +- .../wireformat/CreateProducerMessage.java | 2 +- .../impl/netty/CheckDependencies.java | 2 +- .../core/remoting/impl/ssl/SSLSupport.java | 4 +- .../activemq/artemis/reader/MessageUtil.java | 2 +- .../core/remoting/ssl/SSLContextConfig.java | 2 +- .../artemis/utils/AutoCreateUtil.java | 2 +- .../activemq/artemis/dto/JMXConnectorDTO.java | 10 +-- .../artemis/ActiveMQImageExamplesTest.java | 2 +- .../jms/client/ActiveMQDestination.java | 2 +- .../artemis/jms/client/ActiveMQSession.java | 8 +- .../io/AbstractSequentialFileFactory.java | 2 +- .../core/io/aio/AIOSequentialFile.java | 2 +- .../core/io/nio/NIOSequentialFile.java | 2 +- .../core/journal/impl/JournalImpl.java | 6 +- .../artemis/core/io/aio/FileIOUtilTest.java | 2 +- .../junit/EmbeddedActiveMQDelegate.java | 2 +- .../CuratorDistributedLockManagerTest.java | 2 +- .../artemis/maven/ArtemisAbstractPlugin.java | 2 +- .../protocol/amqp/broker/AMQPMessage.java | 2 +- .../amqp/broker/AMQPMessagePersister.java | 2 +- .../amqp/broker/AMQPSessionCallback.java | 2 +- .../client/ProtonClientConnectionManager.java | 2 +- .../amqp/connect/AMQPBrokerConnection.java | 2 +- .../bridge/AMQPBridgeToAddressSender.java | 2 +- ...AMQPFederationAddressSenderController.java | 2 +- .../AMQPFederationQueueSenderController.java | 2 +- .../mirror/AMQPMirrorControllerSource.java | 2 +- .../amqp/connect/mirror/AckManager.java | 2 +- .../amqp/converter/AMQPMessageSupport.java | 2 +- .../coreWrapper/CoreBytesMessageWrapper.java | 56 ++++++------- .../coreWrapper/CoreMessageWrapper.java | 78 +++++++++---------- .../coreWrapper/CoreTextMessageWrapper.java | 8 +- .../ActiveMQAMQPProtocolMessageBundle.java | 4 +- .../amqp/proton/AMQPRoutingHandler.java | 2 +- .../amqp/proton/ProtonAbstractReceiver.java | 2 +- .../scram/ScramServerFunctionalityImpl.java | 2 +- .../core/protocol/mqtt/MQTTStateManager.java | 2 +- .../mqtt/MQTTSubscriptionManager.java | 2 +- .../protocol/openwire/OpenWireConnection.java | 2 +- .../protocol/openwire/OpenWireConstants.java | 6 +- .../openwire/OpenWireProtocolManager.java | 2 +- .../protocol/openwire/amq/AMQConsumer.java | 2 +- .../protocol/openwire/util/OpenWireUtil.java | 2 +- .../OpenWireMessageConverterTest.java | 2 +- .../openwire/amq/AMQConsumerTest.java | 4 +- .../openwire/amq/OpenWireConnectionTest.java | 10 +-- .../activemq/artemis/ra/ActiveMQRALogger.java | 2 +- .../core/config/BridgeConfiguration.java | 2 +- .../core/config/ConfigurationUtils.java | 2 +- .../core/config/DivertConfiguration.java | 2 +- .../config/JMXConnectorConfiguration.java | 2 +- .../ha/ReplicatedPolicyConfiguration.java | 2 +- .../core/config/impl/ConfigurationImpl.java | 4 +- .../artemis/core/config/impl/Validators.java | 2 +- .../storage/DatabaseStorageConfiguration.java | 2 +- .../impl/FileConfigurationParser.java | 4 +- .../impl/ActiveMQServerControlImpl.java | 6 +- .../impl/ClusterConnectionControlImpl.java | 2 +- .../paging/cursor/impl/BasePagingCounter.java | 2 +- .../artemis/core/paging/impl/Page.java | 2 +- .../core/paging/impl/PagingStoreImpl.java | 2 +- .../core/persistence/StorageManager.java | 2 +- .../impl/journal/JournalStorageManager.java | 4 +- .../impl/journal/LargeServerMessageImpl.java | 2 +- .../core/impl/CoreSessionCallback.java | 2 +- .../wireformat/ReplicationAddMessage.java | 2 +- .../ReplicationLargeMessageBeginMessage.java | 2 +- .../ReplicationLargeMessageEndMessage.java | 2 +- .../ReplicationLargeMessageWriteMessage.java | 2 +- .../core/replication/ReplicationEndpoint.java | 2 +- .../artemis/core/server/ActiveMQServer.java | 2 +- .../federation/address/FederatedAddress.java | 2 +- .../federation/queue/FederatedQueue.java | 4 +- .../queue/FederatedQueueConsumerKey.java | 2 +- .../core/server/impl/ActiveMQServerImpl.java | 10 +-- .../server/impl/PostOfficeJournalLoader.java | 2 +- .../artemis/core/server/impl/QueueImpl.java | 2 +- .../core/server/impl/ScaleDownHandler.java | 2 +- .../core/server/impl/ServerConsumerImpl.java | 2 +- .../core/server/impl/ServerSessionImpl.java | 6 +- .../core/server/lock/LockCoordinator.java | 2 +- .../ArtemisRbacInvocationHandler.java | 2 +- .../websocket/WebSocketServerHandler.java | 2 +- .../core/server/reload/ReloadManagerImpl.java | 2 +- .../core/server/replay/ReplayManager.java | 2 +- .../core/server/routing/KeyResolver.java | 4 +- .../server/routing/targets/TargetMonitor.java | 2 +- .../spi/core/protocol/MessagePersister.java | 2 +- .../security/jaas/ReloadableProperties.java | 2 +- .../core/security/jaas/oidc/OIDCSupport.java | 2 +- .../impl/AbstractConfigurationTestBase.java | 4 +- .../config/impl/ConfigurationImplTest.java | 4 +- .../impl/FileXIncludeConfigurationTest.java | 2 +- ...ropertiesLoginModuleRaceConditionTest.java | 2 +- .../core/security/jaas/StatusTest.java | 8 +- .../core/server/ServerLogBundlesTest.java | 2 +- .../ArtemisMBeanServerGuardTest.java | 10 +-- .../ArtemisRbacMBeanServerBuilderTest.java | 10 +-- .../server/routing/ConnectionRouterTest.java | 6 +- .../security/jaas/OIDCLoginModuleTest.java | 4 +- .../tests/util/RemoveDirectoryExtension.java | 2 +- .../artemis/tests/util/ServerTestBase.java | 2 +- .../utils/SecurityManagerUtilTest.java | 2 +- .../ServiceExtensionLogBundlesTest.java | 4 +- .../extensions/OpenFilesCheckExtension.java | 2 +- .../activemq/artemis/ActiveMQWebLogger.java | 2 +- .../cli/test/WebServerComponentTest.java | 2 +- etc/checkstyle-suppressions.xml | 6 +- etc/checkstyle.xml | 3 + .../extensions/RemoveDirectoryExtension.java | 2 +- .../journal/impl/JournalImplTestBase.java | 4 +- .../artemis/tests/util/ActiveMQTestBase.java | 2 +- .../activemq/artemis/tests/util/Jmx.java | 2 +- .../tests/compatibility/GroovyRun.java | 4 +- .../tests/compatibility/FQQNConsumerTest.java | 4 +- .../compatibility/PrefixSendAckTest.java | 4 +- .../tests/compatibility/SendAckTest.java | 4 +- .../distribution/RollingUpgradeTest.java | 2 +- .../DualMirrorWithContainerTest.java | 2 +- .../cluster/impl/BridgeTestAccessor.java | 2 +- .../integration/amqp/AMQPPrintDataTest.java | 2 +- .../amqp/AmqpFullyQualifiedNameTest.java | 4 +- .../amqp/AmqpLargeMessageTest.java | 6 +- .../amqp/AmqpReceiverWithFiltersTest.java | 2 +- .../BrokerDefinedAnycastConsumerTest.java | 2 +- .../BrokerDefinedMulticastConsumerTest.java | 2 +- .../ClientDefinedAnycastConsumerTest.java | 2 +- .../amqp/ClientDefinedMultiConsumerTest.java | 2 +- .../integration/amqp/JMSAcknowledgeTest.java | 2 +- .../integration/amqp/TopicDurableTests.java | 2 +- .../amqp/connect/AMQPBridgeFromQueueTest.java | 8 +- .../amqp/connect/AMQPBridgeToAddressTest.java | 2 +- .../amqp/connect/AMQPBridgeToQueueTest.java | 2 +- ...AMQPFederationConfigurationReloadTest.java | 8 +- .../AMQPFederationQueuePolicyTest.java | 4 +- .../amqp/connect/ValidateAMQPErrorsTest.java | 2 +- .../integration/client/ForceDeleteQueue.java | 2 +- .../client/InfiniteRedeliveryTest.java | 6 +- .../integration/client/JMSOrderTest.java | 2 +- .../integration/client/SlowConsumerTest.java | 4 +- .../ProtocolsMessageLoadBalancingTest.java | 4 +- .../cluster/distribution/ClusterTestBase.java | 2 +- .../PagedSNFTopicDistributionTest.java | 2 +- .../ClusterWithBackupFailoverTest.java | 2 +- .../failover/FailoverWithDivertTest.java | 2 +- .../failover/NettyReplicatedFailoverTest.java | 2 +- .../PageCleanupWhileReplicaCatchupTest.java | 2 +- .../PrimaryCrashOnBackupSyncTest.java | 2 +- .../failover/ReplicatedPagedFailoverTest.java | 2 +- .../RequestReplyMultiProtocolTest.java | 2 +- .../tests/integration/divert/DivertTest.java | 2 +- .../federation/FederatedAddressTest.java | 2 +- .../federation/FederatedQueueTest.java | 12 +-- .../integration/jms/JmsProducerTest.java | 4 +- .../ManualReconnectionToSingleServerTest.java | 2 +- .../integration/jms/client/WildcardTest.java | 44 +++++------ .../jms/consumer/JmsConsumerTest.java | 2 +- .../jms/multiprotocol/JMSSelectorTest.java | 2 +- .../multiprotocol/JMSTopicSubscriberTest.java | 6 +- .../journal/JournalHashMapTest.java | 2 +- .../journal/NIOJournalCompactTest.java | 2 +- .../management/ActiveMQServerControlTest.java | 4 +- .../AddressControlUsingCoreTest.java | 2 +- ...ClusterConnectionControlUsingCoreTest.java | 4 +- .../management/ManagementServiceImplTest.java | 2 +- .../management/QueueControlTest.java | 8 +- .../management/QueueControlUsingCoreTest.java | 2 +- .../mqtt5/spec/controlpackets/AuthTests.java | 2 +- .../spec/controlpackets/ConnAckTests.java | 2 +- .../spec/controlpackets/DisconnectTests.java | 2 +- .../spec/controlpackets/PingReqTests.java | 2 +- .../spec/controlpackets/PingRespTests.java | 2 +- .../openwire/OpenWireLargeMessageTest.java | 2 +- .../PrefetchRedeliveryCountOpenwireTest.java | 8 +- .../openwire/SimpleOpenWireTest.java | 4 +- .../cluster/MessageRedistributionTest.java | 4 +- .../integration/paging/PagingCounterTest.java | 2 +- .../paging/PagingSizeWildcardTest.java | 8 +- .../paging/WildcardAddressFullTest.java | 2 +- .../integration/plugin/CorePluginTest.java | 4 +- .../integration/plugin/MetricsPluginTest.java | 2 +- .../ra/ActiveMQMessageHandlerXATest.java | 2 +- .../integration/routing/ElasticQueueTest.java | 6 +- .../integration/routing/KeyTypeTest.java | 2 +- .../integration/routing/RoutingTestBase.java | 2 +- .../security/RejectValidatedUserTest.java | 2 +- .../tests/integration/server/LVQTest.java | 2 +- .../integration/server/RingQueueTest.java | 2 +- .../server/ScaleDownCommitIntervalTest.java | 4 +- .../artemis/tests/util/JavaVersionUtil.java | 2 +- .../jms/tests/selector/SelectorTest.java | 2 +- .../client/ArtemisCoreClientFeatureIT.java | 2 +- .../performance/jmh/AddressMapPerfTest.java | 2 +- .../journal/JournalImplTestUnit.java | 6 +- .../DualMirrorNoContainerTest.java | 2 +- .../PagedMirrorSmokeTest.java | 2 +- .../tests/smoke/console/ArtemisTest.java | 2 +- .../tests/smoke/console/PageConstants.java | 8 +- .../ReplicatedMultipleFailbackTest.java | 2 +- .../tests/smoke/transfer/TransferTest.java | 2 +- .../smoke/upgradeTest/CompareUpgradeTest.java | 2 +- .../mirror/ReplicatedMirrorTargetTest.java | 6 +- .../mirror/SingleMirrorSoakTest.java | 6 +- .../soak/journal/TimedBufferMovementTest.java | 2 +- .../soak/paging/FlowControlPagingTest.java | 4 +- .../soak/paging/MegaCleanerPagingTest.java | 2 +- .../soak/paging/SubscriptionPagingTest.java | 4 +- .../replicaTxCheck/ReplicaTXCheckTest.java | 2 +- .../core/paging/impl/PagingStoreImplTest.java | 8 +- .../postoffice/impl/BindingsImplTest.java | 2 +- .../impl/WildcardAddressManagerPerfTest.java | 4 +- .../impl/netty/NettyConnectorTest.java | 8 +- .../remoting/impl/netty/SocksProxyTest.java | 6 +- 236 files changed, 466 insertions(+), 463 deletions(-) diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Upgrade.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Upgrade.java index a4f1d04b588..072ac20740f 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Upgrade.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Upgrade.java @@ -315,7 +315,7 @@ private void upgradeJDK(ActionContext context, String jdkPrefix, String endOfLin }, newLine -> { if (newLine.trim().startsWith(jdkPrefix)) { - String result = JVMArgumentParser.parseNewLine(jdkPrefix, endOfLine, newLine, keepArguments, currentArguments); + String result = JVMArgumentParser.parseNewLine(jdkPrefix, endOfLine, newLine, keepArguments, currentArguments); return result; } else { for (String prefix : keepingPrefixes) { diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/check/NodeCheck.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/check/NodeCheck.java index e281856d06c..a8a2538a2ea 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/check/NodeCheck.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/check/NodeCheck.java @@ -203,7 +203,7 @@ private void checkNodeDiskUsage(final CheckContext context) throws Exception { Double diskStoreUsage = context.getManagementProxy(). getAttribute("broker", "DiskStoreUsage", Double.class, 0); - checkNodeResourceUsage("DiskStoreUsage", (int)(diskStoreUsage * 100), maxDiskUsage); + checkNodeResourceUsage("DiskStoreUsage", (int)(diskStoreUsage * 100), maxDiskUsage); } private void checkNodeMemoryUsage(final CheckContext context) throws Exception { diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/ConnectionConfigurationAbtract.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/ConnectionConfigurationAbtract.java index 5adbc925d9a..bac1caa1f58 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/ConnectionConfigurationAbtract.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/ConnectionConfigurationAbtract.java @@ -119,13 +119,13 @@ protected void recoverConnectionInformation() { if (CONNECTION_INFORMATION.get() != null) { ConnectionInformation connectionInfo = CONNECTION_INFORMATION.get(); if (this.user == null) { - this.user = connectionInfo.user; + this.user = connectionInfo.user; } if (this.password == null) { - this.password = connectionInfo.password; + this.password = connectionInfo.password; } if (this.brokerURL == null || this.brokerURL == DEFAULT_BROKER_URL) { - this.brokerURL = connectionInfo.uri; + this.brokerURL = connectionInfo.uri; } } } diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java index 10bd19865ce..ce1e89cc48e 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java @@ -62,7 +62,7 @@ public static Process startServer(String artemisInstance, String serverName, int } public static Process startServer(String artemisInstance, String serverName, String uri, int timeout) throws Exception { - return startServer(artemisInstance, serverName, uri, timeout, null); + return startServer(artemisInstance, serverName, uri, timeout, null); } public static Process startServer(String artemisInstance, String serverName, String uri, int timeout, File propertiesFile) throws Exception { diff --git a/artemis-cli/src/test/java/org/apache/activemq/artemis/cli/factory/BrokerFactoryTest.java b/artemis-cli/src/test/java/org/apache/activemq/artemis/cli/factory/BrokerFactoryTest.java index 70de3643a1f..e5e5e62cda9 100644 --- a/artemis-cli/src/test/java/org/apache/activemq/artemis/cli/factory/BrokerFactoryTest.java +++ b/artemis-cli/src/test/java/org/apache/activemq/artemis/cli/factory/BrokerFactoryTest.java @@ -124,7 +124,7 @@ public void testCreateBrokerConfigurationWithJaasDomainAndCertificateDomainFromS public void testCreateBrokerConfigurationWithNewJaasDomainFromExistingJaasSecurityAndSystemProperties() throws Exception { setSystemProperty(securityJaasPropertyPrefix + "domain", "newTestDomain"); - JaasSecurityDTO security = new JaasSecurityDTO(); + JaasSecurityDTO security = new JaasSecurityDTO(); security.domain = "testDomain"; security.certificateDomain = "testCertificateDomain"; BrokerDTO broker = new BrokerDTO(); @@ -141,7 +141,7 @@ public void testCreateBrokerConfigurationWithNewJaasDomainFromExistingJaasSecuri public void testCreateBrokerConfigurationWithNewJaasCertificateDomainFromExistingJaasSecurityAndSystemProperties() throws Exception { setSystemProperty(securityJaasPropertyPrefix + "certificateDomain", "newTestCertificateDomain"); - JaasSecurityDTO security = new JaasSecurityDTO(); + JaasSecurityDTO security = new JaasSecurityDTO(); security.domain = "testDomain"; security.certificateDomain = "testCertificateDomain"; BrokerDTO broker = new BrokerDTO(); @@ -158,7 +158,7 @@ public void testCreateBrokerConfigurationWithNewJaasCertificateDomainFromExistin public void testCreateBrokerConfigurationWithNewJaasDomainFromExistingSecurityManagerAndSystemProperties() throws Exception { setSystemProperty(securityJaasPropertyPrefix + "domain", "newTestDomain"); - SecurityManagerDTO security = new SecurityManagerDTO(); + SecurityManagerDTO security = new SecurityManagerDTO(); security.className = "testClass"; BrokerDTO broker = new BrokerDTO(); broker.security = security; @@ -174,7 +174,7 @@ public void testCreateBrokerConfigurationWithNewJaasDomainFromExistingSecurityMa public void testCreateBrokerConfigurationWithNewJaasCertificateDomainFromExistingSecurityManagerAndSystemProperties() throws Exception { setSystemProperty(securityJaasPropertyPrefix + "certificateDomain", "newTestCertificateDomain"); - SecurityManagerDTO security = new SecurityManagerDTO(); + SecurityManagerDTO security = new SecurityManagerDTO(); security.className = "testClass"; BrokerDTO broker = new BrokerDTO(); broker.security = security; @@ -191,7 +191,7 @@ public void testCreateBrokerConfigurationWithNewJaasDomainAndCertificateDomainFr setSystemProperty(securityJaasPropertyPrefix + "domain", "newTestDomain"); setSystemProperty(securityJaasPropertyPrefix + "certificateDomain", "newTestCertificateDomain"); - JaasSecurityDTO security = new JaasSecurityDTO(); + JaasSecurityDTO security = new JaasSecurityDTO(); security.domain = "testDomain"; security.certificateDomain = "testCertificateDomain"; BrokerDTO broker = new BrokerDTO(); @@ -209,7 +209,7 @@ public void testCreateBrokerConfigurationWithNewJaasDomainAndCertificateDomainFr setSystemProperty(securityJaasPropertyPrefix + "domain", "newTestDomain"); setSystemProperty(securityJaasPropertyPrefix + "certificateDomain", "newTestCertificateDomain"); - SecurityManagerDTO security = new SecurityManagerDTO(); + SecurityManagerDTO security = new SecurityManagerDTO(); security.className = "testClassName"; BrokerDTO broker = new BrokerDTO(); broker.security = security; @@ -273,7 +273,7 @@ public void testCreateBrokerConfigurationWithSecurityManagerClassNameAndProperti public void testCreateBrokerConfigurationWithNewSecurityManagerClassNameFromExistingSecurityManagerAndSystemProperties() throws Exception { setSystemProperty(securityManagerPropertyPrefix + "className", "newTestClassName"); - SecurityManagerDTO security = new SecurityManagerDTO(); + SecurityManagerDTO security = new SecurityManagerDTO(); security.className = "testClassName"; security.properties = new ArrayList<>(List.of( new PropertyDTO("testKey1", "testValue1"), @@ -294,7 +294,7 @@ public void testCreateBrokerConfigurationWithNewSecurityManagerPropertiesFromExi setSystemProperty(securityManagerPropertyPrefix + "properties.testKey1", "newTestValue1"); setSystemProperty(securityManagerPropertyPrefix + "properties.newTestKey2", "newTestValue2"); - SecurityManagerDTO security = new SecurityManagerDTO(); + SecurityManagerDTO security = new SecurityManagerDTO(); security.className = "testClassName"; security.properties = new ArrayList<>(List.of( new PropertyDTO("testKey1", "testValue1"), @@ -317,7 +317,7 @@ public void testCreateBrokerConfigurationWithNewSecurityManagerClassNameAndPrope setSystemProperty(securityManagerPropertyPrefix + "properties.testKey1", "newTestValue1"); setSystemProperty(securityManagerPropertyPrefix + "properties.newTestKey2", "newTestValue2"); - SecurityManagerDTO security = new SecurityManagerDTO(); + SecurityManagerDTO security = new SecurityManagerDTO(); security.className = "testClassName"; security.properties = new ArrayList<>(List.of( new PropertyDTO("testKey1", "testValue1"), @@ -338,7 +338,7 @@ public void testCreateBrokerConfigurationWithNewSecurityManagerClassNameAndPrope public void testCreateBrokerConfigurationWithNewSecurityManagerClassNameFromExistingJaasSecurityAndSystemProperties() throws Exception { setSystemProperty(securityManagerPropertyPrefix + "className", "newTestClassName"); - JaasSecurityDTO security = new JaasSecurityDTO(); + JaasSecurityDTO security = new JaasSecurityDTO(); security.domain = "testDomain"; security.certificateDomain = "testCertificateDomain"; BrokerDTO broker = new BrokerDTO(); @@ -356,7 +356,7 @@ public void testCreateBrokerConfigurationWithNewSecurityManagerPropertiesFromExi setSystemProperty(securityManagerPropertyPrefix + "properties.testKey1", "newTestValue1"); setSystemProperty(securityManagerPropertyPrefix + "properties.newTestKey2", "newTestValue2"); - JaasSecurityDTO security = new JaasSecurityDTO(); + JaasSecurityDTO security = new JaasSecurityDTO(); security.domain = "testDomain"; security.certificateDomain = "testCertificateDomain"; BrokerDTO broker = new BrokerDTO(); @@ -375,7 +375,7 @@ public void testCreateBrokerConfigurationWithNewSecurityManagerClassNameAndPrope setSystemProperty(securityManagerPropertyPrefix + "properties.testKey1", "newTestValue1"); setSystemProperty(securityManagerPropertyPrefix + "properties.newTestKey2", "newTestValue2"); - JaasSecurityDTO security = new JaasSecurityDTO(); + JaasSecurityDTO security = new JaasSecurityDTO(); security.domain = "testDomain"; security.certificateDomain = "testCertificateDomain"; BrokerDTO broker = new BrokerDTO(); diff --git a/artemis-cli/src/test/java/org/apache/activemq/artemis/util/JVMArgumentTest.java b/artemis-cli/src/test/java/org/apache/activemq/artemis/util/JVMArgumentTest.java index ff276cbb1fe..3505e122888 100644 --- a/artemis-cli/src/test/java/org/apache/activemq/artemis/util/JVMArgumentTest.java +++ b/artemis-cli/src/test/java/org/apache/activemq/artemis/util/JVMArgumentTest.java @@ -92,7 +92,7 @@ public void testArgumentsLinux() { String[] fixedArguments = new String[]{"-Xmx", "-Xms"}; Map usedArgs = new HashMap<>(); - JVMArgumentParser.parseOriginalArgs(prefix, "\"", arguments, Collections.emptyMap(), fixedArguments, usedArgs); + JVMArgumentParser.parseOriginalArgs(prefix, "\"", arguments, Collections.emptyMap(), fixedArguments, usedArgs); assertEquals(2, usedArgs.size()); assertEquals("-Xmx77G", usedArgs.get("-Xmx")); assertEquals("-Xms333M", usedArgs.get("-Xms")); diff --git a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java index 82ff7bd58d2..fe755e5249b 100644 --- a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java +++ b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java @@ -142,7 +142,7 @@ public void setup() throws Exception { super.setup(); } - private void setupScanTimeout() throws Exception { + private void setupScanTimeout() throws Exception { timeBefore = ActiveMQDefaultConfiguration.getDefaultAddressQueueScanPeriod(); org.apache.activemq.artemis.api.config.ActiveMQDefaultConfigurationTestAccessor.setDefaultAddressQueueScanPeriod(100); } @@ -1531,9 +1531,9 @@ private void testAutoDelete(boolean autoDelete) throws Exception { // This is usually set when run from the command line via artemis.profile Run.setEmbedded(true); if (autoDelete) { - Artemis.main("create", instanceFolder.getAbsolutePath(), "--force", "--silent", "--no-web", "--no-autotune", "--require-login", "--autodelete"); + Artemis.main("create", instanceFolder.getAbsolutePath(), "--force", "--silent", "--no-web", "--no-autotune", "--require-login", "--autodelete"); } else { - Artemis.main("create", instanceFolder.getAbsolutePath(), "--force", "--silent", "--no-web", "--require-login", "--no-autotune"); + Artemis.main("create", instanceFolder.getAbsolutePath(), "--force", "--silent", "--no-web", "--require-login", "--no-autotune"); } System.setProperty("artemis.instance", instanceFolder.getAbsolutePath()); diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDeleteAddressException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDeleteAddressException.java index c3dfcfccbb8..64f69af1b45 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDeleteAddressException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDeleteAddressException.java @@ -19,7 +19,7 @@ /** * An operation failed because an address exists on the server. */ -public class ActiveMQDeleteAddressException extends ActiveMQException { +public class ActiveMQDeleteAddressException extends ActiveMQException { public ActiveMQDeleteAddressException() { super(ActiveMQExceptionType.DELETE_ADDRESS_ERROR); diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java index 40c0511e76f..64e09abd897 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java @@ -231,7 +231,7 @@ public static void longToBytes(long x, byte[] output, int offset) { output[offset + 3] = (byte)(x >>> 32); output[offset + 4] = (byte)(x >>> 24); output[offset + 5] = (byte)(x >>> 16); - output[offset + 6] = (byte)(x >>> 8); + output[offset + 6] = (byte)(x >>> 8); output[offset + 7] = (byte)(x); } diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java index 5a3158c34ec..217f808bd77 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java @@ -75,7 +75,7 @@ public static Object getInstanceWithTypeCheck(String className, public static Object getInstanceForParamsWithTypeCheck(String className, Class expectedType, - ClassLoader loader, Class[] parameterTypes, Object... params) throws ClassNotFoundException, InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException { + ClassLoader loader, Class[] parameterTypes, Object... params) throws ClassNotFoundException, InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException { final Class clazz = loadWithCheck(className, expectedType, loader); return clazz.getDeclaredConstructor(parameterTypes).newInstance(params); } diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java index 890309464d1..fde215374e2 100644 --- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java +++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java @@ -120,7 +120,7 @@ public String getFromEnv(String v) { codecFromEnvVarConfig.init(params); String blaVersion = codecFromEnvVarConfig.encode(someString); Map twoWayParams = Map.of(DefaultSensitiveStringCodec.ALGORITHM, DefaultSensitiveStringCodec.TWO_WAY); - assertNotEquals(blaVersion, PasswordMaskingUtil.getDefaultCodec(twoWayParams).encode(someString)); + assertNotEquals(blaVersion, PasswordMaskingUtil.getDefaultCodec(twoWayParams).encode(someString)); } @Test diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SizeAwareMetricTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SizeAwareMetricTest.java index 16969c2173a..cfda154de6b 100644 --- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SizeAwareMetricTest.java +++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SizeAwareMetricTest.java @@ -502,7 +502,7 @@ public void testMultipleNonSized() { metric.setOverCallback(() -> over.set(true)); metric.setOnSizeCallback(metricMain::addSize); - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 10; i++) { metric.addSize(10, true); } @@ -511,7 +511,7 @@ public void testMultipleNonSized() { assertEquals(0, metricMain.getElements()); assertEquals(0, metric.getElements()); - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 10; i++) { metric.addSize(10, false); } diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java index e71fb2b9ed0..1eccd294b04 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java @@ -432,7 +432,7 @@ public static String getDefaultHapolicyBackupStrategy() { private static boolean DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN = false; // Will a shared-store primary startup wait for activation - private static boolean DEFAULT_WAIT_FOR_ACTIVATION = true; + private static boolean DEFAULT_WAIT_FOR_ACTIVATION = true; // Will the broker populate the message with the name of the validated user private static boolean DEFAULT_POPULATE_VALIDATED_USER = false; diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java index 0115ba9968b..fe647e48387 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java @@ -403,7 +403,7 @@ default boolean isExpired() { Message setUserID(Object userID); - default String getValidatedUserID() { + default String getValidatedUserID() { return null; } diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java index bb08feeeb62..93abe592718 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java @@ -51,7 +51,7 @@ public final class ActiveMQClient { private static int globalScheduledThreadPoolSize; - private static int globalFlowControlThreadPoolSize; + private static int globalFlowControlThreadPoolSize; public static final String DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME = RoundRobinConnectionLoadBalancingPolicy.class.getCanonicalName(); diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java index 1d19b8ece67..eba2bdd15b6 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java @@ -1630,7 +1630,7 @@ void addSecuritySettings(@Parameter(desc = "an address match", name = "addressMa */ @Operation(desc = "Add security-settings for matching addresses", impact = MBeanOperationInfo.ACTION) void addSecuritySettings(@Parameter(desc = "an address match", name = "addressMatch") String addressMatch, - @Parameter(desc = "The configuration of the security-settings as JSON", name = "securitySettingsAsJson") String securitySettingsAsJson) throws Exception; + @Parameter(desc = "The configuration of the security-settings as JSON", name = "securitySettingsAsJson") String securitySettingsAsJson) throws Exception; @Operation(desc = "Remove security settings for an address", impact = MBeanOperationInfo.ACTION) void removeSecuritySettings(@Parameter(desc = "an address match", name = "addressMatch") String addressMatch) throws Exception; @@ -1957,7 +1957,7 @@ void addAddressSettings(@Parameter(desc = "an address match", name = "addressMat */ @Operation(desc = "Add address settings for addresses matching the addressMatch", impact = MBeanOperationInfo.ACTION) String addAddressSettings(@Parameter(desc = "an address match", name = "addressMatch") String address, - @Parameter(desc = "The configuration of the address settings as JSON", name = "addressSettingsAsJson") String addressSettingsAsJson) throws Exception; + @Parameter(desc = "The configuration of the address settings as JSON", name = "addressSettingsAsJson") String addressSettingsAsJson) throws Exception; @Operation(desc = "Remove address settings", impact = MBeanOperationInfo.ACTION) void removeAddressSettings(@Parameter(desc = "an address match", name = "addressMatch") String addressMatch) throws Exception; 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 97d08fc003e..dd955eb0106 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 @@ -523,7 +523,7 @@ int moveMessages(@Parameter(name = "flushLimit", desc = "Limit to flush transact @Operation(desc = "Send a copy of the message with given messageID to another queue)", impact = MBeanOperationInfo.ACTION) boolean copyMessage(@Parameter(name = "messageID", desc = "A message ID") long messageID, - @Parameter(name = "targetQueue", desc = "The name of the queue to copy the messages to") String targetQueue) throws Exception; + @Parameter(name = "targetQueue", desc = "The name of the queue to copy the messages to") String targetQueue) throws Exception; /** * Sends the message corresponding to the specified message ID to this queue's dead letter address. diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/SimpleManagement.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/SimpleManagement.java index d8e72d3ec7a..15294bddd4b 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/SimpleManagement.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/SimpleManagement.java @@ -44,7 +44,7 @@ public class SimpleManagement implements AutoCloseable { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - private static final String SIMPLE_OPTIONS = "{\"field\":\"\",\"value\":\"\",\"operation\":\"\"}"; + private static final String SIMPLE_OPTIONS = "{\"field\":\"\",\"value\":\"\",\"operation\":\"\"}"; String uri, user, password; 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 031c58a07dc..428456a7124 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 @@ -136,7 +136,7 @@ public void send(SimpleString address1, checkClosed(); if (handler != null) { - handler = session.wrap(handler); + handler = session.wrap(handler); } doSend(address1, message, handler); diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CoreRemotingConnection.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CoreRemotingConnection.java index 8ee9e3d8221..1c12e3491ef 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CoreRemotingConnection.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CoreRemotingConnection.java @@ -33,47 +33,47 @@ public interface CoreRemotingConnection extends RemotingConnection { default boolean isVersionBeforeAddressChange() { int version = getChannelVersion(); - return (version > 0 && version < PacketImpl.ADDRESSING_CHANGE_VERSION); + return (version > 0 && version < PacketImpl.ADDRESSING_CHANGE_VERSION); } default boolean isVersionBeforeAsyncResponseChange() { int version = getChannelVersion(); - return (version > 0 && version < PacketImpl.ASYNC_RESPONSE_CHANGE_VERSION); + return (version > 0 && version < PacketImpl.ASYNC_RESPONSE_CHANGE_VERSION); } default boolean isVersionSupportConsumerPriority() { int version = getChannelVersion(); - return version >= PacketImpl.CONSUMER_PRIORITY_CHANGE_VERSION; + return version >= PacketImpl.CONSUMER_PRIORITY_CHANGE_VERSION; } default boolean isVersionNewFQQN() { int version = getChannelVersion(); - return version >= PacketImpl.ARTEMIS_2_7_0_VERSION; + return version >= PacketImpl.ARTEMIS_2_7_0_VERSION; } default boolean isVersionSupportClientID() { int version = getChannelVersion(); - return version >= PacketImpl.ARTEMIS_2_18_0_VERSION; + return version >= PacketImpl.ARTEMIS_2_18_0_VERSION; } default boolean isVersionSupportRouting() { int version = getChannelVersion(); - return version >= PacketImpl.ARTEMIS_2_18_0_VERSION; + return version >= PacketImpl.ARTEMIS_2_18_0_VERSION; } default boolean isVersionSupportCommitV2() { int version = getChannelVersion(); - return version >= PacketImpl.ARTEMIS_2_21_0_VERSION; + return version >= PacketImpl.ARTEMIS_2_21_0_VERSION; } default boolean isVersionUsingLongOnPageReplication() { int version = getChannelVersion(); - return version >= PacketImpl.ARTEMIS_2_24_0_VERSION; + return version >= PacketImpl.ARTEMIS_2_24_0_VERSION; } default boolean isBeforeTwoEighteen() { int version = getChannelVersion(); - return version < PacketImpl.ARTEMIS_2_18_0_VERSION; + return version < PacketImpl.ARTEMIS_2_18_0_VERSION; } default boolean isBeforeProducerMetricsChanged() { 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 6d7d458a864..8c966ce76ab 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 @@ -607,7 +607,7 @@ public int sendLargeMessageChunk(Message msgI, int reconnectID, int senderID, SendAcknowledgementHandler messageHandler) throws ActiveMQException { - return sendSessionSendContinuationMessage(this.sessionChannel, msgI, messageBodySize, sendBlocking, lastChunk, chunk, senderID, messageHandler); + return sendSessionSendContinuationMessage(this.sessionChannel, msgI, messageBodySize, sendBlocking, lastChunk, chunk, senderID, messageHandler); } @Override diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java index 313aba4bda5..e6406ef7276 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java @@ -345,7 +345,7 @@ public void setChannelID(final long channelID) { @Override public ActiveMQBuffer encode(final CoreRemotingConnection connection) { - ActiveMQBuffer buffer = createPacket(connection); + ActiveMQBuffer buffer = createPacket(connection); encodeHeader(buffer); diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java index a24a39910e9..c9207c68da2 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java @@ -375,7 +375,7 @@ public void bufferReceived(final Object connectionID, final ActiveMQBuffer buffe final Packet packet = packetDecoder.decode(buffer, this); if (logger.isTraceEnabled()) { - logger.trace("RemotingConnectionID={} handling packet {}", getID(), packet); + logger.trace("RemotingConnectionID={} handling packet {}", getID(), packet); } doBufferReceived(packet); diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateProducerMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateProducerMessage.java index 9a30bf8fee2..51be643dec3 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateProducerMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateProducerMessage.java @@ -22,7 +22,7 @@ import java.util.Objects; -public class CreateProducerMessage extends PacketImpl { +public class CreateProducerMessage extends PacketImpl { protected int id; protected SimpleString address; diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/CheckDependencies.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/CheckDependencies.java index 4a90401dcca..f31922eecac 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/CheckDependencies.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/CheckDependencies.java @@ -34,7 +34,7 @@ public static final boolean isEpollAvailable() { } catch (NoClassDefFoundError noClassDefFoundError) { ActiveMQClientLogger.LOGGER.unableToCheckEpollAvailabilitynoClass(); return false; - } catch (Throwable e) { + } catch (Throwable e) { ActiveMQClientLogger.LOGGER.unableToCheckEpollAvailability(e); return false; } diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java index deb9c955ead..bc43d302786 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java @@ -395,7 +395,7 @@ protected void addCertPathCheckers(PKIXBuilderParameters pkixParams) throws Exce // Add a certPathChecker to log soft fail exceptions caught by the revocation checker. - pkixParams.addCertPathChecker(new PKIXCertPathChecker() { + pkixParams.addCertPathChecker(new PKIXCertPathChecker() { @Override public void init(boolean forward) throws CertPathValidatorException { } @@ -436,7 +436,7 @@ public void check(Certificate cert, Collection unresolvedCritExts) throw protected Set loadRevocationOptions() { String[] revocationOptionNames = crcOptions.split(","); - Set revocationOptions = new HashSet<>(); + Set revocationOptions = new HashSet<>(); for (String revocationOptionName : revocationOptionNames) { revocationOptions.add(PKIXRevocationChecker.Option.valueOf(revocationOptionName)); } diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MessageUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MessageUtil.java index 36adf4df29b..3b430313a9a 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MessageUtil.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MessageUtil.java @@ -258,7 +258,7 @@ public static void setStringProperty(final Message message, final String name, f } } - public static void setObjectProperty(final Message message, final String name, final Object value) { + public static void setObjectProperty(final Message message, final String name, final Object value) { if (MessageUtil.JMSXGROUPID.equals(name)) { message.setGroupID(Objects.toString(value, null)); } else if (MessageUtil.JMSXGROUPSEQ.equals(name)) { diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/SSLContextConfig.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/SSLContextConfig.java index ca56b4eba16..5839b64ed13 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/SSLContextConfig.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/SSLContextConfig.java @@ -154,7 +154,7 @@ public Builder ocspResponderURL(final String ocspResponderURL) { } } - public static Builder builder() { + public static Builder builder() { return new Builder(); } diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/AutoCreateUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/AutoCreateUtil.java index ac7851aeebf..db0588547b4 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/AutoCreateUtil.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/AutoCreateUtil.java @@ -39,7 +39,7 @@ public class AutoCreateUtil { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - public static void autoCreateQueue(ClientSession session, SimpleString destAddress, SimpleString selectorString) throws ActiveMQException { + public static void autoCreateQueue(ClientSession session, SimpleString destAddress, SimpleString selectorString) throws ActiveMQException { AddressQuery response = session.addressQuery(destAddress); /* * The address query will send back exists=true even if the node only has a REMOTE binding for the destination. diff --git a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/JMXConnectorDTO.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/JMXConnectorDTO.java index 5f7bb6f247c..d41c742c533 100644 --- a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/JMXConnectorDTO.java +++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/JMXConnectorDTO.java @@ -28,19 +28,19 @@ @XmlAccessorType(XmlAccessType.FIELD) public class JMXConnectorDTO { - @XmlAttribute (name = "connector-host") + @XmlAttribute (name = "connector-host") String connectorHost; - @XmlAttribute (name = "connector-port", required = true) + @XmlAttribute (name = "connector-port", required = true) Integer connectorPort; - @XmlAttribute (name = "rmi-registry-port") + @XmlAttribute (name = "rmi-registry-port") Integer rmiRegistryPort; - @XmlAttribute (name = "jmx-realm") + @XmlAttribute (name = "jmx-realm") String jmxRealm; - @XmlAttribute (name = "object-name") + @XmlAttribute (name = "object-name") String objectName; @XmlAttribute (name = "authenticator-type") diff --git a/artemis-image/src/test/java/org/apache/activemq/artemis/ActiveMQImageExamplesTest.java b/artemis-image/src/test/java/org/apache/activemq/artemis/ActiveMQImageExamplesTest.java index 955238a9141..10d9304415c 100644 --- a/artemis-image/src/test/java/org/apache/activemq/artemis/ActiveMQImageExamplesTest.java +++ b/artemis-image/src/test/java/org/apache/activemq/artemis/ActiveMQImageExamplesTest.java @@ -72,7 +72,7 @@ public void testBYOC_etc() throws Exception { thread.start(); // shut it down after it starts! - do { + do { if (Main.getEmbeddedServer() != null) { if (Main.getEmbeddedServer().getActiveMQServer() != null) { if (Main.getEmbeddedServer().getActiveMQServer().getState() == ActiveMQServer.SERVER_STATE.STARTED) { diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java index 2a5f8cffee2..74970acf442 100644 --- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java @@ -274,7 +274,7 @@ public static ActiveMQTemporaryTopic createTemporaryTopic(final ActiveMQSession String name = UUID.randomUUID().toString(); String address = prefix + name; - ActiveMQTemporaryTopic topic = createTemporaryTopic(address, session); + ActiveMQTemporaryTopic topic = createTemporaryTopic(address, session); topic.setName(name); return topic; } diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java index 37c23f77886..56935322dc0 100644 --- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java @@ -1137,9 +1137,9 @@ public TemporaryQueue createTemporaryQueue() throws JMSException { try { final ActiveMQTemporaryQueue queue; if (enable1xPrefixes) { - queue = ActiveMQDestination.createTemporaryQueue(this, PacketImpl.OLD_TEMP_QUEUE_PREFIX.toString()); + queue = ActiveMQDestination.createTemporaryQueue(this, PacketImpl.OLD_TEMP_QUEUE_PREFIX.toString()); } else { - queue = ActiveMQDestination.createTemporaryQueue(this); + queue = ActiveMQDestination.createTemporaryQueue(this); } SimpleString simpleAddress = queue.getSimpleAddress(); @@ -1169,9 +1169,9 @@ public TemporaryTopic createTemporaryTopic() throws JMSException { try { final ActiveMQTemporaryTopic topic; if (enable1xPrefixes) { - topic = ActiveMQDestination.createTemporaryTopic(this, PacketImpl.OLD_TEMP_TOPIC_PREFIX.toString()); + topic = ActiveMQDestination.createTemporaryTopic(this, PacketImpl.OLD_TEMP_TOPIC_PREFIX.toString()); } else { - topic = ActiveMQDestination.createTemporaryTopic(this); + topic = ActiveMQDestination.createTemporaryTopic(this); } SimpleString simpleAddress = topic.getSimpleAddress(); diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFileFactory.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFileFactory.java index cb4397bda0e..a9eaaf15e2c 100644 --- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFileFactory.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFileFactory.java @@ -155,7 +155,7 @@ public int getMaxIO() { } @Override - public void onIOError(Throwable exception, String message, String file) { + public void onIOError(Throwable exception, String message, String file) { if (file != null) { ActiveMQJournalLogger.LOGGER.criticalIOFile(message, file, exception); } else { diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFile.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFile.java index 97065efe475..5fcca40cce7 100644 --- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFile.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFile.java @@ -37,7 +37,7 @@ /** * This class is implementing Runnable to reuse a callback to close it. */ -public class AIOSequentialFile extends AbstractSequentialFile { +public class AIOSequentialFile extends AbstractSequentialFile { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java index 20e779f8afc..62f1f397d99 100644 --- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java @@ -63,7 +63,7 @@ public class NIOSequentialFile extends AbstractSequentialFile { */ private static final int CHUNK_SIZE = 2 * 1024 * 1024; - protected volatile FileChannel channel; + protected volatile FileChannel channel; protected volatile RandomAccessFile rfile; diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java index d81e6f21758..737638c7f05 100644 --- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java @@ -805,7 +805,7 @@ record = new byte[variableSize]; logger.trace("reading {}, userRecordType={}, compactCount={}", recordID, userRecordType, compactCount); } - boolean replaceableUpdate = replaceableRecords != null ? replaceableRecords.containsKey(userRecordType) : false; + boolean replaceableUpdate = replaceableRecords != null ? replaceableRecords.containsKey(userRecordType) : false; switch (recordType) { case EVENT_RECORD: { @@ -1184,7 +1184,7 @@ public void tryAppendDeleteRecord(final long id, final boolean sync, final Journ private void internalAppendDeleteRecord(long id, boolean sync, JournalUpdateCallback updateCallback, - IOCompletion callback) { + IOCompletion callback) { appendExecutor.execute(() -> { journalLock.readLock().lock(); @@ -1559,7 +1559,7 @@ public void appendRollbackRecord(final long txID, final boolean sync, final IOCo result.fail(e); logger.error("Exception during appendRollbackRecord:", e); setErrorCondition(callback, tx, e); - } finally { + } finally { journalLock.readLock().unlock(); result.set(tx); } diff --git a/artemis-journal/src/test/java/org/apache/activemq/artemis/core/io/aio/FileIOUtilTest.java b/artemis-journal/src/test/java/org/apache/activemq/artemis/core/io/aio/FileIOUtilTest.java index 1ecafa76243..9b5de54759e 100644 --- a/artemis-journal/src/test/java/org/apache/activemq/artemis/core/io/aio/FileIOUtilTest.java +++ b/artemis-journal/src/test/java/org/apache/activemq/artemis/core/io/aio/FileIOUtilTest.java @@ -48,7 +48,7 @@ public void testOpenClose() throws Exception { assumeTrue(LibaioContext.isLoaded()); AtomicInteger errors = new AtomicInteger(0); - SequentialFileFactory factory = new AIOSequentialFileFactory(temporaryFolder, (Throwable error, String message, String file) -> errors.incrementAndGet(), 4 * 1024); + SequentialFileFactory factory = new AIOSequentialFileFactory(temporaryFolder, (Throwable error, String message, String file) -> errors.incrementAndGet(), 4 * 1024); factory.start(); SequentialFile file = factory.createSequentialFile("fileAIO.bin"); diff --git a/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQDelegate.java b/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQDelegate.java index e8b5c76823b..e7d6452fc83 100644 --- a/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQDelegate.java +++ b/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQDelegate.java @@ -634,7 +634,7 @@ public ClientMessage receiveMessage(SimpleString address, long timeout, boolean try { message = consumer.receive(timeout); } catch (ActiveMQException amqEx) { - failureCause = new EmbeddedActiveMQResourceException(String.format("ClientConsumer.receive( timeout = %d ) for %s failed", + failureCause = new EmbeddedActiveMQResourceException(String.format("ClientConsumer.receive( timeout = %d ) for %s failed", timeout, address.toString()), amqEx); throw failureCause; } diff --git a/artemis-lockmanager/artemis-lockmanager-ri/src/test/java/org/apache/activemq/artemis/lockmanager/zookeeper/CuratorDistributedLockManagerTest.java b/artemis-lockmanager/artemis-lockmanager-ri/src/test/java/org/apache/activemq/artemis/lockmanager/zookeeper/CuratorDistributedLockManagerTest.java index c70b3eee78c..ce4672925b7 100644 --- a/artemis-lockmanager/artemis-lockmanager-ri/src/test/java/org/apache/activemq/artemis/lockmanager/zookeeper/CuratorDistributedLockManagerTest.java +++ b/artemis-lockmanager/artemis-lockmanager-ri/src/test/java/org/apache/activemq/artemis/lockmanager/zookeeper/CuratorDistributedLockManagerTest.java @@ -120,7 +120,7 @@ public void verifyLayoutInZK() throws Exception { assertTrue(manager.getMutableLong("journal-identity-000-111").compareAndSet(0, 1)); CuratorFramework curatorFramework = ((CuratorDistributedLockManager)manager).getCurator(); - List entries = new LinkedList<>(); + List entries = new LinkedList<>(); dumpZK(curatorFramework.getZookeeperClient().getZooKeeper(), "/", entries); assertTrue(entries.get(2).contains("activation-sequence")); diff --git a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisAbstractPlugin.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisAbstractPlugin.java index 7ecbeefc17d..b1965c12044 100644 --- a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisAbstractPlugin.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisAbstractPlugin.java @@ -127,7 +127,7 @@ protected void doExecute() throws MojoExecutionException, MojoFailureException { int repositories = 0; if (extraRepositories != null) { inUseRepositories = new ArrayList<>(); - for (String strRepo: extraRepositories) { + for (String strRepo: extraRepositories) { RemoteRepository repo = new RemoteRepository.Builder("repo" + (repositories++), "default", strRepo).build(); inUseRepositories.add(repo); remoteRepos.add(repo); diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java index e078fdb2363..a989fac6827 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java @@ -1975,7 +1975,7 @@ public Map getFields(AMQPMessage m, int valueSizeLimit, int deli rc.put(CompositeDataConstants.TYPE, type); - if (m.isLargeMessage()) { + if (m.isLargeMessage()) { rc.put(CompositeDataConstants.TEXT_BODY, "... Large message ..."); } else { Object amqpValue; diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessagePersister.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessagePersister.java index bc3d0903326..267ec290a2d 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessagePersister.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessagePersister.java @@ -65,7 +65,7 @@ public void encode(ActiveMQBuffer buffer, Message record) { } @Override - public Message decode(ActiveMQBuffer buffer, Message record, CoreMessageObjectPools pool) { + public Message decode(ActiveMQBuffer buffer, Message record, CoreMessageObjectPools pool) { long id = buffer.readLong(); long format = buffer.readLong(); final SimpleString address; diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java index 7df943e09a3..35a8eb28cc7 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java @@ -204,7 +204,7 @@ public void init(AMQPSessionContext protonSession, SASLResult saslResult) throws String name = UUIDGenerator.getInstance().generateStringUUID(); - if (connection.isBrokerConnection()) { + if (connection.isBrokerConnection()) { serverSession = manager.getServer().createInternalSession(name, ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, protonSPI.getProtonConnectionDelegate(), // RemotingConnection remotingConnection, false, // boolean autoCommitSends false, // boolean autoCommitAcks, diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/client/ProtonClientConnectionManager.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/client/ProtonClientConnectionManager.java index 8591bec845c..da4a8a1e6ec 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/client/ProtonClientConnectionManager.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/client/ProtonClientConnectionManager.java @@ -76,7 +76,7 @@ public void connectionDestroyed(Object connectionID, boolean failed) { public void connectionException(Object connectionID, ActiveMQException me) { RemotingConnection connection = connectionMap.get(connectionID); if (connection != null) { - logger.info("Connection {} exception: {}", connection.getRemoteAddress(), me.getMessage()); + logger.info("Connection {} exception: {}", connection.getRemoteAddress(), me.getMessage()); connection.fail(me); } else { logger.error("Connection with id {} not found in connectionException", connectionID); diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnection.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnection.java index 54452d4dc46..76f3cdf2259 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnection.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnection.java @@ -687,7 +687,7 @@ public void retryConnection() { retryCounter = 0; started = false; connecting = false; - ActiveMQAMQPProtocolLogger.LOGGER.retryConnectionFailed(brokerConnectConfiguration.getName(), host + ":" + port, lastRetryCounter); + ActiveMQAMQPProtocolLogger.LOGGER.retryConnectionFailed(brokerConnectConfiguration.getName(), host + ":" + port, lastRetryCounter); if (logger.isDebugEnabled()) { logger.debug("no more reconnections as the retry counter reached {} out of {}", retryCounter, brokerConnectConfiguration.getReconnectAttempts()); } diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/bridge/AMQPBridgeToAddressSender.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/bridge/AMQPBridgeToAddressSender.java index 3f2cebecbba..40dfa5a9ad9 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/bridge/AMQPBridgeToAddressSender.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/bridge/AMQPBridgeToAddressSender.java @@ -288,7 +288,7 @@ protected ServerConsumer createServerConsumer(ProtonServerSenderContext senderCo queueQuery = sessionSPI.queueQuery(configuration, true); } - if (!queueQuery.getAddress().equals(address)) { + if (!queueQuery.getAddress().equals(address)) { throw new ActiveMQAMQPIllegalStateException( "Requested queue: " + queue + " for bridge to address: " + address + ", but it is already mapped to a different address: " + queueQuery.getAddress()); diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/federation/AMQPFederationAddressSenderController.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/federation/AMQPFederationAddressSenderController.java index cb62815242d..063d345b2bd 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/federation/AMQPFederationAddressSenderController.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/federation/AMQPFederationAddressSenderController.java @@ -188,7 +188,7 @@ public ServerConsumer createServerConsumer(ProtonServerSenderContext senderConte queueQuery = sessionSPI.queueQuery(configuration, true); } - if (!queueQuery.getAddress().equals(address)) { + if (!queueQuery.getAddress().equals(address)) { throw new ActiveMQAMQPIllegalStateException("Requested queue: " + queueName + " for federation of address: " + address + ", but it is already mapped to a different address: " + queueQuery.getAddress()); } diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/federation/AMQPFederationQueueSenderController.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/federation/AMQPFederationQueueSenderController.java index 0afc87f1377..12d16463c4d 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/federation/AMQPFederationQueueSenderController.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/federation/AMQPFederationQueueSenderController.java @@ -51,7 +51,7 @@ public final class AMQPFederationQueueSenderController extends AMQPFederationSenderController { public AMQPFederationQueueSenderController(AMQPFederationRemoteQueuePolicyManager manager, ProducerMetrics metrics, Consumer closedListener) throws ActiveMQAMQPException { - super(manager, metrics, closedListener); + super(manager, metrics, closedListener); } @Override diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerSource.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerSource.java index ea1ff1cc864..8c7c924d88b 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerSource.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerSource.java @@ -478,7 +478,7 @@ private void syncDone(MessageReference reference) { if (ctx != null) { ctx.replicationDone(); logger.debug("syncDone::replicationDone::ctx={},ref={}", ctx, reference); - } else { + } else { Message message = reference.getMessage(); if (message != null) { ctx = (OperationContext) message.getUserContext(OperationContext.class); diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AckManager.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AckManager.java index d26747fd201..1165d94c801 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AckManager.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AckManager.java @@ -533,7 +533,7 @@ public boolean ack(String nodeID, Queue targetQueue, long messageID, AckReason r addRetry(nodeID, targetQueue, messageID, reason); } return false; - } else { + } else { if (logger.isTraceEnabled()) { logger.trace("ack worked well for messageID={} nodeID={} queue={}, reference={}", messageID, nodeID, reference.getQueue().getName(), reference); if (reference.isPaged()) { diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AMQPMessageSupport.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AMQPMessageSupport.java index d10421d3e9f..b3cf0712ad1 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AMQPMessageSupport.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AMQPMessageSupport.java @@ -290,7 +290,7 @@ public static String toAnnotationName(String key) { return key; } - return key; + return key; } public static CoreBytesMessageWrapper createBytesMessage(long id, CoreMessageObjectPools coreMessageObjectPools) { diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreBytesMessageWrapper.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreBytesMessageWrapper.java index 503f66a9e21..1780deefa31 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreBytesMessageWrapper.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreBytesMessageWrapper.java @@ -91,123 +91,123 @@ public long getBodyLength() { return message.getBodyBufferSize(); } - public boolean readBoolean() { + public boolean readBoolean() { return bytesReadBoolean(getReadBodyBuffer()); } - public byte readByte() { + public byte readByte() { return bytesReadByte(getReadBodyBuffer()); } - public int readUnsignedByte() { + public int readUnsignedByte() { return bytesReadUnsignedByte(getReadBodyBuffer()); } - public short readShort() { + public short readShort() { return bytesReadShort(getReadBodyBuffer()); } - public int readUnsignedShort() { + public int readUnsignedShort() { return bytesReadUnsignedShort(getReadBodyBuffer()); } - public char readChar() { + public char readChar() { return bytesReadChar(getReadBodyBuffer()); } - public int readInt() { + public int readInt() { return bytesReadInt(getReadBodyBuffer()); } - public long readLong() { + public long readLong() { return bytesReadLong(getReadBodyBuffer()); } - public float readFloat() { + public float readFloat() { return bytesReadFloat(getReadBodyBuffer()); } - public double readDouble() { + public double readDouble() { return bytesReadDouble(getReadBodyBuffer()); } - public String readUTF() { + public String readUTF() { return bytesReadUTF(getReadBodyBuffer()); } - public int readBytes(byte[] value) { + public int readBytes(byte[] value) { return bytesReadBytes(getReadBodyBuffer(), value); } - public int readBytes(byte[] value, int length) { + public int readBytes(byte[] value, int length) { return bytesReadBytes(getReadBodyBuffer(), value, length); } - public void writeBoolean(boolean value) { + public void writeBoolean(boolean value) { bytesWriteBoolean(getWriteBodyBuffer(), value); } - public void writeByte(byte value) { + public void writeByte(byte value) { bytesWriteByte(getWriteBodyBuffer(), value); } - public void writeShort(short value) { + public void writeShort(short value) { bytesWriteShort(getWriteBodyBuffer(), value); } - public void writeChar(char value) { + public void writeChar(char value) { bytesWriteChar(getWriteBodyBuffer(), value); } - public void writeInt(int value) { + public void writeInt(int value) { bytesWriteInt(getWriteBodyBuffer(), value); } - public void writeLong(long value) { + public void writeLong(long value) { bytesWriteLong(getWriteBodyBuffer(), value); } - public void writeFloat(float value) { + public void writeFloat(float value) { bytesWriteFloat(getWriteBodyBuffer(), value); } - public void writeDouble(double value) { + public void writeDouble(double value) { bytesWriteDouble(getWriteBodyBuffer(), value); } - public void writeUTF(String value) { + public void writeUTF(String value) { bytesWriteUTF(getWriteBodyBuffer(), value); } - public void writeBytes(byte[] value) { + public void writeBytes(byte[] value) { bytesWriteBytes(getWriteBodyBuffer(), value); } - public void writeBytes(byte[] value, int offset, int length) { + public void writeBytes(byte[] value, int offset, int length) { bytesWriteBytes(getWriteBodyBuffer(), value, offset, length); } - public void writeObject(Object value) throws ConversionException { + public void writeObject(Object value) throws ConversionException { if (!bytesWriteObject(getWriteBodyBuffer(), value)) { throw new ConversionException("Can't make conversion of " + value + " to any known type"); } } @Override - public void encode() { + public void encode() { super.encode(); // this is to make sure we encode the body-length before it's persisted getBodyLength(); } @Override - public void decode() { + public void decode() { super.decode(); } - public void reset() { + public void reset() { if (!message.isLargeMessage()) { bytesMessageReset(getReadBodyBuffer()); bytesMessageReset(getWriteBodyBuffer()); diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreMessageWrapper.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreMessageWrapper.java index 11920a95497..76a951100a6 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreMessageWrapper.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreMessageWrapper.java @@ -130,36 +130,36 @@ protected ActiveMQBuffer getWriteBodyBuffer() { return message.getBodyBuffer(); } - public final String getJMSMessageID() { + public final String getJMSMessageID() { if (message.containsProperty(NATIVE_MESSAGE_ID)) { return getStringProperty(NATIVE_MESSAGE_ID); } return null; } - public final void setJMSMessageID(String id) { + public final void setJMSMessageID(String id) { if (id != null) { message.putStringProperty(NATIVE_MESSAGE_ID, id); } } - public final long getJMSTimestamp() { + public final long getJMSTimestamp() { return message.getTimestamp(); } - public final void setJMSTimestamp(long timestamp) { + public final void setJMSTimestamp(long timestamp) { message.setTimestamp(timestamp); } - public final byte[] getJMSCorrelationIDAsBytes() { + public final byte[] getJMSCorrelationIDAsBytes() { return MessageUtil.getJMSCorrelationIDAsBytes(message); } - public final void setJMSCorrelationIDAsBytes(byte[] correlationID) { + public final void setJMSCorrelationIDAsBytes(byte[] correlationID) { message.setCorrelationID(correlationID); } - public final String getJMSCorrelationID() { + public final String getJMSCorrelationID() { Object correlationID = message.getCorrelationID(); if (correlationID instanceof String string) { @@ -172,30 +172,30 @@ public final String getJMSCorrelationID() { } } - public final void setJMSCorrelationID(String correlationID) { + public final void setJMSCorrelationID(String correlationID) { message.setCorrelationID(correlationID); } - public final SimpleString getJMSReplyTo() { + public final SimpleString getJMSReplyTo() { return MessageUtil.getJMSReplyTo(message); } - public final void setJMSReplyTo(String replyTo) { + public final void setJMSReplyTo(String replyTo) { MessageUtil.setJMSReplyTo(message, SimpleString.of(replyTo)); } - public SimpleString getDestination() { + public SimpleString getDestination() { if (message.getAddress() == null || message.getAddress().isEmpty()) { return null; } return SimpleString.of(AMQPMessageSupport.destination(message.getRoutingType(), message.getAddress())); } - public final void setDestination(String destination) { + public final void setDestination(String destination) { message.setAddress(destination); } - public final int getJMSDeliveryMode() { + public final int getJMSDeliveryMode() { return message.isDurable() ? PERSISTENT : NON_PERSISTENT; } @@ -214,109 +214,109 @@ public final void setDeliveryMode(int deliveryMode) throws ConversionException { } - public final String getJMSType() { + public final String getJMSType() { return MessageUtil.getJMSType(message); } - public final void setJMSType(String type) { + public final void setJMSType(String type) { MessageUtil.setJMSType(message, type); } - public final long getExpiration() { + public final long getExpiration() { return message.getExpiration(); } - public final void setJMSExpiration(long expiration) { + public final void setJMSExpiration(long expiration) { message.setExpiration(expiration); } - public final int getJMSPriority() { + public final int getJMSPriority() { return message.getPriority(); } - public final void setJMSPriority(int priority) { + public final void setJMSPriority(int priority) { message.setPriority((byte) priority); } - public final void clearProperties() { + public final void clearProperties() { MessageUtil.clearProperties(message); } - public final boolean propertyExists(String name) { + public final boolean propertyExists(String name) { return MessageUtil.propertyExists(message, name); } - public final boolean getBooleanProperty(String name) { + public final boolean getBooleanProperty(String name) { return message.getBooleanProperty(name); } - public final byte getByteProperty(String name) { + public final byte getByteProperty(String name) { return message.getByteProperty(name); } - public final short getShortProperty(String name) { + public final short getShortProperty(String name) { return message.getShortProperty(name); } - public final int getIntProperty(String name) { + public final int getIntProperty(String name) { return MessageUtil.getIntProperty(message, name); } - public final long getLongProperty(String name) { + public final long getLongProperty(String name) { return MessageUtil.getLongProperty(message, name); } - public final float getFloatProperty(String name) { + public final float getFloatProperty(String name) { return message.getFloatProperty(name); } - public final double getDoubleProperty(String name) { + public final double getDoubleProperty(String name) { return message.getDoubleProperty(name); } - public final String getStringProperty(String name) { + public final String getStringProperty(String name) { return MessageUtil.getStringProperty(message, name); } - public final Object getObjectProperty(String name) { + public final Object getObjectProperty(String name) { return MessageUtil.getObjectProperty(message, name); } - public final Enumeration getPropertyNames() { + public final Enumeration getPropertyNames() { return Collections.enumeration(MessageUtil.getPropertyNames(message)); } - public final void setBooleanProperty(String name, boolean value) { + public final void setBooleanProperty(String name, boolean value) { message.putBooleanProperty(name, value); } - public final void setByteProperty(String name, byte value) { + public final void setByteProperty(String name, byte value) { message.putByteProperty(name, value); } - public final void setShortProperty(String name, short value) { + public final void setShortProperty(String name, short value) { message.putShortProperty(name, value); } - public final void setIntProperty(String name, int value) { + public final void setIntProperty(String name, int value) { MessageUtil.setIntProperty(message, name, value); } - public final void setLongProperty(String name, long value) { + public final void setLongProperty(String name, long value) { MessageUtil.setLongProperty(message, name, value); } - public final void setFloatProperty(String name, float value) { + public final void setFloatProperty(String name, float value) { message.putFloatProperty(name, value); } - public final void setDoubleProperty(String name, double value) { + public final void setDoubleProperty(String name, double value) { message.putDoubleProperty(name, value); } - public final void setStringProperty(String name, String value) { + public final void setStringProperty(String name, String value) { MessageUtil.setStringProperty(message, name, value); } diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreTextMessageWrapper.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreTextMessageWrapper.java index f1d1999110e..7448a034239 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreTextMessageWrapper.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreTextMessageWrapper.java @@ -82,7 +82,7 @@ public Section createAMQPSection(Map maMap, Properties propertie return body; } - public void setText(final String text) { + public void setText(final String text) { if (text != null) { this.text = SimpleString.of(text); } else { @@ -101,20 +101,20 @@ public String getText() { } @Override - public void clearBody() { + public void clearBody() { super.clearBody(); text = null; } @Override - public void encode() { + public void encode() { super.encode(); writeBodyText(getWriteBodyBuffer(), text); } @Override - public void decode() { + public void decode() { super.decode(); text = readBodyText(getReadBodyBuffer()); } diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/logger/ActiveMQAMQPProtocolMessageBundle.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/logger/ActiveMQAMQPProtocolMessageBundle.java index 13eaebcb12e..cde80f63d2f 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/logger/ActiveMQAMQPProtocolMessageBundle.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/logger/ActiveMQAMQPProtocolMessageBundle.java @@ -89,7 +89,7 @@ public interface ActiveMQAMQPProtocolMessageBundle { @Message(id = 119022, value = "The broker connection is trying to connect to itself. Check your configuration.") ActiveMQAMQPIllegalStateException brokerConnectionMirrorItself(); - @Message(id = 119023, value = "Sender link refused for address {}") + @Message(id = 119023, value = "Sender link refused for address {}") ActiveMQAMQPIllegalStateException senderLinkRefused(String address); @Message(id = 119024, value = "link is missing a desired capability declaration {}") @@ -107,7 +107,7 @@ public interface ActiveMQAMQPProtocolMessageBundle { @Message(id = 119028, value = "Malformed Federation event message: {}") ActiveMQException malformedFederationEventMessage(String message); - @Message(id = 119029, value = "Receiver link refused for address {}") + @Message(id = 119029, value = "Receiver link refused for address {}") ActiveMQAMQPIllegalStateException receiverLinkRefused(String address); @Message(id = 119300, value = "not authorized to delete temporary destination, {}") diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPRoutingHandler.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPRoutingHandler.java index 0819fe490c7..5f20923cd5c 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPRoutingHandler.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPRoutingHandler.java @@ -66,7 +66,7 @@ protected void redirect(AMQPRoutingContext context) { ErrorCondition error = new ErrorCondition(); error.setCondition(ConnectionError.REDIRECT); error.setDescription(String.format("Connection router %s redirected this connection to %s:%d", context.getRouter(), host, port)); - Map info = new HashMap<>(); + Map info = new HashMap<>(); info.put(AmqpSupport.NETWORK_HOST, host); info.put(AmqpSupport.PORT, port); error.setInfo(info); diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonAbstractReceiver.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonAbstractReceiver.java index 99d25824746..b5a5a022032 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonAbstractReceiver.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonAbstractReceiver.java @@ -131,7 +131,7 @@ public void start() { throw new IllegalStateException("Cannot start a receiver that is not yet stopped"); } - if (state == ReceiverState.STOPPED) { + if (state == ReceiverState.STOPPED) { state = ReceiverState.STARTED; topUpCreditIfNeeded(); } diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/sasl/scram/ScramServerFunctionalityImpl.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/sasl/scram/ScramServerFunctionalityImpl.java index e7590832098..342850de213 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/sasl/scram/ScramServerFunctionalityImpl.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/sasl/scram/ScramServerFunctionalityImpl.java @@ -70,7 +70,7 @@ public ScramServerFunctionalityImpl(String digestName, String hmacName, String serverPartNonce) throws NoSuchAlgorithmException { digest = MessageDigest.getInstance(ScramUtils.requireNonNullAndNotEmpty(digestName, "digestName")); hmac = Mac.getInstance(ScramUtils.requireNonNullAndNotEmpty(hmacName, "hmacName")); - mServerPartNonce = ScramUtils.requireNonNullAndNotEmpty(serverPartNonce, "serverPartNonce"); + mServerPartNonce = ScramUtils.requireNonNullAndNotEmpty(serverPartNonce, "serverPartNonce"); } /** diff --git a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTStateManager.java b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTStateManager.java index 700d6f49782..69c21015727 100644 --- a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTStateManager.java +++ b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTStateManager.java @@ -48,7 +48,7 @@ public class MQTTStateManager { private final Map sessionStates = new ConcurrentHashMap<>(); private final Queue sessionStore; private static final Map INSTANCES = new HashMap<>(); - private final Map connectedClients = new ConcurrentHashMap<>(); + private final Map connectedClients = new ConcurrentHashMap<>(); private final boolean subscriptionPersistenceEnabled; /* diff --git a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTSubscriptionManager.java b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTSubscriptionManager.java index 16a188d47bd..6c65292a5cb 100644 --- a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTSubscriptionManager.java +++ b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTSubscriptionManager.java @@ -279,7 +279,7 @@ short[] removeSubscriptions(List topics, boolean enforceSecurity) throws reasonCode = MQTTReasonCodes.UNSPECIFIED_ERROR; } - reasonCodes[i] = reasonCode; + reasonCodes[i] = reasonCode; } // deal with durable state after *all* requested subscriptions have been removed in memory diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java index 6cb4cae0e68..8f7105ae11a 100644 --- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java @@ -1865,7 +1865,7 @@ public Response processRemoveConsumer(ConsumerId id, long lastDeliveredSequenceI } - private void recoverOperationContext() { + private void recoverOperationContext() { server.getStorageManager().setContext(this.operationContext); } diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConstants.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConstants.java index ee995415b96..2395e7ce8da 100644 --- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConstants.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConstants.java @@ -28,11 +28,11 @@ public class OpenWireConstants { public static final SimpleString AMQ_MSG_COMMAND_ID = SimpleString.of(AMQ_PREFIX + "COMMAND_ID"); public static final SimpleString AMQ_MSG_DATASTRUCTURE = SimpleString.of(AMQ_PREFIX + "DATASTRUCTURE"); public static final SimpleString AMQ_MSG_MESSAGE_ID = SimpleString.of(AMQ_PREFIX + "MESSAGE_ID"); - public static final SimpleString AMQ_MSG_ORIG_DESTINATION = SimpleString.of(AMQ_PREFIX + "ORIG_DESTINATION"); - public static final SimpleString AMQ_MSG_PRODUCER_ID = SimpleString.of(AMQ_PREFIX + "PRODUCER_ID"); + public static final SimpleString AMQ_MSG_ORIG_DESTINATION = SimpleString.of(AMQ_PREFIX + "ORIG_DESTINATION"); + public static final SimpleString AMQ_MSG_PRODUCER_ID = SimpleString.of(AMQ_PREFIX + "PRODUCER_ID"); public static final SimpleString AMQ_MSG_REPLY_TO = SimpleString.of(AMQ_PREFIX + "REPLY_TO"); public static final SimpleString AMQ_MSG_USER_ID = SimpleString.of(AMQ_PREFIX + "USER_ID"); - public static final SimpleString AMQ_MSG_DROPPABLE = SimpleString.of(AMQ_PREFIX + "DROPPABLE"); + public static final SimpleString AMQ_MSG_DROPPABLE = SimpleString.of(AMQ_PREFIX + "DROPPABLE"); public static final SimpleString AMQ_MSG_COMPRESSED = SimpleString.of(AMQ_PREFIX + "COMPRESSED"); public static final SimpleString JMS_TYPE_PROPERTY = SimpleString.of("JMSType"); diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java index 7b4375837ed..94de8c5ab87 100644 --- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java @@ -84,7 +84,7 @@ import static org.apache.activemq.artemis.core.protocol.openwire.util.OpenWireUtil.SELECTOR_AWARE_OPTION; -public class OpenWireProtocolManager extends AbstractProtocolManager implements ClusterTopologyListener { +public class OpenWireProtocolManager extends AbstractProtocolManager implements ClusterTopologyListener { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java index 17b1cdce54f..13636fc1d98 100644 --- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java @@ -220,7 +220,7 @@ private SimpleString createTopicSubscription(boolean isDurable, if (isDurable) { queueName = org.apache.activemq.artemis.jms.client.ActiveMQDestination.createQueueNameForSubscription(true, clientID, subscriptionName); if (info.getDestination().isComposite()) { - queueName = queueName.concat(physicalName); + queueName = queueName.concat(physicalName); } QueueConfiguration queueConfiguration = QueueConfiguration.of(queueName).setAddress(address).setRoutingType(RoutingType.MULTICAST).setFilterString(selector).setInternal(internalAddress); QueueQueryResult result = session.getCoreSession().executeQueueQuery(queueName); diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/util/OpenWireUtil.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/util/OpenWireUtil.java index 0250c5ca79e..3d92685fd3f 100644 --- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/util/OpenWireUtil.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/util/OpenWireUtil.java @@ -37,7 +37,7 @@ public static String extractFilterStringOrNull(final ConsumerInfo info, final Ac return info.getSelector(); } if (info.getSelector() != null) { - if (openWireDest.getOptions() != null) { + if (openWireDest.getOptions() != null) { if (Boolean.valueOf(openWireDest.getOptions().get(SELECTOR_AWARE_OPTION))) { return info.getSelector(); } diff --git a/artemis-protocols/artemis-openwire-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverterTest.java b/artemis-protocols/artemis-openwire-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverterTest.java index 306300070d8..b37d7d01d13 100644 --- a/artemis-protocols/artemis-openwire-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverterTest.java +++ b/artemis-protocols/artemis-openwire-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverterTest.java @@ -55,7 +55,7 @@ public class OpenWireMessageConverterTest { final OpenWireFormatFactory formatFactory = new OpenWireFormatFactory(); - final WireFormat openWireFormat = formatFactory.createWireFormat(); + final WireFormat openWireFormat = formatFactory.createWireFormat(); final byte[] content = new byte[] {'a', 'a'}; final String address = "Q"; final ActiveMQDestination destination = new ActiveMQQueue(address); diff --git a/artemis-protocols/artemis-openwire-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumerTest.java b/artemis-protocols/artemis-openwire-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumerTest.java index 152dad95a13..eda0d6e2d49 100644 --- a/artemis-protocols/artemis-openwire-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumerTest.java +++ b/artemis-protocols/artemis-openwire-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumerTest.java @@ -51,7 +51,7 @@ public class AMQConsumerTest { final OpenWireFormatFactory formatFactory = new OpenWireFormatFactory(); - final WireFormat openWireFormat = formatFactory.createWireFormat(); + final WireFormat openWireFormat = formatFactory.createWireFormat(); @Test public void testClientId() throws Exception { @@ -111,7 +111,7 @@ private AMQConsumer getConsumer(int prefetchSize) throws Exception { return consumer; } - private void testCredits(AMQConsumer consumer) throws Exception { + private void testCredits(AMQConsumer consumer) throws Exception { ICoreMessage message = new CoreMessage(1, 0); MessageReference reference = Mockito.mock(MessageReference.class); diff --git a/artemis-protocols/artemis-openwire-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/openwire/amq/OpenWireConnectionTest.java b/artemis-protocols/artemis-openwire-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/openwire/amq/OpenWireConnectionTest.java index 34d129c5f58..6868fca3777 100644 --- a/artemis-protocols/artemis-openwire-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/openwire/amq/OpenWireConnectionTest.java +++ b/artemis-protocols/artemis-openwire-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/openwire/amq/OpenWireConnectionTest.java @@ -142,15 +142,15 @@ public void physicalSend(Command command) throws IOException { } }; - openWireConnection.bufferReceived(openWireConnection, wireFormatInfoBuffer); - openWireConnection.bufferReceived(openWireConnection, connectionInfoBuffer); + openWireConnection.bufferReceived(openWireConnection, wireFormatInfoBuffer); + openWireConnection.bufferReceived(openWireConnection, connectionInfoBuffer); // actor tasks - openWireConnection.bufferReceived(openWireConnection, sessionInfoBuffer); - openWireConnection.bufferReceived(openWireConnection, producerInfoBuffer); + openWireConnection.bufferReceived(openWireConnection, sessionInfoBuffer); + openWireConnection.bufferReceived(openWireConnection, producerInfoBuffer); assertTrue(okResponses.await(10, TimeUnit.SECONDS), "fail on ok response check, iteration: " + i); - openWireConnection.bufferReceived(openWireConnection, removeInfoBuffer); + openWireConnection.bufferReceived(openWireConnection, removeInfoBuffer); assertTrue(okResponsesWithRemove.await(10, TimeUnit.SECONDS), "fail on ok response check with remove, iteration: " + i); diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java index 81091c21f2b..e15e2e51e93 100644 --- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java @@ -118,6 +118,6 @@ public interface ActiveMQRALogger { @LogMessage(id = 153004, value = "Invalid number of session (negative) {}, defaulting to {}.", level = LogMessage.Level.WARN) void invalidNumberOfMaxSession(int value, int defaultValue); - @LogMessage(id = 153005, value = "Unable to retrieve \"{}\" from JNDI. Creating a new \"{}\" named \"{}\" to be used by the MDB.", level = LogMessage.Level.WARN) + @LogMessage(id = 153005, value = "Unable to retrieve \"{}\" from JNDI. Creating a new \"{}\" named \"{}\" to be used by the MDB.", level = LogMessage.Level.WARN) void unableToRetrieveDestinationName(String destinationName, String name, String calculatedDestinationName); } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BridgeConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BridgeConfiguration.java index 2c7fc48c510..4408cb04384 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BridgeConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BridgeConfiguration.java @@ -732,7 +732,7 @@ public int getEncodeSize() { staticConnectorSize += BufferHelper.sizeOfNullableString(connector); } } - int size = BufferHelper.sizeOfNullableString(name) + + int size = BufferHelper.sizeOfNullableString(name) + BufferHelper.sizeOfNullableString(parentName) + BufferHelper.sizeOfNullableString(queueName) + BufferHelper.sizeOfNullableString(forwardingAddress) + diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java index 7992c144d14..40dd0a92cc9 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java @@ -166,7 +166,7 @@ public static List parseAcceptorURI(String name, String } } - public static List parseAcceptorURI(String name, URI uri) { + public static List parseAcceptorURI(String name, URI uri) { try { AcceptorTransportConfigurationParser parser = new AcceptorTransportConfigurationParser(); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/DivertConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/DivertConfiguration.java index 95d46157101..23932374a87 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/DivertConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/DivertConfiguration.java @@ -310,7 +310,7 @@ public int getEncodeSize() { } else { transformerSize = DataConstants.SIZE_NULL; } - int size = BufferHelper.sizeOfNullableString(name) + + int size = BufferHelper.sizeOfNullableString(name) + BufferHelper.sizeOfNullableString(address) + BufferHelper.sizeOfNullableString(forwardingAddress) + BufferHelper.sizeOfNullableString(routingName) + diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/JMXConnectorConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/JMXConnectorConfiguration.java index f87291f026e..d08076fda36 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/JMXConnectorConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/JMXConnectorConfiguration.java @@ -28,7 +28,7 @@ public class JMXConnectorConfiguration { private String jmxRealm = "activemq"; private String objectName = "connector:name=rmi"; private String authenticatorType = "password"; - private boolean secured = false; + private boolean secured = false; private String keyStoreProvider = TransportConstants.DEFAULT_KEYSTORE_PROVIDER; private String keyStoreType = TransportConstants.DEFAULT_KEYSTORE_TYPE; private String keyStorePath; diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/ReplicatedPolicyConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/ReplicatedPolicyConfiguration.java index cd6bd0bf3a1..80da7bb94d6 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/ReplicatedPolicyConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/ReplicatedPolicyConfiguration.java @@ -39,7 +39,7 @@ public class ReplicatedPolicyConfiguration implements HAPolicyConfiguration { private long voteRetryWait = ActiveMQDefaultConfiguration.getDefaultVoteRetryWait(); - private int quorumVoteWait = ActiveMQDefaultConfiguration.getDefaultQuorumVoteWait(); + private int quorumVoteWait = ActiveMQDefaultConfiguration.getDefaultQuorumVoteWait(); private Long retryReplicationWait = ActiveMQDefaultConfiguration.getDefaultRetryReplicationWait(); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java index 5647b653a30..76631124e06 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java @@ -1110,7 +1110,7 @@ private void export(BeanUtilsBean beanUtils, Stack nested, BufferedWrite exportKeyValue(nested, bufferedWriter, (String) enumSet.stream().map(Object::toString).collect(Collectors.joining(","))); } else { - Stream stream = collection.stream(); + Stream stream = collection.stream(); if (collection.stream().findFirst().orElseThrow() instanceof AMQPBrokerConnectionElement amqpBrokerConnectionElement) { // filter type from the shared underlying collection String collectionName = nested.peek(); @@ -1187,7 +1187,7 @@ private void export(BeanUtilsBean beanUtils, Stack nested, BufferedWrite try { attributeValue = propertyDescriptor.getReadMethod().invoke(value, null); } catch (Exception e) { - throw new RuntimeException("accessing: " + propertyDescriptor.getName() + "@" + nested, e); + throw new RuntimeException("accessing: " + propertyDescriptor.getName() + "@" + nested, e); } if (attributeValue != null) { nested.push(propertyDescriptor.getName()); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/Validators.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/Validators.java index 1b128cdb116..cb05785b846 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/Validators.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/Validators.java @@ -84,7 +84,7 @@ public interface Validator { } }; - public static final Validator MINUS_ONE_OR_GT_ZERO = (name, value) -> { + public static final Validator MINUS_ONE_OR_GT_ZERO = (name, value) -> { if (value.doubleValue() == -1 || value.doubleValue() > 0) { return value; } else { diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/storage/DatabaseStorageConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/storage/DatabaseStorageConfiguration.java index 011efff74d0..dc222da53a5 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/storage/DatabaseStorageConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/storage/DatabaseStorageConfiguration.java @@ -323,7 +323,7 @@ public void setJdbcAllowedTimeDiff(long jdbcAllowedTimeDiff) { } @Override - public int getAllowedPageSize(int pageSize) { + public int getAllowedPageSize(int pageSize) { return Math.min(pageSize, maxPageSizeBytes); } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java index 580355d4ac7..bd6c5ccc3ff 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java @@ -1404,7 +1404,7 @@ protected Pair parseAddressSettings(final Node node) { addressSettings.setMaxReadPageBytes(MINUS_ONE_OR_POSITIVE_INT.validate(MAX_READ_PAGE_BYTES_NODE_NAME, ByteUtil.convertTextBytes(getTrimmedTextContent(child))).intValue()); } else if (PREFETCH_PAGE_MESSAGES_NODE_NAME.equalsIgnoreCase(name)) { addressSettings.setPrefetchPageMessages(MINUS_ONE_OR_POSITIVE_INT.validate(PREFETCH_PAGE_MESSAGES_NODE_NAME, Long.parseLong(getTrimmedTextContent(child))).intValue()); - } else if (PREFETCH_PAGE_BYTES_NODE_NAME.equalsIgnoreCase(name)) { + } else if (PREFETCH_PAGE_BYTES_NODE_NAME.equalsIgnoreCase(name)) { addressSettings.setPrefetchPageBytes(MINUS_ONE_OR_POSITIVE_INT.validate(PREFETCH_PAGE_BYTES_NODE_NAME, ByteUtil.convertTextBytes(getTrimmedTextContent(child))).intValue()); } else if (PAGE_MAX_CACHE_SIZE_NODE_NAME.equalsIgnoreCase(name)) { if (!printPageMaxSizeUsed) { @@ -1472,7 +1472,7 @@ protected Pair parseAddressSettings(final Node node) { addressSettings.setAutoDeleteQueuesDelay(GE_ZERO.validate(AUTO_DELETE_QUEUES_DELAY, XMLUtil.parseLong(child)).longValue()); } else if (AUTO_DELETE_QUEUES_MESSAGE_COUNT.equalsIgnoreCase(name)) { addressSettings.setAutoDeleteQueuesMessageCount((Long) MINUS_ONE_OR_GE_ZERO.validate(AUTO_DELETE_QUEUES_MESSAGE_COUNT, XMLUtil.parseLong(child))); - } else if (AUTO_DELETE_QUEUES_SKIP_USAGE_CHECK.equalsIgnoreCase(name)) { + } else if (AUTO_DELETE_QUEUES_SKIP_USAGE_CHECK.equalsIgnoreCase(name)) { addressSettings.setAutoDeleteQueuesSkipUsageCheck(XMLUtil.parseBoolean(child)); } else if (CONFIG_DELETE_QUEUES.equalsIgnoreCase(name)) { addressSettings.setConfigDeleteQueues(Enum.valueOf(DeletionPolicy.class, DELETION_POLICY_TYPE.validate(CONFIG_DELETE_QUEUES, getTrimmedTextContent(child)))); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java index 57c3fe8272a..94f9873d4f9 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java @@ -819,7 +819,7 @@ public double getDiskStoreUsage() { } @Override - public int getAddressMemoryUsagePercentage() { + public int getAddressMemoryUsagePercentage() { if (AuditLogger.isBaseLoggingEnabled()) { AuditLogger.getAddressMemoryUsagePercentage(this.server); } @@ -3884,7 +3884,7 @@ public void createBridge(final String name, clearIO(); try { - TransformerConfiguration transformerConfiguration = transformerClassName == null || transformerClassName.isEmpty() ? null : new TransformerConfiguration(transformerClassName).setProperties(transformerProperties); + TransformerConfiguration transformerConfiguration = transformerClassName == null || transformerClassName.isEmpty() ? null : new TransformerConfiguration(transformerClassName).setProperties(transformerProperties); BridgeConfiguration config = new BridgeConfiguration().setName(name).setQueueName(queueName).setForwardingAddress(forwardingAddress).setFilterString(filterString).setTransformerConfiguration(transformerConfiguration).setClientFailureCheckPeriod(clientFailureCheckPeriod).setRetryInterval(retryInterval).setRetryIntervalMultiplier(retryIntervalMultiplier).setInitialConnectAttempts(initialConnectAttempts).setReconnectAttempts(reconnectAttempts).setUseDuplicateDetection(useDuplicateDetection).setConfirmationWindowSize(confirmationWindowSize).setProducerWindowSize(producerWindowSize).setHA(ha).setUser(user).setPassword(password).setConfigurationManaged(false); if (useDiscoveryGroup) { @@ -3928,7 +3928,7 @@ public void createBridge(final String name, clearIO(); try { - TransformerConfiguration transformerConfiguration = transformerClassName == null || transformerClassName.isEmpty() ? null : new TransformerConfiguration(transformerClassName); + TransformerConfiguration transformerConfiguration = transformerClassName == null || transformerClassName.isEmpty() ? null : new TransformerConfiguration(transformerClassName); BridgeConfiguration config = new BridgeConfiguration().setName(name).setQueueName(queueName).setForwardingAddress(forwardingAddress).setFilterString(filterString).setTransformerConfiguration(transformerConfiguration).setClientFailureCheckPeriod(clientFailureCheckPeriod).setRetryInterval(retryInterval).setRetryIntervalMultiplier(retryIntervalMultiplier).setInitialConnectAttempts(initialConnectAttempts).setReconnectAttempts(reconnectAttempts).setUseDuplicateDetection(useDuplicateDetection).setConfirmationWindowSize(confirmationWindowSize).setHA(ha).setUser(user).setPassword(password).setConfigurationManaged(false); if (useDiscoveryGroup) { diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java index 4b21cb90544..1bddc9da42a 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java @@ -294,7 +294,7 @@ public long getMessagesAcknowledged() { } @Override - public Map getMetrics() { + public Map getMetrics() { if (AuditLogger.isBaseLoggingEnabled()) { AuditLogger.getMetrics(this.clusterConnection); } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/BasePagingCounter.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/BasePagingCounter.java index 3ba540bdf59..db734ffb28e 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/BasePagingCounter.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/BasePagingCounter.java @@ -20,7 +20,7 @@ public abstract class BasePagingCounter implements PageSubscriptionCounter { - private volatile boolean rebuilding = false; + private volatile boolean rebuilding = false; @Override public void markRebuilding() { diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java index a330b5c6f17..b77871091ba 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java @@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory; import java.lang.invoke.MethodHandles; -public final class Page { +public final class Page { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java index 50b930b5fc0..3e1a4a0ee6d 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java @@ -395,7 +395,7 @@ public boolean isPageFull() { private boolean isBelowPageLimitBytes() { if (estimatedMaxPages != null) { return (numberOfPages <= estimatedMaxPages.longValue()); - } else { + } else { return true; } } 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 30ef3233f97..a383809bc92 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 @@ -517,7 +517,7 @@ default ArtemisCloseable closeableReadLock() { void injectMonitor(FileStoreMonitor monitor) throws Exception; - default int getAllowedPageSize(int pageSize) { + default int getAllowedPageSize(int pageSize) { return pageSize; } } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java index bc0823bec23..6196897ed3e 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java @@ -201,7 +201,7 @@ protected void init(Configuration config, IOCriticalErrorListener criticalErrorL /** * We need to correct the file size if its not a multiple of the alignement * - * @param fileSize : the configured file size. + * @param fileSize : the configured file size. * @param alignment : the alignment. * @return the fixed file size */ @@ -904,7 +904,7 @@ public void injectMonitor(FileStoreMonitor monitor) throws Exception { } @Override - public int getAllowedPageSize(int pageSize) { + public int getAllowedPageSize(int pageSize) { if (config.getStoreConfiguration() == null) { return pageSize; } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java index 2a5b34f2145..ceef397e10e 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java @@ -87,7 +87,7 @@ private static Message asLargeMessage(Message message, StorageManager storageMan // that we would have no control. that's usually stored in a ThreadLocal within the native layer. // to avoid that buffer be kept in memory holding resources we will allocate our own buffer here from the NettyPool. // ./soakTest/OWLeakTest was written to validate this scenario here. - ByteBuf ioBuffer = PooledByteBufAllocator.DEFAULT.ioBuffer(CHUNK_LM_SIZE, CHUNK_LM_SIZE); + ByteBuf ioBuffer = PooledByteBufAllocator.DEFAULT.ioBuffer(CHUNK_LM_SIZE, CHUNK_LM_SIZE); ActiveMQBuffer wrappedIOBuffer = new ChannelBufferWrapper(ioBuffer); try { diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreSessionCallback.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreSessionCallback.java index 34eac07137a..46e8e3d905b 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreSessionCallback.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreSessionCallback.java @@ -112,7 +112,7 @@ public int sendLargeMessageContinuation(ServerConsumer consumer, } @Override - public int sendMessage(MessageReference ref, ServerConsumer consumer, int deliveryCount) { + public int sendMessage(MessageReference ref, ServerConsumer consumer, int deliveryCount) { Packet packet; if (channel.getConnection().isVersionBeforeAddressChange()) { diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddMessage.java index 76a62d68119..f096517b3f7 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddMessage.java @@ -71,7 +71,7 @@ public ReplicationAddMessage(final boolean beforeTwoEighteen, @Override public int expectedEncodeSize() { - return PACKET_HEADERS_SIZE + + return PACKET_HEADERS_SIZE + DataConstants.SIZE_BYTE + // buffer.writeByte(journalID); DataConstants.SIZE_BOOLEAN + // buffer.writeBoolean(operation.toBoolean()); DataConstants.SIZE_LONG + // buffer.writeLong(id); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java index 47790078076..0e79806403f 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java @@ -64,7 +64,7 @@ public int hashCode() { @Override protected String getPacketString() { - return super.getPacketString() + + return super.getPacketString() + "messageId=" + messageId; } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java index 7631112e3b5..7ea9e431099 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java @@ -83,7 +83,7 @@ public int hashCode() { @Override protected String getPacketString() { - return super.getPacketString() + + return super.getPacketString() + "messageId=" + messageId + ", isDelete=" + isDelete; } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java index 00b569a419c..e3691c30c79 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java @@ -79,7 +79,7 @@ public int hashCode() { @Override protected String getPacketString() { - return super.getPacketString() + + return super.getPacketString() + "messageId=" + messageId + ", body.size=" + body.length; } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java index 555b5c9a5ea..513bb2e6bd5 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java @@ -397,7 +397,7 @@ public void setChannel(final Channel channel) { } if (channel != null && outgoingInterceptors != null) { - if (channel.getConnection() instanceof RemotingConnectionImpl) { + if (channel.getConnection() instanceof RemotingConnectionImpl) { try { RemotingConnectionImpl impl = (RemotingConnectionImpl) channel.getConnection(); for (Interceptor interceptor : outgoingInterceptors) { 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 6db12d2d5b8..ac39f28f041 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 @@ -521,7 +521,7 @@ Queue createQueue(SimpleString address, RoutingType routingType, SimpleString qu @Deprecated Queue createQueue(SimpleString address, RoutingType routingType, SimpleString queueName, SimpleString user, - SimpleString filterString, boolean durable, boolean temporary) throws Exception; + SimpleString filterString, boolean durable, boolean temporary) throws Exception; @Deprecated Queue createQueue(SimpleString address, RoutingType routingType, SimpleString queueName, SimpleString filter, boolean durable, boolean temporary, int maxConsumers, boolean purgeOnNoConsumers, boolean autoCreateAddress) throws Exception; diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/address/FederatedAddress.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/address/FederatedAddress.java index 12ed58e5b6f..a881a6bb0fc 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/address/FederatedAddress.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/address/FederatedAddress.java @@ -212,7 +212,7 @@ private void conditionalCreateRemoteConsumer(DivertBinding divertBinding, Set matchingQueues, QueueBinding queueBinding) { + private void createRemoteConsumer(DivertBinding divertBinding, final Set matchingQueues, QueueBinding queueBinding) { final AddressInfo addressInfo = server.getPostOffice().getAddressInfo(divertBinding.getAddress()); //If the divert address matches and if the new queueBinding matches the forwarding address of the divert diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/queue/FederatedQueue.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/queue/FederatedQueue.java index b956fd302f9..e9306079da7 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/queue/FederatedQueue.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/queue/FederatedQueue.java @@ -63,7 +63,7 @@ public FederatedQueue(Federation federation, FederationQueuePolicyConfiguration Objects.requireNonNull(config.getName()); this.config = config; this.priorityAdjustment = federationUpstream.getPriorityAdjustment() + Objects.requireNonNullElse(config.getPriorityAdjustment(), -1); - String metaDataFilterString = config.isIncludeFederated() ? null : "hyphenated_props:" + FederatedQueueConsumer.FEDERATION_NAME + " IS NOT NULL"; + String metaDataFilterString = config.isIncludeFederated() ? null : "hyphenated_props:" + FederatedQueueConsumer.FEDERATION_NAME + " IS NOT NULL"; metaDataFilter = FilterImpl.createFilter(metaDataFilterString); if (config.getIncludes().isEmpty()) { includes = Collections.emptySet(); @@ -108,7 +108,7 @@ public FederationQueuePolicyConfiguration getConfig() { return config; } - private void conditionalCreateRemoteConsumer(ServerConsumer consumer) { + private void conditionalCreateRemoteConsumer(ServerConsumer consumer) { if (server.hasBrokerFederationPlugins()) { final AtomicBoolean conditionalCreate = new AtomicBoolean(true); try { diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/queue/FederatedQueueConsumerKey.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/queue/FederatedQueueConsumerKey.java index 131ee1f3a7d..0120d814c6f 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/queue/FederatedQueueConsumerKey.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/queue/FederatedQueueConsumerKey.java @@ -35,7 +35,7 @@ public class FederatedQueueConsumerKey implements FederatedConsumerKey { this.address = address; this.routingType = routingType; this.queueName = queueName; - this.fqqn = CompositeAddress.toFullyQualified(address, queueName); + this.fqqn = CompositeAddress.toFullyQualified(address, queueName); this.filterString = filterString; this.queueFilterString = queueFilterString; this.priority = priority; diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java index ae9819bc644..beb52d1624d 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java @@ -1113,7 +1113,7 @@ public void stop() throws Exception { } @Override - public void stop(boolean isShutdown) throws Exception { + public void stop(boolean isShutdown) throws Exception { try { stop(false, isShutdown); } finally { @@ -1435,7 +1435,7 @@ private void stop(boolean failoverOnServerShutdown, try { if (remotingService != null) { // it will close all connections except to the one used by replication - remotingService.prepareStop(criticalIOError, storageManager != null ? storageManager.getUsedConnections() : Collections.emptySet()); + remotingService.prepareStop(criticalIOError, storageManager != null ? storageManager.getUsedConnections() : Collections.emptySet()); } } catch (Throwable t) { ActiveMQServerLogger.LOGGER.errorStoppingComponent(remotingService.getClass().getName(), t); @@ -2288,14 +2288,14 @@ public Queue createQueue(SimpleString address, @Override public Queue createQueue(AddressInfo addressInfo, SimpleString queueName, SimpleString filter, SimpleString user, boolean durable, boolean temporary, boolean autoCreated, Integer maxConsumers, Boolean purgeOnNoConsumers, boolean autoCreateAddress) throws Exception { AddressSettings as = getAddressSettingsRepository().getMatch(addressInfo == null ? queueName.toString() : addressInfo.getName().toString()); - return createQueue(addressInfo, queueName, filter, user, durable, temporary, false, false, autoCreated, maxConsumers, purgeOnNoConsumers, as.isDefaultExclusiveQueue(), as.isDefaultGroupRebalance(), as.getDefaultGroupBuckets(), as.getDefaultGroupFirstKey(), as.isDefaultLastValueQueue(), as.getDefaultLastValueKey(), as.isDefaultNonDestructive(), as.getDefaultConsumersBeforeDispatch(), as.getDefaultDelayBeforeDispatch(), isAutoDelete(autoCreated, as), as.getAutoDeleteQueuesDelay(), as.getAutoDeleteQueuesMessageCount(), autoCreateAddress, false, as.getDefaultRingSize()); + return createQueue(addressInfo, queueName, filter, user, durable, temporary, false, false, autoCreated, maxConsumers, purgeOnNoConsumers, as.isDefaultExclusiveQueue(), as.isDefaultGroupRebalance(), as.getDefaultGroupBuckets(), as.getDefaultGroupFirstKey(), as.isDefaultLastValueQueue(), as.getDefaultLastValueKey(), as.isDefaultNonDestructive(), as.getDefaultConsumersBeforeDispatch(), as.getDefaultDelayBeforeDispatch(), isAutoDelete(autoCreated, as), as.getAutoDeleteQueuesDelay(), as.getAutoDeleteQueuesMessageCount(), autoCreateAddress, false, as.getDefaultRingSize()); } @Deprecated @Override public Queue createQueue(AddressInfo addressInfo, SimpleString queueName, SimpleString filter, SimpleString user, boolean durable, boolean temporary, boolean autoCreated, Integer maxConsumers, Boolean purgeOnNoConsumers, Boolean exclusive, Boolean lastValue, boolean autoCreateAddress) throws Exception { AddressSettings as = getAddressSettingsRepository().getMatch(addressInfo == null ? queueName.toString() : addressInfo.getName().toString()); - return createQueue(addressInfo, queueName, filter, user, durable, temporary, false, false, autoCreated, maxConsumers, purgeOnNoConsumers, exclusive, as.isDefaultGroupRebalance(), as.getDefaultGroupBuckets(), as.getDefaultGroupFirstKey(), lastValue, as.getDefaultLastValueKey(), as.isDefaultNonDestructive(), as.getDefaultConsumersBeforeDispatch(), as.getDefaultDelayBeforeDispatch(), isAutoDelete(autoCreated, as), as.getAutoDeleteQueuesDelay(), as.getAutoDeleteQueuesMessageCount(), autoCreateAddress, false, as.getDefaultRingSize()); + return createQueue(addressInfo, queueName, filter, user, durable, temporary, false, false, autoCreated, maxConsumers, purgeOnNoConsumers, exclusive, as.isDefaultGroupRebalance(), as.getDefaultGroupBuckets(), as.getDefaultGroupFirstKey(), lastValue, as.getDefaultLastValueKey(), as.isDefaultNonDestructive(), as.getDefaultConsumersBeforeDispatch(), as.getDefaultDelayBeforeDispatch(), isAutoDelete(autoCreated, as), as.getAutoDeleteQueuesDelay(), as.getAutoDeleteQueuesMessageCount(), autoCreateAddress, false, as.getDefaultRingSize()); } @Deprecated @@ -2337,7 +2337,7 @@ public Queue createQueue(SimpleString address, RoutingType routingType, SimpleSt SimpleString user, boolean durable, boolean temporary, boolean ignoreIfExists, boolean transientQueue, boolean autoCreated, int maxConsumers, boolean purgeOnNoConsumers, boolean exclusive, boolean lastValue, boolean autoCreateAddress) throws Exception { AddressSettings as = getAddressSettingsRepository().getMatch(address == null ? queueName.toString() : address.toString()); - return createQueue(address, routingType, queueName, filter, user, durable, temporary, ignoreIfExists, transientQueue, autoCreated, maxConsumers, purgeOnNoConsumers, exclusive, as.isDefaultGroupRebalance(), as.getDefaultGroupBuckets(), lastValue, as.getDefaultLastValueKey(), as.isDefaultNonDestructive(), as.getDefaultConsumersBeforeDispatch(), as.getDefaultDelayBeforeDispatch(), isAutoDelete(autoCreated, as), as.getAutoDeleteQueuesDelay(), as.getAutoDeleteQueuesMessageCount(), autoCreateAddress); + return createQueue(address, routingType, queueName, filter, user, durable, temporary, ignoreIfExists, transientQueue, autoCreated, maxConsumers, purgeOnNoConsumers, exclusive, as.isDefaultGroupRebalance(), as.getDefaultGroupBuckets(), lastValue, as.getDefaultLastValueKey(), as.isDefaultNonDestructive(), as.getDefaultConsumersBeforeDispatch(), as.getDefaultDelayBeforeDispatch(), isAutoDelete(autoCreated, as), as.getAutoDeleteQueuesDelay(), as.getAutoDeleteQueuesMessageCount(), autoCreateAddress); } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java index c39996825d6..cc7811a9ea0 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java @@ -411,7 +411,7 @@ public void recoverPendingPageCounters(List pendingNonTXPageCo } } else { // on this case the page file didn't exist, we just remove all the records since the page is already gone - logger.debug("Page {} didn't exist on address {}, so we are just removing records", pageId, addressPageMapEntry.getKey()); + logger.debug("Page {} didn't exist on address {}, so we are just removing records", pageId, addressPageMapEntry.getKey()); for (List records : perQueue.values()) { for (PageCountPending record : records) { if (logger.isDebugEnabled()) { diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java index 345f1bb8605..8632fc3a844 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java @@ -1538,7 +1538,7 @@ public long getMessageCount() { long returnValue = (long) pendingMetrics.getNonPagedMessageCount() + scheduledDeliveryHandler.getNonPagedScheduledCount() + deliveringMetrics.getNonPagedMessageCount() + pageSubscription.getMessageCount(); if (logger.isDebugEnabled()) { logger.debug("Queue={}/{} returning getMessageCount \n\treturning {}. \n\tpendingMetrics.getMessageCount() = {}, \n\tgetScheduledCount() = {}, \n\tpageSubscription.getMessageCount()={}, \n\tpageSubscription.getCounter().getValue()={}", - queueConfiguration.getName(), queueConfiguration.getId(), returnValue, pendingMetrics.getMessageCount(), scheduledDeliveryHandler.getNonPagedScheduledCount(), pageSubscription.getMessageCount(), pageSubscription.getCounter().getValue()); + queueConfiguration.getName(), queueConfiguration.getId(), returnValue, pendingMetrics.getMessageCount(), scheduledDeliveryHandler.getNonPagedScheduledCount(), pageSubscription.getMessageCount(), pageSubscription.getCounter().getValue()); } return returnValue; } else { diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java index 74bc048914e..cf632473b67 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java @@ -138,7 +138,7 @@ public long scaleDownMessages(ClientSessionFactory sessionFactory, } } - String sfPrefix = ((PostOfficeImpl) postOffice).getServer().getInternalNamingPrefix() + "sf."; + String sfPrefix = ((PostOfficeImpl) postOffice).getServer().getInternalNamingPrefix() + "sf."; long messageCountItem = 0; if (address.toString().startsWith(sfPrefix)) { messageCountItem += scaleDownSNF(address, queues, producer); 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 4ae7147db15..da1eadee960 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 @@ -682,7 +682,7 @@ public void removeItself() throws Exception { * messages to be delivered. */ @Override - public void forceDelivery(final long sequence) { + public void forceDelivery(final long sequence) { forceDelivery(sequence, () -> { Message forcedDeliveryMessage = new CoreMessage(storageManager.generateID(), 50) .putLongProperty(ClientConsumerImpl.FORCED_DELIVERY_MESSAGE, sequence) diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java index 4a46113cef0..01764ae8e58 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java @@ -1878,7 +1878,7 @@ public AutoCreateResult checkAutoCreate(final QueueConfiguration queueConfig) th AutoCreateResult result; SimpleString unPrefixedAddress = removePrefix(queueConfig.getAddress()); SimpleString unPrefixedQueue = removePrefix(queueConfig.getName()); - AddressSettings addressSettings = server.getAddressSettingsRepository().getMatch(unPrefixedAddress.toString()); + AddressSettings addressSettings = server.getAddressSettingsRepository().getMatch(unPrefixedAddress.toString()); if (unPrefixedAddress.equals(server.getManagementService().getManagementAddress())) { return AutoCreateResult.EXISTED; @@ -2206,7 +2206,7 @@ public void describeProducersInfo(JsonArrayBuilder array) { .add(ProducerField.CREATION_TIME.getName(), String.valueOf(entry.getValue().getCreationTime())) .add(ProducerField.ADDRESS.getAlternativeName(), entry.getValue().getAddress()) .add(ProducerField.LAST_PRODUCED_MESSAGE_ID.getName(), uuid, JsonValue.NULL) - .add(ProducerField.MESSAGE_SENT.getName(), entry.getValue().getMessagesSent()) + .add(ProducerField.MESSAGE_SENT.getName(), entry.getValue().getMessagesSent()) .add(ProducerField.MESSAGE_SENT_SIZE.getName(), entry.getValue().getMessagesSentSize()); array.add(producerInfo); } @@ -2611,7 +2611,7 @@ public void removeProducer(String ID) { } @Override - public Collection getServerProducers() { + public Collection getServerProducers() { return serverProducers.getServerProducers(); } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/lock/LockCoordinator.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/lock/LockCoordinator.java index 3850c238732..f722c5354f5 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/lock/LockCoordinator.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/lock/LockCoordinator.java @@ -296,7 +296,7 @@ private void doRunTreatingErrors(RunnableEx r, AtomicBoolean errorOnStart) { } } - private void doRun(RunnableEx r) throws Exception { + private void doRun(RunnableEx r) throws Exception { r.run(); } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ArtemisRbacInvocationHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ArtemisRbacInvocationHandler.java index 40b225ebd4f..e37d1211499 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ArtemisRbacInvocationHandler.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ArtemisRbacInvocationHandler.java @@ -255,7 +255,7 @@ private void handleGetAttribute(MBeanServer delegate, ObjectName objectName, Str private void handleInvoke(ObjectName objectName, String operationName) throws Exception { final SimpleString rbacAddress = addressFrom(objectName, operationName); - final CheckType permission = permissionFrom(operationName); + final CheckType permission = permissionFrom(operationName); securityStoreCheck(rbacAddress, permission); } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/protocol/websocket/WebSocketServerHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/protocol/websocket/WebSocketServerHandler.java index 7a03f3b13e9..f3d86ae9941 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/protocol/websocket/WebSocketServerHandler.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/protocol/websocket/WebSocketServerHandler.java @@ -93,7 +93,7 @@ private void handleHttpRequest(ChannelHandlerContext ctx, FullHttpRequest req) t if (future.isSuccess()) { // we need to insert an encoder that takes the underlying ChannelBuffer of a StompFrame.toActiveMQBuffer and // wrap it in a web socket frame before letting the wsencoder send it on the wire - WebSocketFrameEncoder encoder = new WebSocketFrameEncoder(maxFramePayloadLength, encoderType); + WebSocketFrameEncoder encoder = new WebSocketFrameEncoder(maxFramePayloadLength, encoderType); future.channel().pipeline().addAfter("wsencoder", "websocket-frame-encoder", encoder); } else { // Handshake failed, fire an exceptionCaught event diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/reload/ReloadManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/reload/ReloadManagerImpl.java index 19189b99097..f77b3c42bfb 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/reload/ReloadManagerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/reload/ReloadManagerImpl.java @@ -101,7 +101,7 @@ class ReloadRegistry { private final List callbacks = new LinkedList<>(); - ReloadRegistry(URL uri) { + ReloadRegistry(URL uri) { try { file = new File(uri.toURI()); // artemis-features will have this as "file:etc/artemis.xml" // so, we need to make sure we catch the exception and try diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/replay/ReplayManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/replay/ReplayManager.java index 90af9722d2e..1833b8b4936 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/replay/ReplayManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/replay/ReplayManager.java @@ -82,7 +82,7 @@ public void replay(Date start, Date end, String sourceAddress, String targetAddr if (journal == null) { // notice this routing plays single threaded. no need for any sort of synchronization here - Journal storageManageJournal = server.getStorageManager().getMessageJournal(); + Journal storageManageJournal = server.getStorageManager().getMessageJournal(); if (storageManageJournal instanceof JournalImpl impl) { journal = impl; } else if (storageManageJournal instanceof ReplicatedJournal replicatedJournal) { diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/routing/KeyResolver.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/routing/KeyResolver.java index 5c34d770018..63a61097575 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/routing/KeyResolver.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/routing/KeyResolver.java @@ -68,7 +68,7 @@ public String resolve(Connection connection, String clientID, String username) { } break; case SOURCE_IP: - if (connection != null && connection.getRemoteAddress() != null) { + if (connection != null && connection.getRemoteAddress() != null) { keyValue = connection.getRemoteAddress(); boolean hasPrefix = keyValue.startsWith(SOCKET_ADDRESS_PREFIX); @@ -84,7 +84,7 @@ public String resolve(Connection connection, String clientID, String username) { keyValue = username; break; case ROLE_NAME: - if (connection != null && connection.getProtocolConnection() != null) { + if (connection != null && connection.getProtocolConnection() != null) { Subject subject = connection.getProtocolConnection().getSubject(); if (subject != null) { for (RolePrincipal candidateRole : subject.getPrincipals(RolePrincipal.class)) { diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/routing/targets/TargetMonitor.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/routing/targets/TargetMonitor.java index f3c75741c94..a1d932a09a9 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/routing/targets/TargetMonitor.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/routing/targets/TargetMonitor.java @@ -83,7 +83,7 @@ public void run() { target.connect(); } - targetReady = target.checkReadiness() && checkTargetProbes(); + targetReady = target.checkReadiness() && checkTargetProbes(); if (targetReady) { logger.debug("{} is ready", target); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/MessagePersister.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/MessagePersister.java index 39a83f5580e..a2910d6db0d 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/MessagePersister.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/MessagePersister.java @@ -52,7 +52,7 @@ public byte getID() { CoreMessagePersister persister = CoreMessagePersister.getInstance(); MessagePersister.registerPersister(persister); - Iterable protocols = ServiceLoader.load(ProtocolManagerFactory.class, MessagePersister.class.getClassLoader()); + Iterable protocols = ServiceLoader.load(ProtocolManagerFactory.class, MessagePersister.class.getClassLoader()); for (ProtocolManagerFactory next : protocols) { registerProtocol(next); } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/ReloadableProperties.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/ReloadableProperties.java index 63cfd996ddb..dce1925f4ae 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/ReloadableProperties.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/ReloadableProperties.java @@ -114,7 +114,7 @@ private void updateStatus() { Map statusAttributes = new HashMap<>(); statusAttributes.put("Alder32", String.valueOf(checksum)); statusAttributes.put("reloadTime", String.valueOf(reloadTime)); - ServerStatus.getInstance().update(JAAS_COMPONENT + "/properties/" + key.file.getName(), statusAttributes); + ServerStatus.getInstance().update(JAAS_COMPONENT + "/properties/" + key.file.getName(), statusAttributes); } public synchronized Map invertedPropertiesMap() { diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/oidc/OIDCSupport.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/oidc/OIDCSupport.java index 92f0a02b350..f6860a6e41e 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/oidc/OIDCSupport.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/oidc/OIDCSupport.java @@ -181,7 +181,7 @@ public static JWTStringArray stringArrayForPath(JWTClaimsSet claims, String path String[] segments = path.split("\\."); Map current = claims.getClaims(); - for (int i = 0; i < segments.length; i++) { + for (int i = 0; i < segments.length; i++) { String segment = segments[i]; Object v = current.get(segment); if (i < segments.length - 1) { diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/AbstractConfigurationTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/AbstractConfigurationTestBase.java index 1af769c0fbd..6383f753901 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/AbstractConfigurationTestBase.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/AbstractConfigurationTestBase.java @@ -471,14 +471,14 @@ public static void doSetConnectionRoutersPolicyConfigurationTestImpl(Configurati assertEquals(2, configuration.getConnectionRouters().size()); - ConnectionRouterConfiguration autoShardConfig = configuration.getConnectionRouters().stream().filter( + ConnectionRouterConfiguration autoShardConfig = configuration.getConnectionRouters().stream().filter( connectionRouterConfig -> "autoShard".equals(connectionRouterConfig.getName())).findFirst().get(); assertEquals(KeyType.CLIENT_ID, autoShardConfig.getKeyType()); assertEquals("2", autoShardConfig.getPolicyConfiguration().getProperties().get(ConsistentHashModuloPolicy.MODULO)); assertNull(autoShardConfig.getCacheConfiguration()); assertNull(autoShardConfig.getPoolConfiguration()); - ConnectionRouterConfiguration symmetricRedirectConfig = configuration.getConnectionRouters().stream().filter( + ConnectionRouterConfiguration symmetricRedirectConfig = configuration.getConnectionRouters().stream().filter( connectionRouterConfig -> "symmetricRedirect".equals(connectionRouterConfig.getName())).findFirst().get(); assertEquals(KeyType.CLIENT_ID, symmetricRedirectConfig.getKeyType()); assertEquals("^.{3}", symmetricRedirectConfig.getKeyFilter()); diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java index fd4f1fc7013..d3308982246 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java @@ -972,7 +972,7 @@ public void testCoreBridgeConfiguration() throws Throwable { properties.put("bridgeConfigurations.b1.queueName", queueName); properties.put("bridgeConfigurations.b1.forwardingAddress", forwardingAddress); properties.put("bridgeConfigurations.b1.confirmationWindowSize", "10"); - properties.put("bridgeConfigurations.b1.routingType", "STRIP"); // enum + properties.put("bridgeConfigurations.b1.routingType", "STRIP"); // enum // this is a List from comma sep value properties.put("bridgeConfigurations.b1.staticConnectors", "a,b"); // flip b in place @@ -2830,7 +2830,7 @@ public void testRegxPropertiesFilesInDir() throws Exception { properties.put("name", "a"); properties.store(new FileOutputStream(tmpFile), null); - tmpFile = File.createTempFile("b_stuff", ".0-properties", temporaryFolder); + tmpFile = File.createTempFile("b_stuff", ".0-properties", temporaryFolder); properties = new Properties(); properties.put("name", "0"); properties.store(new FileOutputStream(tmpFile), null); diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeConfigurationTest.java index 400c0451c70..bde29591b17 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeConfigurationTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeConfigurationTest.java @@ -24,7 +24,7 @@ public class FileXIncludeConfigurationTest extends FileConfigurationTest { @Override protected String getConfigurationName() { - return "ConfigurationTest-xinclude-config.xml"; + return "ConfigurationTest-xinclude-config.xml"; } public FileXIncludeConfigurationTest(boolean xxeEnabled) { diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/PropertiesLoginModuleRaceConditionTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/PropertiesLoginModuleRaceConditionTest.java index b33a0de17ba..c96d6514742 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/PropertiesLoginModuleRaceConditionTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/PropertiesLoginModuleRaceConditionTest.java @@ -179,7 +179,7 @@ private void createGroups() throws FileNotFoundException, IOException { for (int i = 0; i < 100; i++) { groups.put("group" + i, "first,second,third"); } - store(groups, new File(temp, ROLES_FILE)); + store(groups, new File(temp, ROLES_FILE)); } private void createUsers() throws FileNotFoundException, IOException { diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/StatusTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/StatusTest.java index ccaeaee4897..46d8371ed1f 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/StatusTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/StatusTest.java @@ -97,10 +97,10 @@ public void testStatusOfServerOrderServerFirst() throws Exception { ActiveMQServerImpl server = new ActiveMQServerImpl(); assertEquals(server, ServerStatus.getServer()); - ServerStatus.getInstance().update(JAAS_COMPONENT + "/properties/" + EARLY_BIRD, "{\"reloadTime\":\"2\"}"); + ServerStatus.getInstance().update(JAAS_COMPONENT + "/properties/" + EARLY_BIRD, "{\"reloadTime\":\"2\"}"); assertTrue(ServerStatus.getInstance().asJson().contains(EARLY_BIRD), "contains"); - ServerStatus.getInstance().update(JAAS_COMPONENT + "/properties/" + BIRD, "{\"reloadTime\":\"2\"}"); + ServerStatus.getInstance().update(JAAS_COMPONENT + "/properties/" + BIRD, "{\"reloadTime\":\"2\"}"); assertTrue(ServerStatus.getInstance().asJson().contains(EARLY_BIRD), "contains"); assertTrue(ServerStatus.getInstance().asJson().contains(BIRD), "contains"); @@ -111,10 +111,10 @@ public void testStatusOfServerOrderServerSecond() throws Exception { final String EARLY_BIRD = "early"; final String BIRD = "later"; - ServerStatus.getInstance().update(JAAS_COMPONENT + "/properties/" + EARLY_BIRD, "{\"reloadTime\":\"2\"}"); + ServerStatus.getInstance().update(JAAS_COMPONENT + "/properties/" + EARLY_BIRD, "{\"reloadTime\":\"2\"}"); assertTrue(ServerStatus.getInstance().asJson().contains(EARLY_BIRD), "contains"); - ServerStatus.getInstance().update(JAAS_COMPONENT + "/properties/" + BIRD, "{\"reloadTime\":\"2\"}"); + ServerStatus.getInstance().update(JAAS_COMPONENT + "/properties/" + BIRD, "{\"reloadTime\":\"2\"}"); ActiveMQServerImpl server = new ActiveMQServerImpl(); assertEquals(server, ServerStatus.getServer()); diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/ServerLogBundlesTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/ServerLogBundlesTest.java index 3bae3a8f117..cc6103cd577 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/ServerLogBundlesTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/ServerLogBundlesTest.java @@ -34,7 +34,7 @@ public class ServerLogBundlesTest { private static final String SERVER_LOGGER = ActiveMQServerLogger.class.getPackage().getName(); - private static final String QUEUE_LOGGER = Queue.class.getName(); + private static final String QUEUE_LOGGER = Queue.class.getName(); private static LogLevel origServerLoggerLevel; private static LogLevel origQueueLoggerLevel; diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/management/ArtemisMBeanServerGuardTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/management/ArtemisMBeanServerGuardTest.java index dba3dea0378..8bd7da6eba9 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/management/ArtemisMBeanServerGuardTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/management/ArtemisMBeanServerGuardTest.java @@ -33,7 +33,7 @@ public class ArtemisMBeanServerGuardTest extends ServerTestBase { @Test public void testInvokeNoMethod() throws Throwable { - ArtemisMBeanServerGuard guard = new ArtemisMBeanServerGuard(); + ArtemisMBeanServerGuard guard = new ArtemisMBeanServerGuard(); ObjectNameBuilder objectNameBuilder = ObjectNameBuilder.create("testdomain", "myBroker"); ObjectName activeMQServerObjectName = objectNameBuilder.getActiveMQServerObjectName(); assertTrue(guard.canInvoke(activeMQServerObjectName.getCanonicalName(), null)); @@ -41,7 +41,7 @@ public void testInvokeNoMethod() throws Throwable { @Test public void testCantInvokeMethod() throws Throwable { - ArtemisMBeanServerGuard guard = new ArtemisMBeanServerGuard(); + ArtemisMBeanServerGuard guard = new ArtemisMBeanServerGuard(); ObjectNameBuilder objectNameBuilder = ObjectNameBuilder.create("testdomain", "myBroker"); ObjectName activeMQServerObjectName = objectNameBuilder.getActiveMQServerObjectName(); assertFalse(guard.canInvoke(activeMQServerObjectName.getCanonicalName(), "getSomething")); @@ -50,7 +50,7 @@ public void testCantInvokeMethod() throws Throwable { @Test public void testCanInvokeMethodWhiteList() throws Throwable { - ArtemisMBeanServerGuard guard = new ArtemisMBeanServerGuard(); + ArtemisMBeanServerGuard guard = new ArtemisMBeanServerGuard(); JMXAccessControlList controlList = new JMXAccessControlList(); guard.setJMXAccessControlList(controlList); ObjectNameBuilder objectNameBuilder = ObjectNameBuilder.create("testdomain", "myBroker"); @@ -62,7 +62,7 @@ public void testCanInvokeMethodWhiteList() throws Throwable { @Test public void testCanInvokeMethodHasRole() throws Throwable { - ArtemisMBeanServerGuard guard = new ArtemisMBeanServerGuard(); + ArtemisMBeanServerGuard guard = new ArtemisMBeanServerGuard(); JMXAccessControlList controlList = new JMXAccessControlList(); guard.setJMXAccessControlList(controlList); ObjectNameBuilder objectNameBuilder = ObjectNameBuilder.create("testdomain", "myBroker"); @@ -83,7 +83,7 @@ public void testCanInvokeMethodHasRole() throws Throwable { @Test public void testCanInvokeMethodDoeNotHasRole() throws Throwable { - ArtemisMBeanServerGuard guard = new ArtemisMBeanServerGuard(); + ArtemisMBeanServerGuard guard = new ArtemisMBeanServerGuard(); JMXAccessControlList controlList = new JMXAccessControlList(); guard.setJMXAccessControlList(controlList); ObjectNameBuilder objectNameBuilder = ObjectNameBuilder.create("testdomain", "myBroker"); diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/management/ArtemisRbacMBeanServerBuilderTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/management/ArtemisRbacMBeanServerBuilderTest.java index f29feba88cb..c6431b7120a 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/management/ArtemisRbacMBeanServerBuilderTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/management/ArtemisRbacMBeanServerBuilderTest.java @@ -176,7 +176,7 @@ public void testRbacAddressFromWithObjectNameBuilder() throws Exception { Class type = m.getParameterTypes()[i]; if (type == String.class) { args[i] = RandomUtil.randomUUIDString(); - } else if (SimpleString.class == type) { + } else if (SimpleString.class == type) { args[i] = RandomUtil.randomUUIDSimpleString(); } else if (RoutingType.class == type) { args[i] = RoutingType.ANYCAST; @@ -461,7 +461,7 @@ public void testConfigViewMethodMatchNoPermission() throws Exception { viewSubject.getPrincipals().add(new UserPrincipal("v")); viewSubject.getPrincipals().add(new RolePrincipal("viewers")); - Object ret = SecurityManagerShim.callAs(viewSubject, (Callable) () -> { + Object ret = SecurityManagerShim.callAs(viewSubject, (Callable) () -> { try { return serverControl.isSecurityEnabled(); } catch (Exception e1) { @@ -474,7 +474,7 @@ public void testConfigViewMethodMatchNoPermission() throws Exception { assertTrue(((Exception)ret).getMessage().contains("EDIT")); // another `is` op is ok with view - ret = SecurityManagerShim.callAs(viewSubject, (Callable) () -> { + ret = SecurityManagerShim.callAs(viewSubject, (Callable) () -> { try { return serverControl.isActive(); } catch (Exception e1) { @@ -516,7 +516,7 @@ public void testConfigMethodMatchEmptyNeedsUpdate() throws Exception { testSubject.getPrincipals().add(new UserPrincipal("v")); testSubject.getPrincipals().add(new RolePrincipal("viewers")); - Object ret = SecurityManagerShim.callAs(testSubject, (Callable) () -> { + Object ret = SecurityManagerShim.callAs(testSubject, (Callable) () -> { try { return serverControl.getAddressCount(); } catch (Exception e1) { @@ -531,7 +531,7 @@ public void testConfigMethodMatchEmptyNeedsUpdate() throws Exception { // with updaters role we can access a specific method testSubject.getPrincipals().add(new RolePrincipal("updaters")); - ret = SecurityManagerShim.callAs(testSubject, (Callable) () -> { + ret = SecurityManagerShim.callAs(testSubject, (Callable) () -> { try { return serverControl.isSecurityEnabled(); } catch (Exception e1) { diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/routing/ConnectionRouterTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/routing/ConnectionRouterTest.java index f1f642e6bff..d317d69ad9c 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/routing/ConnectionRouterTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/routing/ConnectionRouterTest.java @@ -52,7 +52,7 @@ public void setUp() { @Test public void getTarget() throws Exception { Policy policy = null; - underTest = new ConnectionRouter("test", KeyType.CLIENT_ID, "^.{3}", + underTest = new ConnectionRouter("test", KeyType.CLIENT_ID, "^.{3}", localTarget, "^FOO.*", null, null, policy); underTest.start(); @@ -64,7 +64,7 @@ public void getTarget() throws Exception { @Test public void getTargetWhenNotStarted() throws Exception { Policy policy = null; - underTest = new ConnectionRouter("test", KeyType.CLIENT_ID, "^.{3}", + underTest = new ConnectionRouter("test", KeyType.CLIENT_ID, "^.{3}", localTarget, "^FOO.*", null, null, policy); assertEquals(TargetResult.REFUSED_UNAVAILABLE_RESULT, underTest.getTarget("BAR_EE")); @@ -88,7 +88,7 @@ public String transformKey(String key) { } }; - underTest = new ConnectionRouter("test", KeyType.CLIENT_ID, "^.{3}", + underTest = new ConnectionRouter("test", KeyType.CLIENT_ID, "^.{3}", localTarget, "^FOO.*", null, null, policy); underTest.start(); diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/OIDCLoginModuleTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/OIDCLoginModuleTest.java index 28ab28ce432..6bc3aaa39a2 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/OIDCLoginModuleTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/OIDCLoginModuleTest.java @@ -610,7 +610,7 @@ public JWKSecurityContext currentContext() { new SecureRandom().nextBytes(newSignature); String[] split = token.split("\\."); Base64.Encoder encoder = Base64.getUrlEncoder().withoutPadding(); - token = split[0] + "." + split[1] + "." + encoder.encodeToString(newSignature); + token = split[0] + "." + split[1] + "." + encoder.encodeToString(newSignature); Subject subject = new Subject(); lm.initialize(subject, new JaasCallbackHandler(null, token, null), null, config); @@ -1173,7 +1173,7 @@ public String getName() { } } - public static class MyNonPrincipal { + public static class MyNonPrincipal { private final String name; public MyNonPrincipal(String name) { diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/RemoveDirectoryExtension.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/RemoveDirectoryExtension.java index aba11c0b105..2eb858d5060 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/RemoveDirectoryExtension.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/RemoveDirectoryExtension.java @@ -41,7 +41,7 @@ public RemoveDirectoryExtension(String directoryPath) { @Override public void afterEach(ExtensionContext context) throws Exception { - logger.trace("Removing directory: {}", directoryPath); + logger.trace("Removing directory: {}", directoryPath); FileUtil.deleteDirectory(new File(directoryPath)); } diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ServerTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ServerTestBase.java index 2cef9f8f69f..adb21eb4294 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ServerTestBase.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ServerTestBase.java @@ -498,7 +498,7 @@ protected final ActiveMQServer createServer(final boolean realFiles, final Integer maxReadPageMessages, final Integer maxReadPageBytes, final Map settings) { - return createServer(realFiles, configuration, pageSize, maxAddressSize, maxReadPageMessages, maxReadPageBytes, null, null, null, settings); + return createServer(realFiles, configuration, pageSize, maxAddressSize, maxReadPageMessages, maxReadPageBytes, null, null, null, settings); } diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/utils/SecurityManagerUtilTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/utils/SecurityManagerUtilTest.java index 05d45853162..c44e40fa775 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/utils/SecurityManagerUtilTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/utils/SecurityManagerUtilTest.java @@ -80,7 +80,7 @@ public void testAuthorizeWithEmptySubject() { public void testAuthorizeWithEmptyRoles() { Subject subject = getSubject("user"); - assertFalse(SecurityManagerUtil.authorize(subject, new HashSet<>(), CheckType.SEND, RolePrincipal.class)); + assertFalse(SecurityManagerUtil.authorize(subject, new HashSet<>(), CheckType.SEND, RolePrincipal.class)); } @Test diff --git a/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/ServiceExtensionLogBundlesTest.java b/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/ServiceExtensionLogBundlesTest.java index eee8446495e..4e8fd3859a6 100644 --- a/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/ServiceExtensionLogBundlesTest.java +++ b/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/ServiceExtensionLogBundlesTest.java @@ -27,8 +27,8 @@ public class ServiceExtensionLogBundlesTest { - private static final String EXTENSIONS_LOGGER = ActiveMQServiceExtensionLogger.class.getPackage().getName(); - private static final String RECOVERY_LOGGER = ActiveMQXARecoveryLogger.class.getPackage().getName(); + private static final String EXTENSIONS_LOGGER = ActiveMQServiceExtensionLogger.class.getPackage().getName(); + private static final String RECOVERY_LOGGER = ActiveMQXARecoveryLogger.class.getPackage().getName(); private static LogLevel origExtensionsLoggerLevel; private static LogLevel origRecoveryLoggerLevel; diff --git a/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/tests/extensions/OpenFilesCheckExtension.java b/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/tests/extensions/OpenFilesCheckExtension.java index fa03b427c33..152dd6390c8 100644 --- a/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/tests/extensions/OpenFilesCheckExtension.java +++ b/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/tests/extensions/OpenFilesCheckExtension.java @@ -60,7 +60,7 @@ public void afterAll(ExtensionContext context) throws Exception { if (!Wait.waitFor(() -> getOpenFD() < maxFiles, 10000, 0)) { String fileList = getOpenList(); - fail("Too many files open (" + getOpenFD() + ">" + maxFiles + ") after " + testName + ". A possible list: " + fileList); + fail("Too many files open (" + getOpenFD() + ">" + maxFiles + ") after " + testName + ". A possible list: " + fileList); } } diff --git a/artemis-web/src/main/java/org/apache/activemq/artemis/ActiveMQWebLogger.java b/artemis-web/src/main/java/org/apache/activemq/artemis/ActiveMQWebLogger.java index c5348bdb1dd..8a288523dc0 100644 --- a/artemis-web/src/main/java/org/apache/activemq/artemis/ActiveMQWebLogger.java +++ b/artemis-web/src/main/java/org/apache/activemq/artemis/ActiveMQWebLogger.java @@ -24,7 +24,7 @@ * Logger Codes 240000 - 249999 */ @LogBundle(projectCode = "AMQ", regexID = "24[0-9]{4}", retiredIDs = {244003}) -public interface ActiveMQWebLogger { +public interface ActiveMQWebLogger { ActiveMQWebLogger LOGGER = BundleFactory.newBundle(ActiveMQWebLogger.class, ActiveMQWebLogger.class.getPackage().getName()); diff --git a/artemis-web/src/test/java/org/apache/activemq/cli/test/WebServerComponentTest.java b/artemis-web/src/test/java/org/apache/activemq/cli/test/WebServerComponentTest.java index 86a2281cca9..3f7b83fe64b 100644 --- a/artemis-web/src/test/java/org/apache/activemq/cli/test/WebServerComponentTest.java +++ b/artemis-web/src/test/java/org/apache/activemq/cli/test/WebServerComponentTest.java @@ -1105,7 +1105,7 @@ private void addFile(File source, JarOutputStream target, String nameBase) throw JarEntry entry = new JarEntry(name); entry.setTime(source.lastModified()); target.putNextEntry(entry); - try (BufferedInputStream input = new BufferedInputStream(new FileInputStream(source))) { + try (BufferedInputStream input = new BufferedInputStream(new FileInputStream(source))) { byte[] buffer = new byte[1024]; while (true) { int count = input.read(buffer); diff --git a/etc/checkstyle-suppressions.xml b/etc/checkstyle-suppressions.xml index 32b2f780b22..74e96740d50 100644 --- a/etc/checkstyle-suppressions.xml +++ b/etc/checkstyle-suppressions.xml @@ -26,8 +26,8 @@ under the License. - - - + + + diff --git a/etc/checkstyle.xml b/etc/checkstyle.xml index 0bc3e2f05c1..de6f3ab67c9 100644 --- a/etc/checkstyle.xml +++ b/etc/checkstyle.xml @@ -97,6 +97,9 @@ under the License. + + + diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/extensions/RemoveDirectoryExtension.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/extensions/RemoveDirectoryExtension.java index 834bfcfb1d3..cdf7e83af71 100644 --- a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/extensions/RemoveDirectoryExtension.java +++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/extensions/RemoveDirectoryExtension.java @@ -41,7 +41,7 @@ public RemoveDirectoryExtension(String directoryPath) { @Override public void afterEach(ExtensionContext context) throws Exception { - logger.trace("Removing directory: {}", directoryPath); + logger.trace("Removing directory: {}", directoryPath); FileUtil.deleteDirectory(new File(directoryPath)); } diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java index d9bd173962f..87c7a2f8700 100644 --- a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java +++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java @@ -412,7 +412,7 @@ protected void addWithSize(final int size, OperationContext context, final long. journal.debugWait(); } - protected boolean tryUpdate(final long argument) throws Exception { + protected boolean tryUpdate(final long argument) throws Exception { byte[] updateRecord = generateRecord(recordLength); beforeJournalOperation(); @@ -729,7 +729,7 @@ protected void printJournalLists(final List expected, final List settings) { - return createServer(realFiles, configuration, pageSize, maxAddressSize, maxReadPageMessages, maxReadPageBytes, null, null, null, settings); + return createServer(realFiles, configuration, pageSize, maxAddressSize, maxReadPageMessages, maxReadPageBytes, null, null, null, settings); } diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/Jmx.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/Jmx.java index d9b7ad940e9..968d153a1a3 100644 --- a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/Jmx.java +++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/Jmx.java @@ -123,7 +123,7 @@ private static long countMembers(Map> networkTopolo } private static long countNodes(Map> networkTopology) { - final long count = networkTopology.values().stream() + final long count = networkTopology.values().stream() .flatMap(pair -> Stream.of(pair.getA(), pair.getB())) .filter(primaryOrBackup -> primaryOrBackup != null && !primaryOrBackup.isEmpty()) .count(); diff --git a/tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/tests/compatibility/GroovyRun.java b/tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/tests/compatibility/GroovyRun.java index 7fb8751bac5..dc32a8481da 100644 --- a/tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/tests/compatibility/GroovyRun.java +++ b/tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/tests/compatibility/GroovyRun.java @@ -137,14 +137,14 @@ public static void assertNull(Object value) { } } - public static void assertTrue(boolean value) { + public static void assertTrue(boolean value) { if (!value) { throw new RuntimeException("Expected true"); } } - public static void assertFalse(boolean value) { + public static void assertFalse(boolean value) { if (value) { throw new RuntimeException("Expected false"); } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/FQQNConsumerTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/FQQNConsumerTest.java index 72897d55f2c..5e42b709d5a 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/FQQNConsumerTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/FQQNConsumerTest.java @@ -71,8 +71,8 @@ public void tearDown() throws Throwable { @TestTemplate public void testSendReceive() throws Throwable { - evaluate(senderClassloader, "fqqnconsumertest/fqqnConsumerProducer.groovy", server, sender, "sendMessage"); - evaluate(receiverClassloader, "fqqnconsumertest/fqqnConsumerProducer.groovy", server, receiver, "receiveMessage"); + evaluate(senderClassloader, "fqqnconsumertest/fqqnConsumerProducer.groovy", server, sender, "sendMessage"); + evaluate(receiverClassloader, "fqqnconsumertest/fqqnConsumerProducer.groovy", server, receiver, "receiveMessage"); } } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PrefixSendAckTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PrefixSendAckTest.java index e37754d0784..4b0bdc5b6b8 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PrefixSendAckTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PrefixSendAckTest.java @@ -48,8 +48,8 @@ public PrefixSendAckTest(String server, String sender, String receiver) throws E @TestTemplate public void testSendReceive() throws Throwable { - evaluate(senderClassloader, "prefixSendAckTest/sendAckMessages.groovy", server, sender, "sendAckMessages"); - evaluate(receiverClassloader, "prefixSendAckTest/sendAckMessages.groovy", server, receiver, "receiveMessages"); + evaluate(senderClassloader, "prefixSendAckTest/sendAckMessages.groovy", server, sender, "sendAckMessages"); + evaluate(receiverClassloader, "prefixSendAckTest/sendAckMessages.groovy", server, receiver, "receiveMessages"); } @Override diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java index 253d3f5ef5c..dccafb777ca 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java @@ -53,8 +53,8 @@ public SendAckTest(String server, String sender, String receiver) throws Excepti @TestTemplate public void testSendReceive() throws Throwable { - evaluate(senderClassloader, "sendAckTest/sendAckMessages.groovy", server, sender, "sendAckMessages"); - evaluate(receiverClassloader, "sendAckTest/sendAckMessages.groovy", server, receiver, "receiveMessages"); + evaluate(senderClassloader, "sendAckTest/sendAckMessages.groovy", server, sender, "sendAckMessages"); + evaluate(receiverClassloader, "sendAckTest/sendAckMessages.groovy", server, receiver, "receiveMessages"); } } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java index 3616028db7c..1062a2250e9 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java @@ -200,7 +200,7 @@ public void testRollUpgrade_Provided_Distribution() throws Exception { assumeTrue(distribution != null); String distributionUpgrading = TestParameters.testProperty("ROLLED", "DISTRIBUTION_UPGRADE", HelperBase.getHome(ARTEMIS_HOME_PROPERTY).getAbsolutePath()); - testRollUpgrade(new File(distribution), new File(distributionUpgrading)); + testRollUpgrade(new File(distribution), new File(distributionUpgrading)); } private void testRollUpgrade(File artemisHome, File upgradingArtemisHome) throws Exception { diff --git a/tests/e2e-tests/src/test/java/org/apache/activemq/artemis/tests/e2e/brokerConnection/DualMirrorWithContainerTest.java b/tests/e2e-tests/src/test/java/org/apache/activemq/artemis/tests/e2e/brokerConnection/DualMirrorWithContainerTest.java index 02289b66267..e18b92e9953 100644 --- a/tests/e2e-tests/src/test/java/org/apache/activemq/artemis/tests/e2e/brokerConnection/DualMirrorWithContainerTest.java +++ b/tests/e2e-tests/src/test/java/org/apache/activemq/artemis/tests/e2e/brokerConnection/DualMirrorWithContainerTest.java @@ -107,7 +107,7 @@ private void testReconnectMirror(boolean largemessage) throws Throwable { int NUMBER_OF_MESSAGES = 1_000; int FAILURE_INTERVAL = 500; - String extraBody = largemessage ? RandomUtil.randomAlphaNumericString(200 * 1024) : "message "; + String extraBody = largemessage ? RandomUtil.randomAlphaNumericString(200 * 1024) : "message "; try (Connection connectionA = cfA.createConnection("artemis", "artemis")) { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeTestAccessor.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeTestAccessor.java index 3d9110fa343..94e3841f431 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeTestAccessor.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeTestAccessor.java @@ -31,7 +31,7 @@ public static Map getRefs(BridgeImpl bridge) { } public static boolean withinRefs(BridgeImpl bridge, Function, Boolean> function) { - Map refs = getRefs(bridge); + Map refs = getRefs(bridge); return function.apply(refs); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AMQPPrintDataTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AMQPPrintDataTest.java index f7c951ac157..b4bbd768f38 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AMQPPrintDataTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AMQPPrintDataTest.java @@ -63,7 +63,7 @@ public void testPrintDataWithAMQP() throws Exception { this.getClass().getClassLoader().getResource("dataprint").getFile()); ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); - PrintStream printStream = new PrintStream(byteArrayOutputStream, true, StandardCharsets.UTF_8.name()); + PrintStream printStream = new PrintStream(byteArrayOutputStream, true, StandardCharsets.UTF_8.name()); PrintData.printData(server.getConfiguration().getBindingsLocation().getAbsoluteFile(), server.getConfiguration().getJournalLocation().getAbsoluteFile(), server.getConfiguration().getPagingLocation().getAbsoluteFile(), printStream, false, false); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFullyQualifiedNameTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFullyQualifiedNameTest.java index aa6b5b01e69..81ff23c3542 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFullyQualifiedNameTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFullyQualifiedNameTest.java @@ -156,7 +156,7 @@ public void testConsumeQueueToFQQNWrongQueueAttachedToAnotherAddress() throws Ex Exception e = null; // Wrong FQQN. Attempt to subscribe to a queue belonging to a different address than given in the FQQN. - String wrongFQQN = address1 + "::" + queue2; + String wrongFQQN = address1 + "::" + queue2; Connection connection = createConnection(false); try { connection.setClientID("FQQNconn"); @@ -188,7 +188,7 @@ public void testSubscribeTopicToFQQNWrongQueueAttachedToAnotherAddress() throws Exception e = null; // Wrong FQQN. Attempt to subscribe to a queue belonging to a different address than given in the FQQN. - String wrongFQQN = address1 + "::" + queue2; + String wrongFQQN = address1 + "::" + queue2; Connection connection = createConnection(false); try { connection.setClientID("FQQNconn"); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpLargeMessageTest.java index 6114b8e7cf4..da00021dea7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpLargeMessageTest.java @@ -594,7 +594,7 @@ private void testLargeHeaderTX(boolean largeBody) throws Exception { connection.start(); MessageConsumer consumer = session.createConsumer(session.createQueue(testQueueName)); - TextMessage recMessage = (TextMessage) consumer.receive(5000); + TextMessage recMessage = (TextMessage) consumer.receive(5000); assertEquals(smallString, recMessage.getStringProperty("test")); assertEquals(body, recMessage.getText()); session.commit(); @@ -1129,7 +1129,7 @@ public void testDeleteUnreferencedMessage() throws Exception { server.stop(); - try (AssertionLoggerHandler loggerHandler = new AssertionLoggerHandler()) { + try (AssertionLoggerHandler loggerHandler = new AssertionLoggerHandler()) { server.start(); assertTrue(loggerHandler.findText("AMQ221019")); } @@ -1294,7 +1294,7 @@ private static void consumeForInterruptedStreaming(ConnectionFactory factory, assertEquals(bodySize, expectedPayload.length); - byte[] receivedPayLoad = new byte[bodySize]; + byte[] receivedPayLoad = new byte[bodySize]; msg.readBytes(receivedPayLoad); assertArrayEquals(expectedPayload, receivedPayLoad); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverWithFiltersTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverWithFiltersTest.java index 06311374094..61745929d48 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverWithFiltersTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverWithFiltersTest.java @@ -157,7 +157,7 @@ public void testReceivedUnsignedFilter() throws Exception { AmqpReceiver receiver = session.createReceiver(getQueueName(), "myNewID < " + (NUM_MESSAGES / 2)); List messages = new ArrayList<>(NUM_MESSAGES); receiver.flow((NUM_MESSAGES + 2) * 2); - for (int i = 0; i < NUM_MESSAGES / 2; ++i) { + for (int i = 0; i < NUM_MESSAGES / 2; ++i) { AmqpMessage message = receiver.receive(5, TimeUnit.SECONDS); assertNotNull(message); logger.debug("Read message: {}", message.getApplicationProperty("myNewID")); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/BrokerDefinedAnycastConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/BrokerDefinedAnycastConsumerTest.java index df9a52f4ac7..4e5534e8afe 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/BrokerDefinedAnycastConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/BrokerDefinedAnycastConsumerTest.java @@ -39,7 +39,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -public class BrokerDefinedAnycastConsumerTest extends AmqpClientTestSupport { +public class BrokerDefinedAnycastConsumerTest extends AmqpClientTestSupport { SimpleString address = SimpleString.of("testAddress"); SimpleString queue1 = SimpleString.of("queue1"); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/BrokerDefinedMulticastConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/BrokerDefinedMulticastConsumerTest.java index becd08292cd..848c57b31db 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/BrokerDefinedMulticastConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/BrokerDefinedMulticastConsumerTest.java @@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -public class BrokerDefinedMulticastConsumerTest extends AmqpClientTestSupport { +public class BrokerDefinedMulticastConsumerTest extends AmqpClientTestSupport { SimpleString address = SimpleString.of("testAddress"); SimpleString queue1 = SimpleString.of("queue1"); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedAnycastConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedAnycastConsumerTest.java index 538bd3424ef..8192c15f4f4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedAnycastConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedAnycastConsumerTest.java @@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -public class ClientDefinedAnycastConsumerTest extends AmqpClientTestSupport { +public class ClientDefinedAnycastConsumerTest extends AmqpClientTestSupport { SimpleString address = SimpleString.of("testAddress"); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedMultiConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedMultiConsumerTest.java index ce97990a681..3c3dcff5cec 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedMultiConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedMultiConsumerTest.java @@ -40,7 +40,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -public class ClientDefinedMultiConsumerTest extends AmqpClientTestSupport { +public class ClientDefinedMultiConsumerTest extends AmqpClientTestSupport { SimpleString address = SimpleString.of("testAddress"); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSAcknowledgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSAcknowledgeTest.java index 2567a2bb226..8b6f5e10cd5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSAcknowledgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSAcknowledgeTest.java @@ -81,7 +81,7 @@ public void testConsumeIndividualMessagesOutOfOrder() throws Throwable { for (int i = 0; i < msgCount / 2; i++) { Message msg = messages.remove(rand.nextInt(msgCount - i)); - int messageNumber = msg.getIntProperty(MSG_NUM); + int messageNumber = msg.getIntProperty(MSG_NUM); acknowledged.add(messageNumber); msg.acknowledge(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/TopicDurableTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/TopicDurableTests.java index 59cdb4cdb9f..d7307d8bad7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/TopicDurableTests.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/TopicDurableTests.java @@ -67,7 +67,7 @@ public void testMessageDurableSubscription() throws Exception { logger.debug("testMessageDurableSubscription"); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - Topic testTopic = session.createTopic("jmsTopic"); + Topic testTopic = session.createTopic("jmsTopic"); String sub1ID = "sub1DurSub"; String sub2ID = "sub2DurSub"; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPBridgeFromQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPBridgeFromQueueTest.java index 9cb572a6428..98d67e0b7d6 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPBridgeFromQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPBridgeFromQueueTest.java @@ -477,7 +477,7 @@ public void testBridgeQueueReceiverCarriesConsumerQueueFilter() throws Exception try (Connection connection = factory.createConnection()) { final Session session = connection.createSession(Session.AUTO_ACKNOWLEDGE); - final Queue queue = session.createQueue(getTestName()); + final Queue queue = session.createQueue(getTestName()); session.createConsumer(queue, "color='red'"); // new receiver for this selector @@ -571,7 +571,7 @@ public void testBridgeQueueReceiverCanIgnoreConsumerQueueFilter() throws Excepti try (Connection connection = factory.createConnection()) { final Session session = connection.createSession(Session.AUTO_ACKNOWLEDGE); - final Queue queue = session.createQueue(getTestName()); + final Queue queue = session.createQueue(getTestName()); session.createConsumer(queue, "color='red'"); // Consumer filter should be ignored @@ -635,7 +635,7 @@ public void testBridgeQueueReceiverCanIgnoreAllFilters() throws Exception { try (Connection connection = factory.createConnection()) { final Session session = connection.createSession(Session.AUTO_ACKNOWLEDGE); - final Queue queue = session.createQueue(getTestName()); + final Queue queue = session.createQueue(getTestName()); session.createConsumer(queue, "color='red'"); // Consumer filter should be ignored @@ -1179,7 +1179,7 @@ public void testRejectedQueueReceiverAttachWhenLocalMatchingQueueNotFoundIsHandl peer.waitForScriptToComplete(5, TimeUnit.SECONDS); peer.expectAttach().ofReceiver() - .withTarget().withAddress(getTestName() + "::test.queue").also() + .withTarget().withAddress(getTestName() + "::test.queue").also() .withSource().withAddress("test.queue") .withFilter(nullValue()).also() .withName(allOf(containsString(getTestName()), diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPBridgeToAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPBridgeToAddressTest.java index 0aa0bcb6e83..22a16040cfd 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPBridgeToAddressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPBridgeToAddressTest.java @@ -72,7 +72,7 @@ /** * Test the AMQP Bridge to address configuration and protocol behaviors */ -public class AMQPBridgeToAddressTest extends AmqpClientTestSupport { +public class AMQPBridgeToAddressTest extends AmqpClientTestSupport { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPBridgeToQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPBridgeToQueueTest.java index 355ef5b35ae..0430fba51a1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPBridgeToQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPBridgeToQueueTest.java @@ -63,7 +63,7 @@ /** * Test the AMQP Bridge to queue configuration and protocol behaviors */ -class AMQPBridgeToQueueTest extends AmqpClientTestSupport { +class AMQPBridgeToQueueTest extends AmqpClientTestSupport { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationConfigurationReloadTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationConfigurationReloadTest.java index 75f916465ec..49791026bf2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationConfigurationReloadTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationConfigurationReloadTest.java @@ -647,7 +647,7 @@ public void testReloadAmqpConnectionAddressPolicyMatches() throws Exception { assertNotNull(address1Consumer.receive(5_000)); assertNotNull(address2Consumer.receive(5_000)); - } finally { + } finally { embeddedActiveMQ.stop(); } } @@ -737,7 +737,7 @@ public void testReloadAmqpConnectionQueuePolicyMatches() throws Exception { assertNotNull(queue1Consumer.receiveNoWait()); assertNotNull(queue2Consumer.receiveNoWait()); - } finally { + } finally { embeddedActiveMQ.stop(); } } @@ -811,7 +811,7 @@ public void testReloadAmqpConnectionAddressPolicyReplacedWithQueuePolicy() throw // connection was recreated. Wait.assertTrue(() -> server.bindingQuery(SimpleString.of("address2")).getQueueNames().isEmpty()); - } finally { + } finally { embeddedActiveMQ.stop(); } } @@ -907,7 +907,7 @@ public void testReloadAmqpConnectionQueuePolicyMatchesFromBrokerProperties() thr assertNotNull(queue1Consumer.receiveNoWait()); assertNotNull(queue2Consumer.receiveNoWait()); - } finally { + } finally { embeddedActiveMQ.stop(); } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationQueuePolicyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationQueuePolicyTest.java index 2ae83caec94..40521245520 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationQueuePolicyTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationQueuePolicyTest.java @@ -374,7 +374,7 @@ public void testFederationQueueReceiverCarriesConsumerQueueFilter() throws Excep try (Connection connection = factory.createConnection()) { final Session session = connection.createSession(Session.AUTO_ACKNOWLEDGE); - final Queue queue = session.createQueue("test"); + final Queue queue = session.createQueue("test"); session.createConsumer(queue, "color='red'"); // new receiver for this selector @@ -479,7 +479,7 @@ public void testFederationQueueReceiverCanIgnoreConsumerQueueFilter() throws Exc try (Connection connection = factory.createConnection()) { final Session session = connection.createSession(Session.AUTO_ACKNOWLEDGE); - final Queue queue = session.createQueue("test"); + final Queue queue = session.createQueue("test"); session.createConsumer(queue, "color='red'"); // Consumer filter should be ignored diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/ValidateAMQPErrorsTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/ValidateAMQPErrorsTest.java index c95db15bb2d..e81fb11c631 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/ValidateAMQPErrorsTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/ValidateAMQPErrorsTest.java @@ -438,7 +438,7 @@ public void testReconnectAfterMirrorLinkRefusal() throws Exception { expectMirroredJMSMessage(peer, i); } - sendJMSMessage(msgCount, getQueueName()); + sendJMSMessage(msgCount, getQueueName()); peer.waitForScriptToComplete(5, TimeUnit.SECONDS); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ForceDeleteQueue.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ForceDeleteQueue.java index 22ee8740f1b..5838b69cecd 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ForceDeleteQueue.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ForceDeleteQueue.java @@ -114,7 +114,7 @@ public void testForceDelete() throws Exception { conn.start(); - LinkedListIterator queueiterator = serverQueue.browserIterator(); + LinkedListIterator queueiterator = serverQueue.browserIterator(); List listQueue = new ArrayList<>(1000); while (queueiterator.hasNext()) { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InfiniteRedeliveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InfiniteRedeliveryTest.java index 79325e2ddf3..b0b704e1f2b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InfiniteRedeliveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InfiniteRedeliveryTest.java @@ -169,7 +169,7 @@ public void testInifinteRedeliveryWithScheduling(boolean reschedule) throws Exce Session session = connection.createSession(true, Session.SESSION_TRANSACTED); Queue queue = session.createQueue("test"); assertNotNull(queue); - MessageProducer producer = session.createProducer(queue); + MessageProducer producer = session.createProducer(queue); producer.send(session.createTextMessage("hello")); session.commit(); @@ -199,12 +199,12 @@ public void testInifinteRedeliveryWithScheduling(boolean reschedule) throws Exce Map counts = countJournal(primaryServer.getServer().getConfiguration()); counts.forEach((k, v) -> logger.debug("{}={}", k, v)); - counts.forEach((k, v) -> assertTrue(v.intValue() < 20, "Record type " + k + " has a lot of records:" + v)); + counts.forEach((k, v) -> assertTrue(v.intValue() < 20, "Record type " + k + " has a lot of records:" + v)); Map backupCounts = countJournal(backupServer.getServer().getConfiguration()); assertFalse(backupCounts.isEmpty()); backupCounts.forEach((k, v) -> logger.debug("On Backup:{}={}", k, v)); - backupCounts.forEach((k, v) -> assertTrue(v.intValue() < 10, "Backup Record type " + k + " has a lot of records:" + v)); + backupCounts.forEach((k, v) -> assertTrue(v.intValue() < 10, "Backup Record type " + k + " has a lot of records:" + v)); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSOrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSOrderTest.java index 5db9c464106..a1a82e670a9 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSOrderTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSOrderTest.java @@ -72,7 +72,7 @@ public void setupCF() { @Parameters(name = "protocol={0}&exclusive={1}") public static Collection getParameters() { - return Arrays.asList(new Object[][]{{"AMQP", true}, {"AMQP", false}, {"OPENWIRE", true}, {"OPENWIRE", false}, {"CORE", true}, {"CORE", false}}); + return Arrays.asList(new Object[][]{{"AMQP", true}, {"AMQP", false}, {"OPENWIRE", true}, {"OPENWIRE", false}, {"CORE", true}, {"CORE", false}}); } @Override 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 6990cb1129a..9b934ea074f 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 @@ -186,7 +186,7 @@ public void testSlowConsumerKilledAfterBurst() throws Exception { consumer.receiveImmediate().individualAcknowledge(); } - Thread.sleep(3 * checkPeriod * 1000); + Thread.sleep(3 * checkPeriod * 1000); try { consumer.receiveImmediate(); @@ -220,7 +220,7 @@ public void testSlowConsumerSparedAfterBurst() throws Exception { consumer.receiveImmediate().individualAcknowledge(); } - Thread.sleep(3 * checkPeriod * 1000); + Thread.sleep(3 * checkPeriod * 1000); assertNotNull(consumer.receiveImmediate()); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/crossprotocol/ProtocolsMessageLoadBalancingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/crossprotocol/ProtocolsMessageLoadBalancingTest.java index 0fa85343a07..9140d6f1379 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/crossprotocol/ProtocolsMessageLoadBalancingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/crossprotocol/ProtocolsMessageLoadBalancingTest.java @@ -404,8 +404,8 @@ public void testRedistributeAfterLoadBalanced() throws Exception { ConnectionFactory[] factory = new ConnectionFactory[NUMBER_OF_SERVERS]; Connection[] connection = new Connection[NUMBER_OF_SERVERS]; - Session[] session = new Session[NUMBER_OF_SERVERS]; - MessageConsumer[] consumer = new MessageConsumer[NUMBER_OF_SERVERS]; + Session[] session = new Session[NUMBER_OF_SERVERS]; + MessageConsumer[] consumer = new MessageConsumer[NUMBER_OF_SERVERS]; // this will pre create consumers to make sure messages are distributed evenly without redistribution for (int node = 0; node < NUMBER_OF_SERVERS; node++) { 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 34c00f58df9..5ae12f77e10 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 @@ -283,7 +283,7 @@ protected void waitForFailoverTopology(final int bNode, final int... nodes) thro ActiveMQServer server = servers[bNode]; if (logger.isDebugEnabled()) { - logger.debug("waiting for {} on the topology for server = {}", Arrays.toString(nodes), server); + logger.debug("waiting for {} on the topology for server = {}", Arrays.toString(nodes), server); } long start = System.currentTimeMillis(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/PagedSNFTopicDistributionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/PagedSNFTopicDistributionTest.java index b7795650675..b069461bb9e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/PagedSNFTopicDistributionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/PagedSNFTopicDistributionTest.java @@ -106,7 +106,7 @@ public void testTopicWhileSNFPaged() throws Exception { } // verifying if everything is actually paged, nothing should be routed on the journal - Map counters = countJournal(servers[0].getConfiguration()); + Map counters = countJournal(servers[0].getConfiguration()); assertEquals(0, getCounter(JournalRecordIds.ADD_REF, counters), "There are routed messages on the journal"); assertEquals(0, getCounter(JournalRecordIds.ADD_MESSAGE, counters), "There are routed messages on the journal"); assertEquals(0, getCounter(JournalRecordIds.ADD_MESSAGE_PROTOCOL, counters), "There are routed messages on the journal"); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ClusterWithBackupFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ClusterWithBackupFailoverTest.java index 4370013bd88..1c1c7a7873d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ClusterWithBackupFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ClusterWithBackupFailoverTest.java @@ -18,7 +18,7 @@ import org.junit.jupiter.api.Test; -public abstract class ClusterWithBackupFailoverTest extends ClusterWithBackupFailoverTestBase { +public abstract class ClusterWithBackupFailoverTest extends ClusterWithBackupFailoverTestBase { @Test public void testFailPrimaryNodes() throws Throwable { setupCluster(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverWithDivertTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverWithDivertTest.java index aafee1f0133..0d486ce4d7e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverWithDivertTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverWithDivertTest.java @@ -116,7 +116,7 @@ public void testUniqueIDsWithDivert() throws Exception { session.commit(); ClientConsumer consumer = session.createConsumer(DIVERT_ADDRESS); - for (int i = 0; i < num; i++) { + for (int i = 0; i < num; i++) { ClientMessage receivedFromSourceQueue = consumer.receive(5000); assertNotNull(receivedFromSourceQueue); receivedFromSourceQueue.acknowledge(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java index 2aea6290485..ca784b07481 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java @@ -195,7 +195,7 @@ public void testPagedInSync() throws Exception { logger.info("Depaged:: {}", depaged.getPageId()); - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 10; i++) { producer.send(session.createTextMessage("on current page")); session.commit(); store.depage(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PageCleanupWhileReplicaCatchupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PageCleanupWhileReplicaCatchupTest.java index 4473acb6f0c..535ee40a009 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PageCleanupWhileReplicaCatchupTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PageCleanupWhileReplicaCatchupTest.java @@ -127,7 +127,7 @@ public void testPageCleanup() throws Throwable { for (Worker worker : workers) { if (worker.throwable != null) { - throw new RuntimeException("Worker " + worker.queueName + " failed", worker.throwable); + throw new RuntimeException("Worker " + worker.queueName + " failed", worker.throwable); } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PrimaryCrashOnBackupSyncTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PrimaryCrashOnBackupSyncTest.java index c45d4352cf0..cd90167ece1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PrimaryCrashOnBackupSyncTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PrimaryCrashOnBackupSyncTest.java @@ -215,7 +215,7 @@ public static void main(String[] arg) { ActiveMQServer primaryServer = new ActiveMQServerImpl(primaryConfiguration, ManagementFactory.getPlatformMBeanServer(), new ActiveMQJAASSecurityManager(InVMLoginModule.class.getName(), new SecurityConfiguration())) { @Override protected PagingStoreFactoryNIO getPagingStoreFactory() { - return new PagingStoreFactoryNIO(this.getStorageManager(), this.getConfiguration().getPagingLocation(), this.getConfiguration().getJournalBufferTimeout_NIO(), this.getScheduledPool(), this.getExecutorFactory(), this.getConfiguration().isJournalSyncNonTransactional(), null, () -> true) { + return new PagingStoreFactoryNIO(this.getStorageManager(), this.getConfiguration().getPagingLocation(), this.getConfiguration().getJournalBufferTimeout_NIO(), this.getScheduledPool(), this.getExecutorFactory(), this.getConfiguration().isJournalSyncNonTransactional(), null, () -> true) { @Override public synchronized PagingStore newStore(SimpleString address, AddressSettings settings) { return new DelayPagingStoreImpl(address, this.getScheduledExecutor(), primaryConfiguration.getJournalBufferTimeout_NIO(), getPagingManager(), getStorageManager(), null, this, address, settings, getExecutorFactory().getExecutor(), getExecutorFactory().getExecutor(), this.isSyncNonTransactional()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java index 345627697b1..973af66f8f7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java @@ -112,7 +112,7 @@ private void internalBrowser(int tamperMode) throws Exception { for (long pageID = store.getFirstPage(); pageID <= store.getCurrentPage().getPageId() + 10; pageID++) { primaryServer.getServer().getStorageManager().pageClosed(store.getStoreName(), (int) pageID); } - } else if (tamperMode == 2) { + } else if (tamperMode == 2) { for (long pageID = store.getFirstPage(); pageID <= store.getCurrentPage().getPageId() + 10; pageID++) { primaryServer.getServer().getStorageManager().pageDeleted(store.getStoreName(), (int) pageID); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/RequestReplyMultiProtocolTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/RequestReplyMultiProtocolTest.java index 5cd89ed1695..d6cb00532cf 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/RequestReplyMultiProtocolTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/RequestReplyMultiProtocolTest.java @@ -123,7 +123,7 @@ private void testReplyTo(boolean useTopic) throws Throwable { Destination consumerDestination; if (useTopic) { consumerDestination = consumerSess.createTopic(topicName.toString()); - } else { + } else { consumerDestination = consumerSess.createQueue(queueName.toString()); } MessageConsumer consumer; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/DivertTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/DivertTest.java index c6d6199b797..f468b204857 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/DivertTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/DivertTest.java @@ -279,7 +279,7 @@ public void testCrossProtocol() throws Exception { amqpConnection.start(); for (int i = 0; i < 10; i++) { - javax.jms.Message received = consumerFromConvert.receive(5000); + javax.jms.Message received = consumerFromConvert.receive(5000); assertNotNull(received); producer.send(received); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/federation/FederatedAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/federation/FederatedAddressTest.java index 828b82a0a90..f7160aea03d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/federation/FederatedAddressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/federation/FederatedAddressTest.java @@ -591,7 +591,7 @@ public void testFederatedAddressLocalBrokerRestart() throws Exception { Connection newConnection = getCF(0).createConnection(); newConnection.start(); session0 = newConnection.createSession(); - topic0 = session0.createTopic(address); + topic0 = session0.createTopic(address); consumer0 = session0.createConsumer(topic0); Wait.waitFor(() -> getServer(1).getPostOffice().getBindingsForAddress(SimpleString.of(address)).getBindings().size() == 1); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/federation/FederatedQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/federation/FederatedQueueTest.java index e4a0af1d56b..51036c9e726 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/federation/FederatedQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/federation/FederatedQueueTest.java @@ -592,7 +592,7 @@ public void testFederatedQueueRemoteBrokerRestart() throws Exception { Connection connection1 = cf1.createConnection(); connection1.start(); Session session1 = connection1.createSession(); - Queue queue1 = session1.createQueue(queueName); + Queue queue1 = session1.createQueue(queueName); MessageProducer producer = session1.createProducer(queue1); producer.send(session1.createTextMessage("hello")); @@ -600,7 +600,7 @@ public void testFederatedQueueRemoteBrokerRestart() throws Exception { Connection connection0 = cf0.createConnection(); connection0.start(); Session session0 = connection0.createSession(); - Queue queue0 = session0.createQueue(queueName); + Queue queue0 = session0.createQueue(queueName); MessageConsumer consumer0 = session0.createConsumer(queue0); assertNotNull(consumer0.receive(1000)); @@ -621,7 +621,7 @@ public void testFederatedQueueRemoteBrokerRestart() throws Exception { connection1 = cf1.createConnection(); connection1.start(); session1 = connection1.createSession(); - queue1 = session1.createQueue(queueName); + queue1 = session1.createQueue(queueName); producer = session1.createProducer(queue1); producer.send(session1.createTextMessage("hello")); @@ -654,7 +654,7 @@ public void testFederatedQueueLocalBrokerRestart() throws Exception { Connection connection1 = cf1.createConnection(); connection1.start(); Session session1 = connection1.createSession(); - Queue queue1 = session1.createQueue(queueName); + Queue queue1 = session1.createQueue(queueName); MessageProducer producer = session1.createProducer(queue1); producer.send(session1.createTextMessage("hello")); @@ -662,7 +662,7 @@ public void testFederatedQueueLocalBrokerRestart() throws Exception { Connection connection0 = cf0.createConnection(); connection0.start(); Session session0 = connection0.createSession(); - Queue queue0 = session0.createQueue(queueName); + Queue queue0 = session0.createQueue(queueName); MessageConsumer consumer0 = session0.createConsumer(queue0); assertNotNull(consumer0.receive(1000)); @@ -683,7 +683,7 @@ public void testFederatedQueueLocalBrokerRestart() throws Exception { connection0 = getCF(0).createConnection(); connection0.start(); session0 = connection0.createSession(); - queue0 = session0.createQueue(queueName); + queue0 = session0.createQueue(queueName); consumer0 = session0.createConsumer(queue0); producer.send(session1.createTextMessage("hello")); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java index 884b4c66a02..c1bde1a5061 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java @@ -154,7 +154,7 @@ public void defaultAutoCreatedQueueConfigTest() throws Exception { context.createProducer().setProperty("prop1", 1).setProperty("prop2", 2).send(q1, "Text1"); - org.apache.activemq.artemis.core.server.Queue queue = server.locateQueue(SimpleString.of(queueName)); + org.apache.activemq.artemis.core.server.Queue queue = server.locateQueue(SimpleString.of(queueName)); assertEquals(5, queue.getMaxConsumers()); assertTrue(queue.isPurgeOnNoConsumers()); @@ -172,7 +172,7 @@ public void defaultAutoCreatedQueueConfigTest2() throws Exception { session.createProducer(session.createQueue(queueName)); - org.apache.activemq.artemis.core.server.Queue queue = server.locateQueue(SimpleString.of(queueName)); + org.apache.activemq.artemis.core.server.Queue queue = server.locateQueue(SimpleString.of(queueName)); assertEquals(5, queue.getMaxConsumers()); assertTrue(queue.isPurgeOnNoConsumers()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java index 79c9a9af9e5..ab73ea40caf 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java @@ -99,7 +99,7 @@ public void testExceptionListener() throws Exception { conn.close(); server.stop(); server.start(); - cf = new ActiveMQConnectionFactory(BROKER_URL); + cf = new ActiveMQConnectionFactory(BROKER_URL); dest = (Destination) ActiveMQJMSClient.createQueue(QUEUE_NAME); conn = cf.createConnection(); sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/WildcardTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/WildcardTest.java index d897d34bf19..2a57a2b108c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/WildcardTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/WildcardTest.java @@ -56,7 +56,7 @@ public static Iterable data() { @Override protected Configuration createDefaultConfig(boolean netty) throws Exception { - Configuration configuration = super.createDefaultConfig(netty).setJMXManagementEnabled(true); + Configuration configuration = super.createDefaultConfig(netty).setJMXManagementEnabled(true); return configuration; } @@ -70,10 +70,10 @@ public WildcardTest(String topicA, String topicB, String topicWildcard) { @TestTemplate public void testWildcard1Topic() throws Exception { - Session sessionA = createSession(); - MessageProducer producerA = createProducer(sessionA, topicA); + Session sessionA = createSession(); + MessageProducer producerA = createProducer(sessionA, topicA); - MessageConsumer consumerA = createConsumer(topicA); + MessageConsumer consumerA = createConsumer(topicA); MessageConsumer consumerWC = createConsumer(topicWildcard); Message message = sessionA.createObjectMessage(1); @@ -93,14 +93,14 @@ public void testWildcard1Topic() throws Exception { @TestTemplate public void testWildcard2Topics() throws Exception { - Session sessionA = createSession(); - MessageProducer producerA = createProducer(sessionA, topicA); + Session sessionA = createSession(); + MessageProducer producerA = createProducer(sessionA, topicA); - Session sessionB = createSession(); - MessageProducer producerB = createProducer(sessionA, topicB); + Session sessionB = createSession(); + MessageProducer producerB = createProducer(sessionA, topicB); - MessageConsumer consumerA = createConsumer(topicA); - MessageConsumer consumerB = createConsumer(topicB); + MessageConsumer consumerA = createConsumer(topicA); + MessageConsumer consumerB = createConsumer(topicB); MessageConsumer consumerWC = createConsumer(topicWildcard); Message message1 = sessionA.createObjectMessage(1); @@ -173,10 +173,10 @@ public void testNegativeAddressSizeOnWildcardAsync100() throws Exception { } private void testNegativeAddressSizeOnWildcard(int numMessages) throws Exception { - Session sessionA = createSession(); - MessageProducer producerA = createProducer(sessionA, topicA); + Session sessionA = createSession(); + MessageProducer producerA = createProducer(sessionA, topicA); - MessageConsumer consumerA = createConsumer(topicA); + MessageConsumer consumerA = createConsumer(topicA); MessageConsumer consumerWC = createConsumer(topicWildcard); for (int i = 0; i < numMessages; i++) { @@ -194,7 +194,7 @@ private void testNegativeAddressSizeOnWildcard(int numMessages) throws Exception assertNotNull(received2.getObject(), "consumerWC message - " + i + " is null"); } - long addressSizeA = (Long)mbeanServer.getAttribute(new ObjectName("org.apache.activemq.artemis:broker=\"localhost\",component=addresses,address=\"" + topicA + "\""), "AddressSize"); + long addressSizeA = (Long)mbeanServer.getAttribute(new ObjectName("org.apache.activemq.artemis:broker=\"localhost\",component=addresses,address=\"" + topicA + "\""), "AddressSize"); long addressSizeWC = (Long)mbeanServer.getAttribute(new ObjectName("org.apache.activemq.artemis:broker=\"localhost\",component=addresses,address=\"" + topicWildcard + "\""), "AddressSize"); assertTrue(addressSizeA >= 0, topicA + " AddressSize < 0"); @@ -202,13 +202,13 @@ private void testNegativeAddressSizeOnWildcard(int numMessages) throws Exception } private void testNegativeAddressSizeOnWildcardAsync(int numMessages) throws Exception { - Session sessionA = createSession(); - MessageProducer producerA = createProducer(sessionA, topicA); + Session sessionA = createSession(); + MessageProducer producerA = createProducer(sessionA, topicA); - CountDownLatch latchA = new CountDownLatch(numMessages); + CountDownLatch latchA = new CountDownLatch(numMessages); MessageConsumer consumerA = createAsyncConsumer(topicA, latchA); - CountDownLatch latchWC = new CountDownLatch(numMessages); + CountDownLatch latchWC = new CountDownLatch(numMessages); MessageConsumer consumerWC = createAsyncConsumer(topicWildcard, latchWC); for (int i = 0; i < numMessages; i++) { @@ -225,7 +225,7 @@ private void testNegativeAddressSizeOnWildcardAsync(int numMessages) throws Exce fail("Waiting to receive " + latchWC.getCount() + " messages on " + topicWildcard); } - long addressSizeA = (Long)mbeanServer.getAttribute(new ObjectName("org.apache.activemq.artemis:broker=\"localhost\",component=addresses,address=\"" + topicA + "\""), "AddressSize"); + long addressSizeA = (Long)mbeanServer.getAttribute(new ObjectName("org.apache.activemq.artemis:broker=\"localhost\",component=addresses,address=\"" + topicA + "\""), "AddressSize"); long addressSizeWC = (Long)mbeanServer.getAttribute(new ObjectName("org.apache.activemq.artemis:broker=\"localhost\",component=addresses,address=\"" + topicWildcard + "\""), "AddressSize"); assertTrue(addressSizeA >= 0, topicA + " AddressSize < 0"); @@ -234,7 +234,7 @@ private void testNegativeAddressSizeOnWildcardAsync(int numMessages) throws Exce private Session createSession() throws Exception { Connection connection = createConnection(); - Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); + Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); return session; } @@ -252,8 +252,8 @@ private MessageConsumer createConsumer(String topicName) throws Exception { Connection connection = createConnection(); connection.start(); - Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - Topic topic = session.createTopic(topicName); + Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); + Topic topic = session.createTopic(topicName); MessageConsumer consumer = session.createConsumer(topic, null, false); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/JmsConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/JmsConsumerTest.java index bf20424f19a..4b3555c0ec3 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/JmsConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/JmsConsumerTest.java @@ -810,7 +810,7 @@ public void defaultAutoCreatedQueueConfigTest() throws Exception { session.createConsumer(session.createQueue(queueName)); - org.apache.activemq.artemis.core.server.Queue queue = server.locateQueue(SimpleString.of(queueName)); + org.apache.activemq.artemis.core.server.Queue queue = server.locateQueue(SimpleString.of(queueName)); assertEquals(5, queue.getMaxConsumers()); assertTrue(queue.isPurgeOnNoConsumers()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/multiprotocol/JMSSelectorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/multiprotocol/JMSSelectorTest.java index e74c646646c..10995b684f8 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/multiprotocol/JMSSelectorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/multiprotocol/JMSSelectorTest.java @@ -133,7 +133,7 @@ private void receiveLVQ(ConnectionSupplier consumerConnectionSupplier, String qu } } - private void sendMessage(ConnectionSupplier producerConnectionSupplier, String queueName, MessageSetter setValue, int deliveryMode, int priority, long timeToLive) throws JMSException { + private void sendMessage(ConnectionSupplier producerConnectionSupplier, String queueName, MessageSetter setValue, int deliveryMode, int priority, long timeToLive) throws JMSException { try (Connection producerConnection = producerConnectionSupplier.createConnection()) { Session producerSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); Queue queue1 = producerSession.createQueue(queueName); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/multiprotocol/JMSTopicSubscriberTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/multiprotocol/JMSTopicSubscriberTest.java index fdbe7ad3b5c..d52833f6fd2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/multiprotocol/JMSTopicSubscriberTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/multiprotocol/JMSTopicSubscriberTest.java @@ -42,21 +42,21 @@ protected void addConfiguration(ActiveMQServer server) throws Exception { @Test @Timeout(30) public void testCoreSubscriptionQueueCreatedWhenAutoCreateDisabled() throws Exception { - Connection connection = createCoreConnection(); + Connection connection = createCoreConnection(); testSubscriptionQueueCreatedWhenAutoCreateDisabled(connection); } @Test @Timeout(30) public void testOpenWireSubscriptionQueueCreatedWhenAutoCreateDisabled() throws Exception { - Connection connection = createOpenWireConnection(); + Connection connection = createOpenWireConnection(); testSubscriptionQueueCreatedWhenAutoCreateDisabled(connection); } @Test @Timeout(30) public void testAMQPSubscriptionQueueCreatedWhenAutoCreateDisabled() throws Exception { - Connection connection = createConnection(); + Connection connection = createConnection(); testSubscriptionQueueCreatedWhenAutoCreateDisabled(connection); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalHashMapTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalHashMapTest.java index a48941d9f53..3321e768dec 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalHashMapTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalHashMapTest.java @@ -137,7 +137,7 @@ public void testHashMap() throws Exception { journalHashMapProvider.reload(r); }); - List> existingLists = journalHashMapProvider.getMaps(); + List> existingLists = journalHashMapProvider.getMaps(); assertEquals(1, existingLists.size()); JournalHashMap reloadedList = existingLists.get(0); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java index 3ef6922a17c..2c73dcd0d9e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java @@ -381,7 +381,7 @@ long record = idGenerator.generateID(); long recordId = idGenerator.generateID(); for (int i = 0; i < 100; i++) { if (i % 10 == 0) { - logger.debug("i = {}", i); + logger.debug("i = {}", i); } recordId = idGenerator.generateID(); journal.appendAddRecord(recordId, recordType, "test".getBytes(), false); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java index 533e58a100a..582af4b6366 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java @@ -3835,7 +3835,7 @@ public void testListQueuesOrder(boolean legacyFilter) throws Exception { Thread.sleep(500); server.addAddressInfo(new AddressInfo(queueName3, RoutingType.ANYCAST)); if (legacyCreateQueue) { - server.createQueue(queueName3, RoutingType.ANYCAST, queueName3, SimpleString.of("filter0"), null, true, + server.createQueue(queueName3, RoutingType.ANYCAST, queueName3, SimpleString.of("filter0"), null, true, false, false, 10, false, false); } else { server.createQueue(QueueConfiguration.of(queueName3).setRoutingType(RoutingType.ANYCAST).setFilterString("filter0").setMaxConsumers(10).setAutoCreateAddress(false)); @@ -4524,7 +4524,7 @@ public void testListConsumers() throws Exception { assertEquals(3, array.size(), "number of consumers returned from query"); // filter by address - filterString = createJsonFilter(ConsumerField.ADDRESS.getName(), "EQUALS", addressName1.toString()); + filterString = createJsonFilter(ConsumerField.ADDRESS.getName(), "EQUALS", addressName1.toString()); consumersAsJsonString = serverControl.listConsumers(filterString, 1, 50); consumersAsJsonObject = JsonUtil.readJsonObject(consumersAsJsonString); array = (JsonArray) consumersAsJsonObject.get("data"); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java index 92ba0632d4b..e3de138f673 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java @@ -118,7 +118,7 @@ public boolean isPaging() throws Exception { @Override public int getAddressLimitPercent() { - return (int) proxy.retrieveAttributeValue("addressLimitPercent", Integer.class); + return (int) proxy.retrieveAttributeValue("addressLimitPercent", Integer.class); } @Override diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlUsingCoreTest.java index 4cd84405cf3..d1404bc2d61 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlUsingCoreTest.java @@ -128,8 +128,8 @@ public void stop() throws Exception { } @Override - public long getProducerWindowSize() { - return (Long) proxy.retrieveAttributeValue("producerWindowSize", Long.class); + public long getProducerWindowSize() { + return (Long) proxy.retrieveAttributeValue("producerWindowSize", Long.class); } }; } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java index 0bd7a3469f9..970dcdeab76 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java @@ -190,7 +190,7 @@ public void testCorrelateResponseByCorrelationID() throws Exception { public void testCorrelateResponseByMessageID() throws Exception { String queue = RandomUtil.randomUUIDString(); String address = RandomUtil.randomUUIDString(); - UUID messageId = UUIDGenerator.getInstance().generateUUID(); + UUID messageId = UUIDGenerator.getInstance().generateUUID(); Configuration config = createBasicConfig().setJMXManagementEnabled(false); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java index b114159ae78..73b86869c08 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java @@ -4582,7 +4582,7 @@ public void testSendMessageWithAMQP() throws Exception { ConnectionFactory factory = CFUtil.createConnectionFactory("amqp", "tcp://localhost:61616"); try (Connection connection = factory.createConnection("myUser", "myPassword")) { Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - MessageProducer producer = session.createProducer(session.createQueue(address.toString())); + MessageProducer producer = session.createProducer(session.createQueue(address.toString())); producer.setDeliveryMode(DeliveryMode.PERSISTENT); TextMessage message = session.createTextMessage("theAMQPBody"); message.setStringProperty("protocolUsed", "amqp"); @@ -4594,7 +4594,7 @@ public void testSendMessageWithAMQP() throws Exception { ConnectionFactory factory = CFUtil.createConnectionFactory("core", "tcp://localhost:61616"); try (Connection connection = factory.createConnection("myUser", "myPassword")) { Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - MessageProducer producer = session.createProducer(session.createQueue(address.toString())); + MessageProducer producer = session.createProducer(session.createQueue(address.toString())); producer.setDeliveryMode(DeliveryMode.PERSISTENT); TextMessage message = session.createTextMessage("theCoreBody"); message.setStringProperty("protocolUsed", "core"); @@ -4654,7 +4654,7 @@ public void testSendMessageWithAMQPLarge() throws Exception { ConnectionFactory factory = CFUtil.createConnectionFactory("amqp", "tcp://localhost:61616"); try (Connection connection = factory.createConnection("myUser", "myPassword")) { Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - MessageProducer producer = session.createProducer(session.createQueue(address.toString())); + MessageProducer producer = session.createProducer(session.createQueue(address.toString())); producer.setDeliveryMode(DeliveryMode.PERSISTENT); TextMessage message = session.createTextMessage(text); message.setStringProperty("protocolUsed", "amqp"); @@ -4666,7 +4666,7 @@ public void testSendMessageWithAMQPLarge() throws Exception { ConnectionFactory factory = CFUtil.createConnectionFactory("core", "tcp://localhost:61616"); try (Connection connection = factory.createConnection("myUser", "myPassword")) { Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - MessageProducer producer = session.createProducer(session.createQueue(address.toString())); + MessageProducer producer = session.createProducer(session.createQueue(address.toString())); producer.setDeliveryMode(DeliveryMode.PERSISTENT); TextMessage message = session.createTextMessage(text); message.setStringProperty("protocolUsed", "core"); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlUsingCoreTest.java index 04aef0bfeff..1d9b73e522e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlUsingCoreTest.java @@ -220,7 +220,7 @@ public boolean isPurgeOnNoConsumers() { @Override public boolean isEnabled() { - return (Boolean) proxy.retrieveAttributeValue("isEnabled"); + return (Boolean) proxy.retrieveAttributeValue("isEnabled"); } @Override diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/AuthTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/AuthTests.java index 14b63af17ce..16323bc6301 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/AuthTests.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/AuthTests.java @@ -37,5 +37,5 @@ */ @Disabled -public class AuthTests extends MQTT5TestSupport { +public class AuthTests extends MQTT5TestSupport { } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnAckTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnAckTests.java index 1fc8cf06f7a..0960275cd9d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnAckTests.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnAckTests.java @@ -86,7 +86,7 @@ * [MQTT-3.2.2-20] The Server MUST NOT send this (i.e. User Property) property if it would increase the size of the CONNACK packet beyond the Maximum Packet Size specified by the Client. */ -public class ConnAckTests extends MQTT5TestSupport { +public class ConnAckTests extends MQTT5TestSupport { /* * [MQTT-3.1.3-6] A Server MAY allow a Client to supply a ClientID that has a length of zero bytes, however if it diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/DisconnectTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/DisconnectTests.java index 814f7e46978..f9d9dab2306 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/DisconnectTests.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/DisconnectTests.java @@ -57,7 +57,7 @@ * [MQTT-3.14.2-4] The sender MUST NOT send this property if it would increase the size of the DISCONNECT packet beyond the Maximum Packet Size specified by the receiver. */ -public class DisconnectTests extends MQTT5TestSupport { +public class DisconnectTests extends MQTT5TestSupport { /* * [MQTT-3.14.2-1] The Client or Server sending the DISCONNECT packet MUST use one of the DISCONNECT Reason Codes. diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PingReqTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PingReqTests.java index 206371ac726..8e6b5437588 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PingReqTests.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PingReqTests.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -public class PingReqTests extends MQTT5TestSupport { +public class PingReqTests extends MQTT5TestSupport { /* * [MQTT-3.12.4-1] The Server MUST send a PINGRESP packet in response to a PINGREQ packet. diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PingRespTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PingRespTests.java index b8d47321f1e..08a077dd758 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PingRespTests.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PingRespTests.java @@ -25,5 +25,5 @@ */ @Disabled -public class PingRespTests extends MQTT5TestSupport { +public class PingRespTests extends MQTT5TestSupport { } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireLargeMessageTest.java index 680ce390053..5f687ca3ecd 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireLargeMessageTest.java @@ -236,7 +236,7 @@ public void testSendReceiveLargeMessageTX() throws Exception { Message message; if (sent % 2 == 0) { message = session.createTextMessage(largeString); - } else { + } else { BytesMessage bytesMessage = session.createBytesMessage(); bytesMessage.writeBytes(largeString.getBytes(StandardCharsets.UTF_8)); message = bytesMessage; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/PrefetchRedeliveryCountOpenwireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/PrefetchRedeliveryCountOpenwireTest.java index 823324c2d61..1911edbf7a7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/PrefetchRedeliveryCountOpenwireTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/PrefetchRedeliveryCountOpenwireTest.java @@ -107,7 +107,7 @@ public void testConsumerSingleMessageLoopNonExclusive() throws Exception { doTestConsumerSingleMessageLoop(false); } - public void doTestConsumerSingleMessageLoop(boolean exclusive) throws Exception { + public void doTestConsumerSingleMessageLoop(boolean exclusive) throws Exception { Connection exConn = null; SimpleString durableQueue = SimpleString.of("exampleQueue"); @@ -273,7 +273,7 @@ public void testServerSideRollbackOnCloseOrder() throws Exception { final int batch = 100; - final ExecutorService commitExecutor = Executors.newCachedThreadPool(); + final ExecutorService commitExecutor = Executors.newCachedThreadPool(); Runnable consumerTask = () -> { @@ -323,7 +323,7 @@ public void testServerSideRollbackOnCloseOrder() throws Exception { // manual ack in tx to setup server for rollback work on fail Transport transport = ((ActiveMQConnection) consumerConnection).getTransport(); - TransactionId txId = new LocalTransactionId(((ActiveMQConnection) consumerConnection).getConnectionInfo().getConnectionId(), receivedCount.get()); + TransactionId txId = new LocalTransactionId(((ActiveMQConnection) consumerConnection).getConnectionInfo().getConnectionId(), receivedCount.get()); TransactionInfo tx = new TransactionInfo(((ActiveMQConnection) consumerConnection).getConnectionInfo().getConnectionId(), txId, TransactionInfo.BEGIN); transport.request(tx); MessageAck ack = new MessageAck(); @@ -435,7 +435,7 @@ public void testExclusiveConsumerBatchOrderUnderLoad() throws Exception { final int batch = 200; - final ExecutorService commitExecutor = Executors.newCachedThreadPool(); + final ExecutorService commitExecutor = Executors.newCachedThreadPool(); Runnable consumerTask = () -> { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java index d287372b5f0..c353953c5ba 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java @@ -228,7 +228,7 @@ public void testSendNullMapMessage() throws Exception { public void testSendEmptyMessages() throws Exception { Queue dest = new ActiveMQQueue(queueName); - QueueSession defaultQueueSession = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); + QueueSession defaultQueueSession = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); QueueSender defaultSender = defaultQueueSession.createSender(dest); defaultSender.setDeliveryMode(DeliveryMode.NON_PERSISTENT); connection.start(); @@ -646,7 +646,7 @@ public void testTopicNoLocal() throws Exception { MessageConsumer nolocalConsumer = session.createConsumer(dest, null, true); MessageConsumer consumer = session.createConsumer(dest, null, false); - MessageConsumer selectorConsumer = session.createConsumer(dest, "TESTKEY = 'test'", false); + MessageConsumer selectorConsumer = session.createConsumer(dest, "TESTKEY = 'test'", false); MessageProducer producer = session.createProducer(dest); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/cluster/MessageRedistributionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/cluster/MessageRedistributionTest.java index 777c0c0ce6b..7fe8f202f3e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/cluster/MessageRedistributionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/cluster/MessageRedistributionTest.java @@ -213,8 +213,8 @@ public void testAdvisoriesNotClustered() throws Exception { MessageProducer producer = session.createProducer(dest); producer.send(session.createTextMessage("test message")); Message message = mySubscriber.receive(5000); - SimpleString advQueue = SimpleString.of("ActiveMQ.Advisory.TempQueue"); - SimpleString advTopic = SimpleString.of("ActiveMQ.Advisory.TempTopic"); + SimpleString advQueue = SimpleString.of("ActiveMQ.Advisory.TempQueue"); + SimpleString advTopic = SimpleString.of("ActiveMQ.Advisory.TempTopic"); //we create a consumer on node 2 and assert that the advisory subscription queue is not clustered assertEquals(1, servers[0].getPostOffice().getBindingsForAddress(advQueue).getBindings().size(), ""); assertEquals(1, servers[0].getPostOffice().getBindingsForAddress(advTopic).getBindings().size(), ""); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingCounterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingCounterTest.java index 0b467996795..bfb6f939ddf 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingCounterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingCounterTest.java @@ -282,7 +282,7 @@ public void testCleanupCounter() throws Exception { storage.waitOnOperations(); Wait.assertEquals(i + 1, counter::getValue); - Wait.assertEquals((i + 1) * 1000, counter::getPersistentSize); + Wait.assertEquals((i + 1) * 1000, counter::getPersistentSize); tx = new TransactionImpl(server.getStorageManager()); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSizeWildcardTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSizeWildcardTest.java index 9f51678cb74..0eae94258ef 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSizeWildcardTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSizeWildcardTest.java @@ -63,8 +63,8 @@ public void testWildcardPageSize() throws Exception { publish(cf, numMessages); for (int i = 0; i < numMessages; i++) { - assertNotNull(consumerA.receive(1000), " on " + i); - assertNotNull(consumerW.receive(1000), " on " + i); + assertNotNull(consumerA.receive(1000), " on " + i); + assertNotNull(consumerW.receive(1000), " on " + i); } // commit in reverse order to dispatch @@ -108,8 +108,8 @@ public void testDurableSubReveresOrderAckPageSize() throws Exception { publish(cf, numMessages); for (int i = 0; i < numMessages; i++) { - assertNotNull(consumerA.receive(1000), " on " + i); - assertNotNull(consumerW.receive(1000), " on " + i); + assertNotNull(consumerA.receive(1000), " on " + i); + assertNotNull(consumerW.receive(1000), " on " + i); } // commit in reverse order to dispatch diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/WildcardAddressFullTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/WildcardAddressFullTest.java index 1aaa3dc7c45..5cf8551d07d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/WildcardAddressFullTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/WildcardAddressFullTest.java @@ -219,7 +219,7 @@ public void testDrop() throws Exception { @Test public void testBlock() throws Exception { String addressToSend = "a.b.c.d.e.f.g"; - String[] queueToReceive = new String[]{"a.b.c.d.e.f.*", "a.b.c.d.e.*.*", "a.b.c.d.*.*.*", "a.b.c.*.*.*.*", "a.b.*.*.*.*.*", "a.*.*.*.*.*.*"}; + String[] queueToReceive = new String[]{"a.b.c.d.e.f.*", "a.b.c.d.e.*.*", "a.b.c.d.*.*.*", "a.b.c.*.*.*.*", "a.b.*.*.*.*.*", "a.*.*.*.*.*.*"}; String addressSettingsMatch = "a.#"; ExecutorService executorService = Executors.newFixedThreadPool(1 + queueToReceive.length); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/CorePluginTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/CorePluginTest.java index f817cebc987..ef4ecf966e8 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/CorePluginTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/CorePluginTest.java @@ -207,7 +207,7 @@ public void testAutoCreateQueue() throws Exception { sess.createConsumer(autoCreatedQueue); conn.close(); - verifier.validatePluginMethodsEquals(1, BEFORE_DESTROY_QUEUE, + verifier.validatePluginMethodsEquals(1, BEFORE_DESTROY_QUEUE, AFTER_DESTROY_QUEUE, BEFORE_REMOVE_ADDRESS, AFTER_REMOVE_ADDRESS); verifier.validatePluginMethodsEquals(3, BEFORE_ADD_ADDRESS, @@ -227,7 +227,7 @@ public void testAutoCreateTopic() throws Exception { conn.close(); //before/add address called just once to remove autocreated destination - verifier.validatePluginMethodsEquals(1, BEFORE_DESTROY_QUEUE, + verifier.validatePluginMethodsEquals(1, BEFORE_DESTROY_QUEUE, AFTER_DESTROY_QUEUE, BEFORE_REMOVE_ADDRESS, AFTER_REMOVE_ADDRESS, BEFORE_REMOVE_BINDING, AFTER_REMOVE_BINDING); //Before/Add address are called twice because of the autocreated destination and the diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/MetricsPluginTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/MetricsPluginTest.java index 18b645fdbdf..4a8875d7bae 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/MetricsPluginTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/MetricsPluginTest.java @@ -94,7 +94,7 @@ public void testForArtemisMetricsPresence() throws Exception { Matcher> anyOrder = containsInAnyOrder( // broker metrics - new Metric("artemis.address.memory.usage", 0.0, Arrays.asList(Tag.of("broker", "localhost"))), + new Metric("artemis.address.memory.usage", 0.0, Arrays.asList(Tag.of("broker", "localhost"))), new Metric("artemis.address.memory.usage.percentage", 0.0, Arrays.asList(Tag.of("broker", "localhost"))), new Metric("artemis.connection.count", 1.0, Arrays.asList(Tag.of("broker", "localhost"))), new Metric("artemis.total.connection.count", 1.0, Arrays.asList(Tag.of("broker", "localhost"))), diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerXATest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerXATest.java index 122ffe6ab92..e9b7d32c1fd 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerXATest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerXATest.java @@ -308,7 +308,7 @@ public void release() { } } - class XADummyEndpointBegin extends XADummyEndpoint { + class XADummyEndpointBegin extends XADummyEndpoint { private boolean afterDelivery = false; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/routing/ElasticQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/routing/ElasticQueueTest.java index 41cc2771a8d..4a7f1f8d28b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/routing/ElasticQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/routing/ElasticQueueTest.java @@ -344,7 +344,7 @@ public void run() { } } } catch (JMSException | InterruptedException ignored) { - System.out.println("Exception: " + ignored.toString() + ", PC=" + producedCount.get()); + System.out.println("Exception: " + ignored.toString() + ", PC=" + producedCount.get()); } } } @@ -585,7 +585,7 @@ public void testScale0_1_CombinedProducerConsumerConnectionWithProducerRole() th nodes.get(1).start(); // ensure nothing can be consumed from the head - AddressControl addressControl1 = (AddressControl) ManagementControlHelper.createProxy(node1NameBuilder.getAddressObjectName(qNameSimple), AddressControl.class, mBeanServer); + AddressControl addressControl1 = (AddressControl) ManagementControlHelper.createProxy(node1NameBuilder.getAddressObjectName(qNameSimple), AddressControl.class, mBeanServer); assertTrue(Wait.waitFor(() -> { try { addressControl1.pause(); @@ -692,7 +692,7 @@ public void testScale0_1_CombinedRoleConnection() throws Exception { nodes.get(1).start(); // ensure nothing can be consumed from the head - AddressControl addressControl1 = (AddressControl) ManagementControlHelper.createProxy(node1NameBuilder.getAddressObjectName(qNameSimple), AddressControl.class, mBeanServer); + AddressControl addressControl1 = (AddressControl) ManagementControlHelper.createProxy(node1NameBuilder.getAddressObjectName(qNameSimple), AddressControl.class, mBeanServer); assertTrue(Wait.waitFor(() -> { try { addressControl1.pause(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/routing/KeyTypeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/routing/KeyTypeTest.java index 5bfddae8f15..1cfda9e1a20 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/routing/KeyTypeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/routing/KeyTypeTest.java @@ -275,7 +275,7 @@ private void testConnection(String host, int port, String clientID, String user, testMQTTConnection(host, port, clientID, user, password, sslEnabled, needClientAuth); break; } catch (Throwable t) { - if (i == retries) { + if (i == retries) { throw t; } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/routing/RoutingTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/routing/RoutingTestBase.java index 3516c4f3698..0e034c5286c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/routing/RoutingTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/routing/RoutingTestBase.java @@ -162,7 +162,7 @@ protected void setupRouterLocalCache(final int node, boolean persisted, int time } protected ConnectionFactory createFactory(String protocol, boolean sslEnabled, String host, int port, String clientID, String user, String password) throws Exception { - return createFactory(protocol, sslEnabled, host, port, clientID, user, password, false, -1); + return createFactory(protocol, sslEnabled, host, port, clientID, user, password, false, -1); } protected ConnectionFactory createFactory(String protocol, boolean sslEnabled, String host, int port, String clientID, String user, String password, boolean needClientAuth, int retries) throws Exception { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/RejectValidatedUserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/RejectValidatedUserTest.java index 6c2d706b56a..cec0d74b64c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/RejectValidatedUserTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/RejectValidatedUserTest.java @@ -38,7 +38,7 @@ import javax.jms.Queue; import javax.jms.Session; -public class RejectValidatedUserTest extends ActiveMQTestBase { +public class RejectValidatedUserTest extends ActiveMQTestBase { private static final String ADDRESS = "TestQueue"; private ActiveMQServer server; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/LVQTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/LVQTest.java index 0976d6fc249..354de9f69a2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/LVQTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/LVQTest.java @@ -860,7 +860,7 @@ public void testSizeInReplace() throws Exception { producer.send(m2); // encoded size is a little larger than payload Wait.assertTrue(() -> queue.getPersistentSize() > 10 * 1024); - Wait.assertEquals(0L, () -> queue.getDeliveringSize(), 5000, 100); + Wait.assertEquals(0L, () -> queue.getDeliveringSize(), 5000, 100); } @Test diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/RingQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/RingQueueTest.java index 5c3dbefdbc3..8abe01768ee 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/RingQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/RingQueueTest.java @@ -157,7 +157,7 @@ public void testConsumerCloseWithDirectDeliver() throws Exception { Wait.assertEquals(2, queue::getDeliveringCount); consumer.close(); Wait.assertEquals(1, queue::getMessageCount); - Wait.assertEquals(0, queue::getDeliveringCount); + Wait.assertEquals(0, queue::getDeliveringCount); Wait.assertEquals(1, queue::getMessagesReplaced); consumer = clientSession.createConsumer(qName); message = consumer.receiveImmediate(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownCommitIntervalTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownCommitIntervalTest.java index 212ae656347..5919d2c46ab 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownCommitIntervalTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownCommitIntervalTest.java @@ -83,8 +83,8 @@ private void testCommitInterval(int commitInterval) throws Exception { consumers[1].getSession().commit(); removeConsumer(1); - Wait.assertEquals((long) TEST_SIZE, () -> servers[0].locateQueue(queueName1).getMessageCount(), 500, 20); - Wait.assertEquals((long) TEST_SIZE - 1, () -> servers[0].locateQueue(queueName2).getMessageCount(), 500, 20); + Wait.assertEquals((long) TEST_SIZE, () -> servers[0].locateQueue(queueName1).getMessageCount(), 500, 20); + Wait.assertEquals((long) TEST_SIZE - 1, () -> servers[0].locateQueue(queueName2).getMessageCount(), 500, 20); assertEquals((long) TEST_SIZE, performScaledown(commitInterval)); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JavaVersionUtil.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JavaVersionUtil.java index be45ed45ab4..4e3016ebaa3 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JavaVersionUtil.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JavaVersionUtil.java @@ -22,7 +22,7 @@ public class JavaVersionUtil { static { String version = System.getProperty("java.version"); - if (version != null && version.startsWith("1.8.")) { + if (version != null && version.startsWith("1.8.")) { isJdk8 = true; } } diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java index 578203ba4fa..68e9f12b4e2 100644 --- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java @@ -906,7 +906,7 @@ public void testMultipleConsumers() throws Exception { tm.setText("3"); tm.setStringProperty("PROP2", "VALUE2"); msgProducer.send(tm); - logger.debug("Sent message with id [{}]", tm.getJMSMessageID()); + logger.debug("Sent message with id [{}]", tm.getJMSMessageID()); tm = session.createTextMessage(); tm.setText("4"); diff --git a/tests/karaf-client-integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/client/ArtemisCoreClientFeatureIT.java b/tests/karaf-client-integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/client/ArtemisCoreClientFeatureIT.java index 018a54be6e3..ce508f3addb 100644 --- a/tests/karaf-client-integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/client/ArtemisCoreClientFeatureIT.java +++ b/tests/karaf-client-integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/client/ArtemisCoreClientFeatureIT.java @@ -64,7 +64,7 @@ public Option[] config() throws IOException { @Test public void testArtemisCoreClient() throws Exception { try (ServerLocator locator = ActiveMQClient.createServerLocator("tcp://localhost:61616")) { - ClientSessionFactory factory = locator.createSessionFactory(); + ClientSessionFactory factory = locator.createSessionFactory(); ClientSession session = factory.createSession(); String queueName = "artemisCoreClientFeatureITQueue"; ClientProducer producer = session.createProducer(queueName); diff --git a/tests/performance-jmh/src/main/java/org/apache/activemq/artemis/tests/performance/jmh/AddressMapPerfTest.java b/tests/performance-jmh/src/main/java/org/apache/activemq/artemis/tests/performance/jmh/AddressMapPerfTest.java index 7078a171d75..1591a7bb785 100644 --- a/tests/performance-jmh/src/main/java/org/apache/activemq/artemis/tests/performance/jmh/AddressMapPerfTest.java +++ b/tests/performance-jmh/src/main/java/org/apache/activemq/artemis/tests/performance/jmh/AddressMapPerfTest.java @@ -54,7 +54,7 @@ public class AddressMapPerfTest { } @Setup - public void init() { + public void init() { objectAddressMap = new AddressMap<>(WILDCARD_CONFIGURATION.getAnyWordsString(), WILDCARD_CONFIGURATION.getSingleWordString(), WILDCARD_CONFIGURATION.getDelimiter()); diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/JournalImplTestUnit.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/JournalImplTestUnit.java index 7031497bde8..cadb4b7f5ac 100644 --- a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/JournalImplTestUnit.java +++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/JournalImplTestUnit.java @@ -105,7 +105,7 @@ public void testCommitOnError() throws Exception { Assertions.assertThrows(Exception.class, () -> { journal.appendCommitRecord(1, true, context, true); }); - CountDownLatch latch = new CountDownLatch(1); + CountDownLatch latch = new CountDownLatch(1); context.executeOnCompletion(new IOCompletion() { @Override public void storeLineUp() { @@ -139,7 +139,7 @@ public void testBiggerRecordTX() throws Exception { Assertions.assertThrows(Exception.class, () -> { addTxWithSize(1024 * 1024, 1, 1); }); - CountDownLatch latch = new CountDownLatch(1); + CountDownLatch latch = new CountDownLatch(1); context.executeOnCompletion(new IOCompletion() { @Override public void storeLineUp() { @@ -173,7 +173,7 @@ public void testBiggerRecord() throws Exception { Assertions.assertThrows(Exception.class, () -> { addWithSize(1024 * 1024, context, 1, 1); }); - CountDownLatch latch = new CountDownLatch(1); + CountDownLatch latch = new CountDownLatch(1); context.executeOnCompletion(new IOCompletion() { @Override public void storeLineUp() { diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DualMirrorNoContainerTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DualMirrorNoContainerTest.java index 4dc292752d7..a9780f95ce9 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DualMirrorNoContainerTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DualMirrorNoContainerTest.java @@ -80,7 +80,7 @@ public static void createServers() throws Exception { } @BeforeEach - public void beforeClass() throws Exception { + public void beforeClass() throws Exception { cleanupData(SERVER_NAME_A); cleanupData(SERVER_NAME_B); processB = startServer(SERVER_NAME_B, 0, 0); diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/PagedMirrorSmokeTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/PagedMirrorSmokeTest.java index 158ed4d71cc..2ab483375e9 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/PagedMirrorSmokeTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/PagedMirrorSmokeTest.java @@ -71,7 +71,7 @@ public static void createServers() throws Exception { Process processA; @BeforeEach - public void beforeClass() throws Exception { + public void beforeClass() throws Exception { cleanupData(SERVER_NAME_A); cleanupData(SERVER_NAME_B); processB = startServer(SERVER_NAME_B, 1, 0); diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/ArtemisTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/ArtemisTest.java index a99d3f39d3a..fae496970f1 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/ArtemisTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/ArtemisTest.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.smoke.console; -public abstract class ArtemisTest extends ConsoleTest { +public abstract class ArtemisTest extends ConsoleTest { public ArtemisTest(String browser, String serverName) { super(browser, serverName); } diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/PageConstants.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/PageConstants.java index 63dc4a4dcd7..69f0d02d063 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/PageConstants.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/PageConstants.java @@ -75,16 +75,16 @@ public class PageConstants { public static final By BRAND_LOCATOR = By.xpath("//img[@class='pf-v5-c-brand']"); //Component Locators - public static final By USERNAME_LOCATOR = By.id("pf-login-username-id"); + public static final By USERNAME_LOCATOR = By.id("pf-login-username-id"); - public static final By PASSWORD_LOCATOR = By.id("pf-login-password-id"); + public static final By PASSWORD_LOCATOR = By.id("pf-login-password-id"); public static final By LOGOUT_DROPDOWN_LOCATOR = By.id(HAWTIO_HEADER_USER_DROPDOWN_TOGGLE); public static final By LOGIN_BUTTON_LOCATOR = By.xpath("//button[@type='submit']"); - public static final By MESSAGE_TEXT_EDITOR_LOCATOR = By.cssSelector("div[class='pf-v5-c-code-editor__code']"); + public static final By MESSAGE_TEXT_EDITOR_LOCATOR = By.cssSelector("div[class='pf-v5-c-code-editor__code']"); public static final By USE_LOGIN_LOCATOR = By.id("uselogon"); @@ -94,7 +94,7 @@ public class PageConstants { public static final By DATA_TABLE = By.id("data-table"); - public static final By DATA_ROW_CONTEXT_MENU = By.cssSelector("div[class='pf-v5-c-menu']"); + public static final By DATA_ROW_CONTEXT_MENU = By.cssSelector("div[class='pf-v5-c-menu']"); public static final By MESSAGE_TABLE = By.id("message-table"); diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxmultiplefailback/ReplicatedMultipleFailbackTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxmultiplefailback/ReplicatedMultipleFailbackTest.java index 9489f161f70..5e876c09468 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxmultiplefailback/ReplicatedMultipleFailbackTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxmultiplefailback/ReplicatedMultipleFailbackTest.java @@ -122,7 +122,7 @@ private static long countMembers(Map> networkTopolo } private static long countNodes(Map> networkTopology) { - final long count = networkTopology.values().stream() + final long count = networkTopology.values().stream() .flatMap(pair -> Stream.of(pair.getA(), pair.getB())) .filter(primaryOrBackup -> primaryOrBackup != null && !primaryOrBackup.isEmpty()) .count(); diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/transfer/TransferTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/transfer/TransferTest.java index 19af19a969a..c474bcde746 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/transfer/TransferTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/transfer/TransferTest.java @@ -333,7 +333,7 @@ public void testDurableConsumer(String topicName, String queueName, String sende connection.close(); subscription.close(); - callTransferQueue("tcp://localhost:61716", null, topicName, null, null, "testSubs", "test", queueName, sourceTransferProtocol, targetTransferProtocol, false); + callTransferQueue("tcp://localhost:61716", null, topicName, null, null, "testSubs", "test", queueName, sourceTransferProtocol, targetTransferProtocol, false); ConnectionFactory factoryTarget = createConsumerCF(consumerProtocol); Connection connectionTarget = factoryTarget.createConnection(); diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/upgradeTest/CompareUpgradeTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/upgradeTest/CompareUpgradeTest.java index 4c36b043f8c..b6f6bc797b3 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/upgradeTest/CompareUpgradeTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/upgradeTest/CompareUpgradeTest.java @@ -197,7 +197,7 @@ public void testWindows() throws Exception { checkExpectedValues(windowsBin + "/artemis.cmd", "set ARTEMIS_INSTANCE_ETC=", "\"" + windowsETC + "\""); Map result = checkExpectedValues(windowsBin + "/artemis-service.xml", "", + "", "", "", "-Dhawtio.roles=", hawtioRoles + "" diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedMirrorTargetTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedMirrorTargetTest.java index ccdfd1d0cad..687a489d4d3 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedMirrorTargetTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedMirrorTargetTest.java @@ -74,9 +74,9 @@ public class ReplicatedMirrorTargetTest extends SoakTestBase { private static final int SEND_COMMIT = TestParameters.testProperty(TEST_NAME, "SEND_COMMIT", 200); // If -1 means to never kill the target broker - private static final int KILL_INTERVAL = TestParameters.testProperty(TEST_NAME, "KILL_INTERVAL", 1_000); - private static final int SNF_TIMEOUT = TestParameters.testProperty(TEST_NAME, "SNF_TIMEOUT", 300_000); - private static final int GENERAL_WAIT_TIMEOUT = TestParameters.testProperty(TEST_NAME, "GENERAL_TIMEOUT", 10_000); + private static final int KILL_INTERVAL = TestParameters.testProperty(TEST_NAME, "KILL_INTERVAL", 1_000); + private static final int SNF_TIMEOUT = TestParameters.testProperty(TEST_NAME, "SNF_TIMEOUT", 300_000); + private static final int GENERAL_WAIT_TIMEOUT = TestParameters.testProperty(TEST_NAME, "GENERAL_TIMEOUT", 10_000); /* * Time each consumer takes to process a message received to allow some messages accumulating. diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/SingleMirrorSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/SingleMirrorSoakTest.java index 67ecca803c6..9193966dd91 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/SingleMirrorSoakTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/SingleMirrorSoakTest.java @@ -74,9 +74,9 @@ public class SingleMirrorSoakTest extends SoakTestBase { private static final int SEND_COMMIT = TestParameters.testProperty(TEST_NAME, "SEND_COMMIT", 100); // If -1 means to never kill the target broker - private static final int KILL_INTERVAL = TestParameters.testProperty(TEST_NAME, "KILL_INTERVAL", 1_000); - private static final int SNF_TIMEOUT = TestParameters.testProperty(TEST_NAME, "SNF_TIMEOUT", 300_000); - private static final int GENERAL_WAIT_TIMEOUT = TestParameters.testProperty(TEST_NAME, "GENERAL_TIMEOUT", 10_000); + private static final int KILL_INTERVAL = TestParameters.testProperty(TEST_NAME, "KILL_INTERVAL", 1_000); + private static final int SNF_TIMEOUT = TestParameters.testProperty(TEST_NAME, "SNF_TIMEOUT", 300_000); + private static final int GENERAL_WAIT_TIMEOUT = TestParameters.testProperty(TEST_NAME, "GENERAL_TIMEOUT", 10_000); /* * Time each consumer takes to process a message received to allow some messages accumulating. diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/journal/TimedBufferMovementTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/journal/TimedBufferMovementTest.java index 66abfae5332..53bfc6a8d08 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/journal/TimedBufferMovementTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/journal/TimedBufferMovementTest.java @@ -245,7 +245,7 @@ public void onError(int errorCode, String errorMessage) { journal.forceBackup(1, TimeUnit.SECONDS); // If the issue was happening, this would print the IDs that are missing - if (pendingCallbacks.size() < 10 && !pendingCallbacks.isEmpty() && done.getCount() == 0) { + if (pendingCallbacks.size() < 10 && !pendingCallbacks.isEmpty() && done.getCount() == 0) { if (missingData++ > 5) { // lets give a chance for the test to finish, otherwise it would never finish break; diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/FlowControlPagingTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/FlowControlPagingTest.java index 12b37e16715..95c5b3ac3d9 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/FlowControlPagingTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/FlowControlPagingTest.java @@ -126,7 +126,7 @@ public FlowControlPagingTest(String protocol) { boolean unzipped = false; private String getZipName() { - return "flow-data-" + protocol + "-" + MESSAGES + "-" + MESSAGE_SIZE + ".zip"; + return "flow-data-" + protocol + "-" + MESSAGES + "-" + MESSAGE_SIZE + ".zip"; } @BeforeEach @@ -138,7 +138,7 @@ public void before() throws Exception { String zipName = getZipName(); File zipFile = useZip ? new File(ZIP_LOCATION + "/" + zipName) : null; - if (ZIP_LOCATION != null && zipFile.exists()) { + if (ZIP_LOCATION != null && zipFile.exists()) { unzipped = true; unzip(zipFile, new File(getServerLocation(SERVER_NAME_0))); } diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/MegaCleanerPagingTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/MegaCleanerPagingTest.java index 8a498f97434..7db91b76346 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/MegaCleanerPagingTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/MegaCleanerPagingTest.java @@ -285,7 +285,7 @@ public void internalTest(boolean midstream) throws Throwable { ConnectionFactory cf = CFUtil.createConnectionFactory("core", "tcp://localhost:61616?consumerWindowSize=0"); assertEquals(0, ((ActiveMQConnectionFactory)cf).getServerLocator().getConsumerWindowSize()); - Connection slowConnection = cf.createConnection(); + Connection slowConnection = cf.createConnection(); Session slowSession = slowConnection.createSession(false, Session.CLIENT_ACKNOWLEDGE); Queue slowQueue = slowSession.createQueue(queueName); MessageProducer slowProducer = slowSession.createProducer(slowQueue); diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/SubscriptionPagingTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/SubscriptionPagingTest.java index 8fdb93f35eb..b689a5d5994 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/SubscriptionPagingTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/SubscriptionPagingTest.java @@ -135,7 +135,7 @@ public SubscriptionPagingTest(String protocol) { boolean unzipped = false; private String getZipName() { - return "subscription-" + protocol + "-" + MESSAGES + "-" + MESSAGE_SIZE + "-" + SLOW_SUBSCRIPTIONS + ".zip"; + return "subscription-" + protocol + "-" + MESSAGES + "-" + MESSAGE_SIZE + "-" + SLOW_SUBSCRIPTIONS + ".zip"; } @BeforeEach @@ -147,7 +147,7 @@ public void before() throws Exception { String zipName = getZipName(); File zipFile = useZip ? new File(ZIP_LOCATION + "/" + zipName) : null; - if (ZIP_LOCATION != null && zipFile.exists()) { + if (ZIP_LOCATION != null && zipFile.exists()) { unzipped = true; unzip(zipFile, new File(getServerLocation(SERVER_NAME_0))); } diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicaTxCheck/ReplicaTXCheckTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicaTxCheck/ReplicaTXCheckTest.java index 7c68bb26851..1c2361d7085 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicaTxCheck/ReplicaTXCheckTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicaTxCheck/ReplicaTXCheckTest.java @@ -45,7 +45,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ReplicaTXCheckTest extends SoakTestBase { +public class ReplicaTXCheckTest extends SoakTestBase { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingStoreImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingStoreImplTest.java index 0a8d4fce175..a4c6244e82d 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingStoreImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingStoreImplTest.java @@ -873,7 +873,7 @@ public void testLogStartPaging() throws Exception { PagingStoreImplTest.destinationTestName, new AddressSettings() .setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE), - orderedExecutorFactory.getExecutor(), true); + orderedExecutorFactory.getExecutor(), true); store.start(); try (AssertionLoggerHandler loggerHandler = new AssertionLoggerHandler()) { @@ -894,7 +894,7 @@ public void testLogStopPaging() throws Exception { PagingStoreImplTest.destinationTestName, new AddressSettings() .setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE), - orderedExecutorFactory.getExecutor(), true); + orderedExecutorFactory.getExecutor(), true); store.start(); try (AssertionLoggerHandler loggerHandler = new AssertionLoggerHandler()) { store.startPaging(); @@ -914,7 +914,7 @@ public void testGetAddressLimitPercent() throws Exception { PagingStoreImplTest.destinationTestName, new AddressSettings() .setAddressFullMessagePolicy(AddressFullMessagePolicy.BLOCK), - orderedExecutorFactory.getExecutor(), true); + orderedExecutorFactory.getExecutor(), true); store.start(); try { @@ -1033,7 +1033,7 @@ public void testBlockUnblock() throws Exception { store.start(); try { - final AtomicInteger calls = new AtomicInteger(); + final AtomicInteger calls = new AtomicInteger(); final Runnable trackMemoryChecks = calls::incrementAndGet; store.applySetting(new AddressSettings().setMaxSizeBytes(1000).setAddressFullMessagePolicy(AddressFullMessagePolicy.BLOCK)); store.addSize(100); diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/BindingsImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/BindingsImplTest.java index 0ca3c95dbc6..c9e3bcb8404 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/BindingsImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/BindingsImplTest.java @@ -430,7 +430,7 @@ public void routeWithAck(Message message, RoutingContext context) { } } - private final class FakeRemoteBinding extends FakeBinding implements RemoteQueueBinding { + private final class FakeRemoteBinding extends FakeBinding implements RemoteQueueBinding { MessageLoadBalancingType messageLoadBalancingType; FakeRemoteBinding(SimpleString name) { super(name); diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerPerfTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerPerfTest.java index dd4dacf38f1..990b03894a6 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerPerfTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerPerfTest.java @@ -71,9 +71,9 @@ public void testConcurrencyAndEfficiency() throws Exception { } // subscribe as wildcard - ad.addBinding(new BindingFake(SimpleString.of("Topic1." + id % partitions + ".>"), SimpleString.of("" + id), id)); + ad.addBinding(new BindingFake(SimpleString.of("Topic1." + id % partitions + ".>"), SimpleString.of("" + id), id)); - SimpleString pubAddr = SimpleString.of("Topic1." + id % partitions + "." + id); + SimpleString pubAddr = SimpleString.of("Topic1." + id % partitions + "." + id); if (id != 0 && id % 1000 == 0) { diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java index 8e36b986dc9..e5909a5353a 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java @@ -70,7 +70,7 @@ public void setUp() throws Exception { params.put(TransportConstants.SSL_PROVIDER, TransportConstants.OPENSSL_PROVIDER); params.put(TransportConstants.KEYSTORE_PATH_PROP_NAME, "server-keystore.jks"); params.put(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME, "securepass"); - params.put(TransportConstants.TRUSTSTORE_PATH_PROP_NAME, "client-ca-truststore.jks"); + params.put(TransportConstants.TRUSTSTORE_PATH_PROP_NAME, "client-ca-truststore.jks"); params.put(TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME, "securepass"); params.put(TransportConstants.NEED_CLIENT_AUTH_PROP_NAME, true); ConfigurationImpl config = createBasicConfig().addAcceptorConfiguration(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params, "nettySSL")); @@ -242,7 +242,7 @@ public void testOverridesJavaSystemPropertyFail() throws Exception { Map params = new HashMap<>(); params.put(TransportConstants.SSL_ENABLED_PROP_NAME, true); - params.put(TransportConstants.KEYSTORE_PATH_PROP_NAME, "client-keystore.jks"); + params.put(TransportConstants.KEYSTORE_PATH_PROP_NAME, "client-keystore.jks"); params.put(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME, "securepass"); params.put(TransportConstants.TRUSTSTORE_PATH_PROP_NAME, "server-ca-truststore.jks"); params.put(TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME, "securepass"); @@ -272,7 +272,7 @@ public void testOverridesJavaSystemProperty() throws Exception { Map params = new HashMap<>(); params.put(TransportConstants.SSL_ENABLED_PROP_NAME, true); - params.put(TransportConstants.KEYSTORE_PATH_PROP_NAME, "bad path"); + params.put(TransportConstants.KEYSTORE_PATH_PROP_NAME, "bad path"); params.put(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME, "bad password"); params.put(TransportConstants.TRUSTSTORE_PATH_PROP_NAME, "bad path"); params.put(TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME, "bad password"); @@ -304,7 +304,7 @@ public void testOverridesJavaSystemPropertyForceSSLParameters() throws Exception Map params = new HashMap<>(); params.put(TransportConstants.SSL_ENABLED_PROP_NAME, true); params.put(TransportConstants.FORCE_SSL_PARAMETERS, true); - params.put(TransportConstants.KEYSTORE_PATH_PROP_NAME, "client-keystore.jks"); + params.put(TransportConstants.KEYSTORE_PATH_PROP_NAME, "client-keystore.jks"); params.put(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME, "securepass"); params.put(TransportConstants.TRUSTSTORE_PATH_PROP_NAME, "server-ca-truststore.jks"); params.put(TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME, "securepass"); diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/SocksProxyTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/SocksProxyTest.java index e84f92d47e5..2fff314794d 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/SocksProxyTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/SocksProxyTest.java @@ -74,8 +74,8 @@ public class SocksProxyTest extends ActiveMQTestBase { public void setUp() throws Exception { super.setUp(); - closeExecutor = Executors.newCachedThreadPool(ActiveMQThreadFactory.defaultThreadFactory(getClass().getName())); - threadPool = Executors.newCachedThreadPool(ActiveMQThreadFactory.defaultThreadFactory(getClass().getName())); + closeExecutor = Executors.newCachedThreadPool(ActiveMQThreadFactory.defaultThreadFactory(getClass().getName())); + threadPool = Executors.newCachedThreadPool(ActiveMQThreadFactory.defaultThreadFactory(getClass().getName())); scheduledThreadPool = Executors.newScheduledThreadPool(5, ActiveMQThreadFactory.defaultThreadFactory(getClass().getName())); startSocksProxy(); @@ -264,7 +264,7 @@ public void connectionReadyForWrites(Object connectionID, boolean ready) { } private void startSocksProxy() throws Exception { - bossGroup = new NioEventLoopGroup(); + bossGroup = new NioEventLoopGroup(); workerGroup = new NioEventLoopGroup(); ServerBootstrap b = new ServerBootstrap();