[rocketmq] branch develop updated: [ISSUE #7340] Abstract Duplicate code into a method in `TopicConfigManager` (#7341)

[jinrongtong]

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

jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new dad6ad09d1 [ISSUE #7340] Abstract Duplicate code into a method in 
`TopicConfigManager` (#7341)
dad6ad09d1 is described below

commit dad6ad09d13dadc36b6342671c77f619bbb8c522
Author: Ao Qiao <qiao...@foxmail.com>
AuthorDate: Tue Sep 12 08:28:45 2023 +0800

    [ISSUE #7340] Abstract Duplicate code into a method in `TopicConfigManager` 
(#7341)
---
 .../rocketmq/broker/topic/TopicConfigManager.java  | 44 +++++++---------------
 1 file changed, 14 insertions(+), 30 deletions(-)

diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java 
b/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
index 8537929be7..511d29e12a 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
@@ -293,11 +293,7 @@ public class TopicConfigManager extends ConfigManager {
         }
 
         if (createNew) {
-            if 
(brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {
-                this.brokerController.registerSingleTopicAll(topicConfig);
-            } else {
-                this.brokerController.registerIncrementBrokerData(topicConfig, 
dataVersion);
-            }
+            registerBrokerData(topicConfig);
         }
 
         return topicConfig;
@@ -337,11 +333,7 @@ public class TopicConfigManager extends ConfigManager {
             log.error("createTopicIfAbsent ", e);
         }
         if (createNew && register) {
-            if 
(brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {
-                this.brokerController.registerSingleTopicAll(topicConfig);
-            } else {
-                this.brokerController.registerIncrementBrokerData(topicConfig, 
dataVersion);
-            }
+            registerBrokerData(topicConfig);
         }
         return getTopicConfig(topicConfig.getTopicName());
     }
@@ -401,11 +393,7 @@ public class TopicConfigManager extends ConfigManager {
         }
 
         if (createNew) {
-            if 
(brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {
-                this.brokerController.registerSingleTopicAll(topicConfig);
-            } else {
-                this.brokerController.registerIncrementBrokerData(topicConfig, 
dataVersion);
-            }
+            registerBrokerData(topicConfig);
         }
 
         return topicConfig;
@@ -446,11 +434,7 @@ public class TopicConfigManager extends ConfigManager {
         }
 
         if (createNew) {
-            if 
(brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {
-                this.brokerController.registerSingleTopicAll(topicConfig);
-            } else {
-                this.brokerController.registerIncrementBrokerData(topicConfig, 
dataVersion);
-            }
+            registerBrokerData(topicConfig);
         }
 
         return topicConfig;
@@ -476,11 +460,7 @@ public class TopicConfigManager extends ConfigManager {
             dataVersion.nextVersion(stateMachineVersion);
 
             this.persist();
-            if 
(brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {
-                this.brokerController.registerSingleTopicAll(topicConfig);
-            } else {
-                this.brokerController.registerIncrementBrokerData(topicConfig, 
dataVersion);
-            }
+            registerBrokerData(topicConfig);
         }
     }
 
@@ -503,11 +483,7 @@ public class TopicConfigManager extends ConfigManager {
             dataVersion.nextVersion(stateMachineVersion);
 
             this.persist();
-            if 
(brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {
-                this.brokerController.registerSingleTopicAll(topicConfig);
-            } else {
-                this.brokerController.registerIncrementBrokerData(topicConfig, 
dataVersion);
-            }
+            registerBrokerData(topicConfig);
         }
     }
 
@@ -699,6 +675,14 @@ public class TopicConfigManager extends ConfigManager {
         }
     }
 
+    private void registerBrokerData(TopicConfig topicConfig) {
+        if (brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {
+            this.brokerController.registerSingleTopicAll(topicConfig);
+        } else {
+            this.brokerController.registerIncrementBrokerData(topicConfig, 
dataVersion);
+        }
+    }
+
     public boolean containsTopic(String topic) {
         return topicConfigTable.containsKey(topic);
     }