This is an automated email from the ASF dual-hosted git repository. lhotari pushed a commit to branch branch-4.0 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit b63f685c9a742147d90243ae3bd8b8025de2f8b8 Author: Philipp Dolif <[email protected]> AuthorDate: Fri May 9 14:37:32 2025 +0200 [cleanup][test] Remove unused parameter from deleteNamespaceWithRetry method in MockedPulsarServiceBaseTest (#24283) (cherry picked from commit 63d35d147cc61e271cf492cd4ef2884940c2ed7b) --- .../apache/pulsar/broker/admin/AdminApi2Test.java | 3 +-- .../pulsar/broker/admin/v1/V1_AdminApiTest.java | 3 +-- .../broker/auth/MockedPulsarServiceBaseTest.java | 25 +++------------------- .../broker/service/BacklogQuotaManagerTest.java | 9 ++++---- .../broker/transaction/TransactionTestBase.java | 10 ++++----- 5 files changed, 13 insertions(+), 37 deletions(-) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java index 38fcef02057..edd414a6d80 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java @@ -227,8 +227,7 @@ public class AdminApi2Test extends MockedPulsarServiceBaseTest { pulsar.getConfiguration().setForceDeleteNamespaceAllowed(true); for (String tenant : admin.tenants().getTenants()) { for (String namespace : admin.namespaces().getNamespaces(tenant)) { - deleteNamespaceWithRetry(namespace, true, admin, pulsar, - mockPulsarSetup.getPulsar()); + deleteNamespaceWithRetry(namespace, true, admin); } try { admin.tenants().deleteTenant(tenant, true); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java index d92c3126c54..6356ec4dced 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java @@ -192,8 +192,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest { pulsar.getConfiguration().setForceDeleteNamespaceAllowed(true); for (String tenant : admin.tenants().getTenants()) { for (String namespace : admin.namespaces().getNamespaces(tenant)) { - deleteNamespaceWithRetry(namespace, true, admin, pulsar, - mockPulsarSetup.getPulsar()); + deleteNamespaceWithRetry(namespace, true, admin); } } pulsar.getConfiguration().setForceDeleteNamespaceAllowed(false); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java index 5be5c754452..16c6c6d0fee 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java @@ -29,7 +29,6 @@ import java.net.InetSocketAddress; import java.net.URI; import java.net.URL; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.HashSet; @@ -50,7 +49,6 @@ import org.apache.pulsar.broker.PulsarService; import org.apache.pulsar.broker.ServiceConfiguration; import org.apache.pulsar.broker.authentication.AuthenticationProviderTls; import org.apache.pulsar.broker.service.BrokerService; -import org.apache.pulsar.broker.service.BrokerTestBase; import org.apache.pulsar.broker.service.persistent.PersistentTopic; import org.apache.pulsar.broker.testcontext.PulsarTestContext; import org.apache.pulsar.client.admin.PulsarAdmin; @@ -693,35 +691,18 @@ public abstract class MockedPulsarServiceBaseTest extends TestRetrySupport { } /** - * see {@link BrokerTestBase#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)} + * see {@link #deleteNamespaceWithRetry(String, boolean, PulsarAdmin)} */ protected void deleteNamespaceWithRetry(String ns, boolean force) throws Exception { - BrokerTestBase.deleteNamespaceWithRetry(ns, force, admin, pulsar); - } - - /** - * see {@link BrokerTestBase#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)} - */ - protected void deleteNamespaceWithRetry(String ns, boolean force, PulsarAdmin admin) - throws Exception { - BrokerTestBase.deleteNamespaceWithRetry(ns, force, admin, pulsar); - } - - /** - * see {@link MockedPulsarServiceBaseTest#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)} - */ - public static void deleteNamespaceWithRetry(String ns, boolean force, PulsarAdmin admin, PulsarService...pulsars) - throws Exception { - deleteNamespaceWithRetry(ns, force, admin, Arrays.asList(pulsars)); + deleteNamespaceWithRetry(ns, force, admin); } /** * 1. Pause system "__change_event" topic creates. * 2. Do delete namespace with retry because maybe fail by race-condition with create topics. */ - public static void deleteNamespaceWithRetry(String ns, boolean force, PulsarAdmin admin, - Collection<PulsarService> pulsars) throws Exception { + public static void deleteNamespaceWithRetry(String ns, boolean force, PulsarAdmin admin) throws Exception { Awaitility.await() .pollDelay(500, TimeUnit.MILLISECONDS) .until(() -> { diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java index 963dc3d26b2..01cc56f4e60 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java @@ -38,7 +38,6 @@ import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; import java.net.URL; import java.time.Duration; import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Optional; @@ -110,19 +109,19 @@ public class BacklogQuotaManagerTest { private static final int MAX_ENTRIES_PER_LEDGER = 5; /** - * see {@link MockedPulsarServiceBaseTest#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)} + * see {@link MockedPulsarServiceBaseTest#deleteNamespaceWithRetry(String, boolean, PulsarAdmin)} */ protected void deleteNamespaceWithRetry(String ns, boolean force) throws Exception { - MockedPulsarServiceBaseTest.deleteNamespaceWithRetry(ns, force, admin, pulsar); + MockedPulsarServiceBaseTest.deleteNamespaceWithRetry(ns, force, admin); } /** - * see {@link MockedPulsarServiceBaseTest#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)} + * see {@link MockedPulsarServiceBaseTest#deleteNamespaceWithRetry(String, boolean, PulsarAdmin)} */ protected void deleteNamespaceWithRetry(String ns, boolean force, PulsarAdmin admin) throws Exception { - MockedPulsarServiceBaseTest.deleteNamespaceWithRetry(ns, force, admin, pulsar); + MockedPulsarServiceBaseTest.deleteNamespaceWithRetry(ns, force, admin); } @DataProvider(name = "backlogQuotaSizeGB") diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java index 34af94f2c31..d546f0be4cd 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java @@ -21,7 +21,6 @@ package org.apache.pulsar.broker.transaction; import static org.mockito.Mockito.spy; import com.google.common.collect.Sets; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.Optional; import java.util.concurrent.TimeUnit; @@ -32,7 +31,6 @@ import org.apache.pulsar.broker.PulsarService; import org.apache.pulsar.broker.ServiceConfiguration; import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest; import org.apache.pulsar.broker.intercept.CounterBrokerInterceptor; -import org.apache.pulsar.broker.service.BrokerTestBase; import org.apache.pulsar.broker.testcontext.PulsarTestContext; import org.apache.pulsar.client.admin.PulsarAdmin; import org.apache.pulsar.client.admin.PulsarAdminBuilder; @@ -217,19 +215,19 @@ public abstract class TransactionTestBase extends TestRetrySupport { } /** - * see {@link BrokerTestBase#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)} + * see {@link MockedPulsarServiceBaseTest#deleteNamespaceWithRetry(String, boolean, PulsarAdmin)} */ protected void deleteNamespaceWithRetry(String ns, boolean force) throws Exception { - MockedPulsarServiceBaseTest.deleteNamespaceWithRetry(ns, force, admin, pulsarServiceList); + MockedPulsarServiceBaseTest.deleteNamespaceWithRetry(ns, force, admin); } /** - * see {@link MockedPulsarServiceBaseTest#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)} + * see {@link MockedPulsarServiceBaseTest#deleteNamespaceWithRetry(String, boolean, PulsarAdmin)} */ protected void deleteNamespaceWithRetry(String ns, boolean force, PulsarAdmin admin) throws Exception { - MockedPulsarServiceBaseTest.deleteNamespaceWithRetry(ns, force, admin, pulsarServiceList); + MockedPulsarServiceBaseTest.deleteNamespaceWithRetry(ns, force, admin); } public void checkSnapshotPublisherCount(String namespace, int expectCount) {
