From 70cc0b8e5bcea5aa6aa3bd8c1ea34aa2c0cbeac3 Mon Sep 17 00:00:00 2001
From: huangjian888 <465265897@qq.com>
Date: Thu, 10 Oct 2019 20:27:41 +0800
Subject: [PATCH] Nacos RegistryCenter Added Namespace Property Configuration
 (#3209)

* Nacos RegistryCenter Added Namespace Property Configuration

* For checkstyle
---
 .../reg/nacos/NacosRegistryCenter.java        | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-nacos/src/main/java/org/apache/shardingsphere/orchestration/reg/nacos/NacosRegistryCenter.java b/sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-nacos/src/main/java/org/apache/shardingsphere/orchestration/reg/nacos/NacosRegistryCenter.java
index 5efe56c4b3..f8cf8162e9 100644
--- a/sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-nacos/src/main/java/org/apache/shardingsphere/orchestration/reg/nacos/NacosRegistryCenter.java
+++ b/sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-nacos/src/main/java/org/apache/shardingsphere/orchestration/reg/nacos/NacosRegistryCenter.java
@@ -35,7 +35,7 @@ import java.util.Properties;
 import java.util.concurrent.Executor;
 
 @Slf4j
-public class NacosRegistryCenter implements RegistryCenter {
+public final class NacosRegistryCenter implements RegistryCenter {
 
     private ConfigService configService;
 
@@ -46,9 +46,12 @@ public class NacosRegistryCenter implements RegistryCenter {
     @Override
     public void init(final RegistryCenterConfiguration config) {
         try {
-            configService = NacosFactory.createConfigService(config.getServerLists());
-        } catch (NacosException e) {
-            log.debug("exception for: {}", e.toString());
+            Properties properties = new Properties();
+            properties.put("serverAddr", config.getServerLists());
+            properties.put("namespace", null == config.getNamespace() ? "" : config.getNamespace());
+            configService = NacosFactory.createConfigService(properties);
+        } catch (final NacosException ex) {
+            log.debug("exception for: {}", ex.toString());
         }
     }
 
@@ -64,8 +67,8 @@ public class NacosRegistryCenter implements RegistryCenter {
             String group = properties.getProperty("group", "SHARDING_SPHERE_DEFAULT_GROUP");
             long timeoutMs = Long.parseLong(properties.getProperty("timeout", "3000"));
             return configService.getConfig(dataId, group, timeoutMs);
-        } catch (NacosException e) {
-            log.debug("exception for: {}", e.toString());
+        } catch (final NacosException ex) {
+            log.debug("exception for: {}", ex.toString());
             return null;
         }
     }
@@ -91,8 +94,8 @@ public class NacosRegistryCenter implements RegistryCenter {
             String dataId = key.replace("/", ".");
             String group = properties.getProperty("group", "SHARDING_SPHERE_DEFAULT_GROUP");
             configService.publishConfig(dataId, group, value);
-        } catch (NacosException e) {
-            log.debug("exception for: {}", e.toString());
+        } catch (final NacosException ex) {
+            log.debug("exception for: {}", ex.toString());
         }
     }
 
@@ -118,8 +121,8 @@ public class NacosRegistryCenter implements RegistryCenter {
                     dataChangedEventListener.onChange(new DataChangedEvent(key, configInfo, DataChangedEvent.ChangedType.UPDATED));
                 }
             });
-        } catch (NacosException e) {
-            log.debug("exception for: {}", e.toString());
+        } catch (final NacosException ex) {
+            log.debug("exception for: {}", ex.toString());
         }
     }
 
-- 
GitLab