(pulsar) branch branch-4.0 updated: [fix][broker][branch-4.0] Fix compilation errors after cherry-picking #25312

[zhaocong]

This is an automated email from the ASF dual-hosted git repository.

zhaocong pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-4.0 by this push:
     new e036a2494e5 [fix][broker][branch-4.0] Fix compilation errors after 
cherry-picking #25312
e036a2494e5 is described below

commit e036a2494e5d74388ade58c5f9c5e9b352144820
Author: coderzc <zhaoc...@apache.org>
AuthorDate: Thu Mar 19 20:59:25 2026 +0800

    [fix][broker][branch-4.0] Fix compilation errors after cherry-picking #25312
    
    Adapt test code to branch-4.0 APIs:
    - Replace configureInitialConfig(conf) with super.doInitConf() since
      MockedPulsarServiceBaseTest does not have configureInitialConfig in 
branch-4.0
    - Remove boolean compareTopicPartitions argument from
      setNamespaceReplicationClusters calls since this overload does not exist
      in branch-4.0 (introduced in master by #25170)
---
 .../java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java     | 2 +-
 .../pulsar/broker/service/OneWayReplicatorUsingGlobalZKTest.java      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
index 46e28147732..a41fad63cf3 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
@@ -139,7 +139,7 @@ public class PersistentTopicsTest extends 
MockedPulsarServiceBaseTest {
 
     @Override
     protected void doInitConf() throws Exception {
-        configureInitialConfig(conf);
+        super.doInitConf();
         conf.setCreateTopicToRemoteClusterForReplication(false);
     }
 
diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorUsingGlobalZKTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorUsingGlobalZKTest.java
index 4a3d8bbb417..4a0d2131000 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorUsingGlobalZKTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorUsingGlobalZKTest.java
@@ -682,7 +682,7 @@ public class OneWayReplicatorUsingGlobalZKTest extends 
OneWayReplicatorTest {
         Predicate<String> topicNameFilter = t -> 
TopicName.get(t).getNamespace().equals(ns);
         String systemTopic = "persistent://" + ns + "/__change_events";
         admin1.namespaces().createNamespace(ns);
-        admin1.namespaces().setNamespaceReplicationClusters(ns, new 
HashSet<>(Arrays.asList(cluster1)), false);
+        admin1.namespaces().setNamespaceReplicationClusters(ns, new 
HashSet<>(Arrays.asList(cluster1)));
         Awaitility.await().untilAsserted(() -> {
             
assertEquals(admin1.namespaces().getNamespaceReplicationClusters(ns).size(), 1);
             
assertEquals(admin2.namespaces().getNamespaceReplicationClusters(ns).size(), 1);
@@ -729,7 +729,7 @@ public class OneWayReplicatorUsingGlobalZKTest extends 
OneWayReplicatorTest {
         // Set topic auto-creation rule to "partitions: 2".
         final String tp = BrokerTestUtil.newUniqueName("persistent://" + ns + 
"/tp");
         final Set<String> clusters = new HashSet<>(Arrays.asList(cluster1, 
cluster2));
-        admin1.namespaces().setNamespaceReplicationClusters(ns, clusters, 
true);
+        admin1.namespaces().setNamespaceReplicationClusters(ns, clusters);
         AutoTopicCreationOverride autoTopicCreation2 =
                 
AutoTopicCreationOverrideImpl.builder().allowAutoTopicCreation(true)
                         
.topicType("partitioned").defaultNumPartitions(2).build();