You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2023/05/18 11:13:00 UTC
[jmeter] branch master updated: style: replace remove redundant type parameters with diamond operators
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new 957ec02b2c style: replace remove redundant type parameters with diamond operators
957ec02b2c is described below
commit 957ec02b2c4e53bda8e2ba7a48faeb84a33ddfa7
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Thu May 18 14:08:37 2023 +0300
style: replace remove redundant type parameters with diamond operators
---
.../src/main/java/org/apache/jmeter/visualizers/TableVisualizer.java | 2 +-
src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java | 2 +-
.../java/org/apache/jmeter/visualizers/CachingStatCalculator.java | 2 +-
.../main/java/org/apache/jorphan/util/AlphaNumericComparator.java | 5 +++--
.../main/java/org/apache/jorphan/util/AlphaNumericKeyComparator.java | 2 +-
.../java/org/apache/jmeter/protocol/http/control/CacheManager.java | 2 +-
.../src/main/java/org/apache/jmeter/protocol/http/proxy/Daemon.java | 4 ++--
.../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java | 2 +-
.../org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java | 2 +-
9 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/TableVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/TableVisualizer.java
index 0f7d32898f..6dbd9b8f48 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/TableVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/TableVisualizer.java
@@ -243,7 +243,7 @@ public class TableVisualizer extends AbstractVisualizer implements Clearable {
}));
for (int i=0; i<model.getColumnCount(); i++) {
if (model.getColumnClass(i).equals(String.class)) {
- rowSorter.setValueComparator(i, new AlphaNumericComparator<Object>(o -> o.toString()));
+ rowSorter.setValueComparator(i, AlphaNumericComparator.TO_STRING_COMPARATOR);
}
}
table.setRowSorter(rowSorter);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java b/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
index 18e0a548e2..7b69566082 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
@@ -714,7 +714,7 @@ public final class GuiPackage implements LocaleChangeListener, HistoryListener {
private String testPlanFile;
- private final List<Stoppable> stoppables = Collections.synchronizedList(new ArrayList<Stoppable>());
+ private final List<Stoppable> stoppables = Collections.synchronizedList(new ArrayList<>());
private TreeNodeNamingPolicy namingPolicy;
diff --git a/src/core/src/main/java/org/apache/jmeter/visualizers/CachingStatCalculator.java b/src/core/src/main/java/org/apache/jmeter/visualizers/CachingStatCalculator.java
index 881ce94146..d163765a49 100644
--- a/src/core/src/main/java/org/apache/jmeter/visualizers/CachingStatCalculator.java
+++ b/src/core/src/main/java/org/apache/jmeter/visualizers/CachingStatCalculator.java
@@ -28,7 +28,7 @@ import org.apache.jmeter.samplers.SampleResult;
*/
public class CachingStatCalculator extends SamplingStatCalculator {
- private final List<Sample> storedValues = Collections.synchronizedList(new ArrayList<Sample>());
+ private final List<Sample> storedValues = Collections.synchronizedList(new ArrayList<>());
public CachingStatCalculator(String string) {
super(string);
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericComparator.java b/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericComparator.java
index 8281353fb9..ec12c26c00 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericComparator.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericComparator.java
@@ -30,14 +30,15 @@ import java.util.regex.Pattern;
* Heavily influenced by https://codereview.stackexchange.com/questions/37192/number-aware-string-sorting-with-comparator
*/
public class AlphaNumericComparator<T> implements Comparator<T> {
+ public static final Comparator<?> TO_STRING_COMPARATOR = new AlphaNumericComparator<>(Object::toString);
- private final Function<T, String> converter;
+ private final Function<? super T, String> converter;
/**
* Constructs a comparator with a converter function
* @param converter that generates a String value from the arguments given to {@link Comparator#compare(Object, Object)}
*/
- public AlphaNumericComparator(Function<T, String> converter) {
+ public AlphaNumericComparator(Function<? super T, String> converter) {
this.converter = converter;
}
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericKeyComparator.java b/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericKeyComparator.java
index 16fc6b4c2f..d7b8d458a7 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericKeyComparator.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericKeyComparator.java
@@ -33,7 +33,7 @@ public class AlphaNumericKeyComparator implements Comparator<Map.Entry<Object, O
private AlphaNumericKeyComparator() {
// don't instantiate this class on your own.
- this.comparator = new AlphaNumericComparator<Map.Entry<Object, Object>>(e -> e.getKey().toString());
+ this.comparator = new AlphaNumericComparator<>(e -> e.getKey().toString());
}
@Override
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
index c86f6fbe11..0a6a42bd12 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
@@ -214,7 +214,7 @@ public class CacheManager extends ConfigTestElement implements TestStateListener
final Set<String> names = new HashSet<>(Arrays.asList(headerName.split(",\\s*")));
final Map<String, List<String>> values = new HashMap<>();
for (final String name: names) {
- values.put(name, new ArrayList<String>());
+ values.put(name, new ArrayList<>());
}
for (Header header: reqHeaders) {
if (names.contains(header.getName())) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Daemon.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Daemon.java
index fbdd33e7d2..8afc14ac15 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Daemon.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Daemon.java
@@ -116,8 +116,8 @@ public class Daemon extends Thread implements Stoppable {
log.info("Test Script Recorder up and running!");
// Maps to contain page and form encodings
- Map<String, String> pageEncodings = Collections.synchronizedMap(new HashMap<String, String>());
- Map<String, String> formEncodings = Collections.synchronizedMap(new HashMap<String, String>());
+ Map<String, String> pageEncodings = Collections.synchronizedMap(new HashMap<>());
+ Map<String, String> formEncodings = Collections.synchronizedMap(new HashMap<>());
pageEncodings.put(AbstractSamplerCreator.DEFAULT_ENCODING_KEY, target.getDefaultEncoding());
try {
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
index 35a0e66932..703c5143cb 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
@@ -121,7 +121,7 @@ public class DataSourceElement extends AbstractTestElement
log.error("JDBC data source already defined for: {}", poolName);
} else {
String maxPool = getPoolMax();
- perThreadPoolSet = Collections.synchronizedSet(new HashSet<BasicDataSource>());
+ perThreadPoolSet = Collections.synchronizedSet(new HashSet<>());
if (maxPool.equals("0")){ // i.e. if we want per thread pooling
variables.putObject(poolName, new DataSourceComponentImpl()); // pool will be created later
} else {
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java
index aeb62a7d62..8f0d5ebd89 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java
@@ -235,7 +235,7 @@ public class JMSPublisherGui extends AbstractSamplerGui implements ChangeListene
mainPanel.add(jmsPropertiesPanel, "span, growx");
mainPanel.add(msgChoice, "span");
- fileEncoding = new JComboBox<String>(PublisherSampler.getSupportedEncodings());
+ fileEncoding = new JComboBox<>(PublisherSampler.getSupportedEncodings());
fileEncoding.setEditable(true);
mainPanel.add(JMeterUtils.labelFor(fileEncoding, "content_encoding"));
mainPanel.add(fileEncoding, "span, growx");