This is an automated email from the ASF dual-hosted git repository.
vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 9ff28b6b10 QPID-8653: [Broker-J] Code cleanup: collection type
arguments, collection factory methods, lambdas (#203)
9ff28b6b10 is described below
commit 9ff28b6b104baba5e10b4cd502e580f832ae0649
Author: Daniil Kirilyuk <daniel.kiril...@gmail.com>
AuthorDate: Mon Aug 7 10:31:12 2023 +0200
QPID-8653: [Broker-J] Code cleanup: collection type arguments, collection
factory methods, lambdas (#203)
---
.../org/apache/qpid/disttest/AbstractRunner.java | 3 +-
.../org/apache/qpid/disttest/ClientRunner.java | 14 +++-----
.../org/apache/qpid/disttest/ConfigFileHelper.java | 13 +++----
.../org/apache/qpid/disttest/client/Client.java | 12 +++----
.../qpid/disttest/client/ConsumerParticipant.java | 12 ++-----
.../qpid/disttest/client/MessageProvider.java | 17 ++++-----
.../client/ParticipantExecutorRegistry.java | 2 +-
.../qpid/disttest/client/utils/BeanUtils.java | 2 +-
.../disttest/controller/AbstractTestRunner.java | 2 +-
.../qpid/disttest/controller/ClientRegistry.java | 2 +-
.../disttest/controller/ParticipatingClients.java | 2 +-
.../disttest/controller/ResultsForAllTests.java | 2 +-
.../disttest/controller/config/ClientConfig.java | 16 ++++-----
.../qpid/disttest/controller/config/Config.java | 12 +++----
.../controller/config/ConnectionConfig.java | 10 +++---
.../disttest/controller/config/IterationValue.java | 5 ++-
.../disttest/controller/config/SessionConfig.java | 16 ++++-----
.../disttest/controller/config/TestConfig.java | 26 +++++++-------
.../disttest/controller/config/TestInstance.java | 2 +-
.../qpid/disttest/jms/ClientJmsDelegate.java | 40 ++++++++-------------
.../qpid/disttest/jms/ControllerJmsDelegate.java | 42 +++++++++-------------
.../message/ParticipantAttributeExtractor.java | 4 +--
.../qpid/disttest/message/ParticipantResult.java | 10 ++----
.../results/aggregation/AggregatedTestResult.java | 2 +-
.../results/aggregation/SeriesStatistics.java | 2 +-
.../disttest/results/formatting/CSVFormatter.java | 9 +++--
.../CSVOrderParticipantResultComparator.java | 9 ++---
.../apache/qpid/disttest/ConfigFileHelperTest.java | 5 ++-
.../qpid/disttest/charting/ChartingUtil.java | 2 +-
.../chartbuilder/XYDataSetBasedChartBuilder.java | 3 +-
.../definition/ChartingDefinitionCreator.java | 2 +-
.../definition/SeriesDefinitionCreator.java | 2 +-
.../qpid/disttest/charting/writer/ChartWriter.java | 2 +-
33 files changed, 114 insertions(+), 190 deletions(-)
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java
b/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java
index baa0a4bcf4..7dca93d62c 100644
--- a/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java
+++ b/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java
@@ -27,7 +27,6 @@ import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.HashMap;
-import java.util.Hashtable;
import java.util.Map;
import java.util.Properties;
@@ -40,7 +39,7 @@ public class AbstractRunner
public static final String JNDI_CONFIG_PROP = "jndi-config";
public static final String JNDI_CONFIG_DEFAULT =
"perftests-jndi.properties";
- private final Map<String,String> _cliOptions = new HashMap<String,
String>();
+ private final Map<String,String> _cliOptions = new HashMap<>();
{
getCliOptions().put(JNDI_CONFIG_PROP, JNDI_CONFIG_DEFAULT);
}
diff --git a/perftests/src/main/java/org/apache/qpid/disttest/ClientRunner.java
b/perftests/src/main/java/org/apache/qpid/disttest/ClientRunner.java
index 2a2265a046..7697b19c25 100644
--- a/perftests/src/main/java/org/apache/qpid/disttest/ClientRunner.java
+++ b/perftests/src/main/java/org/apache/qpid/disttest/ClientRunner.java
@@ -82,16 +82,12 @@ public class ClientRunner extends AbstractRunner
{
final Client client = new Client(new ClientJmsDelegate(context));
- Thread clientThread = new Thread(new Runnable()
+ Thread clientThread = new Thread(() ->
{
- @Override
- public void run()
- {
- LOGGER.info("Starting client {}", client.getClientName());
- client.start();
- client.waitUntilStopped();
- LOGGER.info("Stopped client {}", client.getClientName());
- }
+ LOGGER.info("Starting client {}", client.getClientName());
+ client.start();
+ client.waitUntilStopped();
+ LOGGER.info("Stopped client {}", client.getClientName());
});
clientThread.start();
return clientThread;
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java
b/perftests/src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java
index a465813159..1b9df29092 100644
--- a/perftests/src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java
+++ b/perftests/src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java
@@ -19,7 +19,6 @@
package org.apache.qpid.disttest;
import java.io.File;
-import java.io.FilenameFilter;
import java.util.ArrayList;
import java.util.List;
@@ -33,19 +32,15 @@ public class ConfigFileHelper
*/
public List<String> getTestConfigFiles(String testConfigPath)
{
- final List<String> testConfigFile = new ArrayList<String>();
+ final List<String> testConfigFile = new ArrayList<>();
final File configFileOrDirectory = new File(testConfigPath);
if (configFileOrDirectory.isDirectory())
{
- final String[] configFiles = configFileOrDirectory.list(new
FilenameFilter()
+ final String[] configFiles = configFileOrDirectory.list((dir,
name) ->
{
- @Override
- public boolean accept(File dir, String name)
- {
- boolean suffixOk = name.endsWith(".json") ||
name.endsWith(".js");
- return new File(dir, name).isFile() && suffixOk;
- }
+ boolean suffixOk = name.endsWith(".json") ||
name.endsWith(".js");
+ return new File(dir, name).isFile() && suffixOk;
});
for (String configFile : configFiles)
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/client/Client.java
b/perftests/src/main/java/org/apache/qpid/disttest/client/Client.java
index 39288198a3..3662e1e7af 100644
--- a/perftests/src/main/java/org/apache/qpid/disttest/client/Client.java
+++ b/perftests/src/main/java/org/apache/qpid/disttest/client/Client.java
@@ -56,7 +56,7 @@ public class Client implements ResultReporter
public Client(final ClientJmsDelegate delegate) throws NamingException
{
_clientJmsDelegate = delegate;
- _state = new AtomicReference<ClientState>(ClientState.CREATED);
+ _state = new AtomicReference<>(ClientState.CREATED);
_visitor = new ClientCommandVisitor(this, _clientJmsDelegate);
}
@@ -65,14 +65,10 @@ public class Client implements ResultReporter
*/
public void start()
{
- _clientJmsDelegate.setConnectionLostListener(new
ConnectionLostListener()
+ _clientJmsDelegate.setConnectionLostListener(() ->
{
- @Override
- public void connectionLost()
- {
- LOGGER.warn("Client unexpectedly lost the JMS connection.
Shutting down.");
- transitToStopped();
- }
+ LOGGER.warn("Client unexpectedly lost the JMS connection. Shutting
down.");
+ transitToStopped();
});
_clientJmsDelegate.setInstructionListener(this);
_clientJmsDelegate.sendRegistrationMessage();
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java
b/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java
index faff71a81c..23491f4145 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java
@@ -46,7 +46,7 @@ public class ConsumerParticipant implements Participant
private static final Logger LOGGER =
LoggerFactory.getLogger(ConsumerParticipant.class);
private final AtomicInteger _totalNumberOfMessagesReceived = new
AtomicInteger(0);
- private final NavigableSet<Integer> _allConsumedPayloadSizes = new
ConcurrentSkipListSet<Integer>();
+ private final NavigableSet<Integer> _allConsumedPayloadSizes = new
ConcurrentSkipListSet<>();
private final AtomicLong _totalPayloadSizeOfAllMessagesReceived = new
AtomicLong(0);
private final CountDownLatch _asyncRunHasFinished = new CountDownLatch(1);
private final ClientJmsDelegate _jmsDelegate;
@@ -98,15 +98,7 @@ public class ConsumerParticipant implements Participant
{
LOGGER.debug("Consumer {} registering listener", getName());
- _jmsDelegate.registerListener(_command.getParticipantName(), new
MessageListener(){
-
- @Override
- public void onMessage(Message message)
- {
- processAsyncMessage(message);
- }
-
- });
+ _jmsDelegate.registerListener(_command.getParticipantName(),
this::processAsyncMessage);
waitUntilMsgListenerHasFinished();
rethrowAnyAsyncMessageListenerException();
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/client/MessageProvider.java
b/perftests/src/main/java/org/apache/qpid/disttest/client/MessageProvider.java
index eb2b52623a..726e39ff0f 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/client/MessageProvider.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/client/MessageProvider.java
@@ -23,7 +23,6 @@ import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Future;
@@ -56,7 +55,7 @@ public class MessageProvider
public MessageProvider(Map<String, PropertyValue> messageProperties)
{
_messageProperties = messageProperties;
- _payloads = new ConcurrentHashMap<Integer, Future<String>>();
+ _payloads = new ConcurrentHashMap<>();
}
public Message nextMessage(Session session, CreateProducerCommand command)
throws JMSException
@@ -183,16 +182,12 @@ public class MessageProvider
protected String getMessagePayload(final CreateProducerCommand command)
{
- FutureTask<String> createTextFuture = new FutureTask<String>(new
Callable<String>()
+ FutureTask<String> createTextFuture = new FutureTask<>(() ->
{
- @Override
- public String call() throws Exception
- {
- final int messageSize = command.getMessageSize();
- char[] chars = new char[messageSize];
- Arrays.fill(chars, 'a');
- return new String(chars);
- }
+ final int messageSize = command.getMessageSize();
+ char[] chars = new char[messageSize];
+ Arrays.fill(chars, 'a');
+ return new String(chars);
});
Future<String> future =
_payloads.putIfAbsent(command.getMessageSize(), createTextFuture);
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutorRegistry.java
b/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutorRegistry.java
index 3d9780e640..fb0d28e45d 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutorRegistry.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutorRegistry.java
@@ -26,7 +26,7 @@ import java.util.Set;
public class ParticipantExecutorRegistry
{
- private final Set<ParticipantExecutor> _participantExecutors =
Collections.synchronizedSet(new HashSet<ParticipantExecutor>());
+ private final Set<ParticipantExecutor> _participantExecutors =
Collections.synchronizedSet(new HashSet<>());
public void add(ParticipantExecutor participantExecutor)
{
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/client/utils/BeanUtils.java
b/perftests/src/main/java/org/apache/qpid/disttest/client/utils/BeanUtils.java
index f489597799..43dec39b68 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/client/utils/BeanUtils.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/client/utils/BeanUtils.java
@@ -32,7 +32,7 @@ import java.util.Map;
public class BeanUtils
{
- private static final Map<Class, Class> PRIMITIVE_TYPES =
Collections.synchronizedMap(new HashMap<Class, Class>());
+ private static final Map<Class, Class> PRIMITIVE_TYPES =
Collections.synchronizedMap(new HashMap<>());
static
{
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/controller/AbstractTestRunner.java
b/perftests/src/main/java/org/apache/qpid/disttest/controller/AbstractTestRunner.java
index 061ae2d08a..af932bbd8d 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/controller/AbstractTestRunner.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/controller/AbstractTestRunner.java
@@ -58,7 +58,7 @@ public abstract class AbstractTestRunner implements
ITestRunner
private final ParticipatingClients _participatingClients;
private final TestInstance _testInstance;
private final AtomicInteger _errorResponseCount = new AtomicInteger();
- private final Set<CommandType> _setOfResponsesToExpect =
Collections.synchronizedSet(new HashSet<CommandType>());
+ private final Set<CommandType> _setOfResponsesToExpect =
Collections.synchronizedSet(new HashSet<>());
/** Length of time to await test results or {@value #WAIT_FOREVER} */
private final long _testResultTimeout;
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/controller/ClientRegistry.java
b/perftests/src/main/java/org/apache/qpid/disttest/controller/ClientRegistry.java
index ca54ab3711..9e479b104d 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/controller/ClientRegistry.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/controller/ClientRegistry.java
@@ -32,7 +32,7 @@ public class ClientRegistry
{
private static final Logger LOGGER =
LoggerFactory.getLogger(ClientRegistry.class);
- private final Set<String> _registeredClientNames = new
ConcurrentSkipListSet<String>();
+ private final Set<String> _registeredClientNames = new
ConcurrentSkipListSet<>();
private final Object _lock = new Object();
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/controller/ParticipatingClients.java
b/perftests/src/main/java/org/apache/qpid/disttest/controller/ParticipatingClients.java
index 499c78018d..f0ac95f58e 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/controller/ParticipatingClients.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/controller/ParticipatingClients.java
@@ -61,7 +61,7 @@ public class ParticipatingClients
{
BiMap<String, String> configuredToRegisteredNameMap =
HashBiMap.create();
- TreeSet<String> registeredClients = new
TreeSet<String>(clientRegistry.getClients());
+ TreeSet<String> registeredClients = new
TreeSet<>(clientRegistry.getClients());
for (String configuredClientName : configuredClientNamesForTest)
{
String allocatedClientName = registeredClients.pollFirst();
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/controller/ResultsForAllTests.java
b/perftests/src/main/java/org/apache/qpid/disttest/controller/ResultsForAllTests.java
index 0bd13505d6..f4e5c0f56c 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/controller/ResultsForAllTests.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/controller/ResultsForAllTests.java
@@ -27,7 +27,7 @@ import
org.apache.qpid.disttest.results.aggregation.TestResultAggregator;
public class ResultsForAllTests
{
- private final List<ITestResult> _results = new ArrayList<ITestResult>();
+ private final List<ITestResult> _results = new ArrayList<>();
private boolean _hasErrors;
public List<ITestResult> getTestResults()
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ClientConfig.java
b/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ClientConfig.java
index 22872907c0..2775611e10 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ClientConfig.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ClientConfig.java
@@ -20,8 +20,6 @@
package org.apache.qpid.disttest.controller.config;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import org.apache.qpid.disttest.controller.CommandForClient;
@@ -36,13 +34,13 @@ public class ClientConfig
public ClientConfig()
{
_name = null;
- _connections = Collections.emptyList();
- _messageProviders = Collections.emptyList();
+ _connections = List.of();
+ _messageProviders = List.of();
}
public ClientConfig(String name, ConnectionConfig... connections)
{
- this(name, Arrays.asList(connections), null);
+ this(name, List.of(connections), null);
}
public ClientConfig(String name, List<ConnectionConfig> connections,
List<MessageProviderConfig> messageProviders)
@@ -51,7 +49,7 @@ public class ClientConfig
_connections = connections;
if (messageProviders == null)
{
- _messageProviders = Collections.emptyList();
+ _messageProviders = List.of();
}
else
{
@@ -66,12 +64,12 @@ public class ClientConfig
public List<ConnectionConfig> getConnections()
{
- return Collections.unmodifiableList(_connections);
+ return List.copyOf(_connections);
}
public List<CommandForClient> createCommands()
{
- List<CommandForClient> commandsForClient = new
ArrayList<CommandForClient>();
+ List<CommandForClient> commandsForClient = new ArrayList<>();
for (MessageProviderConfig messageProvider : _messageProviders)
{
@@ -101,7 +99,7 @@ public class ClientConfig
public List<MessageProviderConfig> getMessageProviders()
{
- return Collections.unmodifiableList(_messageProviders);
+ return List.copyOf(_messageProviders);
}
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/controller/config/Config.java
b/perftests/src/main/java/org/apache/qpid/disttest/controller/config/Config.java
index eabaac30dc..29734bd748 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/controller/config/Config.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/controller/config/Config.java
@@ -19,8 +19,6 @@
package org.apache.qpid.disttest.controller.config;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
public class Config
@@ -30,7 +28,7 @@ public class Config
public Config()
{
super();
- _tests = Collections.emptyList();
+ _tests = List.of();
}
public Config(List<TestConfig> tests)
@@ -40,12 +38,12 @@ public class Config
public Config(TestConfig... tests)
{
- _tests = Arrays.asList(tests);
+ _tests = List.of(tests);
}
public List<TestInstance> getTests()
{
- List<TestInstance> testInstances = new ArrayList<TestInstance>();
+ List<TestInstance> testInstances = new ArrayList<>();
for (TestConfig testConfig : _tests)
{
int iterationNumber = 0;
@@ -65,12 +63,12 @@ public class Config
}
}
- return Collections.unmodifiableList(testInstances);
+ return List.copyOf(testInstances);
}
public List<TestConfig> getTestConfigs()
{
- return Collections.unmodifiableList(_tests);
+ return List.copyOf(_tests);
}
public int getTotalNumberOfClients()
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConnectionConfig.java
b/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConnectionConfig.java
index 522f073e60..ec89437a53 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConnectionConfig.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConnectionConfig.java
@@ -20,8 +20,6 @@
package org.apache.qpid.disttest.controller.config;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import org.apache.qpid.disttest.message.Command;
@@ -36,7 +34,7 @@ public class ConnectionConfig
public ConnectionConfig()
{
super();
- _sessions = Collections.emptyList();
+ _sessions = List.of();
}
public ConnectionConfig(String name, String factory, SessionConfig...
sessions)
@@ -44,13 +42,13 @@ public class ConnectionConfig
super();
_name = name;
_factory = factory;
- _sessions = Arrays.asList(sessions);
+ _sessions = List.of(sessions);
}
public List<SessionConfig> getSessions()
{
- return Collections.unmodifiableList(_sessions);
+ return _sessions;
}
public String getName()
@@ -60,7 +58,7 @@ public class ConnectionConfig
public List<Command> createCommands()
{
- List<Command> commands = new ArrayList<Command>();
+ List<Command> commands = new ArrayList<>();
commands.add(createCommand());
for (SessionConfig sessionConfig : _sessions)
{
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/controller/config/IterationValue.java
b/perftests/src/main/java/org/apache/qpid/disttest/controller/config/IterationValue.java
index d1673380ff..29159e2e91 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/controller/config/IterationValue.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/controller/config/IterationValue.java
@@ -20,7 +20,6 @@ package org.apache.qpid.disttest.controller.config;
import java.beans.IntrospectionException;
import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -38,7 +37,7 @@ public class IterationValue
public IterationValue()
{
- _iterationPropertyValuesWithUnderscores = Collections.emptyMap();
+ _iterationPropertyValuesWithUnderscores = Map.of();
}
public Map<String, String> getIterationPropertyValuesWithUnderscores()
@@ -61,7 +60,7 @@ public class IterationValue
private Map<String, String> getIterationPropertyValuesWithoutUnderscores()
{
- Map<String, String> iterationPropertyValues = new HashMap<String,
String>();
+ Map<String, String> iterationPropertyValues = new HashMap<>();
for (String propertyNameWithUnderscore :
_iterationPropertyValuesWithUnderscores.keySet())
{
String propertyName = propertyNameWithUnderscore.replaceFirst("_",
"");
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/controller/config/SessionConfig.java
b/perftests/src/main/java/org/apache/qpid/disttest/controller/config/SessionConfig.java
index d4d8a67732..5d44a48abe 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/controller/config/SessionConfig.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/controller/config/SessionConfig.java
@@ -20,8 +20,6 @@
package org.apache.qpid.disttest.controller.config;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import javax.jms.Session;
@@ -31,8 +29,8 @@ import org.apache.qpid.disttest.message.CreateSessionCommand;
public class SessionConfig
{
- private static final List<ProducerConfig> EMPTY_PRODUCER_LIST =
Collections.emptyList();
- private static final List<ConsumerConfig> EMPTY_CONSUMER_LIST =
Collections.emptyList();
+ private static final List<ProducerConfig> EMPTY_PRODUCER_LIST = List.of();
+ private static final List<ConsumerConfig> EMPTY_CONSUMER_LIST = List.of();
private final int _acknowledgeMode;
private final String _sessionName;
@@ -46,12 +44,12 @@ public class SessionConfig
public SessionConfig(String sessionName, int acknowledgeMode,
ProducerConfig...producers)
{
- this(sessionName, acknowledgeMode, EMPTY_CONSUMER_LIST,
Arrays.asList(producers));
+ this(sessionName, acknowledgeMode, EMPTY_CONSUMER_LIST,
List.of(producers));
}
public SessionConfig(String sessionName, int acknowledgeMode,
ConsumerConfig... consumers)
{
- this(sessionName, acknowledgeMode, Arrays.asList(consumers),
EMPTY_PRODUCER_LIST);
+ this(sessionName, acknowledgeMode, List.of(consumers),
EMPTY_PRODUCER_LIST);
}
public SessionConfig(String sessionName, int acknowledgeMode,
List<ConsumerConfig> consumers, List<ProducerConfig> producers)
@@ -74,17 +72,17 @@ public class SessionConfig
public List<ProducerConfig> getProducers()
{
- return Collections.unmodifiableList(_producers);
+ return List.copyOf(_producers);
}
public List<ConsumerConfig> getConsumers()
{
- return Collections.unmodifiableList(_consumers);
+ return List.copyOf(_consumers);
}
public List<Command> createCommands(String connectionName)
{
- List<Command> commands = new ArrayList<Command>();
+ List<Command> commands = new ArrayList<>();
commands.add(createCommand(connectionName));
for (ProducerConfig producer : _producers)
{
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/controller/config/TestConfig.java
b/perftests/src/main/java/org/apache/qpid/disttest/controller/config/TestConfig.java
index 2bb5f1b289..8fc97da82f 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/controller/config/TestConfig.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/controller/config/TestConfig.java
@@ -20,8 +20,6 @@
package org.apache.qpid.disttest.controller.config;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -39,23 +37,23 @@ public class TestConfig
public TestConfig()
{
- _clients = Collections.emptyList();
- _queues = Collections.emptyList();
+ _clients = List.of();
+ _queues = List.of();
_name = null;
- _iterations = Collections.emptyList();
+ _iterations = List.of();
}
public TestConfig(String name, ClientConfig[] clients, QueueConfig[]
queues)
{
- _clients = Arrays.asList(clients);
- _queues = Arrays.asList(queues);
+ _clients = List.of(clients);
+ _queues = List.of(queues);
_name = name;
- _iterations = Collections.emptyList();
+ _iterations = List.of();
}
public List<String> getClientNames()
{
- List<String> clientNames = new ArrayList<String>();
+ List<String> clientNames = new ArrayList<>();
for (ClientConfig clientConfig : _clients)
{
clientNames.add(clientConfig.getName());
@@ -80,18 +78,18 @@ public class TestConfig
public List<CommandForClient> createCommands()
{
- List<CommandForClient> commandsForClients = new
ArrayList<CommandForClient>();
+ List<CommandForClient> commandsForClients = new ArrayList<>();
for (ClientConfig client : _clients)
{
commandsForClients.addAll(client.createCommands());
}
- return Collections.unmodifiableList(commandsForClients);
+ return List.copyOf(commandsForClients);
}
public List<QueueConfig> getQueues()
{
- return Collections.unmodifiableList(_queues);
+ return _queues;
}
public String getName()
@@ -101,7 +99,7 @@ public class TestConfig
public List<IterationValue> getIterationValues()
{
- List<IterationValue> iterationValues = new ArrayList<IterationValue>();
+ List<IterationValue> iterationValues = new ArrayList<>();
for (Map<String, String> iterationMap : _iterations)
{
iterationValues.add(new IterationValue(iterationMap));
@@ -112,6 +110,6 @@ public class TestConfig
public List<ClientConfig> getClients()
{
- return Collections.unmodifiableList(_clients);
+ return _clients;
}
}
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/controller/config/TestInstance.java
b/perftests/src/main/java/org/apache/qpid/disttest/controller/config/TestInstance.java
index f02674bb31..b2453ca813 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/controller/config/TestInstance.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/controller/config/TestInstance.java
@@ -51,7 +51,7 @@ public class TestInstance
public List<CommandForClient> createCommands()
{
List<CommandForClient> commands = _testConfig.createCommands();
- List<CommandForClient> newCommands = new
ArrayList<CommandForClient>(commands.size());
+ List<CommandForClient> newCommands = new ArrayList<>(commands.size());
double ratePerProducer = calculateRatePerProducer(_producerRate,
commands);
for (CommandForClient commandForClient : commands)
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
b/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
index bc04fc183b..6e4a83d056 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
@@ -32,7 +32,6 @@ import javax.jms.ConnectionFactory;
import javax.jms.ConnectionMetaData;
import javax.jms.DeliveryMode;
import javax.jms.Destination;
-import javax.jms.ExceptionListener;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
@@ -126,14 +125,7 @@ public class ClientJmsDelegate
{
_instructionQueue =
_instructionListenerSession.createTemporaryQueue();
final MessageConsumer instructionConsumer =
_instructionListenerSession.createConsumer(_instructionQueue);
- instructionConsumer.setMessageListener(new MessageListener()
- {
- @Override
- public void onMessage(final Message message)
- {
-
client.processInstruction(JmsMessageAdaptor.messageToCommand(message));
- }
- });
+ instructionConsumer.setMessageListener(message ->
client.processInstruction(JmsMessageAdaptor.messageToCommand(message)));
}
catch (final JMSException jmse)
{
@@ -710,28 +702,24 @@ public class ClientJmsDelegate
{
try
{
- _controllerConnection.setExceptionListener(new ExceptionListener()
- {
- @Override
- public void onException(final JMSException exception)
- {
- LOGGER.warn("Caught ", exception);
+ _controllerConnection.setExceptionListener(exception ->
+ {
+ LOGGER.warn("Caught ", exception);
- if (connectionLostListener != null)
+ if (connectionLostListener != null)
+ {
+ try
{
- try
- {
- _controllerConnection.createSession(false,
Session.AUTO_ACKNOWLEDGE).close();
- }
- catch (JMSException e)
- {
- LOGGER.warn("Unable to create/close a new session,
assuming the connection is lost ", exception);
-
- connectionLostListener.connectionLost();
- }
+ _controllerConnection.createSession(false,
Session.AUTO_ACKNOWLEDGE).close();
}
+ catch (JMSException e)
+ {
+ LOGGER.warn("Unable to create/close a new session,
assuming the connection is lost ", exception);
+ connectionLostListener.connectionLost();
+ }
}
+
});
}
catch (JMSException e)
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java
b/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java
index a4df9fb79a..c1f1870b99 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java
@@ -19,7 +19,6 @@
*/
package org.apache.qpid.disttest.jms;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -31,7 +30,6 @@ import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.Session;
@@ -51,14 +49,14 @@ public class ControllerJmsDelegate
{
private static final Logger LOGGER =
LoggerFactory.getLogger(ControllerJmsDelegate.class);
- private final Map<String, Destination> _clientNameToQueueMap = new
ConcurrentHashMap<String, Destination>();
+ private final Map<String, Destination> _clientNameToQueueMap = new
ConcurrentHashMap<>();
private final Connection _connection;
private final Queue _controllerQueue;
private final Session _controllerQueueListenerSession;
private final Session _commandSession;
private final QueueCreator _queueCreator;
- private final List<CommandListener> _commandListeners = new
CopyOnWriteArrayList<CommandListener>();
+ private final List<CommandListener> _commandListeners = new
CopyOnWriteArrayList<>();
public ControllerJmsDelegate(final Context context) throws
NamingException, JMSException
{
@@ -77,26 +75,22 @@ public class ControllerJmsDelegate
{
createControllerQueue();
final MessageConsumer consumer =
_controllerQueueListenerSession.createConsumer(_controllerQueue);
- consumer.setMessageListener(new MessageListener()
+ consumer.setMessageListener(message ->
{
- @Override
- public void onMessage(final Message message)
+ try
{
- try
- {
- String jmsMessageID = message.getJMSMessageID();
- LOGGER.debug("Received message ID {}", jmsMessageID);
+ String jmsMessageID = message.getJMSMessageID();
+ LOGGER.debug("Received message ID {}", jmsMessageID);
- final Command command =
JmsMessageAdaptor.messageToCommand(message);
- LOGGER.debug("Converted message ID {} into command
{}", jmsMessageID, command);
+ final Command command =
JmsMessageAdaptor.messageToCommand(message);
+ LOGGER.debug("Converted message ID {} into command {}",
jmsMessageID, command);
- processCommandWithFirstSupportingListener(command);
- LOGGER.debug("Finished processing command for message
ID", jmsMessageID);
- }
- catch (Exception t)
- {
- LOGGER.error("Can't handle JMS message", t);
- }
+ processCommandWithFirstSupportingListener(command);
+ LOGGER.debug("Finished processing command for message ID",
jmsMessageID);
+ }
+ catch (Exception t)
+ {
+ LOGGER.error("Can't handle JMS message", t);
}
});
}
@@ -239,12 +233,8 @@ public class ControllerJmsDelegate
private void createControllerQueue() throws JMSException
{
- QueueConfig controllerQueueConfig = new
QueueConfig(_controllerQueue.getQueueName(),
- true,
-
Collections.<String, Object>emptyMap());
- _queueCreator.createQueues(_connection,
- _controllerQueueListenerSession,
-
Collections.singletonList(controllerQueueConfig));
+ final QueueConfig controllerQueueConfig = new
QueueConfig(_controllerQueue.getQueueName(), true, Map.of());
+ _queueCreator.createQueues(_connection,
_controllerQueueListenerSession, List.of(controllerQueueConfig));
}
public void addCommandListener(CommandListener commandListener)
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantAttributeExtractor.java
b/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantAttributeExtractor.java
index a56adb3481..dba151a99d 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantAttributeExtractor.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantAttributeExtractor.java
@@ -28,13 +28,11 @@ import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
-
public class ParticipantAttributeExtractor
{
public static Map<ParticipantAttribute, Object> getAttributes(Object
targetObject)
{
- Map<ParticipantAttribute, Object> attributes = new
HashMap<ParticipantAttribute, Object>();
-
+ Map<ParticipantAttribute, Object> attributes = new HashMap<>();
PropertyDescriptor[] descriptors;
try
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantResult.java
b/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantResult.java
index 70d40ce2d6..b81362f171 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantResult.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantResult.java
@@ -62,14 +62,8 @@ public class ParticipantResult extends Response
// summarizes results from participants using different session
acknowledge modes.
private int _acknowledgeMode = -1;
- public static final Comparator<? super ParticipantResult>
PARTICIPANT_NAME_COMPARATOR = new Comparator<ParticipantResult>()
- {
- @Override
- public int compare(ParticipantResult participantResult1,
ParticipantResult participantResult2)
- {
- return
participantResult1.getParticipantName().compareTo(participantResult2.getParticipantName());
- }
- };
+ public static final Comparator<? super ParticipantResult>
PARTICIPANT_NAME_COMPARATOR =
+ Comparator.comparing(ParticipantResult::getParticipantName);
public ParticipantResult()
{
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/AggregatedTestResult.java
b/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/AggregatedTestResult.java
index 5e6da2e65b..b80153746f 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/AggregatedTestResult.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/AggregatedTestResult.java
@@ -71,7 +71,7 @@ public class AggregatedTestResult implements ITestResult
@Override
public List<ParticipantResult> getParticipantResults()
{
- List<ParticipantResult> allParticipantResults = new
ArrayList<ParticipantResult>(_originalTestResult.getParticipantResults());
+ List<ParticipantResult> allParticipantResults = new
ArrayList<>(_originalTestResult.getParticipantResults());
allParticipantResults.add(_allConsumerParticipantResult);
allParticipantResults.add(_allProducerParticipantResult);
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/SeriesStatistics.java
b/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/SeriesStatistics.java
index b93c210473..515bfb1d50 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/SeriesStatistics.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/SeriesStatistics.java
@@ -29,7 +29,7 @@ public class SeriesStatistics
private long _maxValue;
private double _mean;
private double _standardDeviation;
- private Collection<Long> _series = new CopyOnWriteArrayList<Long>();
+ private Collection<Long> _series = new CopyOnWriteArrayList<>();
public SeriesStatistics()
{
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVFormatter.java
b/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVFormatter.java
index 17a56f72a2..55584bc2c7 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVFormatter.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVFormatter.java
@@ -19,7 +19,6 @@
package org.apache.qpid.disttest.results.formatting;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -43,8 +42,8 @@ public class CSVFormatter
for (ITestResult testResult : results)
{
- List<ParticipantResult> participantResults = new
ArrayList<ParticipantResult>(testResult.getParticipantResults());
- Collections.sort(participantResults, new
CSVOrderParticipantResultComparator());
+ List<ParticipantResult> participantResults = new
ArrayList<>(testResult.getParticipantResults());
+ participantResults.sort(new CSVOrderParticipantResultComparator());
for (ParticipantResult participantResult : participantResults)
{
@@ -61,7 +60,7 @@ public class CSVFormatter
*/
private String row(Map<ParticipantAttribute, Object> attributeValueMap)
{
- List<Object> attributeValues = new ArrayList<Object>();
+ List<Object> attributeValues = new ArrayList<>();
for (ParticipantAttribute attribute : ParticipantAttribute.values())
{
Object attributeValue = attributeValueMap.get(attribute);
@@ -75,7 +74,7 @@ public class CSVFormatter
/** return the header row, including a newline at the end */
private String header()
{
- List<String> displayNames = new ArrayList<String>();
+ List<String> displayNames = new ArrayList<>();
for (ParticipantAttribute attribute : ParticipantAttribute.values())
{
displayNames.add(attribute.getDisplayName());
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVOrderParticipantResultComparator.java
b/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVOrderParticipantResultComparator.java
index 8c06bbc8ed..d50d102a45 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVOrderParticipantResultComparator.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVOrderParticipantResultComparator.java
@@ -19,7 +19,6 @@
package org.apache.qpid.disttest.results.formatting;
import java.util.Comparator;
-import java.util.HashMap;
import java.util.Map;
import com.google.common.collect.ComparisonChain;
@@ -32,12 +31,8 @@ import
org.apache.qpid.disttest.message.ProducerParticipantResult;
public class CSVOrderParticipantResultComparator implements
Comparator<ParticipantResult>
{
// TODO yuk
- private static final Map<Class<? extends ParticipantResult>, Integer>
TYPE_CODES = new HashMap<Class<? extends ParticipantResult>, Integer>();
- static {
- TYPE_CODES.put(ProducerParticipantResult.class, 0);
- TYPE_CODES.put(ConsumerParticipantResult.class, 1);
- TYPE_CODES.put(ParticipantResult.class, 2);
- }
+ private static final Map<Class<? extends ParticipantResult>, Integer>
TYPE_CODES =
+ Map.of(ProducerParticipantResult.class, 0,
ConsumerParticipantResult.class, 1, ParticipantResult.class, 2);
@Override
public int compare(ParticipantResult left, ParticipantResult right)
diff --git
a/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileHelperTest.java
b/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileHelperTest.java
index 457fec8a0e..37873b48ae 100644
--- a/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileHelperTest.java
+++ b/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileHelperTest.java
@@ -22,7 +22,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.io.IOException;
-import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -57,8 +56,8 @@ public class ConfigFileHelperTest extends UnitTestBase
List<String> configFiles =
_configFileHelper.getTestConfigFiles(testConfigPath);
- Set<String> expectedFiles = new HashSet<String>(Arrays.asList(jsFile,
jsonFile));
- Set<String> actualFiles = new HashSet<String>(configFiles);
+ Set<String> expectedFiles = Set.of(jsFile, jsonFile);
+ Set<String> actualFiles = new HashSet<>(configFiles);
assertEquals(expectedFiles, actualFiles);
}
diff --git
a/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java
b/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java
index e85d20a01b..730ecdc89c 100644
---
a/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java
+++
b/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java
@@ -77,7 +77,7 @@ public class ChartingUtil
public static final String JDBC_URL_DEFAULT = null;
- private final Map<String,String> _cliOptions = new HashMap<String,
String>();
+ private final Map<String,String> _cliOptions = new HashMap<>();
{
_cliOptions.put(OUTPUT_DIR_PROP, OUTPUT_DIR_DEFAULT);
diff --git
a/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYDataSetBasedChartBuilder.java
b/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYDataSetBasedChartBuilder.java
index cf97b06db0..9104b61be9 100644
---
a/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYDataSetBasedChartBuilder.java
+++
b/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYDataSetBasedChartBuilder.java
@@ -36,7 +36,6 @@ import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
import org.jfree.data.general.Dataset;
import org.jfree.data.xy.DefaultXYDataset;
-
public abstract class XYDataSetBasedChartBuilder extends BaseChartBuilder
{
public XYDataSetBasedChartBuilder(SeriesBuilder seriesBuilder)
@@ -55,7 +54,7 @@ public abstract class XYDataSetBasedChartBuilder extends
BaseChartBuilder
@Override
public void beginSeries(SeriesDefinition seriesDefinition)
{
- _xyPairs = new ArrayList<Double[]>();
+ _xyPairs = new ArrayList<>();
}
@Override
diff --git
a/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java
b/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java
index 49133c5b57..251a123b07 100644
---
a/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java
+++
b/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java
@@ -50,7 +50,7 @@ public class ChartingDefinitionCreator
public List<ChartingDefinition> createFromFileOrDirectory(String
chartingDefinitionFileOrDirectory)
{
- List<ChartingDefinition> definitions = new
ArrayList<ChartingDefinition>();
+ List<ChartingDefinition> definitions = new ArrayList<>();
File fileOrDirectory = new File(chartingDefinitionFileOrDirectory);
if (fileOrDirectory.isDirectory())
diff --git
a/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java
b/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java
index 1f76ba5194..b66be850a8 100644
---
a/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java
+++
b/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java
@@ -35,7 +35,7 @@ public class SeriesDefinitionCreator
public List<SeriesDefinition> createFromProperties(Properties properties)
{
- final List<SeriesDefinition> seriesDefinitions = new
ArrayList<SeriesDefinition>();
+ final List<SeriesDefinition> seriesDefinitions = new ArrayList<>();
int index = 1;
boolean moreSeriesDefinitions = true;
diff --git
a/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java
b/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java
index 9236896f53..5425a088a6 100644
---
a/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java
+++
b/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java
@@ -42,7 +42,7 @@ public class ChartWriter
static final String SUMMARY_FILE_NAME = "chart-summary.html";
- private final SortedMap<File,ChartingDefinition> _chartFilesToChartDef =
new TreeMap<File, ChartingDefinition>();
+ private final SortedMap<File,ChartingDefinition> _chartFilesToChartDef =
new TreeMap<>();
private File _chartDirectory = new File(".");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
