Remove redundant type arguments
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f8a1c5ba Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f8a1c5ba Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f8a1c5ba Branch: refs/heads/master Commit: f8a1c5ba8efb1dd85a70e263839f3ff7151a2168 Parents: 3b5ee6c Author: Ville Skyttä <ville.sky...@iki.fi> Authored: Sun Dec 6 01:57:02 2015 +0200 Committer: Ville Skyttä <ville.sky...@iki.fi> Committed: Mon Dec 7 22:55:05 2015 +0200 ---------------------------------------------------------------------- .../apache/activemq/artemis/boot/Artemis.java | 6 +- .../activemq/artemis/cli/commands/Create.java | 4 +- .../cli/commands/tools/DecodeJournal.java | 2 +- .../artemis/cli/commands/tools/PrintData.java | 12 +- .../artemis/integration/FileBroker.java | 2 +- .../artemis/api/core/ActiveMQExceptionType.java | 2 +- .../activemq/artemis/api/core/SimpleString.java | 2 +- .../artemis/utils/ConcurrentHashSet.java | 2 +- .../activemq/artemis/utils/FactoryFinder.java | 2 +- .../apache/activemq/artemis/utils/FileUtil.java | 2 +- .../artemis/utils/PasswordMaskingUtil.java | 2 +- .../activemq/artemis/utils/TypedProperties.java | 8 +- .../apache/activemq/artemis/utils/UTF8Util.java | 6 +- .../activemq/artemis/utils/UUIDGenerator.java | 4 +- .../activemq/artemis/utils/uri/URISchema.java | 2 +- .../apache/activemq/artemis/utils/PairTest.java | 2 +- .../api/core/JGroupsBroadcastEndpoint.java | 4 +- .../api/core/TransportConfiguration.java | 2 +- .../api/core/management/ManagementHelper.java | 4 +- .../core/client/impl/AddressQueryImpl.java | 2 +- .../core/client/impl/ClientConsumerImpl.java | 2 +- .../impl/ClientProducerCreditManagerImpl.java | 4 +- .../client/impl/ClientSessionFactoryImpl.java | 18 +-- .../core/client/impl/ClientSessionImpl.java | 12 +- .../core/client/impl/DelegatingSession.java | 2 +- .../core/client/impl/ServerLocatorImpl.java | 14 +- .../artemis/core/client/impl/Topology.java | 2 +- .../core/client/impl/TopologyMemberImpl.java | 2 +- .../artemis/core/cluster/DiscoveryGroup.java | 8 +- .../artemis/core/message/impl/MessageImpl.java | 2 +- .../core/protocol/core/impl/ChannelImpl.java | 2 +- .../core/impl/RemotingConnectionImpl.java | 4 +- .../ClusterTopologyChangeMessage.java | 2 +- .../ClusterTopologyChangeMessage_V2.java | 2 +- .../SessionBindingQueryResponseMessage.java | 2 +- .../SessionXAGetInDoubtXidsResponseMessage.java | 2 +- .../impl/TransportConfigurationUtil.java | 2 +- .../remoting/impl/netty/NettyConnection.java | 2 +- .../remoting/impl/netty/NettyConnector.java | 4 +- .../impl/netty/SharedNioEventLoopGroup.java | 2 +- .../remoting/impl/netty/TransportConstants.java | 4 +- .../activemq/artemis/reader/MessageUtil.java | 4 +- .../protocol/AbstractRemotingConnection.java | 12 +- .../artemis/utils/ConfigurationHelper.java | 4 +- .../activemq/artemis/utils/LinkedListImpl.java | 6 +- .../activemq/artemis/utils/MemorySize.java | 2 +- .../artemis/utils/OrderedExecutorFactory.java | 2 +- .../artemis/utils/PriorityLinkedListImpl.java | 2 +- .../artemis/utils/SecurityFormatter.java | 6 +- .../artemis/utils/SoftValueHashMap.java | 12 +- .../activemq/artemis/utils/VersionLoader.java | 2 +- .../apache/activemq/artemis/utils/XMLUtil.java | 2 +- .../activemq/artemis/utils/json/JSONArray.java | 6 +- .../artemis/util/CompressionUtilTest.java | 6 +- .../artemis/util/ConcurrentHashSetTest.java | 2 +- .../util/TimeAndCounterIDGeneratorTest.java | 2 +- .../artemis/jms/client/ActiveMQConnection.java | 12 +- .../jms/client/ActiveMQConnectionMetaData.java | 2 +- .../artemis/jms/client/ActiveMQDestination.java | 2 +- .../artemis/jms/client/ActiveMQJMSProducer.java | 2 +- .../artemis/jms/client/ActiveMQMapMessage.java | 2 +- .../artemis/jms/client/ActiveMQMessage.java | 4 +- .../artemis/jms/client/ActiveMQSession.java | 4 +- .../artemis/jms/client/SelectorTranslator.java | 2 +- .../artemis/jms/client/ThreadAwareContext.java | 2 +- .../activemq/artemis/jndi/ReadOnlyContext.java | 22 +-- .../artemis/uri/ConnectionFactoryURITest.java | 2 +- .../artemis/jms/bridge/impl/JMSBridgeImpl.java | 4 +- .../management/impl/JMSQueueControlImpl.java | 2 +- .../management/impl/JMSServerControlImpl.java | 10 +- .../management/impl/JMSTopicControlImpl.java | 4 +- .../persistence/config/PersistedBindings.java | 4 +- .../journal/JMSJournalStorageManagerImpl.java | 30 ++-- .../ConnectionFactoryConfigurationImpl.java | 2 +- .../config/impl/JMSConfigurationImpl.java | 6 +- .../TransportConfigurationEncodingSupport.java | 6 +- .../jms/server/impl/JMSServerManagerImpl.java | 34 ++-- .../core/io/aio/AIOSequentialFileFactory.java | 2 +- .../artemis/core/io/buffer/TimedBuffer.java | 4 +- .../core/io/nio/NIOSequentialFileFactory.java | 2 +- .../core/journal/PreparedTransactionInfo.java | 4 +- .../journal/impl/AbstractJournalUpdateTask.java | 4 +- .../core/journal/impl/FileWrapperJournal.java | 2 +- .../core/journal/impl/JournalCompactor.java | 12 +- .../core/journal/impl/JournalFileImpl.java | 2 +- .../journal/impl/JournalFilesRepository.java | 6 +- .../artemis/core/journal/impl/JournalImpl.java | 30 ++-- .../core/journal/impl/JournalRecord.java | 4 +- .../core/journal/impl/JournalTransaction.java | 14 +- .../artemis/maven/ArtemisAbstractPlugin.java | 2 +- .../converter/jms/ServerJMSMapMessage.java | 2 +- .../hornetq/util/HQPropertiesConverter.java | 2 +- .../core/protocol/mqtt/MQTTConnection.java | 4 +- .../protocol/mqtt/MQTTConnectionManager.java | 2 +- .../core/protocol/mqtt/MQTTSessionState.java | 4 +- .../protocol/openwire/OpenWireConnection.java | 22 +-- .../openwire/OpenWireProtocolManager.java | 14 +- .../core/protocol/openwire/amq/AMQConsumer.java | 2 +- .../protocol/openwire/amq/AMQServerSession.java | 6 +- .../core/protocol/openwire/amq/AMQSession.java | 2 +- .../context/AbstractProtonSessionContext.java | 4 +- .../server/ProtonServerSessionContext.java | 2 +- .../org/proton/plug/test/AbstractJMSTest.java | 2 +- .../protocol/stomp/ActiveMQStompException.java | 2 +- .../core/protocol/stomp/StompConnection.java | 14 +- .../core/protocol/stomp/StompDecoder.java | 2 +- .../artemis/core/protocol/stomp/StompFrame.java | 2 +- .../protocol/stomp/StompProtocolManager.java | 6 +- .../core/protocol/stomp/StompSession.java | 6 +- .../artemis/core/protocol/stomp/StompUtils.java | 2 +- .../core/protocol/stomp/v11/StompFrameV11.java | 2 +- .../ra/ActiveMQRAConnectionMetaData.java | 2 +- .../artemis/ra/ActiveMQRAManagedConnection.java | 2 +- .../ra/ActiveMQRAManagedConnectionFactory.java | 2 +- .../activemq/artemis/ra/ActiveMQRASession.java | 4 +- .../ra/ActiveMQRASessionFactoryImpl.java | 6 +- .../activemq/artemis/ra/ActiveMQRaUtils.java | 8 +- .../artemis/ra/ActiveMQResourceAdapter.java | 12 +- .../artemis/ra/inflow/ActiveMQActivation.java | 8 +- .../ra/inflow/ActiveMQActivationSpec.java | 4 +- .../ra/inflow/ActiveMQMessageHandler.java | 2 +- .../artemis/ra/recovery/RecoveryManager.java | 2 +- .../artemis/rest/MessageServiceManager.java | 2 +- .../artemis/rest/queue/ConsumersResource.java | 2 +- .../artemis/rest/queue/PostMessage.java | 2 +- .../rest/queue/QueueDestinationsResource.java | 2 +- .../artemis/rest/queue/QueueServiceManager.java | 2 +- .../artemis/rest/queue/push/FilePushStore.java | 8 +- .../artemis/rest/queue/push/PushConsumer.java | 4 +- .../rest/queue/push/PushConsumerResource.java | 2 +- .../rest/queue/push/xml/PushRegistration.java | 2 +- .../artemis/rest/topic/FileTopicPushStore.java | 2 +- .../rest/topic/PushSubscriptionsResource.java | 2 +- .../rest/topic/SubscriptionsResource.java | 2 +- .../rest/topic/TopicDestinationsResource.java | 2 +- .../artemis/rest/topic/TopicServiceManager.java | 2 +- .../activemq/artemis/rest/util/TimeoutTask.java | 10 +- .../activemq/artemis/rest/test/RawAckTest.java | 2 +- .../selector/filter/ComparisonExpression.java | 4 +- .../selector/filter/UnaryExpression.java | 2 +- .../activemq/artemis/selector/SelectorTest.java | 2 +- .../activemq/artemis/osgi/OsgiBroker.java | 4 +- .../activemq/artemis/osgi/ProtocolTracker.java | 4 +- .../core/config/impl/ConfigurationImpl.java | 30 ++-- .../core/config/impl/SecurityConfiguration.java | 4 +- .../deployers/impl/FileConfigurationParser.java | 36 ++--- .../impl/ActiveMQServerControlImpl.java | 12 +- .../management/impl/AddressControlImpl.java | 4 +- .../core/management/impl/MBeanInfoHelper.java | 2 +- .../core/management/impl/QueueControlImpl.java | 6 +- .../core/messagecounter/MessageCounter.java | 4 +- .../impl/MessageCounterManagerImpl.java | 4 +- .../core/paging/cursor/PagedReferenceImpl.java | 4 +- .../paging/cursor/impl/LivePageCacheImpl.java | 2 +- .../cursor/impl/PageCursorProviderImpl.java | 8 +- .../impl/PageSubscriptionCounterImpl.java | 14 +- .../cursor/impl/PageSubscriptionImpl.java | 18 +-- .../activemq/artemis/core/paging/impl/Page.java | 4 +- .../artemis/core/paging/impl/PageSyncTimer.java | 2 +- .../paging/impl/PageTransactionInfoImpl.java | 2 +- .../core/paging/impl/PagingManagerImpl.java | 4 +- .../core/paging/impl/PagingStoreFactoryNIO.java | 2 +- .../core/paging/impl/PagingStoreImpl.java | 6 +- .../impl/journal/DescribeJournal.java | 10 +- .../impl/journal/JournalStorageManager.java | 50 +++--- .../impl/journal/OperationContextImpl.java | 4 +- .../core/postoffice/impl/AddressImpl.java | 2 +- .../core/postoffice/impl/BindingsImpl.java | 10 +- .../postoffice/impl/DuplicateIDCacheImpl.java | 8 +- .../core/postoffice/impl/PostOfficeImpl.java | 20 +-- .../postoffice/impl/SimpleAddressManager.java | 6 +- .../postoffice/impl/WildcardAddressManager.java | 4 +- .../protocol/core/impl/CoreProtocolManager.java | 8 +- .../BackupReplicationStartFailedMessage.java | 2 +- .../core/registry/MapBindingRegistry.java | 2 +- .../core/remoting/impl/invm/InVMAcceptor.java | 2 +- .../core/remoting/impl/invm/InVMConnection.java | 2 +- .../core/remoting/impl/invm/InVMConnector.java | 4 +- .../core/remoting/impl/invm/InVMRegistry.java | 2 +- .../impl/netty/HttpAcceptorHandler.java | 4 +- .../impl/netty/HttpKeepAliveRunnable.java | 2 +- .../core/remoting/impl/netty/NettyAcceptor.java | 2 +- .../server/impl/RemotingServiceImpl.java | 12 +- .../core/replication/ReplicationEndpoint.java | 10 +- .../core/replication/ReplicationManager.java | 6 +- .../core/security/impl/SecurityStoreImpl.java | 4 +- .../core/server/cluster/ClusterManager.java | 12 +- .../core/server/cluster/impl/BridgeImpl.java | 6 +- .../server/cluster/impl/BroadcastGroupImpl.java | 2 +- .../cluster/impl/ClusterConnectionBridge.java | 6 +- .../cluster/impl/ClusterConnectionImpl.java | 12 +- .../cluster/impl/RemoteQueueBindingImpl.java | 4 +- .../server/group/impl/LocalGroupingHandler.java | 16 +- .../group/impl/RemoteGroupingHandler.java | 6 +- .../core/server/impl/ActiveMQServerImpl.java | 18 +-- .../impl/AnyLiveNodeLocatorForReplication.java | 6 +- .../core/server/impl/ConnectorsService.java | 2 +- .../core/server/impl/LastValueQueue.java | 2 +- .../impl/LegacyLDAPSecuritySettingPlugin.java | 4 +- .../NamedLiveNodeLocatorForReplication.java | 2 +- .../impl/NamedLiveNodeLocatorForScaleDown.java | 2 +- .../server/impl/PostOfficeJournalLoader.java | 6 +- .../artemis/core/server/impl/QueueImpl.java | 22 +-- .../artemis/core/server/impl/RefsOperation.java | 12 +- .../core/server/impl/RoutingContextImpl.java | 6 +- .../core/server/impl/ScaleDownHandler.java | 2 +- .../impl/ScheduledDeliveryHandlerImpl.java | 8 +- .../core/server/impl/ServerConsumerImpl.java | 6 +- .../core/server/impl/ServerSessionImpl.java | 26 +-- .../management/impl/ManagementServiceImpl.java | 16 +- .../impl/HierarchicalObjectRepository.java | 18 +-- .../transaction/impl/ResourceManagerImpl.java | 12 +- .../core/transaction/impl/TransactionImpl.java | 6 +- .../security/jaas/CertificateLoginModule.java | 2 +- .../core/security/jaas/GuestLoginModule.java | 2 +- .../spi/core/security/jaas/InVMLoginModule.java | 2 +- .../spi/core/security/jaas/LDAPLoginModule.java | 14 +- .../core/security/jaas/PropertiesLoader.java | 2 +- .../security/jaas/PropertiesLoginModule.java | 2 +- .../jaas/TextFileCertificateLoginModule.java | 2 +- .../impl/FileConfigurationParserTest.java | 2 +- .../core/list/PriorityLinkedListTest.java | 2 +- .../jaas/CertificateLoginModuleTest.java | 8 +- .../PropertiesLoginModuleRaceConditionTest.java | 6 +- .../group/impl/ClusteredResetMockTest.java | 4 +- .../impl/ScheduledDeliveryHandlerTest.java | 2 +- .../artemis/core/settings/RepositoryTest.java | 18 +-- .../artemis/tests/util/ActiveMQTestBase.java | 52 +++--- .../xa/recovery/ActiveMQXAResourceRecovery.java | 2 +- .../xa/ActiveMQXAResourceWrapperImplTest.java | 2 +- .../jms/example/ClusteredJgroupsExample.java | 4 +- .../ColocatedFailoverScaleDownExample.java | 4 +- .../jms/example/ColocatedFailoverExample.java | 4 +- .../jms/example/HAPolicyAutoBackupExample.java | 2 +- .../artemis/jms/example/ScaleDownExample.java | 4 +- .../artemis/jms/example/BridgeExample.java | 4 +- .../jms/example/ClientKickoffExample.java | 2 +- .../artemis/jms/example/EmbeddedExample.java | 2 +- .../artemis/jms/example/EmbeddedExample.java | 2 +- .../artemis/jms/example/JMSBridgeExample.java | 2 +- .../jms/example/MessageGroupExample.java | 2 +- .../jms/example/MessageGroup2Example.java | 2 +- .../jms/example/MessagePriorityExample.java | 2 +- .../jms/example/RequestReplyExample.java | 2 +- .../artemis/jms/example/XAHeuristicExample.java | 2 +- .../artemis/jms/example/XASendExample.java | 2 +- .../integration/vertx/VertxConstants.java | 8 +- .../activemq/ActiveMQConnectionFactory.java | 2 +- .../apache/activemq/broker/BrokerService.java | 4 +- .../artemiswrapper/ArtemisBrokerWrapper.java | 12 +- .../artemiswrapper/InVMNamingContext.java | 6 +- .../transport/tcp/TcpTransportFactory.java | 2 +- .../org/apache/activemq/usage/SystemUsage.java | 2 +- .../activemq/ActiveMQMessageAuditTest.java | 8 +- .../apache/activemq/CombinationTestSupport.java | 18 +-- .../org/apache/activemq/JMSMessageTest.java | 4 +- .../activemq/JmsConnectionStartStopTest.java | 2 +- .../JmsConsumerResetActiveListenerTest.java | 4 +- .../activemq/JmsMultipleBrokersTestSupport.java | 4 +- .../activemq/JmsMultipleClientsTestSupport.java | 2 +- .../apache/activemq/JmsQueueBrowserTest.java | 2 +- ...eiveTwoConnectionsStartBeforeBrokerTest.java | 2 +- .../activemq/JmsRollbackRedeliveryTest.java | 6 +- ...JmsSendReceiveWithMessageExpirationTest.java | 4 +- .../apache/activemq/JmsTempDestinationTest.java | 2 +- .../activemq/JmsTopicRequestReplyTest.java | 2 +- .../apache/activemq/MessageEvictionTest.java | 2 +- .../activemq/MessageListenerRedeliveryTest.java | 2 +- .../org/apache/activemq/SpringTestSupport.java | 2 +- .../advisory/AdvisoryTempDestinationTests.java | 2 +- .../activemq/advisory/ConsumerListenerTest.java | 2 +- .../advisory/DestinationListenerTest.java | 2 +- .../activemq/advisory/ProducerListenerTest.java | 2 +- .../activemq/advisory/TempDestDeleteTest.java | 2 +- .../activemq/advisory/TempQueueMemoryTest.java | 2 +- .../apache/activemq/blob/FTPTestSupport.java | 2 +- .../org/apache/activemq/broker/AMQ4351Test.java | 2 +- .../org/apache/activemq/broker/BrokerTest.java | 6 +- .../activemq/broker/BrokerTestSupport.java | 2 +- .../broker/NioQueueSubscriptionTest.java | 2 +- .../activemq/broker/QueueMbeanRestartTest.java | 2 +- .../activemq/broker/RecoveryBrokerTest.java | 6 +- .../org/apache/activemq/broker/StubBroker.java | 4 +- .../apache/activemq/broker/StubConnection.java | 4 +- .../activemq/broker/XARecoveryBrokerTest.java | 2 +- .../broker/ft/QueueMasterSlaveTestSupport.java | 2 +- .../apache/activemq/broker/jmx/MBeanTest.java | 2 +- .../broker/policy/AbortSlowConsumerBase.java | 2 +- .../PriorityNetworkDispatchPolicyTest.java | 2 +- .../region/QueueDuplicatesFromStoreTest.java | 2 +- .../region/SubscriptionAddRemoveQueueTest.java | 4 +- ...iquePropertyMessageEvictionStrategyTest.java | 2 +- .../broker/region/cursors/CursorSupport.java | 8 +- .../region/cursors/NegativeQueueTest.java | 6 +- .../region/cursors/OrderPendingListTest.java | 2 +- .../broker/scheduler/JobSchedulerStoreTest.java | 2 +- .../KahaDBSchedulerMissingJournalLogsTest.java | 4 +- .../memory/InMemoryJobSchedulerStoreTest.java | 2 +- .../store/RecoverExpiredMessagesTest.java | 2 +- .../MirroredQueueCorrectMemoryUsageTest.java | 2 +- .../broker/virtual/VirtualDestPerfTest.java | 8 +- .../broker/virtual/VirtualTopicPubSubTest.java | 2 +- .../org/apache/activemq/bugs/AMQ1853Test.java | 2 +- .../java/org/apache/activemq/bugs/AMQ1866.java | 2 +- .../org/apache/activemq/bugs/AMQ1917Test.java | 2 +- .../org/apache/activemq/bugs/AMQ1936Test.java | 2 +- .../org/apache/activemq/bugs/AMQ2021Test.java | 4 +- .../org/apache/activemq/bugs/AMQ2149Test.java | 8 +- .../org/apache/activemq/bugs/AMQ2171Test.java | 2 +- .../org/apache/activemq/bugs/AMQ2401Test.java | 2 +- .../org/apache/activemq/bugs/AMQ2413Test.java | 6 +- .../org/apache/activemq/bugs/AMQ2489Test.java | 4 +- .../org/apache/activemq/bugs/AMQ2512Test.java | 2 +- .../activemq/bugs/AMQ2584ConcurrentDlqTest.java | 2 +- .../org/apache/activemq/bugs/AMQ2584Test.java | 2 +- .../org/apache/activemq/bugs/AMQ2616Test.java | 2 +- .../org/apache/activemq/bugs/AMQ2801Test.java | 2 +- .../org/apache/activemq/bugs/AMQ2870Test.java | 2 +- .../org/apache/activemq/bugs/AMQ2910Test.java | 2 +- .../org/apache/activemq/bugs/AMQ2983Test.java | 2 +- .../org/apache/activemq/bugs/AMQ3140Test.java | 2 +- .../org/apache/activemq/bugs/AMQ3167Test.java | 2 +- .../org/apache/activemq/bugs/AMQ3274Test.java | 2 +- .../org/apache/activemq/bugs/AMQ3622Test.java | 2 +- .../org/apache/activemq/bugs/AMQ3732Test.java | 2 +- .../org/apache/activemq/bugs/AMQ3841Test.java | 2 +- .../org/apache/activemq/bugs/AMQ3961Test.java | 6 +- .../org/apache/activemq/bugs/AMQ4083Test.java | 4 +- .../org/apache/activemq/bugs/AMQ4092Test.java | 2 +- .../org/apache/activemq/bugs/AMQ4157Test.java | 2 +- .../org/apache/activemq/bugs/AMQ4220Test.java | 2 +- .../org/apache/activemq/bugs/AMQ4221Test.java | 2 +- .../org/apache/activemq/bugs/AMQ4361Test.java | 4 +- .../org/apache/activemq/bugs/AMQ4407Test.java | 2 +- .../org/apache/activemq/bugs/AMQ4413Test.java | 2 +- .../org/apache/activemq/bugs/AMQ4475Test.java | 2 +- .../activemq/bugs/AMQ4485LowLimitTest.java | 10 +- ...XBrokersWithNDestsFanoutTransactionTest.java | 10 +- .../org/apache/activemq/bugs/AMQ4485Test.java | 6 +- .../org/apache/activemq/bugs/AMQ4607Test.java | 4 +- .../org/apache/activemq/bugs/AMQ4853Test.java | 2 +- .../org/apache/activemq/bugs/AMQ4952Test.java | 6 +- .../activemq/bugs/AMQ5266SingleDestTest.java | 10 +- .../bugs/AMQ5266StarvedConsumerTest.java | 10 +- .../org/apache/activemq/bugs/AMQ5266Test.java | 10 +- .../org/apache/activemq/bugs/AMQ5450Test.java | 2 +- .../activemq/bugs/DurableConsumerTest.java | 4 +- .../bugs/MemoryUsageBlockResumeTest.java | 2 +- .../activemq/bugs/QueueWorkerPrefetchTest.java | 2 +- .../bugs/RawRollbackSharedConsumerTests.java | 2 +- .../apache/activemq/bugs/RawRollbackTests.java | 2 +- .../bugs/TrapMessageInJDBCStoreTest.java | 4 +- .../activemq/bugs/amq1095/ActiveMQTestCase.java | 2 +- .../command/ActiveMQDestinationTest.java | 4 +- .../config/BrokerXmlConfigFromJNDITest.java | 2 +- .../activemq/console/command/AMQ3410Test.java | 10 +- .../activemq/console/command/AMQ3411Test.java | 10 +- .../console/command/PurgeCommandTest.java | 10 +- .../ActiveMQWASInitialContextFactoryTest.java | 2 +- .../apache/activemq/jndi/JNDITestSupport.java | 2 +- .../activemq/joramtests/ActiveMQAdmin.java | 2 +- .../BrokerNetworkWithStuckMessagesTest.java | 8 +- .../CheckDuplicateMessagesOnDuplexTest.java | 4 +- .../network/FailoverStaticNetworkTest.java | 12 +- .../network/NetworkDestinationFilterTest.java | 2 +- .../activemq/network/NetworkLoadTest.java | 4 +- .../activemq/network/NetworkReconnectTest.java | 2 +- .../activemq/network/NetworkTestSupport.java | 2 +- .../network/SSHTunnelNetworkReconnectTest.java | 2 +- .../jms/QueueBridgeStandaloneReconnectTest.java | 2 +- .../jms/QueueOutboundBridgeReconnectTest.java | 2 +- .../jms/TopicBridgeStandaloneReconnectTest.java | 2 +- .../jms/TopicOutboundBridgeReconnectTest.java | 2 +- .../activemq/openwire/DataFileGenerator.java | 2 +- .../openwire/DataFileGeneratorTestSupport.java | 2 +- .../activemq/perf/ConnectionChurnTest.java | 2 +- .../SimpleNonPersistentQueueNetworkTest.java | 2 +- .../perf/SimpleNonPersistentQueueTest.java | 2 +- .../org/apache/activemq/proxy/AMQ4889Test.java | 4 +- .../apache/activemq/proxy/ProxyTestSupport.java | 2 +- ...actCachedLDAPAuthorizationMapLegacyTest.java | 2 +- .../activemq/security/AuthorizationMapTest.java | 6 +- ...JaasCertificateAuthenticationBrokerTest.java | 10 +- .../JaasDualAuthenticationBrokerTest.java | 4 +- .../security/LDAPAuthorizationMapTest.java | 2 +- .../activemq/security/SecurityJMXTest.java | 2 +- .../SimpleSecurityBrokerSystemTest.java | 10 +- .../apache/activemq/spring/ConsumerBean.java | 4 +- .../store/AutoStorePerDestinationTest.java | 2 +- .../activemq/store/StorePerDestinationTest.java | 6 +- .../jdbc/JDBCIOExceptionHandlerMockeryTest.java | 2 +- .../store/jdbc/JDBCIOExceptionHandlerTest.java | 2 +- .../store/jdbc/JDBCMessagePriorityTest.java | 6 +- .../store/jdbc/JDBCTablePrefixAssignedTest.java | 2 +- .../store/jdbc/LeaseDatabaseLockerTest.java | 2 +- .../store/kahadb/KahaDBFastEnqueueTest.java | 2 +- .../kahadb/KahaDBStoreRecoveryBrokerTest.java | 2 +- .../activemq/store/kahadb/KahaDBStoreTest.java | 2 +- .../activemq/store/kahadb/plist/PListTest.java | 14 +- .../activemq/streams/JMSInputStreamTest.java | 4 +- .../message/NestedMapAndListPropertyTest.java | 4 +- .../test/message/NestedMapMessageTest.java | 4 +- .../transport/StubCompositeTransport.java | 2 +- .../activemq/transport/StubTransport.java | 2 +- .../transport/StubTransportListener.java | 4 +- .../activemq/transport/TopicClusterTest.java | 2 +- .../transport/TransportBrokerTestSupport.java | 2 +- .../DiscoveryNetworkReconnectTest.java | 4 +- .../DiscoveryTransportNoBrokerTest.java | 2 +- .../transport/failover/AMQ1925Test.java | 2 +- .../failover/ConnectionHangOnStartupTest.java | 4 +- .../transport/failover/FailoverClusterTest.java | 6 +- .../failover/FailoverClusterTestSupport.java | 10 +- .../FailoverConsumerOutstandingCommitTest.java | 2 +- .../FailoverConsumerUnconsumedTest.java | 4 +- .../failover/FailoverPrefetchZeroTest.java | 2 +- .../failover/FailoverPriorityTest.java | 2 +- .../failover/FailoverTransactionTest.java | 12 +- .../transport/failover/SlowConnectionTest.java | 2 +- .../tcp/QualityOfServiceUtilsTest.java | 2 +- .../transport/tcp/SocketTstFactory.java | 2 +- .../transport/tcp/SslTransportFactoryTest.java | 2 +- .../tcp/TcpFaultyTransportFactory.java | 2 +- .../tcp/WireformatNegociationTest.java | 6 +- .../transport/vm/VMTransportThreadSafeTest.java | 4 +- .../vm/VmTransportNetworkBrokerTest.java | 2 +- .../activemq/usecases/AMQStackOverFlowTest.java | 2 +- .../usecases/ChangeSentMessageTest.java | 2 +- .../ConcurrentDestinationCreationTest.java | 2 +- .../ConcurrentProducerDurableConsumerTest.java | 6 +- .../ConcurrentProducerQueueConsumerTest.java | 4 +- .../usecases/ConsumeTopicPrefetchTest.java | 2 +- .../DurableSubDelayedUnsubscribeTest.java | 8 +- ...ConcurrentCommitActivateNoDuplicateTest.java | 12 +- .../DurableSubProcessMultiRestartTest.java | 2 +- .../usecases/DurableSubProcessTest.java | 12 +- .../DurableSubProcessWithRestartTest.java | 12 +- ...neSelectorConcurrentConsumeIndexUseTest.java | 2 +- .../DurableSubsOfflineSelectorIndexUseTest.java | 2 +- .../DurableSubscriptionOffline1Test.java | 4 +- .../DurableSubscriptionOffline2Test.java | 2 +- .../DurableSubscriptionOffline3Test.java | 2 +- .../DurableSubscriptionOffline4Test.java | 2 +- .../DurableSubscriptionOfflineTest.java | 2 +- .../DurableSubscriptionOfflineTestBase.java | 2 +- .../usecases/ExceptionListenerTest.java | 2 +- .../usecases/JdbcDurableSubDupTest.java | 2 +- .../usecases/MessageGroupCloseTest.java | 8 +- .../usecases/MessageGroupDelayedTest.java | 4 +- .../usecases/MessageGroupLateArrivalsTest.java | 6 +- .../MessageGroupReconnectDistributionTest.java | 4 +- .../usecases/MultiBrokersMultiClientsTest.java | 4 +- .../MultiBrokersMultiClientsUsingTcpTest.java | 2 +- .../NetworkBridgeProducerFlowControlTest.java | 2 +- .../usecases/NoDuplicateOnTopicNetworkTest.java | 4 +- .../NonBlockingConsumerRedeliveryTest.java | 26 +-- .../ObjectMessageNotSerializableTest.java | 4 +- .../activemq/usecases/QueueDuplicatesTest.java | 2 +- .../QueueMemoryFullMultiBrokersTest.java | 2 +- .../RequestReplyNoAdvisoryNetworkTest.java | 2 +- ...estReplyTempDestRemovalAdvisoryRaceTest.java | 12 +- ...uestReplyToTopicViaThreeNetworkHopsTest.java | 2 +- .../usecases/ThreeBrokerQueueNetworkTest.java | 4 +- .../ThreeBrokerQueueNetworkUsingTcpTest.java | 2 +- .../usecases/ThreeBrokerTopicNetworkTest.java | 2 +- .../ThreeBrokerTopicNetworkUsingTcpTest.java | 2 +- .../usecases/TopicDurableConnectStatsTest.java | 2 +- .../usecases/TransactionRollbackOrderTest.java | 8 +- .../usecases/TwoBrokerTopicSendReceiveTest.java | 2 +- .../TwoBrokerVirtualTopicForwardingTest.java | 2 +- .../activemq/usecases/UnlimitedEnqueueTest.java | 2 +- .../VerifyNetworkConsumersDisconnectTest.java | 6 +- .../org/apache/activemq/util/MessageIdList.java | 6 +- .../activemq/util/ReflectionSupportTest.java | 6 +- .../org/apache/activemq/util/SimplePojo.java | 6 +- .../xbean/ManagementContextXBeanConfigTest.java | 4 +- .../BridgeServerLocatorConfigurationTest.java | 14 +- .../byteman/ConcurrentDeliveryCancelTest.java | 6 +- .../HierarchicalObjectRepositoryTest.java | 2 +- .../tests/extras/byteman/MessageCopyTest.java | 2 +- .../tests/extras/byteman/PagingLeakTest.java | 4 +- .../tests/extras/jms/bridge/BridgeTestBase.java | 4 +- .../jms/bridge/ClusteredBridgeTestBase.java | 6 +- .../tests/extras/jms/bridge/JMSBridgeTest.java | 8 +- ...MDBMultipleHandlersServerDisconnectTest.java | 4 +- .../protocols/hornetq/HornetQProtocolTest.java | 6 +- .../integration/SimpleNotificationService.java | 4 +- .../client/AutoCreateJmsQueueTest.java | 4 +- .../tests/integration/client/ConsumerTest.java | 2 +- .../client/ConsumerWindowSizeTest.java | 12 +- .../client/DeadLetterAddressTest.java | 2 +- .../integration/client/HangConsumerTest.java | 2 +- .../client/JmsNettyNioStressTest.java | 4 +- .../integration/client/JournalCrashTest.java | 4 +- .../integration/client/LargeMessageTest.java | 6 +- .../client/MessageConcurrencyTest.java | 10 +- .../client/MessageConsumerRollbackTest.java | 2 +- .../MessageGroupingConnectionFactoryTest.java | 2 +- .../integration/client/MessageGroupingTest.java | 2 +- .../tests/integration/client/NIOvsOIOTest.java | 4 +- .../tests/integration/client/PagingTest.java | 28 ++-- .../client/ProducerFlowControlTest.java | 2 +- .../client/SessionCloseOnGCTest.java | 32 ++-- .../integration/cluster/NodeManagerTest.java | 2 +- .../cluster/RealNodeManagerTest.java | 2 +- .../cluster/bridge/BridgeFailoverTest.java | 6 +- .../cluster/bridge/BridgeReconnectTest.java | 52 +++--- .../cluster/bridge/BridgeStartTest.java | 56 +++---- .../integration/cluster/bridge/BridgeTest.java | 162 +++++++++---------- .../BridgeWithDiscoveryGroupStartTest.java | 16 +- .../cluster/distribution/ClusterTestBase.java | 26 +-- .../distribution/ClusteredGroupingTest.java | 2 +- .../distribution/MessageRedistributionTest.java | 2 +- .../MessageRedistributionWithDiscoveryTest.java | 2 +- .../failover/AsynchronousFailoverTest.java | 6 +- .../cluster/failover/BackupSyncJournalTest.java | 4 +- .../failover/BackupSyncLargeMessageTest.java | 2 +- .../cluster/failover/BackupSyncPagingTest.java | 2 +- .../ClusterWithBackupFailoverTestBase.java | 2 +- .../cluster/failover/FailoverListenerTest.java | 2 +- .../failover/FailoverOnFlowControlTest.java | 2 +- .../cluster/failover/FailoverTest.java | 8 +- .../cluster/failover/FailoverTestBase.java | 4 +- ...ultipleLivesMultipleBackupsFailoverTest.java | 2 +- .../MultipleServerFailoverTestBase.java | 20 +-- .../cluster/failover/NettyFailoverTest.java | 2 +- .../cluster/failover/QuorumFailOverTest.java | 4 +- ...dMultipleServerFailoverExtraBackupsTest.java | 2 +- .../cluster/failover/SecurityFailoverTest.java | 2 +- .../SingleLiveMultipleBackupsFailoverTest.java | 2 +- .../MultiThreadRandomReattachTestBase.java | 46 +++--- .../MultiThreadReattachSupportTestBase.java | 2 +- .../cluster/reattach/OrderReattachTest.java | 8 +- .../cluster/reattach/RandomReattachTest.java | 42 ++--- .../cluster/topology/IsolatedTopologyTest.java | 16 +- .../cluster/topology/NonHATopologyTest.java | 2 +- .../cluster/util/MultiServerTestBase.java | 6 +- .../discovery/DiscoveryBaseTest.java | 6 +- .../http/CoreClientOverHttpTest.java | 2 +- .../jms/ActiveMQConnectionFactoryTest.java | 6 +- .../tests/integration/jms/FloodServerTest.java | 2 +- .../ManualReconnectionToSingleServerTest.java | 2 +- .../integration/jms/SimpleJNDIClientTest.java | 6 +- .../jms/client/ReSendMessageTest.java | 4 +- ...onClosedOnRemotingConnectionFailureTest.java | 2 +- .../integration/jms/client/StoreConfigTest.java | 6 +- .../jms/cluster/JMSFailoverListenerTest.java | 2 +- .../jms/cluster/JMSFailoverTest.java | 2 +- .../jms/connection/CloseConnectionOnGCTest.java | 14 +- .../ConnectionFactorySerializationTest.java | 8 +- .../jms/connection/InvalidConnectorTest.java | 4 +- .../JmsProducerCompletionListenerTest.java | 2 +- .../jms/server/JMSServerStartStopTest.java | 2 +- .../jms/server/config/JMSConfigurationTest.java | 2 +- .../ConnectionFactoryControlTest.java | 2 +- .../server/management/JMSQueueControlTest.java | 2 +- .../server/management/JMSServerControlTest.java | 6 +- .../jms/server/management/TopicControlTest.java | 2 +- .../journal/NIOJournalCompactTest.java | 48 +++--- .../management/AddressControlTest.java | 4 +- .../management/AddressControlUsingCoreTest.java | 2 +- .../management/BridgeControlTest.java | 4 +- .../management/BridgeControlUsingCoreTest.java | 4 +- .../management/BroadcastGroupControlTest.java | 2 +- .../ClusterConnectionControl2Test.java | 4 +- .../ClusterConnectionControlTest.java | 4 +- .../integration/management/JMXDomainTest.java | 2 +- .../management/ManagementActivationTest.java | 2 +- .../management/ManagementHelperTest.java | 8 +- .../management/ManagementWithStompTest.java | 2 +- .../management/SecurityNotificationTest.java | 4 +- .../integration/mqtt/imported/MQTTTest.java | 10 +- .../mqtt/imported/MQTTTestSupport.java | 6 +- .../integration/mqtt/imported/PahoMQTTTest.java | 2 +- .../util/ResourceLoadingSslContext.java | 4 +- .../integration/openwire/BasicOpenWireTest.java | 2 +- .../integration/openwire/OpenWireTestBase.java | 6 +- .../openwire/amq/JMSMessageTest.java | 4 +- .../amq/JmsConnectionStartStopTest.java | 2 +- .../amq/JmsConsumerResetActiveListenerTest.java | 4 +- .../openwire/amq/JmsTopicRequestReplyTest.java | 2 +- .../openwire/amq/JmsTransactionTestSupport.java | 18 +-- .../amq/MessageListenerRedeliveryTest.java | 2 +- .../paging/MultipleProducersPagingTest.java | 2 +- .../integration/paging/PagingSendTest.java | 4 +- .../paging/SpawnedServerSupport.java | 4 +- ...AddressSettingsConfigurationStorageTest.java | 2 +- .../DeleteMessagesOnStartupTest.java | 4 +- ...nnectionFactoryConfigurationStorageTest.java | 14 +- .../persistence/JMSDynamicConfigTest.java | 2 +- .../integration/persistence/RestartSMTest.java | 8 +- .../RolesConfigurationStorageTest.java | 2 +- ...ansportConfigurationEncodingSupportTest.java | 12 +- .../tests/integration/proton/ProtonTest.java | 2 +- .../ra/ActiveMQMessageHandlerSecurityTest.java | 2 +- .../tests/integration/ra/JMSContextTest.java | 2 +- .../integration/ra/OutgoingConnectionTest.java | 2 +- .../ra/OutgoingConnectionTestJTA.java | 2 +- .../integration/ra/ResourceAdapterTest.java | 2 +- .../integration/remoting/BatchDelayTest.java | 4 +- .../integration/remoting/DirectDeliverTest.java | 2 +- .../remoting/NetworkAddressTestBase.java | 8 +- .../integration/remoting/ReconnectTest.java | 4 +- .../replication/ReplicationTest.java | 4 +- .../scheduling/ScheduledMessageTest.java | 2 +- .../integration/security/SecurityTest.java | 60 +++---- .../integration/server/ExpiryRunnerTest.java | 2 +- .../integration/server/FakeStorageManager.java | 4 +- .../integration/server/PredefinedQueueTest.java | 4 +- .../ssl/CoreClientOverOneWaySSLTest.java | 2 +- .../ssl/CoreClientOverTwoWaySSLTest.java | 2 +- .../tests/integration/stomp/ExtraStompTest.java | 20 +-- .../tests/integration/stomp/StompTestBase.java | 2 +- .../integration/stomp/StompWebSocketTest.java | 2 +- .../stomp/util/AbstractClientStompFrame.java | 6 +- .../util/AbstractStompClientConnection.java | 4 +- .../integration/stomp/v11/StompV11TestBase.java | 2 +- .../netty/ActiveMQFrameDecoder2Test.java | 2 +- .../NettyConnectorWithHTTPUpgradeTest.java | 4 +- .../vertx/ActiveMQVertxUnitTest.java | 10 +- .../integration/xa/BasicXaRecoveryTest.java | 2 +- .../tests/integration/xa/BasicXaTest.java | 2 +- .../tests/integration/xa/XaTimeoutTest.java | 4 +- .../artemis/tests/util/JMSTestBase.java | 4 +- .../tests/util/TransportConfigurationUtils.java | 10 +- .../jms/tests/ActiveMQServerTestCase.java | 10 +- .../artemis/jms/tests/CTSMiscellaneousTest.java | 2 +- .../jms/tests/ConnectionFactoryTest.java | 2 +- .../activemq/artemis/jms/tests/JMSTest.java | 4 +- .../activemq/artemis/jms/tests/JMSTestCase.java | 2 +- .../activemq/artemis/jms/tests/QueueTest.java | 2 +- .../tests/message/BodyIsAssignableFromTest.java | 2 +- .../jms/tests/message/MessageBodyTest.java | 2 +- .../jms/tests/message/MessageHeaderTest.java | 2 +- .../jms/tests/message/ObjectMessageTest.java | 6 +- .../jms/tests/message/SimpleJMSMessage.java | 2 +- .../tests/message/SimpleJMSStreamMessage.java | 2 +- .../jms/tests/selector/SelectorTest.java | 4 +- .../jms/tests/tools/ServerManagement.java | 2 +- .../jms/tests/tools/container/InVMContext.java | 4 +- .../container/InVMInitialContextFactory.java | 2 +- .../tests/tools/container/LocalTestServer.java | 8 +- .../activemq/artemis/jms/ActiveMQAdmin.java | 2 +- .../paging/MeasurePagingMultiThreadTest.java | 2 +- .../sends/AbstractSendReceivePerfTest.java | 2 +- .../tests/soak/client/ClientSoakTest.java | 2 +- .../stress/journal/AddAndRemoveStressTest.java | 8 +- .../JournalCleanupCompactStressTest.java | 6 +- .../journal/JournalRestartStressTest.java | 2 +- .../journal/MultiThreadConsumerStressTest.java | 2 +- .../NIOMultiThreadCompactorStressTest.java | 6 +- .../paging/MultipleConsumersPageStressTest.java | 8 +- .../stress/paging/PageCursorStressTest.java | 2 +- .../tests/stress/paging/PageStressTest.java | 2 +- .../tests/stress/stomp/StompStressTest.java | 2 +- .../core/server/impl/QueueConcurrentTest.java | 2 +- .../timing/core/server/impl/QueueImplTest.java | 4 +- .../jms/bridge/impl/JMSBridgeImplTest.java | 10 +- .../MultiThreadAsynchronousFileTest.java | 4 +- .../core/config/impl/ConnectorsServiceTest.java | 2 +- .../impl/fakes/FakeConnectorServiceFactory.java | 4 +- .../journal/impl/AlignedJournalImplTest.java | 12 +- .../core/journal/impl/JournalAsyncTest.java | 4 +- .../core/journal/impl/JournalImplTestBase.java | 14 +- .../unit/core/journal/impl/ReclaimerTest.java | 8 +- .../impl/SequentialFileFactoryTestBase.java | 2 +- .../unit/core/journal/impl/TimedBufferTest.java | 4 +- .../impl/fakes/FakeSequentialFileFactory.java | 6 +- .../unit/core/message/impl/MessageImplTest.java | 2 +- .../tests/unit/core/paging/impl/PageTest.java | 2 +- .../core/paging/impl/PagingManagerImplTest.java | 2 +- .../core/paging/impl/PagingStoreImplTest.java | 14 +- .../impl/BatchIDGeneratorUnitTest.java | 4 +- .../impl/DuplicateDetectionUnitTest.java | 2 +- .../impl/WildcardAddressManagerUnitTest.java | 2 +- .../impl/invm/InVMConnectorFactoryTest.java | 2 +- .../impl/netty/NettyAcceptorFactoryTest.java | 2 +- .../remoting/impl/netty/NettyAcceptorTest.java | 2 +- .../impl/netty/NettyConnectorFactoryTest.java | 2 +- .../remoting/impl/netty/NettyConnectorTest.java | 12 +- .../impl/ActiveMQSecurityManagerImplTest.java | 28 ++-- .../unit/core/server/impl/QueueImplTest.java | 38 ++--- .../core/server/impl/fakes/FakeConsumer.java | 2 +- .../ra/ActiveMQResourceAdapterConfigTest.java | 2 +- .../ra/ConnectionFactoryPropertiesTest.java | 46 +++--- .../tests/unit/ra/ResourceAdapterTest.java | 14 +- .../artemis/tests/unit/util/InVMContext.java | 6 +- .../tests/unit/util/InVMNamingContext.java | 6 +- .../artemis/tests/unit/util/LinkedListTest.java | 12 +- .../ObjectInputStreamWithClassLoaderTest.java | 2 +- .../tests/unit/util/SoftValueMapTest.java | 6 +- .../artemis/tests/unit/util/UUIDTest.java | 2 +- 692 files changed, 1947 insertions(+), 1947 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java ---------------------------------------------------------------------- diff --git a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java index b0458a2..bc2910d 100644 --- a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java +++ b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java @@ -53,7 +53,7 @@ public class Artemis { /** This is a good method for booting an embedded command */ public static Object execute(File fileHome, File fileInstance, String ... args) throws Throwable { - ArrayList<File> dirs = new ArrayList<File>(); + ArrayList<File> dirs = new ArrayList<>(); if (fileHome != null) { dirs.add(new File(fileHome, "lib")); } @@ -62,7 +62,7 @@ public class Artemis { } - ArrayList<URL> urls = new ArrayList<URL>(); + ArrayList<URL> urls = new ArrayList<>(); // Without the etc on the config, things like JGroups configuration wouldn't be loaded if (fileInstance != null) { @@ -79,7 +79,7 @@ public class Artemis { if (bootdir.exists() && bootdir.isDirectory()) { // Find the jar files in the directory.. - ArrayList<File> files = new ArrayList<File>(); + ArrayList<File> files = new ArrayList<>(); for (File f : bootdir.listFiles()) { if (f.getName().endsWith(".jar") || f.getName().endsWith(".zip")) { files.add(f); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java index cd7eb5d..cb1ae12 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java @@ -460,7 +460,7 @@ public class Create extends InputAbstract { context.out.println(String.format("Creating ActiveMQ Artemis instance at: %s", directory.getCanonicalPath())); - HashMap<String, String> filters = new HashMap<String, String>(); + HashMap<String, String> filters = new HashMap<>(); filters.put("${master-slave}", isSlave() ? "slave" : "master"); @@ -681,7 +681,7 @@ public class Create extends InputAbstract { String writesPerMillisecondStr = new DecimalFormat("###.##").format(writesPerMillisecond); - HashMap<String, String> syncFilter = new HashMap<String, String>(); + HashMap<String, String> syncFilter = new HashMap<>(); syncFilter.put("${nanoseconds}", Long.toString(nanoseconds)); syncFilter.put("${writesPerMillisecond}", writesPerMillisecondStr); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DecodeJournal.java ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DecodeJournal.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DecodeJournal.java index 88c761f..f2c20d9 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DecodeJournal.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DecodeJournal.java @@ -122,7 +122,7 @@ public class DecodeJournal extends LockAbstract { String line; - HashMap<Long, AtomicInteger> txCounters = new HashMap<Long, AtomicInteger>(); + HashMap<Long, AtomicInteger> txCounters = new HashMap<>(); long lineNumber = 0; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/PrintData.java ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/PrintData.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/PrintData.java index 4cd4716..c148484 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/PrintData.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/PrintData.java @@ -148,7 +148,7 @@ public class PrintData extends LockAbstract { }; final StorageManager sm = new NullStorageManager(); PagingStoreFactory pageStoreFactory = new PagingStoreFactoryNIO(sm, pageDirectory, 1000L, scheduled, execfactory, false, null); - HierarchicalRepository<AddressSettings> addressSettingsRepository = new HierarchicalObjectRepository<AddressSettings>(); + HierarchicalRepository<AddressSettings> addressSettingsRepository = new HierarchicalObjectRepository<>(); addressSettingsRepository.setDefault(new AddressSettings()); PagingManager manager = new PagingManagerImpl(pageStoreFactory, addressSettingsRepository); @@ -241,7 +241,7 @@ public class PrintData extends LockAbstract { Set<PagePosition> set = cursorInfo.getCursorRecords().get(encoding.queueID); if (set == null) { - set = new HashSet<PagePosition>(); + set = new HashSet<>(); cursorInfo.getCursorRecords().put(encoding.queueID, set); } @@ -281,11 +281,11 @@ public class PrintData extends LockAbstract { private static class PageCursorsInfo { - private final Map<Long, Set<PagePosition>> cursorRecords = new HashMap<Long, Set<PagePosition>>(); + private final Map<Long, Set<PagePosition>> cursorRecords = new HashMap<>(); - private final Set<Long> pgTXs = new HashSet<Long>(); + private final Set<Long> pgTXs = new HashSet<>(); - private final Map<Long, Set<Long>> completePages = new HashMap<Long, Set<Long>>(); + private final Map<Long, Set<Long>> completePages = new HashMap<>(); public PageCursorsInfo() { } @@ -315,7 +315,7 @@ public class PrintData extends LockAbstract { Set<Long> completePagesSet = completePages.get(queueID); if (completePagesSet == null) { - completePagesSet = new HashSet<Long>(); + completePagesSet = new HashSet<>(); completePages.put(queueID, completePagesSet); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java index 04f658f..8ae5729 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java @@ -95,7 +95,7 @@ public class FileBroker implements Broker { * will need impproving if we get more. * */ public ArrayList<ActiveMQComponent> getComponentsByStartOrder(Map<String, ActiveMQComponent> components) { - ArrayList<ActiveMQComponent> activeMQComponents = new ArrayList<ActiveMQComponent>(); + ArrayList<ActiveMQComponent> activeMQComponents = new ArrayList<>(); ActiveMQComponent jmsComponent = components.get("jms"); if (jmsComponent != null) { activeMQComponents.add(jmsComponent); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java index 6aca1d0..f135653 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java @@ -206,7 +206,7 @@ public enum ActiveMQExceptionType { private static final Map<Integer, ActiveMQExceptionType> TYPE_MAP; static { - HashMap<Integer, ActiveMQExceptionType> map = new HashMap<Integer, ActiveMQExceptionType>(); + HashMap<Integer, ActiveMQExceptionType> map = new HashMap<>(); for (ActiveMQExceptionType type : EnumSet.allOf(ActiveMQExceptionType.class)) { map.put(type.getCode(), type); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java index b9f8861..70cf4cf 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java @@ -262,7 +262,7 @@ public final class SimpleString implements CharSequence, Serializable, Comparabl // For that reason I'm allocating the ArrayList with 2 already // I have thought about using LinkedList here but I think this will be good enough already // Note by Clebert - all = new ArrayList<SimpleString>(2); + all = new ArrayList<>(2); } all.add(new SimpleString(bytes)); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentHashSet.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentHashSet.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentHashSet.java index 9a3ae8c..1b4e5d7 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentHashSet.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentHashSet.java @@ -33,7 +33,7 @@ public class ConcurrentHashSet<E> extends AbstractSet<E> implements ConcurrentSe private static final Object dummy = new Object(); public ConcurrentHashSet() { - theMap = new ConcurrentHashMap<E, Object>(); + theMap = new ConcurrentHashMap<>(); } @Override http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java index 748006d..70b9c83 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java @@ -52,7 +52,7 @@ public class FactoryFinder { */ protected static class StandaloneObjectFactory implements ObjectFactory { - final ConcurrentMap<String, Class> classMap = new ConcurrentHashMap<String, Class>(); + final ConcurrentMap<String, Class> classMap = new ConcurrentHashMap<>(); @Override public Object create(final String path) throws InstantiationException, IllegalAccessException, ClassNotFoundException, IOException { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FileUtil.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FileUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FileUtil.java index 9ec689c..81008af 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FileUtil.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FileUtil.java @@ -37,7 +37,7 @@ public class FileUtil { public static void makeExec(File file) throws IOException { try { - Files.setPosixFilePermissions(file.toPath(), new HashSet<PosixFilePermission>(Arrays.asList(OWNER_READ, OWNER_WRITE, OWNER_EXECUTE, GROUP_READ, GROUP_WRITE, GROUP_EXECUTE, OTHERS_READ, OTHERS_EXECUTE))); + Files.setPosixFilePermissions(file.toPath(), new HashSet<>(Arrays.asList(OWNER_READ, OWNER_WRITE, OWNER_EXECUTE, GROUP_READ, GROUP_WRITE, GROUP_EXECUTE, OTHERS_READ, OTHERS_EXECUTE))); } catch (Throwable ignore) { // Our best effort was not good enough :) http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java index 99c4cba..6be5e05 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java @@ -63,7 +63,7 @@ public class PasswordMaskingUtil { }); if (parts.length > 1) { - Map<String, String> props = new HashMap<String, String>(); + Map<String, String> props = new HashMap<>(); for (int i = 1; i < parts.length; i++) { String[] keyVal = parts[i].split("="); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/TypedProperties.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/TypedProperties.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/TypedProperties.java index 432e46f..5bff66f 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/TypedProperties.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/TypedProperties.java @@ -71,7 +71,7 @@ public final class TypedProperties { } public TypedProperties(final TypedProperties other) { - properties = other.properties == null ? null : new HashMap<SimpleString, PropertyValue>(other.properties); + properties = other.properties == null ? null : new HashMap<>(other.properties); size = other.size; } @@ -376,7 +376,7 @@ public final class TypedProperties { else { int numHeaders = buffer.readInt(); - properties = new HashMap<SimpleString, PropertyValue>(numHeaders); + properties = new HashMap<>(numHeaders); size = 0; for (int i = 0; i < numHeaders; i++) { @@ -546,7 +546,7 @@ public final class TypedProperties { private void checkCreateProperties() { if (properties == null) { - properties = new HashMap<SimpleString, PropertyValue>(); + properties = new HashMap<>(); } } @@ -935,7 +935,7 @@ public final class TypedProperties { } public Map<String, Object> getMap() { - Map<String, Object> m = new HashMap<String, Object>(); + Map<String, Object> m = new HashMap<>(); for (Entry<SimpleString, PropertyValue> entry : properties.entrySet()) { Object val = entry.getValue().getValue(); if (val instanceof SimpleString) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java index 18dca84..5af507e 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java @@ -35,7 +35,7 @@ public final class UTF8Util { private static final boolean isTrace = ActiveMQUtilLogger.LOGGER.isTraceEnabled(); - private static final ThreadLocal<SoftReference<StringUtilBuffer>> currenBuffer = new ThreadLocal<SoftReference<StringUtilBuffer>>(); + private static final ThreadLocal<SoftReference<StringUtilBuffer>> currenBuffer = new ThreadLocal<>(); public static void saveUTF(final ActiveMQBuffer out, final String str) { StringUtilBuffer buffer = UTF8Util.getThreadLocalBuffer(); @@ -149,7 +149,7 @@ public final class UTF8Util { StringUtilBuffer value; if (softReference == null) { value = new StringUtilBuffer(); - softReference = new SoftReference<StringUtilBuffer>(value); + softReference = new SoftReference<>(value); UTF8Util.currenBuffer.set(softReference); } else { @@ -158,7 +158,7 @@ public final class UTF8Util { if (value == null) { value = new StringUtilBuffer(); - softReference = new SoftReference<StringUtilBuffer>(value); + softReference = new SoftReference<>(value); UTF8Util.currenBuffer.set(softReference); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java index df9607b..e9878d1 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java @@ -258,7 +258,7 @@ public final class UUIDGenerator { try { networkInterfaces = NetworkInterface.getNetworkInterfaces(); - List<NetworkInterface> ifaces = new ArrayList<NetworkInterface>(); + List<NetworkInterface> ifaces = new ArrayList<>(); while (networkInterfaces.hasMoreElements()) { ifaces.add(networkInterfaces.nextElement()); } @@ -275,7 +275,7 @@ public final class UUIDGenerator { final Method isLoopbackMethod, final Method isVirtualMethod) { ExecutorService executor = Executors.newFixedThreadPool(ifaces.size()); - Collection<Callable<byte[]>> tasks = new ArrayList<Callable<byte[]>>(ifaces.size()); + Collection<Callable<byte[]>> tasks = new ArrayList<>(ifaces.size()); for (final NetworkInterface networkInterface : ifaces) { tasks.add(new Callable<byte[]>() { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISchema.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISchema.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISchema.java index 3358331..b76ceb1 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISchema.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISchema.java @@ -108,7 +108,7 @@ public abstract class URISchema<T, P> { public static Map<String, String> parseQuery(String uri, Map<String, String> propertyOverrides) throws URISyntaxException { try { - Map<String, String> rc = new HashMap<String, String>(); + Map<String, String> rc = new HashMap<>(); if (uri != null && !uri.isEmpty()) { String[] parameters = uri.split("&"); for (int i = 0; i < parameters.length; i++) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/PairTest.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/PairTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/PairTest.java index b441c7b..a45886e 100644 --- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/PairTest.java +++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/PairTest.java @@ -25,7 +25,7 @@ public class PairTest extends Assert { @Test public void testPair() { - Pair<Integer, Integer> p = new Pair<Integer, Integer>(Integer.valueOf(12), Integer.valueOf(13)); + Pair<Integer, Integer> p = new Pair<>(Integer.valueOf(12), Integer.valueOf(13)); int hash = p.hashCode(); p.setA(null); assertTrue(hash != p.hashCode()); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java index e419dfc..5bcddbc 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java @@ -134,7 +134,7 @@ public abstract class JGroupsBroadcastEndpoint implements BroadcastEndpoint { */ private static final class JGroupsReceiver extends ReceiverAdapter { - private final BlockingQueue<byte[]> dequeue = new LinkedBlockingDeque<byte[]>(); + private final BlockingQueue<byte[]> dequeue = new LinkedBlockingDeque<>(); @Override public void receive(org.jgroups.Message msg) { @@ -160,7 +160,7 @@ public abstract class JGroupsBroadcastEndpoint implements BroadcastEndpoint { int refCount = 1; JChannel channel; String channelName; - final List<JGroupsReceiver> receivers = new ArrayList<JGroupsReceiver>(); + final List<JGroupsReceiver> receivers = new ArrayList<>(); public JChannelWrapper(String channelName, JChannel channel) throws Exception { this.refCount = 1; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java index 3ad7a73..6f91537 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java @@ -310,7 +310,7 @@ public class TransportConfiguration implements Serializable { if (params == null) { if (num > 0) { - params = new HashMap<String, Object>(); + params = new HashMap<>(); } } else { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java index 8cd7e2e..fb7d88b 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java @@ -209,7 +209,7 @@ public final class ManagementHelper { else if (val instanceof JSONObject) { JSONObject jsonObject = (JSONObject) val; - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); Iterator<String> iter = jsonObject.keys(); @@ -222,7 +222,7 @@ public final class ManagementHelper { innerVal = ManagementHelper.fromJSONArray(((JSONArray) innerVal)); } else if (innerVal instanceof JSONObject) { - Map<String, Object> innerMap = new HashMap<String, Object>(); + Map<String, Object> innerMap = new HashMap<>(); JSONObject o = (JSONObject) innerVal; Iterator it = o.keys(); while (it.hasNext()) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AddressQueryImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AddressQueryImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AddressQueryImpl.java index aeec614..3a1f62b 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AddressQueryImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AddressQueryImpl.java @@ -34,7 +34,7 @@ public class AddressQueryImpl implements ClientSession.AddressQuery { final List<SimpleString> queueNames, final boolean autoCreateJmsQueues) { this.exists = exists; - this.queueNames = new ArrayList<SimpleString>(queueNames); + this.queueNames = new ArrayList<>(queueNames); this.autoCreateJmsQueues = autoCreateJmsQueues; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java index 727ba74..8013b72 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java @@ -87,7 +87,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { private final int ackBatchSize; - private final PriorityLinkedList<ClientMessageInternal> buffer = new PriorityLinkedListImpl<ClientMessageInternal>(ClientConsumerImpl.NUM_PRIORITIES); + private final PriorityLinkedList<ClientMessageInternal> buffer = new PriorityLinkedListImpl<>(ClientConsumerImpl.NUM_PRIORITIES); private final Runner runner = new Runner(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java index 229dc82..982ce29 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java @@ -27,9 +27,9 @@ public class ClientProducerCreditManagerImpl implements ClientProducerCreditMana public static final int MAX_UNREFERENCED_CREDITS_CACHE_SIZE = 1000; - private final Map<SimpleString, ClientProducerCredits> producerCredits = new LinkedHashMap<SimpleString, ClientProducerCredits>(); + private final Map<SimpleString, ClientProducerCredits> producerCredits = new LinkedHashMap<>(); - private final Map<SimpleString, ClientProducerCredits> unReferencedCredits = new LinkedHashMap<SimpleString, ClientProducerCredits>(); + private final Map<SimpleString, ClientProducerCredits> unReferencedCredits = new LinkedHashMap<>(); private final ClientSessionInternal session; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java index 1a67dff..3b36345 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java @@ -97,7 +97,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C private final long connectionTTL; - private final Set<ClientSessionInternal> sessions = new HashSet<ClientSessionInternal>(); + private final Set<ClientSessionInternal> sessions = new HashSet<>(); private final Object createSessionLock = new Object(); @@ -123,9 +123,9 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C private int reconnectAttempts; - private final Set<SessionFailureListener> listeners = new ConcurrentHashSet<SessionFailureListener>(); + private final Set<SessionFailureListener> listeners = new ConcurrentHashSet<>(); - private final Set<FailoverEventListener> failoverListeners = new ConcurrentHashSet<FailoverEventListener>(); + private final Set<FailoverEventListener> failoverListeners = new ConcurrentHashSet<>(); private Connector connector; @@ -222,7 +222,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C confirmationWindowWarning = new ConfirmationWindowWarning(serverLocator.getConfirmationWindowSize() < 0); - lifeCycleListeners = new HashSet<ConnectionLifeCycleListener>(); + lifeCycleListeners = new HashSet<>(); connectionReadyForWrites = true; } @@ -456,7 +456,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C private void closeCleanSessions(boolean close) { HashSet<ClientSessionInternal> sessionsToClose; synchronized (sessions) { - sessionsToClose = new HashSet<ClientSessionInternal>(sessions); + sessionsToClose = new HashSet<>(sessions); } // work on a copied set. the session will be removed from sessions when session.close() is // called @@ -633,7 +633,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C if (connection == null) { synchronized (sessions) { - sessionsToClose = new HashSet<ClientSessionInternal>(sessions); + sessionsToClose = new HashSet<>(sessions); } callFailoverListeners(FailoverEventType.FAILOVER_FAILED); callSessionFailureListeners(me, true, false, scaleDownTargetNodeID); @@ -697,7 +697,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C final boolean afterReconnect, final boolean failedOver, final String scaleDownTargetNodeID) { - final List<SessionFailureListener> listenersClone = new ArrayList<SessionFailureListener>(listeners); + final List<SessionFailureListener> listenersClone = new ArrayList<>(listeners); for (final SessionFailureListener listener : listenersClone) { try { @@ -741,7 +741,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C final ActiveMQException cause) { HashSet<ClientSessionInternal> sessionsToFailover; synchronized (sessions) { - sessionsToFailover = new HashSet<ClientSessionInternal>(sessions); + sessionsToFailover = new HashSet<>(sessions); } for (ClientSessionInternal session : sessionsToFailover) { @@ -1195,7 +1195,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C private final WeakReference<PingRunnable> pingRunnable; ActualScheduledPinger(final PingRunnable runnable) { - pingRunnable = new WeakReference<PingRunnable>(runnable); + pingRunnable = new WeakReference<>(runnable); } @Override http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java index 2942b8c..ca7e767 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java @@ -54,7 +54,7 @@ import org.apache.activemq.artemis.utils.XidCodecSupport; public final class ClientSessionImpl implements ClientSessionInternal, FailureListener { - private final Map<String, String> metadata = new HashMap<String, String>(); + private final Map<String, String> metadata = new HashMap<>(); private final ClientSessionFactoryInternal sessionFactory; @@ -74,10 +74,10 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi /** * All access to producers are guarded (i.e. synchronized) on itself. */ - private final Set<ClientProducerInternal> producers = new HashSet<ClientProducerInternal>(); + private final Set<ClientProducerInternal> producers = new HashSet<>(); // Consumers must be an ordered map so if we fail we recreate them in the same order with the same ids - private final Map<ConsumerContext, ClientConsumerInternal> consumers = new LinkedHashMap<ConsumerContext, ClientConsumerInternal>(); + private final Map<ConsumerContext, ClientConsumerInternal> consumers = new LinkedHashMap<>(); private volatile boolean closed; @@ -1012,7 +1012,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi HashMap<String, String> metaDataToSend; synchronized (metadata) { - metaDataToSend = new HashMap<String, String>(metadata); + metaDataToSend = new HashMap<>(metadata); } sessionContext.resetMetadata(metaDataToSend); @@ -1652,7 +1652,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi Set<ClientProducerInternal> producersClone; synchronized (producers) { - producersClone = new HashSet<ClientProducerInternal>(producers); + producersClone = new HashSet<>(producers); } return producersClone; } @@ -1664,7 +1664,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi */ public Set<ClientConsumerInternal> cloneConsumers() { synchronized (consumers) { - return new HashSet<ClientConsumerInternal>(consumers.values()); + return new HashSet<>(consumers.values()); } } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java index 95bb26f..dde59d2 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java @@ -51,7 +51,7 @@ public class DelegatingSession implements ClientSessionInternal { private volatile boolean closed; - private static Set<DelegatingSession> sessions = new ConcurrentHashSet<DelegatingSession>(); + private static Set<DelegatingSession> sessions = new ConcurrentHashSet<>(); public static volatile boolean debug; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java index 0a608a1..a483f5d 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java @@ -90,9 +90,9 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery private transient String identity; - private final Set<ClientSessionFactoryInternal> factories = new HashSet<ClientSessionFactoryInternal>(); + private final Set<ClientSessionFactoryInternal> factories = new HashSet<>(); - private final Set<ClientSessionFactoryInternal> connectingFactories = new HashSet<ClientSessionFactoryInternal>(); + private final Set<ClientSessionFactoryInternal> connectingFactories = new HashSet<>(); private volatile TransportConfiguration[] initialConnectors; @@ -183,9 +183,9 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery private transient STATE state; private transient CountDownLatch latch; - private final List<Interceptor> incomingInterceptors = new CopyOnWriteArrayList<Interceptor>(); + private final List<Interceptor> incomingInterceptors = new CopyOnWriteArrayList<>(); - private final List<Interceptor> outgoingInterceptors = new CopyOnWriteArrayList<Interceptor>(); + private final List<Interceptor> outgoingInterceptors = new CopyOnWriteArrayList<>(); private static ExecutorService globalThreadPool; @@ -1427,7 +1427,7 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery Set<ClientSessionFactoryInternal> clonedFactory; synchronized (factories) { - clonedFactory = new HashSet<ClientSessionFactoryInternal>(factories); + clonedFactory = new HashSet<>(factories); factories.clear(); } @@ -1536,7 +1536,7 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery TopologyMember actMember = topology.getMember(nodeID); if (actMember != null && actMember.getLive() != null && actMember.getBackup() != null) { - HashSet<ClientSessionFactory> clonedFactories = new HashSet<ClientSessionFactory>(); + HashSet<ClientSessionFactory> clonedFactories = new HashSet<>(); synchronized (factories) { clonedFactories.addAll(factories); } @@ -1802,7 +1802,7 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery } } } - connectors = new ArrayList<Connector>(); + connectors = new ArrayList<>(); if (initialConnectors != null) { for (TransportConfiguration initialConnector : initialConnectors) { ClientSessionFactoryInternal factory = new ClientSessionFactoryImpl(ServerLocatorImpl.this, initialConnector, callTimeout, callFailoverTimeout, clientFailureCheckPeriod, connectionTTL, retryInterval, retryIntervalMultiplier, maxRetryInterval, reconnectAttempts, threadPool, scheduledThreadPool, incomingInterceptors, outgoingInterceptors); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java index 35bfb5d..526d9f0 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java @@ -345,7 +345,7 @@ public final class Topology { final Map<String, TopologyMemberImpl> copy; synchronized (Topology.this) { - copy = new HashMap<String, TopologyMemberImpl>(topology); + copy = new HashMap<>(topology); } for (Map.Entry<String, TopologyMemberImpl> entry : copy.entrySet()) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/TopologyMemberImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/TopologyMemberImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/TopologyMemberImpl.java index 1696efc..50bb50b 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/TopologyMemberImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/TopologyMemberImpl.java @@ -46,7 +46,7 @@ public final class TopologyMemberImpl implements TopologyMember { this.nodeId = nodeId; this.backupGroupName = backupGroupName; this.scaleDownGroupName = scaleDownGroupName; - this.connector = new Pair<TransportConfiguration, TransportConfiguration>(a, b); + this.connector = new Pair<>(a, b); uniqueEventID = System.currentTimeMillis(); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java index 4a91f65..40b48a6 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java @@ -49,7 +49,7 @@ public final class DiscoveryGroup implements ActiveMQComponent { private static final boolean isTrace = ActiveMQClientLogger.LOGGER.isTraceEnabled(); - private final List<DiscoveryListener> listeners = new ArrayList<DiscoveryListener>(); + private final List<DiscoveryListener> listeners = new ArrayList<>(); private final String name; @@ -59,7 +59,7 @@ public final class DiscoveryGroup implements ActiveMQComponent { private final Object waitLock = new Object(); - private final Map<String, DiscoveryEntry> connectors = new ConcurrentHashMap<String, DiscoveryEntry>(); + private final Map<String, DiscoveryEntry> connectors = new ConcurrentHashMap<>(); private final long timeout; @@ -67,7 +67,7 @@ public final class DiscoveryGroup implements ActiveMQComponent { private final String nodeID; - private final Map<String, String> uniqueIDMap = new HashMap<String, String>(); + private final Map<String, String> uniqueIDMap = new HashMap<>(); private final BroadcastEndpoint endpoint; @@ -192,7 +192,7 @@ public final class DiscoveryGroup implements ActiveMQComponent { } public synchronized List<DiscoveryEntry> getDiscoveryEntries() { - List<DiscoveryEntry> list = new ArrayList<DiscoveryEntry>(connectors.values()); + List<DiscoveryEntry> list = new ArrayList<>(connectors.values()); return list; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java index 1d82bee..f27402e 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java @@ -408,7 +408,7 @@ public abstract class MessageImpl implements MessageInternal { @Override public Map<String, Object> toMap() { - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); map.put("messageID", messageID); if (userID != null) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java index b152156..a0985fc 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java @@ -130,7 +130,7 @@ public final class ChannelImpl implements Channel { this.confWindowSize = confWindowSize; if (confWindowSize != -1) { - resendCache = new ConcurrentLinkedQueue<Packet>(); + resendCache = new ConcurrentLinkedQueue<>(); } else { resendCache = null;
