[pulsar] branch master updated: avoid build new subscription name for reader if it's already configed (#11586)

[eolivelli]

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

eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 177ea06  avoid build new subscription name for reader if it's already 
configed (#11586)
177ea06 is described below

commit 177ea069ea4e8cfc3c0440c22c7e30693d2c7183
Author: Aloys <lofterzh...@gmail.com>
AuthorDate: Mon Aug 9 00:51:53 2021 +0800

    avoid build new subscription name for reader if it's already configed 
(#11586)
---
 .../org/apache/pulsar/client/impl/MultiTopicsReaderImpl.java  | 10 ++++++----
 .../main/java/org/apache/pulsar/client/impl/ReaderImpl.java   | 11 ++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git 
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsReaderImpl.java
 
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsReaderImpl.java
index d25d1ba..32c9869 100644
--- 
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsReaderImpl.java
+++ 
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsReaderImpl.java
@@ -48,12 +48,14 @@ public class MultiTopicsReaderImpl<T> implements Reader<T> {
 
     public MultiTopicsReaderImpl(PulsarClientImpl client, 
ReaderConfigurationData<T> readerConfiguration,
                                  ExecutorProvider executorProvider, 
CompletableFuture<Consumer<T>> consumerFuture, Schema<T> schema) {
-        String subscription = "multiTopicsReader-" + 
DigestUtils.sha1Hex(UUID.randomUUID().toString()).substring(0, 10);
-        if 
(StringUtils.isNotBlank(readerConfiguration.getSubscriptionRolePrefix())) {
-            subscription = readerConfiguration.getSubscriptionRolePrefix() + 
"-" + subscription;
-        }
+        String subscription;
         if (StringUtils.isNotBlank(readerConfiguration.getSubscriptionName())) 
{
             subscription = readerConfiguration.getSubscriptionName();
+        } else {
+            subscription = "multiTopicsReader-" + 
DigestUtils.sha1Hex(UUID.randomUUID().toString()).substring(0, 10);
+            if 
(StringUtils.isNotBlank(readerConfiguration.getSubscriptionRolePrefix())) {
+                subscription = readerConfiguration.getSubscriptionRolePrefix() 
+ "-" + subscription;
+            }
         }
         ConsumerConfigurationData<T> consumerConfiguration = new 
ConsumerConfigurationData<>();
         
consumerConfiguration.getTopicNames().addAll(readerConfiguration.getTopicNames());
diff --git 
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ReaderImpl.java 
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ReaderImpl.java
index 2fa3dd7..5b86864 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ReaderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ReaderImpl.java
@@ -52,13 +52,14 @@ public class ReaderImpl<T> implements Reader<T> {
 
     public ReaderImpl(PulsarClientImpl client, ReaderConfigurationData<T> 
readerConfiguration,
                       ExecutorProvider executorProvider, 
CompletableFuture<Consumer<T>> consumerFuture, Schema<T> schema) {
-
-        String subscription = "reader-" + 
DigestUtils.sha1Hex(UUID.randomUUID().toString()).substring(0, 10);
-        if 
(StringUtils.isNotBlank(readerConfiguration.getSubscriptionRolePrefix())) {
-            subscription = readerConfiguration.getSubscriptionRolePrefix() + 
"-" + subscription;
-        }
+        String subscription;
         if (StringUtils.isNotBlank(readerConfiguration.getSubscriptionName())) 
{
             subscription = readerConfiguration.getSubscriptionName();
+        } else {
+            subscription = "reader-" + 
DigestUtils.sha1Hex(UUID.randomUUID().toString()).substring(0, 10);
+            if 
(StringUtils.isNotBlank(readerConfiguration.getSubscriptionRolePrefix())) {
+                subscription = readerConfiguration.getSubscriptionRolePrefix() 
+ "-" + subscription;
+            }
         }
 
         ConsumerConfigurationData<T> consumerConfiguration = new 
ConsumerConfigurationData<>();