[rocketmq] branch develop updated: [ISSUE #5288] Fix default loading mechanism of AccessValidator

[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 0c73f1596 [ISSUE #5288] Fix default loading mechanism of 
AccessValidator
0c73f1596 is described below

commit 0c73f1596bcba63f244b064255d00a6fff1a8144
Author: caigy <csgyt...@163.com>
AuthorDate: Fri Oct 14 15:11:12 2022 +0800

    [ISSUE #5288] Fix default loading mechanism of AccessValidator
---
 .../src/main/java/org/apache/rocketmq/broker/BrokerController.java   | 5 +++--
 .../META-INF/service/org.apache.rocketmq.acl.AccessValidator         | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java 
b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
index 61098a178..9e4ee83eb 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
@@ -44,6 +44,7 @@ import java.util.stream.Collectors;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.acl.AccessValidator;
+import org.apache.rocketmq.acl.plain.PlainAccessValidator;
 import org.apache.rocketmq.broker.client.ClientHousekeepingService;
 import org.apache.rocketmq.broker.client.ConsumerIdsChangeListener;
 import org.apache.rocketmq.broker.client.ConsumerManager;
@@ -916,8 +917,8 @@ public class BrokerController {
 
         List<AccessValidator> accessValidators = 
ServiceProvider.load(ServiceProvider.ACL_VALIDATOR_ID, AccessValidator.class);
         if (accessValidators.isEmpty()) {
-            LOG.info("The broker dose not load the AccessValidator");
-            return;
+            LOG.info("ServiceProvider loaded no AccessValidator, using default 
org.apache.rocketmq.acl.plain.PlainAccessValidator");
+            accessValidators.add(new PlainAccessValidator());
         }
 
         for (AccessValidator accessValidator : accessValidators) {
diff --git 
a/broker/src/main/resources/META-INF/service/org.apache.rocketmq.acl.AccessValidator
 
b/broker/src/main/resources/META-INF/service/org.apache.rocketmq.acl.AccessValidator
deleted file mode 100644
index 1abc92e01..000000000
--- 
a/broker/src/main/resources/META-INF/service/org.apache.rocketmq.acl.AccessValidator
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.rocketmq.acl.plain.PlainAccessValidator
\ No newline at end of file