[rocketmq] branch develop updated: [ISSUE #2196] code style(acl): correct spell mistake, remove redundant code (#2197)

[vongosling]

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

vongosling 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 e58a6b2  [ISSUE #2196] code style(acl): correct spell mistake, remove 
redundant code (#2197)
e58a6b2 is described below

commit e58a6b2a0120124226da13464010c71b3b3af6c2
Author: 张旭 <maixiaoha...@gmail.com>
AuthorDate: Wed Jul 29 11:49:30 2020 +0800

    [ISSUE #2196] code style(acl): correct spell mistake, remove redundant code 
(#2197)
    
    * code style(acl): correct spell mistake, remove redundant code
    * refine
    Co-authored-by: zhangxu16 <zhangx...@xiaomi.com>
---
 .../java/org/apache/rocketmq/acl/common/Permission.java     |  1 -
 .../apache/rocketmq/acl/plain/PlainPermissionManager.java   | 13 ++++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/acl/src/main/java/org/apache/rocketmq/acl/common/Permission.java 
b/acl/src/main/java/org/apache/rocketmq/acl/common/Permission.java
index 0acc8e9..8ceb135 100644
--- a/acl/src/main/java/org/apache/rocketmq/acl/common/Permission.java
+++ b/acl/src/main/java/org/apache/rocketmq/acl/common/Permission.java
@@ -65,7 +65,6 @@ public class Permission {
             case "SUB":
                 return Permission.SUB;
             case "PUB|SUB":
-                return Permission.PUB | Permission.SUB;
             case "SUB|PUB":
                 return Permission.PUB | Permission.SUB;
             case "DENY":
diff --git 
a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java 
b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java
index 89638f6..c182d7e 100644
--- 
a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java
+++ 
b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java
@@ -73,7 +73,7 @@ public class PlainPermissionManager {
         JSONObject plainAclConfData = AclUtils.getYamlDataObject(fileHome + 
File.separator + fileName,
             JSONObject.class);
         if (plainAclConfData == null || plainAclConfData.isEmpty()) {
-            throw new AclException(String.format("%s file  is not data", 
fileHome + File.separator + fileName));
+            throw new AclException(String.format("%s file is not data", 
fileHome + File.separator + fileName));
         }
         log.info("Broker plain acl conf data is : ", 
plainAclConfData.toString());
         JSONArray globalWhiteRemoteAddressesList = 
plainAclConfData.getJSONArray("globalWhiteRemoteAddresses");
@@ -164,14 +164,13 @@ public class PlainPermissionManager {
         return false;
     }
 
-    private Map<String, Object> createAclAccessConfigMap(Map<String, Object> 
existedAccoutMap, PlainAccessConfig plainAccessConfig) {
-
-
+    private Map<String, Object> createAclAccessConfigMap(Map<String, Object> 
existedAccountMap, PlainAccessConfig plainAccessConfig) {
+        
         Map<String, Object> newAccountsMap = null;
-        if (existedAccoutMap == null) {
+        if (existedAccountMap == null) {
             newAccountsMap = new LinkedHashMap<String, Object>();
         } else {
-            newAccountsMap = existedAccoutMap;
+            newAccountsMap = existedAccountMap;
         }
 
         if (StringUtils.isEmpty(plainAccessConfig.getAccessKey()) ||
@@ -278,7 +277,7 @@ public class PlainPermissionManager {
         JSONObject plainAclConfData = AclUtils.getYamlDataObject(fileHome + 
File.separator + fileName,
                 JSONObject.class);
         if (plainAclConfData == null || plainAclConfData.isEmpty()) {
-            throw new AclException(String.format("%s file  is not data", 
fileHome + File.separator + fileName));
+            throw new AclException(String.format("%s file is not data", 
fileHome + File.separator + fileName));
         }
         JSONArray globalWhiteAddrs = 
plainAclConfData.getJSONArray(AclConstants.CONFIG_GLOBAL_WHITE_ADDRS);
         if (globalWhiteAddrs != null && !globalWhiteAddrs.isEmpty()) {