Skip to content

Commit cdce20a

Browse files
author
Patrick Deasy
committed
AMQ-9544 Replace the deprecated WildcardFileFilter constructor with a builder.
1 parent e45ee4a commit cdce20a

7 files changed

+26
-20
lines changed

‎activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6131Test.java

+11-8
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@
5656
*/
5757
public class AMQ6131Test {
5858

59+
private final static WildcardFileFilter LOG_FILE_FILTER = WildcardFileFilter.builder().setWildcards("*.log").get();
60+
private final static WildcardFileFilter DB_FILE_FILTER = WildcardFileFilter.builder().setWildcards("db.*").get();
61+
5962
protected BrokerService broker;
6063
protected URI brokerConnectURI;
6164

@@ -111,7 +114,7 @@ public void testDurableWithOnePendingAfterRestartAndIndexRecovery() throws Excep
111114
TopicSubscriber durable = jmsSession.createDurableSubscriber(new ActiveMQTopic("durable.sub"), "sub");
112115
final MessageProducer producer = jmsSession.createProducer(new ActiveMQTopic("durable.sub"));
113116

114-
final int original = new ArrayList<File>(FileUtils.listFiles(persistentDir, new WildcardFileFilter("*.log"), TrueFileFilter.INSTANCE)).size();
117+
final int original = new ArrayList<File>(FileUtils.listFiles(persistentDir, LOG_FILE_FILTER, TrueFileFilter.INSTANCE)).size();
115118

116119
// 100k messages
117120
final byte[] data = new byte[100000];
@@ -132,7 +135,7 @@ public boolean isSatisified() throws Exception {
132135
messageCount.getAndIncrement();
133136
}
134137

135-
return new ArrayList<File>(FileUtils.listFiles(persistentDir, new WildcardFileFilter("*.log"), TrueFileFilter.INSTANCE)).size() > original;
138+
return new ArrayList<File>(FileUtils.listFiles(persistentDir, LOG_FILE_FILTER, TrueFileFilter.INSTANCE)).size() > original;
136139
}
137140
}));
138141

@@ -159,7 +162,7 @@ public boolean isSatisified() throws Exception {
159162

160163
@Override
161164
public boolean isSatisified() throws Exception {
162-
return new ArrayList<File>(FileUtils.listFiles(persistentDir, new WildcardFileFilter("*.log"), TrueFileFilter.INSTANCE)).size() == original;
165+
return new ArrayList<File>(FileUtils.listFiles(persistentDir, LOG_FILE_FILTER, TrueFileFilter.INSTANCE)).size() == original;
163166
}
164167
}, 5000, 500));
165168

@@ -169,7 +172,7 @@ public boolean isSatisified() throws Exception {
169172

170173
// delete the index so that the durables are gone from the index
171174
// The test passes if you take out this delete section
172-
for (File index : FileUtils.listFiles(persistentDir, new WildcardFileFilter("db.*"), TrueFileFilter.INSTANCE)) {
175+
for (File index : FileUtils.listFiles(persistentDir, DB_FILE_FILTER, TrueFileFilter.INSTANCE)) {
173176
FileUtils.deleteQuietly(index);
174177
}
175178

@@ -208,7 +211,7 @@ public void testDurableWithNoMessageAfterRestartAndIndexRecovery() throws Except
208211
TopicSubscriber durable = jmsSession.createDurableSubscriber(new ActiveMQTopic("durable.sub"), "sub");
209212
final MessageProducer producer = jmsSession.createProducer(new ActiveMQTopic("durable.sub"));
210213

211-
final int original = new ArrayList<File>(FileUtils.listFiles(persistentDir, new WildcardFileFilter("*.log"), TrueFileFilter.INSTANCE)).size();
214+
final int original = new ArrayList<File>(FileUtils.listFiles(persistentDir, LOG_FILE_FILTER, TrueFileFilter.INSTANCE)).size();
212215

213216
// 100k messages
214217
final byte[] data = new byte[100000];
@@ -229,7 +232,7 @@ public boolean isSatisified() throws Exception {
229232
messageCount.getAndIncrement();
230233
}
231234

232-
return new ArrayList<File>(FileUtils.listFiles(persistentDir, new WildcardFileFilter("*.log"), TrueFileFilter.INSTANCE)).size() > original;
235+
return new ArrayList<File>(FileUtils.listFiles(persistentDir, LOG_FILE_FILTER, TrueFileFilter.INSTANCE)).size() > original;
233236
}
234237
}));
235238

