fix(deps): update dependency org.apache.commons:commons-text to v1.11.0
Fixes https://github.com/apache/jmeter/pull/6155
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index d533721..065b34e 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -99,7 +99,7 @@
api("org.apache.commons:commons-lang3:3.12.0")
api("org.apache.commons:commons-math3:3.6.1")
api("org.apache.commons:commons-pool2:2.11.1")
- api("org.apache.commons:commons-text:1.10.0")
+ api("org.apache.commons:commons-text:1.11.0")
api("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1")
api("org.apache.httpcomponents.client5:httpclient5:5.2.2")
api("org.apache.httpcomponents:httpasyncclient:4.1.5")
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
index d024491..390fd22 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
@@ -23,6 +23,7 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
@@ -161,7 +162,7 @@
? extractedValues.size() * 20
: 1);
for (Object extractedObject : extractedValues) {
- String extractedString = StringUtils.defaultString(stringify(extractedObject), defaultValue);
+ String extractedString = Objects.toString(extractedObject, defaultValue);
vars.put(currentRefName + "_" + index,
extractedString); //$NON-NLS-1$
if (getComputeConcatenation()) {
@@ -246,11 +247,7 @@
private static void placeObjectIntoVars(JMeterVariables vars, String currentRefName,
List<Object> extractedValues, int matchNr, String defaultValue) {
vars.put(currentRefName,
- StringUtils.defaultString(stringify(extractedValues.get(matchNr)), defaultValue));
- }
-
- private static String stringify(Object obj) {
- return obj == null ? null : obj.toString();
+ Objects.toString(extractedValues.get(matchNr), defaultValue));
}
public String getJsonPathExpressions() {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java
index b0bd5c0..6625fa7 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java
@@ -23,12 +23,12 @@
import java.awt.event.HierarchyEvent;
import java.awt.event.HierarchyListener;
import java.io.IOException;
+import java.util.Objects;
import java.util.Properties;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
-import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.gui.action.LookAndFeelCommand;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.JFactory;
@@ -302,7 +302,7 @@
*/
public void setInitialText(String string) {
try {
- setText(StringUtils.defaultString(string, ""));
+ setText(Objects.toString(string, ""));
} catch (Exception e) {
log.error("Dubious problem while setting text to {}", string, e);
}
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/AbstractSampleWriter.java b/src/core/src/main/java/org/apache/jmeter/report/core/AbstractSampleWriter.java
index 62f6ad2..722e02a 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/AbstractSampleWriter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/AbstractSampleWriter.java
@@ -26,8 +26,8 @@
import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
+import java.util.Objects;
-import org.apache.commons.lang3.Validate;
import org.apache.jmeter.save.SaveService;
import org.apache.jorphan.util.JOrphanUtils;
import org.slf4j.Logger;
@@ -66,7 +66,7 @@
* sample writer
*/
public void setWriter(Writer newWriter) {
- Validate.notNull(newWriter, "writer must not be null."); // NOSONAR
+ Objects.requireNonNull(newWriter, "writer must not be null."); // NOSONAR
if (this.writer != null) {
// flush and close previous writer
@@ -84,7 +84,7 @@
* The output stream on which sample should be written
*/
public void setOutputStream(OutputStream out) {
- Validate.notNull(out, "out must not be null."); // NOSONAR
+ Objects.requireNonNull(out, "out must not be null."); // NOSONAR
try {
setWriter(new OutputStreamWriter(out, CHARSET));
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
index 03fe8f7..c066097 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
@@ -20,10 +20,10 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
import java.util.TreeMap;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
import org.apache.jmeter.samplers.SampleSaveConfiguration;
import org.apache.jmeter.save.CSVSaveService;
@@ -56,7 +56,7 @@
* The list of columns names (must not be {@code null})
*/
public SampleMetadata(char separator, String... columns) {
- Validate.notNull(columns, "columns must not be null");
+ Objects.requireNonNull(columns, "columns must not be null");
initialize(separator, Arrays.asList(columns));
}
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
index 3f6de35..cdb25dc 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
@@ -22,13 +22,13 @@
import java.nio.file.Files;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import java.util.TimeZone;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.jmeter.JMeter;
import org.apache.jmeter.report.config.ExporterConfiguration;
@@ -61,9 +61,6 @@
public class HtmlTemplateExporter extends AbstractDataExporter {
private static final String CUSTOM_GRAPH_PREFIX = "custom_";
- /** Format used for non null check of parameters. */
- private static final String MUST_NOT_BE_NULL = "%s must not be null";
-
private static final Logger log = LoggerFactory.getLogger(HtmlTemplateExporter.class);
public static final String DATA_CTX_REPORT_TITLE = "reportTitle";
@@ -289,9 +286,9 @@
@Override
public void export(SampleContext context, File file,
ReportGeneratorConfiguration configuration) throws ExportException {
- Validate.notNull(context, MUST_NOT_BE_NULL, "context");
- Validate.notNull(file, MUST_NOT_BE_NULL, "file");
- Validate.notNull(configuration, MUST_NOT_BE_NULL, "configuration");
+ Objects.requireNonNull(context, "context must not be null");
+ Objects.requireNonNull(file, "file must not be null");
+ Objects.requireNonNull(configuration, "configuration must not be null");
log.debug("Start template processing");
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleConsumer.java
index d62d8f9..72eb137 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleConsumer.java
@@ -21,9 +21,9 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.TreeMap;
-import org.apache.commons.lang3.Validate;
import org.apache.jmeter.report.core.Sample;
import org.apache.jmeter.report.core.SampleException;
import org.apache.jmeter.report.core.SampleMetadata;
@@ -132,7 +132,7 @@
* for the samples (must not be {@code null})
*/
public void setSampleConsumers(List<SampleConsumer> consumers) {
- Validate.notNull(consumers, "consumers must not be null");
+ Objects.requireNonNull(consumers, "consumers must not be null");
this.sampleConsumers = consumers;
}
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java
index 67c3403..8462583 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java
@@ -17,7 +17,8 @@
package org.apache.jmeter.report.processor;
-import org.apache.commons.lang3.Validate;
+import java.util.Objects;
+
import org.apache.jmeter.report.core.Sample;
import org.apache.jmeter.report.core.SampleSelector;
@@ -29,8 +30,6 @@
*/
public class AggregateConsumer extends AbstractSampleConsumer {
- private static final String MUST_NOT_BE_NULL = "%s must not be null";
-
/** The aggregator. */
private final Aggregator aggregator;
@@ -65,8 +64,8 @@
*/
public AggregateConsumer(Aggregator aggregator,
SampleSelector<Double> selector) {
- Validate.notNull(aggregator, MUST_NOT_BE_NULL, "aggregator");
- Validate.notNull(selector, MUST_NOT_BE_NULL, "selector");
+ Objects.requireNonNull(aggregator, "aggregator must not be null");
+ Objects.requireNonNull(selector, "selector must not be null");
this.aggregator = aggregator;
this.selector = selector;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java b/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
index 31296e8..904b6dc 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
@@ -20,6 +20,7 @@
import java.io.File;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
@@ -247,7 +248,7 @@
* {@code null})
*/
public void setSampleConsumers(List<SampleConsumer> consumers) {
- Validate.notNull(consumers, "consumers must not be null");
+ Objects.requireNonNull(consumers, "consumers must not be null");
this.sampleConsumers = consumers;
}
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java
index db25bb4..d049e36 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java
@@ -22,6 +22,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
+import java.util.Objects;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
@@ -79,8 +80,6 @@
*/
public class ExternalSampleSorter extends AbstractSampleConsumer {
- private static final String MUST_NOT_BE_NULL = "%s must not be null";
-
private static final Logger LOG = LoggerFactory.getLogger(ExternalSampleSorter.class);
private static final int DEFAULT_CHUNK_SIZE = 50000;
@@ -219,7 +218,7 @@
*/
public void sort(SampleMetadata sampleMetadata, File inputFile,
File outputFile, boolean writeHeader) {
- Validate.notNull(sampleMetadata, MUST_NOT_BE_NULL, "sampleMetadata");
+ Objects.requireNonNull(sampleMetadata, "sampleMetadata must not be null");
if (!inputFile.isFile()) {
throw new SampleException(
@@ -250,7 +249,7 @@
*/
private void sort(CsvSampleReader csvReader, File output,
boolean writeHeader) {
- Validate.notNull(output, MUST_NOT_BE_NULL, "output");
+ Objects.requireNonNull(output, "output must not be null");
SampleMetadata readSampleMetadata = csvReader.getMetadata();
SampleWriterConsumer writerConsumer = new SampleWriterConsumer();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/SampleWriterConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/SampleWriterConsumer.java
index c45aa03..56af460 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/SampleWriterConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/SampleWriterConsumer.java
@@ -18,8 +18,8 @@
package org.apache.jmeter.report.processor;
import java.io.File;
+import java.util.Objects;
-import org.apache.commons.lang3.Validate;
import org.apache.jmeter.report.core.CsvSampleWriter;
import org.apache.jmeter.report.core.Sample;
import org.slf4j.Logger;
@@ -48,7 +48,7 @@
}
public void setOutputFile(File outputFile) {
- Validate.notNull(outputFile, "outputFile must not be null");
+ Objects.requireNonNull(outputFile, "outputFile must not be null");
this.outputFile = outputFile;
}
diff --git a/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java b/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
index f03a736..c48d969 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
@@ -31,13 +31,13 @@
import java.security.cert.CertificateException;
import java.util.Arrays;
import java.util.Locale;
+import java.util.Objects;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JPasswordField;
-import org.apache.commons.lang3.Validate;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.util.keystore.JmeterKeyStore;
import org.slf4j.Logger;
@@ -179,7 +179,7 @@
for (int i = 0; i < 3; i++) {
String password = getPassword();
if (!allowEmptyPassword) {
- Validate.notNull(password, "Password for keystore must not be null");
+ Objects.requireNonNull(password, "Password for keystore must not be null");
}
try {
if (initStore == null) {
diff --git a/src/core/src/main/java/org/apache/jmeter/util/SecurityProviderLoader.java b/src/core/src/main/java/org/apache/jmeter/util/SecurityProviderLoader.java
index db817ff..e96beee 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/SecurityProviderLoader.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/SecurityProviderLoader.java
@@ -22,11 +22,11 @@
import java.security.Provider;
import java.security.Security;
import java.util.Comparator;
+import java.util.Objects;
import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,7 +49,7 @@
if (matcher.matches()) {
final String classname = matcher.group("classname");
- final int position = Integer.parseInt(StringUtils.defaultString(matcher.group("position"), "0"));
+ final int position = Integer.parseInt(Objects.toString(matcher.group("position"), "0"));
final String config = matcher.group("config");
try {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CSSParseExceptionCallback.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CSSParseExceptionCallback.java
index f123454..bae2e7a 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CSSParseExceptionCallback.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CSSParseExceptionCallback.java
@@ -18,8 +18,8 @@
package org.apache.jmeter.protocol.http.parser;
import java.net.URL;
+import java.util.Objects;
-import org.apache.commons.lang3.Validate;
import org.apache.jmeter.util.JMeterUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,7 +39,7 @@
private final URL baseUrl;
public CSSParseExceptionCallback(URL baseUrl) {
- this.baseUrl = Validate.notNull(baseUrl);
+ this.baseUrl = Objects.requireNonNull(baseUrl, "baseUrl must not be null");
}
/**
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java
index ac01468..952f61f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java
@@ -21,9 +21,9 @@
import java.nio.charset.Charset;
import java.util.Collections;
import java.util.Iterator;
+import java.util.Objects;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
import org.apache.commons.lang3.tuple.ImmutableTriple;
import org.apache.commons.lang3.tuple.Triple;
import org.apache.jmeter.util.JMeterUtils;
@@ -78,7 +78,7 @@
private static URLCollection orDefault(URLCollection urlCollection,
URLCollection defaultValue) {
if (urlCollection == null) {
- return Validate.notNull(defaultValue);
+ return Objects.requireNonNull(defaultValue);
}
return urlCollection;
}
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java
index 6a68dd2..9972847 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java
@@ -21,8 +21,8 @@
import java.net.URL;
import java.util.Collection;
import java.util.Iterator;
+import java.util.Objects;
-import org.apache.commons.lang3.Validate;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.jmeter.protocol.http.util.ConversionUtils;
import org.slf4j.Logger;
@@ -47,7 +47,7 @@
* @param c collection to start with (Must not be {@code null})
*/
public URLCollection(Collection<URLString> c) {
- coll = Validate.notNull(c);
+ coll = Objects.requireNonNull(c, "collection must not be null");
}
/**
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
index 75206a9..fc075cc 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
@@ -26,6 +26,7 @@
import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import javax.xml.XMLConstants;
import javax.xml.parsers.ParserConfigurationException;
@@ -345,7 +346,7 @@
*/
protected static void computeSamplerName(HTTPSamplerBase sampler,
HttpRequestHdr request) {
- String prefix = StringUtils.defaultString(request.getPrefix(), "");
+ String prefix = Objects.toString(request.getPrefix(), "");
int httpSampleNameMode = request.getHttpSampleNameMode();
String format = getFormat(httpSampleNameMode, request.getHttpSampleNameFormat());
String url;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
index 01155e7..5fbbc1a 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
@@ -42,6 +42,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.prefs.Preferences;
import java.util.regex.PatternSyntaxException;
@@ -49,7 +50,6 @@
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.apache.jmeter.assertions.Assertion;
import org.apache.jmeter.assertions.ResponseAssertion;
@@ -1265,7 +1265,7 @@
prefixChanged = true;
}
if (deltaT > sampleGap || prefixChanged) {
- String controllerName = StringUtils.defaultString(getPrefixHTTPSampleName(), sampler.getName());
+ String controllerName = Objects.toString(getPrefixHTTPSampleName(), sampler.getName());
if (!myTarget.isLeaf() && cachedGroupingMode == GROUPING_ADD_SEPARATORS) {
addDivider(treeModel, myTarget);
}
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
index 18ba242..d94a613 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
@@ -20,6 +20,7 @@
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
+import java.util.Objects;
import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.testelement.AbstractTestElement;
@@ -99,7 +100,7 @@
if (StringUtils.isNotBlank(mimetype)) {
return mimetype;
}
- mimetype = StringUtils.defaultString(mimetype, "");
+ mimetype = Objects.toString(mimetype, "");
if (StringUtils.isBlank(path)) {
return mimetype;
}
