This is an automated email from the ASF dual-hosted git repository. yubiao pushed a commit to branch branch-3.0 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 9b1373038b37b56d9e02b87ec1d18d701f4a1ca1 Author: Masahiro Sakamoto <[email protected]> AuthorDate: Sat Aug 26 00:36:57 2023 +0900 [fix][broker] Fix typos lister -> listener (#21068) (cherry picked from commit e0c481e5f8d7fa5534d3327785928a234376789e) --- .../pulsar/broker/web/plugin/servlet/AdditionalServletUtilsTest.java | 4 ++-- .../java/org/apache/pulsar/broker/namespace/NamespaceService.java | 4 ++-- .../apache/pulsar/broker/intercept/BrokerInterceptorUtilsTest.java | 4 ++-- .../src/main/java/org/apache/pulsar/client/impl/ConsumerBase.java | 2 +- .../java/org/apache/pulsar/metadata/impl/AbstractMetadataStore.java | 2 +- .../org/apache/pulsar/metadata/impl/LocalMemoryMetadataStore.java | 2 +- .../java/org/apache/pulsar/metadata/impl/RocksdbMetadataStore.java | 2 +- .../pulsar/metadata/impl/batching/AbstractBatchedMetadataStore.java | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletUtilsTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletUtilsTest.java index 819d0b2f711..6cfab9d560c 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletUtilsTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletUtilsTest.java @@ -68,7 +68,7 @@ public class AdditionalServletUtilsTest { } @Test(expectedExceptions = IOException.class) - public void testLoadEventListenerWithBlankListerClass() throws Exception { + public void testLoadEventListenerWithBlankListenerClass() throws Exception { AdditionalServletDefinition def = new AdditionalServletDefinition(); def.setDescription("test-proxy-listener"); @@ -95,7 +95,7 @@ public class AdditionalServletUtilsTest { } @Test(expectedExceptions = IOException.class) - public void testLoadEventListenerWithWrongListerClass() throws Exception { + public void testLoadEventListenerWithWrongListenerClass() throws Exception { AdditionalServletDefinition def = new AdditionalServletDefinition(); def.setAdditionalServletClass(Runnable.class.getName()); def.setDescription("test-proxy-listener"); diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java index 3d0dfcf0dfd..e255c60a409 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java @@ -1243,7 +1243,7 @@ public class NamespaceService implements AutoCloseable { bundleOwnedListener.unLoad(bundle); } } catch (Throwable t) { - LOG.error("Call bundle {} ownership lister error", bundle, t); + LOG.error("Call bundle {} ownership listener error", bundle, t); } } } @@ -1266,7 +1266,7 @@ public class NamespaceService implements AutoCloseable { listener.onLoad(bundle); } } catch (Throwable t) { - LOG.error("Call bundle {} ownership lister error", bundle, t); + LOG.error("Call bundle {} ownership listener error", bundle, t); } } } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorUtilsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorUtilsTest.java index 709e43b3728..5abe8a69ee4 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorUtilsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorUtilsTest.java @@ -71,7 +71,7 @@ public class BrokerInterceptorUtilsTest { } @Test(expectedExceptions = IOException.class) - public void testLoadBrokerEventListenerWithBlankListerClass() throws Exception { + public void testLoadBrokerEventListenerWithBlankListenerClass() throws Exception { BrokerInterceptorDefinition def = new BrokerInterceptorDefinition(); def.setDescription("test-broker-listener"); @@ -98,7 +98,7 @@ public class BrokerInterceptorUtilsTest { } @Test(expectedExceptions = IOException.class) - public void testLoadBrokerEventListenerWithWrongListerClass() throws Exception { + public void testLoadBrokerEventListenerWithWrongListenerClass() throws Exception { BrokerInterceptorDefinition def = new BrokerInterceptorDefinition(); def.setInterceptorClass(Runnable.class.getName()); def.setDescription("test-broker-listener"); diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBase.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBase.java index 67bddf525c6..31357e8225f 100644 --- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBase.java +++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBase.java @@ -228,7 +228,7 @@ public abstract class ConsumerBase<T> extends HandlerState implements Consumer<T } } - // if lister is not null, we will track unAcked msg in callMessageListener + // if listener is not null, we will track unAcked msg in callMessageListener protected void trackUnAckedMsgIfNoListener(MessageId messageId, int redeliveryCount) { if (listener == null) { unAckedMessageTracker.add(messageId, redeliveryCount); diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/AbstractMetadataStore.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/AbstractMetadataStore.java index cc148c2a311..7bc881c1254 100644 --- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/AbstractMetadataStore.java +++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/AbstractMetadataStore.java @@ -175,7 +175,7 @@ public abstract class AbstractMetadataStore implements MetadataStoreExtended, Co return result; } - protected void registerSyncLister(Optional<MetadataEventSynchronizer> synchronizer) { + protected void registerSyncListener(Optional<MetadataEventSynchronizer> synchronizer) { synchronizer.ifPresent(s -> s.registerSyncListener(this::handleMetadataEvent)); } diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/LocalMemoryMetadataStore.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/LocalMemoryMetadataStore.java index 94d9a1f8937..7a495f78771 100644 --- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/LocalMemoryMetadataStore.java +++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/LocalMemoryMetadataStore.java @@ -83,7 +83,7 @@ public class LocalMemoryMetadataStore extends AbstractMetadataStore implements M // Local means a private data set // update synchronizer and register sync listener synchronizer = metadataStoreConfig.getSynchronizer(); - registerSyncLister(Optional.ofNullable(synchronizer)); + registerSyncListener(Optional.ofNullable(synchronizer)); if ("local".equals(name)) { map = new TreeMap<>(); sequentialIdGenerator = new AtomicLong(); diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/RocksdbMetadataStore.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/RocksdbMetadataStore.java index fcec2fcf9c1..be985129f2a 100644 --- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/RocksdbMetadataStore.java +++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/RocksdbMetadataStore.java @@ -113,7 +113,7 @@ public class RocksdbMetadataStore extends AbstractMetadataStore { store = new RocksdbMetadataStore(metadataStoreUri, conf); // update synchronizer and register sync listener store.synchronizer = conf.getSynchronizer(); - store.registerSyncLister(Optional.ofNullable(store.synchronizer)); + store.registerSyncListener(Optional.ofNullable(store.synchronizer)); instancesCache.put(metadataStoreUri, store); return store; } diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/AbstractBatchedMetadataStore.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/AbstractBatchedMetadataStore.java index 93aeb28c39b..a164e4c2460 100644 --- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/AbstractBatchedMetadataStore.java +++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/AbstractBatchedMetadataStore.java @@ -76,7 +76,7 @@ public abstract class AbstractBatchedMetadataStore extends AbstractMetadataStore // update synchronizer and register sync listener synchronizer = conf.getSynchronizer(); - registerSyncLister(Optional.ofNullable(synchronizer)); + registerSyncListener(Optional.ofNullable(synchronizer)); this.batchMetadataStoreStats = new BatchMetadataStoreStats(metadataStoreName, executor); }
