From dcdcb35725f35854cfdb35cf82e41a352358c06e Mon Sep 17 00:00:00 2001 From: thetumbled <843221020@qq.com> Date: Wed, 5 Mar 2025 17:56:39 +0800 Subject: [PATCH] fix class name's consistency. --- .../org/apache/pulsar/client/api/DeadLetterTopicTest.java | 2 +- .../java/org/apache/pulsar/client/api/RetryTopicTest.java | 2 +- .../java/org/apache/pulsar/client/api/DeadLetterPolicy.java | 4 ++-- ...erContext.java => DeadLetterProducerBuilderContext.java} | 2 +- ...omizer.java => DeadLetterProducerBuilderCustomizer.java} | 6 +++--- .../java/org/apache/pulsar/client/impl/ConsumerImpl.java | 6 +++--- ...tImpl.java => DeadLetterProducerBuilderContextImpl.java} | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) rename pulsar-client-api/src/main/java/org/apache/pulsar/client/api/{ProducerBuilderContext.java => DeadLetterProducerBuilderContext.java} (97%) rename pulsar-client-api/src/main/java/org/apache/pulsar/client/api/{ProducerBuilderCustomizer.java => DeadLetterProducerBuilderCustomizer.java} (88%) rename pulsar-client/src/main/java/org/apache/pulsar/client/impl/{ProducerBuilderContextImpl.java => DeadLetterProducerBuilderContextImpl.java} (90%) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DeadLetterTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DeadLetterTopicTest.java index 1a1fd5c14d4de..0fb70c74172c8 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DeadLetterTopicTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DeadLetterTopicTest.java @@ -1059,7 +1059,7 @@ public void testDeadLetterTopicWithProducerBuilder() throws Exception { final int sendMessages = 100; // enable batch - ProducerBuilderCustomizer producerBuilderCustomizer = (context, producerBuilder) -> { + DeadLetterProducerBuilderCustomizer producerBuilderCustomizer = (context, producerBuilder) -> { producerBuilder.enableBatching(true); }; String subscriptionName = "my-subscription"; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/RetryTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/RetryTopicTest.java index 20987d2b34692..b87bc27ed7270 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/RetryTopicTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/RetryTopicTest.java @@ -143,7 +143,7 @@ public void testRetryTopicWithProducerBuilder() throws Exception { final int sendMessages = 100; // enable batch - ProducerBuilderCustomizer producerBuilderCustomizer = (context, producerBuilder) -> { + DeadLetterProducerBuilderCustomizer producerBuilderCustomizer = (context, producerBuilder) -> { producerBuilder.enableBatching(true); }; String subscriptionName = "my-subscription"; diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/DeadLetterPolicy.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/DeadLetterPolicy.java index db032f0b7a84a..f45a15437da6c 100644 --- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/DeadLetterPolicy.java +++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/DeadLetterPolicy.java @@ -71,7 +71,7 @@ public class DeadLetterPolicy implements Serializable { * can use the provided context (which includes input topic and subscription details) to adjust * configurations such as timeouts, batching, or message routing. */ - private ProducerBuilderCustomizer retryLetterProducerBuilderCustomizer; + private DeadLetterProducerBuilderCustomizer retryLetterProducerBuilderCustomizer; /** * Customizer for configuring the producer builder for the dead letter topic. @@ -81,5 +81,5 @@ public class DeadLetterPolicy implements Serializable { * implementations can perform specific adjustments that ensure the dead letter queue operates * with the appropriate configurations tailored for handling undeliverable messages. */ - private ProducerBuilderCustomizer deadLetterProducerBuilderCustomizer; + private DeadLetterProducerBuilderCustomizer deadLetterProducerBuilderCustomizer; } diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerBuilderContext.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/DeadLetterProducerBuilderContext.java similarity index 97% rename from pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerBuilderContext.java rename to pulsar-client-api/src/main/java/org/apache/pulsar/client/api/DeadLetterProducerBuilderContext.java index 25af7736cd8f3..6e74f8c5ca005 100644 --- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerBuilderContext.java +++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/DeadLetterProducerBuilderContext.java @@ -24,7 +24,7 @@ *

