(dubbo) branch 3.2 updated: 'blacklist' renamed to 'blocklist' (#13800)

[albumenj]

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

albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.2 by this push:
     new 6dbac54b39 'blacklist' renamed to 'blocklist' (#13800)
6dbac54b39 is described below

commit 6dbac54b398252ce0110ddb55150d3f0422c13be
Author: J.Son <x...@x-wx.com>
AuthorDate: Mon Feb 26 17:11:10 2024 +0800

    'blacklist' renamed to 'blocklist' (#13800)
---
 .../apache/dubbo/rpc/cluster/router/condition/ConditionStateRouter.java | 2 +-
 .../java/org/apache/dubbo/registry/integration/DynamicDirectory.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionStateRouter.java
 
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionStateRouter.java
index b89395ca69..84cf9ef663 100644
--- 
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionStateRouter.java
+++ 
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionStateRouter.java
@@ -235,7 +235,7 @@ public class ConditionStateRouter<T> extends 
AbstractStateRouter<T> {
                         CLUSTER_CONDITIONAL_ROUTE_LIST_EMPTY,
                         "condition state router thenCondition is empty",
                         "",
-                        "The current consumer in the service blacklist. 
consumer: " + NetUtils.getLocalHost()
+                        "The current consumer in the service blocklist. 
consumer: " + NetUtils.getLocalHost()
                                 + ", service: " + url.getServiceKey());
                 if (needToPrintMessage) {
                     messageHolder.set("Empty return. Reason: ThenCondition is 
empty.");
diff --git 
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/DynamicDirectory.java
 
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/DynamicDirectory.java
index 87a1871067..be8c2e74c2 100644
--- 
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/DynamicDirectory.java
+++ 
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/DynamicDirectory.java
@@ -202,7 +202,7 @@ public abstract class DynamicDirectory<T> extends 
AbstractDirectory<T> implement
                             + " for service " + 
getConsumerUrl().getServiceKey() + " on consumer "
                             + NetUtils.getLocalHost()
                             + " use dubbo version " + Version.getVersion()
-                            + ", please check status of providers(disabled, 
not registered or in blacklist).");
+                            + ", please check status of providers(disabled, 
not registered or in blocklist).");
         }
 
         if (multiGroup) {