Skip to content

Commit 63d35d1

Browse files
pdolifpdolif
authored
[cleanup][test] Remove unused parameter from deleteNamespaceWithRetry method in MockedPulsarServiceBaseTest (apache#24283)
1 parent f51123c commit 63d35d1

File tree

5 files changed

+13
-37
lines changed

5 files changed

+13
-37
lines changed

‎pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,7 @@ private void cleanupCluster() throws Exception {
227227
pulsar.getConfiguration().setForceDeleteNamespaceAllowed(true);
228228
for (String tenant : admin.tenants().getTenants()) {
229229
for (String namespace : admin.namespaces().getNamespaces(tenant)) {
230-
deleteNamespaceWithRetry(namespace, true, admin, pulsar,
231-
mockPulsarSetup.getPulsar());
230+
deleteNamespaceWithRetry(namespace, true, admin);
232231
}
233232
try {
234233
admin.tenants().deleteTenant(tenant, true);

‎pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,7 @@ public void reset() throws Exception {
192192
pulsar.getConfiguration().setForceDeleteNamespaceAllowed(true);
193193
for (String tenant : admin.tenants().getTenants()) {
194194
for (String namespace : admin.namespaces().getNamespaces(tenant)) {
195-
deleteNamespaceWithRetry(namespace, true, admin, pulsar,
196-
mockPulsarSetup.getPulsar());
195+
deleteNamespaceWithRetry(namespace, true, admin);
197196
}
198197
}
199198
pulsar.getConfiguration().setForceDeleteNamespaceAllowed(false);

‎pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import java.net.URI;
3030
import java.net.URL;
3131
import java.util.ArrayList;
32-
import java.util.Arrays;
3332
import java.util.Collection;
3433
import java.util.Date;
3534
import java.util.HashSet;
@@ -50,7 +49,6 @@
5049
import org.apache.pulsar.broker.ServiceConfiguration;
5150
import org.apache.pulsar.broker.authentication.AuthenticationProviderTls;
5251
import org.apache.pulsar.broker.service.BrokerService;
53-
import org.apache.pulsar.broker.service.BrokerTestBase;
5452
import org.apache.pulsar.broker.service.persistent.PersistentTopic;
5553
import org.apache.pulsar.broker.testcontext.PulsarTestContext;
5654
import org.apache.pulsar.client.admin.PulsarAdmin;
@@ -693,35 +691,18 @@ public Map<Class<?>, Collection<Class<?>>> register(Object callback, Object... c
693691
}
694692

695693
/**
696-
* see {@link BrokerTestBase#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)}
694+
* see {@link #deleteNamespaceWithRetry(String, boolean, PulsarAdmin)}
697695
*/
698696
protected void deleteNamespaceWithRetry(String ns, boolean force)
699697
throws Exception {
700-
BrokerTestBase.deleteNamespaceWithRetry(ns, force, admin, pulsar);
701-
}
702-
703-
/**
704-
* see {@link BrokerTestBase#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)}
705-
*/
706-
protected void deleteNamespaceWithRetry(String ns, boolean force, PulsarAdmin admin)
707-
throws Exception {
708-
BrokerTestBase.deleteNamespaceWithRetry(ns, force, admin, pulsar);
709-
}
710-
711-
/**
712-
* see {@link MockedPulsarServiceBaseTest#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)}
713-
*/
714-
public static void deleteNamespaceWithRetry(String ns, boolean force, PulsarAdmin admin, PulsarService...pulsars)
715-
throws Exception {
716-
deleteNamespaceWithRetry(ns, force, admin, Arrays.asList(pulsars));
698+
deleteNamespaceWithRetry(ns, force, admin);
717699
}
718700

719701
/**
720702
* 1. Pause system "__change_event" topic creates.
721703
* 2. Do delete namespace with retry because maybe fail by race-condition with create topics.
722704
*/
723-
public static void deleteNamespaceWithRetry(String ns, boolean force, PulsarAdmin admin,
724-
Collection<PulsarService> pulsars) throws Exception {
705+
public static void deleteNamespaceWithRetry(String ns, boolean force, PulsarAdmin admin) throws Exception {
725706
Awaitility.await()
726707
.pollDelay(500, TimeUnit.MILLISECONDS)
727708
.until(() -> {

‎pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import java.net.URL;
3939
import java.time.Duration;
4040
import java.util.ArrayList;
41-
import java.util.Collection;
4241
import java.util.HashMap;
4342
import java.util.List;
4443
import java.util.Optional;
@@ -110,19 +109,19 @@ public class BacklogQuotaManagerTest {
110109
private static final int MAX_ENTRIES_PER_LEDGER = 5;
111110

112111
/**
113-
* see {@link MockedPulsarServiceBaseTest#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)}
112+
* see {@link MockedPulsarServiceBaseTest#deleteNamespaceWithRetry(String, boolean, PulsarAdmin)}
114113
*/
115114
protected void deleteNamespaceWithRetry(String ns, boolean force)
116115
throws Exception {
117-
MockedPulsarServiceBaseTest.deleteNamespaceWithRetry(ns, force, admin, pulsar);
116+
MockedPulsarServiceBaseTest.deleteNamespaceWithRetry(ns, force, admin);
118117
}
119118

120119
/**
121-
* see {@link MockedPulsarServiceBaseTest#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)}
120+
* see {@link MockedPulsarServiceBaseTest#deleteNamespaceWithRetry(String, boolean, PulsarAdmin)}
122121
*/
123122
protected void deleteNamespaceWithRetry(String ns, boolean force, PulsarAdmin admin)
124123
throws Exception {
125-
MockedPulsarServiceBaseTest.deleteNamespaceWithRetry(ns, force, admin, pulsar);
124+
MockedPulsarServiceBaseTest.deleteNamespaceWithRetry(ns, force, admin);
126125
}
127126

128127
@DataProvider(name = "backlogQuotaSizeGB")

‎pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import static org.mockito.Mockito.spy;
2222
import com.google.common.collect.Sets;
2323
import java.util.ArrayList;
24-
import java.util.Collection;
2524
import java.util.List;
2625
import java.util.Optional;
2726
import java.util.concurrent.TimeUnit;
@@ -32,7 +31,6 @@
3231
import org.apache.pulsar.broker.ServiceConfiguration;
3332
import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest;
3433
import org.apache.pulsar.broker.intercept.CounterBrokerInterceptor;
35-
import org.apache.pulsar.broker.service.BrokerTestBase;
3634
import org.apache.pulsar.broker.testcontext.PulsarTestContext;
3735
import org.apache.pulsar.client.admin.PulsarAdmin;
3836
import org.apache.pulsar.client.admin.PulsarAdminBuilder;
@@ -217,19 +215,19 @@ protected final void internalCleanup() {
217215
}
218216

219217
/**
220-
* see {@link BrokerTestBase#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)}
218+
* see {@link MockedPulsarServiceBaseTest#deleteNamespaceWithRetry(String, boolean, PulsarAdmin)}
221219
*/
222220
protected void deleteNamespaceWithRetry(String ns, boolean force)
223221
throws Exception {
224-
MockedPulsarServiceBaseTest.deleteNamespaceWithRetry(ns, force, admin, pulsarServiceList);
222+
MockedPulsarServiceBaseTest.deleteNamespaceWithRetry(ns, force, admin);
225223
}
226224

227225
/**
228-
* see {@link MockedPulsarServiceBaseTest#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)}
226+
* see {@link MockedPulsarServiceBaseTest#deleteNamespaceWithRetry(String, boolean, PulsarAdmin)}
229227
*/
230228
protected void deleteNamespaceWithRetry(String ns, boolean force, PulsarAdmin admin)
231229
throws Exception {
232-
MockedPulsarServiceBaseTest.deleteNamespaceWithRetry(ns, force, admin, pulsarServiceList);
230+
MockedPulsarServiceBaseTest.deleteNamespaceWithRetry(ns, force, admin);
233231
}
234232

235233
public void checkSnapshotPublisherCount(String namespace, int expectCount) {

0 commit comments

Comments
 (0)