(shenyu) branch master updated: fix:Data sync dataId for proxy selector and discovery is not unique (#5783)

[yangwenjie]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new bde0653fa1 fix:Data sync dataId for proxy selector and discovery is 
not unique (#5783)
bde0653fa1 is described below

commit bde0653fa15f4af8ac130c8e5495d9366c120a6c
Author: Wweiei <45253632+wwe...@users.noreply.github.com>
AuthorDate: Tue Nov 19 21:38:46 2024 +0800

    fix:Data sync dataId for proxy selector and discovery is not unique (#5783)
    
    Co-authored-by: aias00 <liuhon...@apache.org>
---
 .../apache/shenyu/admin/listener/AbstractNodeDataChangedListener.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/shenyu-admin-listener/shenyu-admin-listener-api/src/main/java/org/apache/shenyu/admin/listener/AbstractNodeDataChangedListener.java
 
b/shenyu-admin-listener/shenyu-admin-listener-api/src/main/java/org/apache/shenyu/admin/listener/AbstractNodeDataChangedListener.java
index 203da3a31c..6554820f22 100644
--- 
a/shenyu-admin-listener/shenyu-admin-listener-api/src/main/java/org/apache/shenyu/admin/listener/AbstractNodeDataChangedListener.java
+++ 
b/shenyu-admin-listener/shenyu-admin-listener-api/src/main/java/org/apache/shenyu/admin/listener/AbstractNodeDataChangedListener.java
@@ -274,7 +274,7 @@ public abstract class AbstractNodeDataChangedListener 
implements DataChangedList
         }
         final String namespaceId = changed.stream().map(value -> 
StringUtils.defaultString(value.getNamespaceId(), 
SYS_DEFAULT_NAMESPACE_ID)).findFirst().get();
         final String configKeyPrefix = namespaceId + 
DefaultNodeConstants.JOIN_POINT + changeData.getProxySelectorDataId() + 
DefaultNodeConstants.JOIN_POINT;
-        this.onCommonMultiChanged(changed, eventType, configKeyPrefix, 
ProxySelectorData::getPluginName, ProxySelectorData::getName);
+        this.onCommonMultiChanged(changed, eventType, configKeyPrefix, 
ProxySelectorData::getPluginName, ProxySelectorData::getId);
         LOG.debug("[DataChangedListener] ProxySelectorChanged {}", 
changeData.getProxySelectorDataId());
     }
 
@@ -285,7 +285,7 @@ public abstract class AbstractNodeDataChangedListener 
implements DataChangedList
         }
         final String namespaceId = changed.stream().map(value -> 
StringUtils.defaultString(value.getNamespaceId(), 
SYS_DEFAULT_NAMESPACE_ID)).findFirst().get();
         final String configKeyPrefix = namespaceId + 
DefaultNodeConstants.JOIN_POINT + changeData.getDiscoveryDataId() + 
DefaultNodeConstants.JOIN_POINT;
-        this.onCommonMultiChanged(changed, eventType, configKeyPrefix, 
DiscoverySyncData::getPluginName, DiscoverySyncData::getSelectorName);
+        this.onCommonMultiChanged(changed, eventType, configKeyPrefix, 
DiscoverySyncData::getPluginName, DiscoverySyncData::getSelectorId);
         LOG.debug("[DataChangedListener] DiscoveryUpstreamChanged {}", 
changeData.getDiscoveryDataId());
     }