@@ -255,7 +258,7 @@ public boolean isSatisified() throws Exception {
255258

256259
@Override
257260
public boolean isSatisified() throws Exception {
258-
return new ArrayList<File>(FileUtils.listFiles(persistentDir, new WildcardFileFilter("*.log"), TrueFileFilter.INSTANCE)).size() == original;
261+
return new ArrayList<File>(FileUtils.listFiles(persistentDir, LOG_FILE_FILTER, TrueFileFilter.INSTANCE)).size() == original;
259262
}
260263
}));
261264

@@ -265,7 +268,7 @@ public boolean isSatisified() throws Exception {
265268

266269
// delete the index so that the durables are gone from the index
267270
// The test passes if you take out this delete section
268-
for (File index : FileUtils.listFiles(persistentDir, new WildcardFileFilter("db.*"), TrueFileFilter.INSTANCE)) {
271+
for (File index : FileUtils.listFiles(persistentDir, DB_FILE_FILTER, TrueFileFilter.INSTANCE)) {
269272
FileUtils.deleteQuietly(index);
270273
}
271274

‎activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6133PersistJMSRedeliveryTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,9 @@ private void restartWithRecovery(File persistenceDir) throws Exception {
117117
broker.stop();
118118
broker.waitUntilStopped();
119119

120+
final WildcardFileFilter fileFilter = WildcardFileFilter.builder().setWildcards("db.*").get();
120121
// delete the index so that it needs to be rebuilt from replay
121-
for (File index : FileUtils.listFiles(persistenceDir, new WildcardFileFilter("db.*"), TrueFileFilter.INSTANCE)) {
122+
for (File index : FileUtils.listFiles(persistenceDir, fileFilter, TrueFileFilter.INSTANCE)) {
122123
FileUtils.deleteQuietly(index);
123124
}
124125

@@ -201,9 +202,8 @@ private void createBroker(boolean deleteAllMessages) throws Exception {
201202
}
202203

203204
private int getLogFileCount() throws Exception {
204-
return new ArrayList<File>(
205-
FileUtils.listFiles(getPersistentDir(),
206-
new WildcardFileFilter("*.log"), TrueFileFilter.INSTANCE)).size();
205+
final WildcardFileFilter fileFilter = WildcardFileFilter.builder().setWildcards("*.log").get();
206+
return new ArrayList<File>(FileUtils.listFiles(getPersistentDir(), fileFilter, TrueFileFilter.INSTANCE)).size();
207207
}
208208

209209
private File getPersistentDir() throws IOException {

‎activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/AbstractKahaDBMessageStoreSizeTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ public void testMessageSizeStoreRecoveryVersion5RebuildIndex() throws Exception
124124
FileUtils.deleteDirectory(new File(dataDirectory));
125125
FileUtils.copyDirectory(new File(getVersion5Dir()),
126126
dataDir);
127-
for (File index : FileUtils.listFiles(new File(dataDirectory), new WildcardFileFilter("*.data"), TrueFileFilter.INSTANCE)) {
127+
final WildcardFileFilter fileFilter = WildcardFileFilter.builder().setWildcards("*.data").get();
128+
for (File index : FileUtils.listFiles(new File(dataDirectory), fileFilter, TrueFileFilter.INSTANCE)) {
128129
FileUtils.deleteQuietly(index);
129130
}
130131

‎activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/AbstractMultiKahaDBDeletionTest.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444

4545

4646
public abstract class AbstractMultiKahaDBDeletionTest {
47+
private final static WildcardFileFilter DB_FILE_FILTER = WildcardFileFilter.builder().setWildcards("db*").get();
4748
protected static final Logger LOG = LoggerFactory
4849
.getLogger(MultiKahaDBTopicDeletionTest.class);
4950

@@ -131,7 +132,7 @@ public void testDest1Deletion() throws Exception {
131132
// try and create a consumer on dest2, before AMQ-5875 this
132133
//would cause an IllegalStateException for Topics
133134
createConsumer(dest2);
134-
Collection<File> storeFiles = FileUtils.listFiles(storeDir, new WildcardFileFilter("db*"), getStoreFileFilter());
135+
Collection<File> storeFiles = FileUtils.listFiles(storeDir, DB_FILE_FILTER, getStoreFileFilter());
135136
assertTrue("Store index should still exist", storeFiles.size() >= 1);
136137
}
137138

@@ -151,7 +152,7 @@ public void testDest2Deletion() throws Exception {
151152
// try and create a consumer on dest1, before AMQ-5875 this
152153
//would cause an IllegalStateException for Topics
153154
createConsumer(dest1);
154-
Collection<File> storeFiles = FileUtils.listFiles(storeDir, new WildcardFileFilter("db*"), getStoreFileFilter());
155+
Collection<File> storeFiles = FileUtils.listFiles(storeDir, DB_FILE_FILTER, getStoreFileFilter());
155156
assertTrue("Store index should still exist", storeFiles.size() >= 1);
156157
}
157158

@@ -170,7 +171,7 @@ public void testStoreCleanupDeleteDest1First() throws Exception {
170171
broker.removeDestination(brokerService.getAdminConnectionContext(), dest2, 100);
171172

172173
//Assert that with no more destinations attached to a store that it has been cleaned up
173-
Collection<File> storeFiles = FileUtils.listFiles(storeDir, new WildcardFileFilter("db*"), getStoreFileFilter());
174+
Collection<File> storeFiles = FileUtils.listFiles(storeDir, DB_FILE_FILTER, getStoreFileFilter());
174175
assertEquals("Store files should be deleted", 0, storeFiles.size());
175176

176177
}
@@ -189,7 +190,7 @@ public void testStoreCleanupDeleteDest2First() throws Exception {
189190
broker.removeDestination(brokerService.getAdminConnectionContext(), dest1, 100);
190191

191192
//Assert that with no more destinations attached to a store that it has been cleaned up
192-
Collection<File> storeFiles = FileUtils.listFiles(storeDir, new WildcardFileFilter("db*"), getStoreFileFilter());
193+
Collection<File> storeFiles = FileUtils.listFiles(storeDir, DB_FILE_FILTER, getStoreFileFilter());
193194
assertEquals("Store files should be deleted", 0, storeFiles.size());
194195

195196
}

‎activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBQueueDeletionTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ protected void createConsumer(ActiveMQDestination dest) throws JMSException {
8585
*/
8686
@Override
8787
protected WildcardFileFilter getStoreFileFilter() {
88-
return new WildcardFileFilter("queue*");
88+
return WildcardFileFilter.builder().setWildcards("queue*").get();
8989
}
9090

9191
}

‎activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBTopicDeletionTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ protected void createConsumer(ActiveMQDestination dest) throws JMSException {
8080

8181
@Override
8282
protected WildcardFileFilter getStoreFileFilter() {
83-
return new WildcardFileFilter("topic*");
83+
return WildcardFileFilter.builder().setWildcards("topic*").get();
8484
}
8585

8686
}

‎activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/SubscriptionRecoveryTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ public void createBroker(boolean deleteAllMessages, boolean recover) throws Exce
8181
pa.setCleanupInterval(TimeUnit.SECONDS.toMillis(5));
8282
//Delete the index files on recovery
8383
if (recover) {
84-
for (File index : FileUtils.listFiles(dataFile, new WildcardFileFilter("*.data"), TrueFileFilter.INSTANCE)) {
84+
final WildcardFileFilter fileFilter = WildcardFileFilter.builder().setWildcards("*.data").get();
85+
for (File index : FileUtils.listFiles(dataFile, fileFilter, TrueFileFilter.INSTANCE)) {
8586
LOG.info("deleting: " + index);
8687
FileUtils.deleteQuietly(index);
8788
}

0 commit comments

Comments
 (0)