(shenyu) 01/01: Revert "fix:Data sync dataId for proxy selector and discovery is not unique (…"

[yangwenjie]

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

yangwenjie pushed a commit to branch 
revert-5783-bugfix/Data-sync-dataId-for-proxy-selector-and-discovery
in repository https://gitbox.apache.org/repos/asf/shenyu.git

commit 0eea55fe096737fca61cc3c603f048c55e21734c
Author: 杨文杰 <31105009+ywj1...@users.noreply.github.com>
AuthorDate: Tue Nov 19 21:54:47 2024 +0800

    Revert "fix:Data sync dataId for proxy selector and discovery is not unique 
(…"
    
    This reverts commit bde0653fa15f4af8ac130c8e5495d9366c120a6c.
---
 .../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 6554820f22..203da3a31c 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::getId);
+        this.onCommonMultiChanged(changed, eventType, configKeyPrefix, 
ProxySelectorData::getPluginName, ProxySelectorData::getName);
         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::getSelectorId);
+        this.onCommonMultiChanged(changed, eventType, configKeyPrefix, 
DiscoverySyncData::getPluginName, DiscoverySyncData::getSelectorName);
         LOG.debug("[DataChangedListener] DiscoveryUpstreamChanged {}", 
changeData.getDiscoveryDataId());
     }