From fb961f6026c57564a1413d902ca70451c18215f0 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Thu, 2 Dec 2021 14:53:47 +0200 Subject: [PATCH] Remove unused mockZooKeeperClientFactory fields --- .../auth/MockedPulsarServiceBaseTest.java | 23 +--------------- .../OwnerShipForCurrentServerTestBase.java | 26 +++++-------------- .../transaction/TransactionTestBase.java | 19 +++----------- .../pulsar/broker/web/WebServiceTest.java | 18 ------------- 4 files changed, 10 insertions(+), 76 deletions(-) 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 e20e14fc725e2..0057e6fb55664 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 @@ -23,12 +23,10 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; - import com.google.common.collect.Sets; import com.google.common.util.concurrent.MoreExecutors; - -import java.lang.reflect.Field; import io.netty.channel.EventLoopGroup; +import java.lang.reflect.Field; import java.net.InetSocketAddress; import java.net.URI; import java.net.URL; @@ -38,7 +36,6 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.function.Predicate; import java.util.function.Supplier; @@ -64,10 +61,8 @@ import org.apache.pulsar.metadata.api.extended.MetadataStoreExtended; import org.apache.pulsar.metadata.impl.ZKMetadataStore; import org.apache.pulsar.tests.TestRetrySupport; -import org.apache.pulsar.zookeeper.ZooKeeperClientFactory; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.MockZooKeeper; -import org.apache.zookeeper.ZooKeeper; import org.apache.zookeeper.data.ACL; import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.slf4j.Logger; @@ -401,22 +396,6 @@ public void reallyShutdown() { } } - protected ZooKeeperClientFactory mockZooKeeperClientFactory = new ZooKeeperClientFactory() { - - @Override - public CompletableFuture create(String serverList, SessionType sessionType, - int zkSessionTimeoutMillis) { - - if (serverList != null - && (serverList.equalsIgnoreCase(conf.getConfigurationStoreServers()) - || serverList.equalsIgnoreCase(GLOBAL_DUMMY_VALUE))) { - return CompletableFuture.completedFuture(mockZooKeeperGlobal); - } - - return CompletableFuture.completedFuture(mockZooKeeper); - } - }; - private final BookKeeperClientFactory mockBookKeeperClientFactory = new BookKeeperClientFactory() { @Override diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnerShipForCurrentServerTestBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnerShipForCurrentServerTestBase.java index c6c797738a787..9c9f7fd92275b 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnerShipForCurrentServerTestBase.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnerShipForCurrentServerTestBase.java @@ -24,6 +24,12 @@ import com.google.common.util.concurrent.MoreExecutors; import io.netty.channel.EventLoopGroup; import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; @@ -42,21 +48,11 @@ import org.apache.pulsar.client.api.PulsarClient; import org.apache.pulsar.metadata.api.extended.MetadataStoreExtended; import org.apache.pulsar.metadata.impl.ZKMetadataStore; -import org.apache.pulsar.zookeeper.ZooKeeperClientFactory; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.MockZooKeeper; import org.apache.zookeeper.MockZooKeeperSession; -import org.apache.zookeeper.ZooKeeper; import org.apache.zookeeper.data.ACL; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; - @Slf4j public class OwnerShipForCurrentServerTestBase { @@ -182,16 +178,6 @@ public void reallyShutdown() { } } - protected ZooKeeperClientFactory mockZooKeeperClientFactory = new ZooKeeperClientFactory() { - - @Override - public CompletableFuture create(String serverList, SessionType sessionType, - int zkSessionTimeoutMillis) { - // Always return the same instance (so that we don't loose the mock ZK content on broker restart - return CompletableFuture.completedFuture(mockZooKeeper); - } - }; - private final BookKeeperClientFactory mockBookKeeperClientFactory = new BookKeeperClientFactory() { @Override 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 24e154a3d9893..2a2ba95c14a93 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 @@ -29,7 +29,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import lombok.Getter; @@ -47,21 +46,19 @@ import org.apache.pulsar.broker.auth.SameThreadOrderedSafeExecutor; import org.apache.pulsar.broker.intercept.CounterBrokerInterceptor; import org.apache.pulsar.broker.namespace.NamespaceService; +import org.apache.pulsar.client.admin.PulsarAdmin; +import org.apache.pulsar.client.api.PulsarClient; import org.apache.pulsar.common.naming.NamespaceName; import org.apache.pulsar.common.naming.TopicName; import org.apache.pulsar.common.policies.data.ClusterData; import org.apache.pulsar.common.policies.data.TenantInfoImpl; -import org.apache.pulsar.client.admin.PulsarAdmin; -import org.apache.pulsar.client.api.PulsarClient; import org.apache.pulsar.metadata.api.extended.MetadataStoreExtended; import org.apache.pulsar.metadata.impl.ZKMetadataStore; import org.apache.pulsar.tests.TestRetrySupport; -import org.apache.pulsar.zookeeper.ZooKeeperClientFactory; import org.apache.zookeeper.CreateMode; -import org.apache.zookeeper.data.ACL; import org.apache.zookeeper.MockZooKeeper; import org.apache.zookeeper.MockZooKeeperSession; -import org.apache.zookeeper.ZooKeeper; +import org.apache.zookeeper.data.ACL; import org.awaitility.Awaitility; import org.testng.Assert; @@ -241,16 +238,6 @@ public void reallyShutdown() { } } - protected ZooKeeperClientFactory mockZooKeeperClientFactory = new ZooKeeperClientFactory() { - - @Override - public CompletableFuture create(String serverList, SessionType sessionType, - int zkSessionTimeoutMillis) { - // Always return the same instance (so that we don't loose the mock ZK content on broker restart - return CompletableFuture.completedFuture(mockZooKeeper); - } - }; - private final BookKeeperClientFactory mockBookKeeperClientFactory = new BookKeeperClientFactory() { @Override diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/WebServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/WebServiceTest.java index d585494f4fe1d..13823472a843d 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/WebServiceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/WebServiceTest.java @@ -23,13 +23,10 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; - import com.google.common.collect.Sets; import com.google.common.io.CharStreams; import com.google.common.io.Closeables; - import io.netty.handler.ssl.util.InsecureTrustManagerFactory; - import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -44,16 +41,12 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.concurrent.CompletableFuture; - import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.KeyManager; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; - import lombok.Cleanup; - import org.apache.commons.lang3.StringUtils; import org.apache.pulsar.broker.MockedBookKeeperClientFactory; import org.apache.pulsar.broker.PulsarService; @@ -69,9 +62,7 @@ import org.apache.pulsar.common.util.ObjectMapperFactory; import org.apache.pulsar.common.util.SecurityUtility; import org.apache.pulsar.metadata.impl.ZKMetadataStore; -import org.apache.pulsar.zookeeper.ZooKeeperClientFactory; import org.apache.zookeeper.MockZooKeeper; -import org.apache.zookeeper.ZooKeeper; import org.asynchttpclient.AsyncHttpClient; import org.asynchttpclient.BoundRequestBuilder; import org.asynchttpclient.DefaultAsyncHttpClient; @@ -390,15 +381,6 @@ private void setupEnv(boolean enableFilter, String minApiVersion, boolean allowU pulsar = spy(new PulsarService(config)); // mock zk MockZooKeeper mockZooKeeper = MockedPulsarServiceBaseTest.createMockZooKeeper(); - ZooKeeperClientFactory mockZooKeeperClientFactory = new ZooKeeperClientFactory() { - - @Override - public CompletableFuture create(String serverList, SessionType sessionType, - int zkSessionTimeoutMillis) { - // Always return the same instance (so that we don't loose the mock ZK content on broker restart - return CompletableFuture.completedFuture(mockZooKeeper); - } - }; doReturn(new ZKMetadataStore(mockZooKeeper)).when(pulsar).createConfigurationMetadataStore(); doReturn(new ZKMetadataStore(mockZooKeeper)).when(pulsar).createLocalMetadataStore(); doReturn(new MockedBookKeeperClientFactory()).when(pulsar).newBookKeeperClientFactory();