Skip to content

Commit f5518e3

Browse files
committed
chore: remove the use of commons-io and commons-text
We keep the jars in the distribution, however, we no longer depend on commons-io and commons-text
1 parent 6027c3b commit f5518e3

93 files changed

Lines changed: 1864 additions & 2429 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

bin/testfiles/FTP_TESTS.jmx

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,17 @@ import org.apache.ftpserver.usermanager.impl.BaseUser;
7676
import org.apache.ftpserver.usermanager.impl.WritePermission;
7777
import org.apache.jmeter.util.JMeterUtils;
7878
import org.apache.ftpserver.ftplet.Authority;
79+
import java.nio.file.Files;
80+
import java.nio.file.Path;
7981
import java.util.List;
8082
import java.util.ArrayList;
81-
import org.apache.commons.io.FileUtils;
8283
import org.apache.ftpserver.DataConnectionConfiguration;
8384
import org.apache.ftpserver.DataConnectionConfigurationFactory;
85+
import kotlin.io.path.PathsKt;
8486

85-
FileUtils.deleteDirectory(new File(JMeterUtils.getJMeterHome(), "bin/temp/ftp_test"));
86-
new File(JMeterUtils.getJMeterHome(), "bin/temp/ftp_test").mkdirs();
87+
Path ftpTestPath = Path.of(JMeterUtils.getJMeterHome(), "bin/temp/ftp_test");
88+
PathsKt.deleteRecursively(ftpTestPath);
89+
Files.createDirectories(ftpTestPath);
8790

8891
DataConnectionConfigurationFactory dataConnectionConfigurationFactory =
8992
new DataConnectionConfigurationFactory();
@@ -244,11 +247,11 @@ props.put("FTP_SERVER", server);
244247
<stringProp name="cacheKey">d09f6f8d-0f86-4cae-b88c-0ad9bd587d31</stringProp>
245248
<stringProp name="script">import org.apache.ftpserver.FtpServer;
246249
import org.apache.jmeter.util.JMeterUtils;
247-
import org.apache.commons.io.FileUtils;
248-
import org.apache.commons.io.FileUtils;
250+
import java.nio.file.Path;
251+
import kotlin.io.path.PathsKt;
249252

250-
251-
FileUtils.deleteDirectory(new File(JMeterUtils.getJMeterHome(), &quot;bin/temp/ftp_test&quot;));
253+
Path ftpTestPath = Path.of(JMeterUtils.getJMeterHome(), &quot;bin/temp/ftp_test&quot;);
254+
PathsKt.deleteRecursively(ftpTestPath);
252255

253256
FtpServer server = (FtpServer) props.get(&quot;FTP_SERVER&quot;);
254257
try {

bin/testfiles/JMS_TESTS.jmx

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,13 @@
3333
<stringProp name="script">import org.apache.activemq.broker.BrokerService;
3434
import org.apache.activemq.broker.BrokerFactory;
3535
import org.apache.jmeter.util.JMeterUtils;
36-
import org.apache.commons.io.FileUtils;
37-
import java.io.File;
36+
import java.nio.file.Path;
37+
import kotlin.io.path.PathsKt;
38+
39+
Path activemqData = Path.of(JMeterUtils.getJMeterHome(), &quot;bin/activemq-data&quot;);
40+
log.info(&quot;Deleting {}&quot;, activemqData);
41+
PathsKt.deleteRecursively(activemqData);
3842

39-
File file = new File(JMeterUtils.getJMeterHome(), &quot;bin/activemq-data&quot;);
40-
log.info(&quot;Deleting {}&quot;, file);
41-
FileUtils.deleteDirectory(file);
4243
log.info(&quot;Creating activemq config from {}&quot;, JMeterUtils.getJMeterHome()+ &quot;/bin/testfiles/activemq.xml&quot;);
4344
try {
4445
String path = JMeterUtils.getJMeterHome()+ &quot;/bin/testfiles/activemq.xml&quot;;
@@ -120,18 +121,18 @@ import org.slf4j.LoggerFactory;
120121
import javax.naming.InitialContext;
121122
import javax.naming.Context;
122123
import java.util.Properties;
123-
def thread = Thread.start {
124+
def thread = Thread.start {
124125
Properties props = new Properties();
125126
props.setProperty(Context.INITIAL_CONTEXT_FACTORY, &quot;org.apache.activemq.jndi.ActiveMQInitialContextFactory&quot;);
126-
props.setProperty(Context.PROVIDER_URL,&quot;tcp://127.0.0.1:61616&quot;);
127+
props.setProperty(Context.PROVIDER_URL,&quot;tcp://127.0.0.1:61616&quot;);
127128
Context namingCtx = new InitialContext(props);
128129
ConnectionFactory cf = (ConnectionFactory)namingCtx.lookup(&quot;ConnectionFactory&quot;);
129130
Connection con = cf.createConnection();
130131
log.info(&quot;Creating connection to &quot;+Parameters);
131132
Destination dest = (Destination)namingCtx.lookup(Parameters);
132133

133134
try {
134-
Session session =
135+
Session session =
135136
con.createSession(false, Session.AUTO_ACKNOWLEDGE); // non-transacted session (more)
136137
MessageConsumer consumer = session.createConsumer(dest);
137138
consumer.setMessageListener(new MyMessageListener(session));
@@ -141,7 +142,7 @@ def thread = Thread.start {
141142
session.close();
142143
log.info(&quot;Closed session&quot;);
143144
} finally {
144-
con.close(); // free all resources (more)
145+
con.close(); // free all resources (more)
145146
}
146147
}
147148
SampleResult.setResponseMessageOK();
@@ -400,7 +401,7 @@ Connection con = cf.createConnection();
400401
Destination dest = (Destination)namingCtx.lookup(&quot;dynamicQueues/requestQueue4&quot;);
401402

402403
try {
403-
Session session =
404+
Session session =
404405
con.createSession(false, Session.AUTO_ACKNOWLEDGE); // non-transacted session (more)
405406

406407
MessageConsumer consumer = session.createConsumer(dest);
@@ -1396,7 +1397,8 @@ propFloat 1.2</stringProp>
13961397
<stringProp name="cacheKey">true</stringProp>
13971398
<stringProp name="script">import org.apache.activemq.broker.BrokerService;
13981399
import org.apache.jmeter.util.JMeterUtils;
1399-
import org.apache.commons.io.FileUtils;
1400+
import java.nio.file.Path;
1401+
import kotlin.io.path.PathsKt;
14001402

14011403
BrokerService broker = props.get(&quot;ACTIVEMQ_BROKER&quot;);
14021404
Thread.start {
@@ -1406,7 +1408,7 @@ Thread.start {
14061408
// Otherwise &quot;The following non-daemon threads are still running&quot; is printed
14071409
sleep(700)
14081410
broker.stop()
1409-
FileUtils.deleteDirectory(new File(JMeterUtils.getJMeterHome(), &quot;bin/activemq-data&quot;))
1411+
PathsKt.deleteRecursively(Path.of(JMeterUtils.getJMeterHome(), &quot;bin/activemq-data&quot;))
14101412
}
14111413
</stringProp>
14121414
</JSR223Sampler>

0 commit comments

Comments
 (0)