This interface supplies relevant details such as the name of the input topic and associated subscription name. * This contextual information helps in correctly configuring the producer for the appropriate topic. */ -public interface ProducerBuilderContext { +public interface DeadLetterProducerBuilderContext { /** * Returns the default name of topic for the dead letter or retry letter producer. This topic name is used * unless the ProducerBuilderCustomizer overrides it. diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerBuilderCustomizer.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/DeadLetterProducerBuilderCustomizer.java similarity index 88% rename from pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerBuilderCustomizer.java rename to pulsar-client-api/src/main/java/org/apache/pulsar/client/api/DeadLetterProducerBuilderCustomizer.java index 1b4d681d871c3..85670132a8940 100644 --- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerBuilderCustomizer.java +++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/DeadLetterProducerBuilderCustomizer.java @@ -25,14 +25,14 @@ * or the dead letter topic. The customization might include setting producer properties such as batching, timeouts, * or any other producer-specific configuration. * - * @see ProducerBuilderContext + * @see DeadLetterProducerBuilderContext */ -public interface ProducerBuilderCustomizer { +public interface DeadLetterProducerBuilderCustomizer { /** * Customize the given producer builder with settings specific to the topic context provided. * * @param context the context containing information about the input topic and the subscription * @param producerBuilder the producer builder instance to be customized */ - void customize(ProducerBuilderContext context, ProducerBuilder producerBuilder); + void customize(DeadLetterProducerBuilderContext context, ProducerBuilder producerBuilder); } diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java index db385983cf7c8..184f1893897db 100644 --- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java +++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java @@ -84,7 +84,7 @@ import org.apache.pulsar.client.api.Messages; import org.apache.pulsar.client.api.Producer; import org.apache.pulsar.client.api.ProducerBuilder; -import org.apache.pulsar.client.api.ProducerBuilderContext; +import org.apache.pulsar.client.api.DeadLetterProducerBuilderContext; import org.apache.pulsar.client.api.PulsarClientException; import org.apache.pulsar.client.api.PulsarClientException.TopicDoesNotExistException; import org.apache.pulsar.client.api.Schema; @@ -2307,7 +2307,7 @@ private CompletableFuture> initDeadLetterProducerIfNeeded() { .enableBatching(false) .enableChunking(true); if (deadLetterPolicy.getDeadLetterProducerBuilderCustomizer() != null) { - ProducerBuilderContext context = new ProducerBuilderContextImpl( + DeadLetterProducerBuilderContext context = new DeadLetterProducerBuilderContextImpl( deadLetterPolicy.getDeadLetterTopic(), topic, subscription, consumerName); deadLetterPolicy.getDeadLetterProducerBuilderCustomizer().customize(context, builder); } @@ -2378,7 +2378,7 @@ private CompletableFuture> initRetryLetterProducerIfNeeded() { .enableChunking(true) .blockIfQueueFull(false); if (deadLetterPolicy.getRetryLetterProducerBuilderCustomizer() != null) { - ProducerBuilderContext context = new ProducerBuilderContextImpl( + DeadLetterProducerBuilderContext context = new DeadLetterProducerBuilderContextImpl( deadLetterPolicy.getRetryLetterTopic(), topic, subscription, consumerName); deadLetterPolicy.getRetryLetterProducerBuilderCustomizer().customize(context, builder); } diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerBuilderContextImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/DeadLetterProducerBuilderContextImpl.java similarity index 90% rename from pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerBuilderContextImpl.java rename to pulsar-client/src/main/java/org/apache/pulsar/client/impl/DeadLetterProducerBuilderContextImpl.java index d169008a897ce..0df67561c93e2 100644 --- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerBuilderContextImpl.java +++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/DeadLetterProducerBuilderContextImpl.java @@ -19,10 +19,10 @@ package org.apache.pulsar.client.impl; import lombok.AllArgsConstructor; -import org.apache.pulsar.client.api.ProducerBuilderContext; +import org.apache.pulsar.client.api.DeadLetterProducerBuilderContext; @AllArgsConstructor -class ProducerBuilderContextImpl implements ProducerBuilderContext { +class DeadLetterProducerBuilderContextImpl implements DeadLetterProducerBuilderContext { private final String defaultTopicName; private final String inputTopicName; private final String inputTopicSubscriptionName;