Merge branch 'develop'

Author: tigerweili

.travis.yml

@@ -18,8 +18,11 @@ matrix:
   # On Linux we install latest OpenJDK 1.8 from Ubuntu repositories
   - name: Linux x86_64
     arch: amd64
-#  - name: Linux aarch64
-#    arch: arm64
+  - name: Linux aarch64
+    dist: focal
+    arch: arm64-graviton2
+    group: edge
+    virt: vm
 
 cache:
   directories:
@@ -45,11 +48,11 @@ before_script:
   - ulimit -c unlimited
 
 script:
-  - mvn verify -DskipTests
+  - mvn -B verify -DskipTests
   - travis_retry mvn -B clean apache-rat:check
-  - travis_retry mvn -B package jacoco:report coveralls:report
+  - travis_retry mvn -B install jacoco:report coveralls:report
+  - travis_retry mvn -B clean install -pl test -Pit-test
 
 after_success:
-  - mvn clean install -Pit-test
   - mvn sonar:sonar -Psonar-apache
   - bash <(curl -s https://codecov.io/bash) || echo 'Codecov failed to upload'

README.md

@@ -18,7 +18,7 @@ It offers a variety of features:
 * A variety of cross language clients, such as Java, [C/C++](https://github.com/apache/rocketmq-client-cpp), [Python](https://github.com/apache/rocketmq-client-python), [Go](https://github.com/apache/rocketmq-client-go), [Node.js](https://github.com/apache/rocketmq-client-nodejs)
 * Pluggable transport protocols, such as TCP, SSL, AIO
 * Built-in message tracing capability, also support opentracing
-* Versatile big-data and streaming ecosytem integration
+* Versatile big-data and streaming ecosystem integration
 * Message retroactivity by time or offset
 * Reliable FIFO and strict ordered messaging in the same queue
 * Efficient pull and push consumption model
@@ -31,9 +31,23 @@ It offers a variety of features:
 * Feature-rich administrative dashboard for configuration, metrics and monitoring
 * Authentication and authorization
 * Free open source connectors, for both sources and sinks
-
+* Lightweight real-time computing
 ----------
 
+## Apache RocketMQ Community
+* [RocketMQ Streams](https://github.com/apache/rocketmq-streams)
+* [RocketMQ Flink](https://github.com/apache/rocketmq-flink)
+* [RocketMQ Client CPP](https://github.com/apache/rocketmq-client-cpp)
+* [RocketMQ Client Go](https://github.com/apache/rocketmq-client-go)
+* [RocketMQ Client Python](https://github.com/apache/rocketmq-client-python)
+* [RocketMQ Client Nodejs](https://github.com/apache/rocketmq-client-nodejs)
+* [RocketMQ Spring](https://github.com/apache/rocketmq-spring)
+* [RocketMQ Exporter](https://github.com/apache/rocketmq-exporter)
+* [RocketMQ Operator](https://github.com/apache/rocketmq-operator)
+* [RocketMQ Docker](https://github.com/apache/rocketmq-docker)
+* [RocketMQ Incubating Community Projects](https://github.com/apache/rocketmq-externals)
+
+----------
 ## Learn it & Contact us
 * Mailing Lists: <https://rocketmq.apache.org/about/contact/>
 * Home: <https://rocketmq.apache.org>
@@ -46,9 +60,7 @@ It offers a variety of features:
 
 ----------
 
-## Apache RocketMQ Community
-* [RocketMQ Community Projects](https://github.com/apache/rocketmq-externals)
-----------
+
 
 ## Contributing
 We always welcome new contributions, whether for trivial cleanups, [big new features](https://github.com/apache/rocketmq/wiki/RocketMQ-Improvement-Proposal) or other material rewards, more details see [here](http://rocketmq.apache.org/docs/how-to-contribute/).

acl/pom.xml

@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.apache.rocketmq</groupId>
         <artifactId>rocketmq-all</artifactId>
-        <version>4.9.3-SNAPSHOT</version>
+        <version>4.9.4-SNAPSHOT</version>
     </parent>
     <artifactId>rocketmq-acl</artifactId>
     <name>rocketmq-acl ${project.version}</name>

acl/src/main/java/org/apache/rocketmq/acl/AccessValidator.java

@@ -18,7 +18,10 @@
 package org.apache.rocketmq.acl;
 
 import java.util.List;
+import java.util.Map;
+
 import org.apache.rocketmq.common.AclConfig;
+import org.apache.rocketmq.common.DataVersion;
 import org.apache.rocketmq.common.PlainAccessConfig;
 import org.apache.rocketmq.remoting.protocol.RemotingCommand;
 
@@ -60,17 +63,27 @@ public interface AccessValidator {
      *
      * @return
      */
+    @Deprecated
     String getAclConfigVersion();
 
     /**
      * Update globalWhiteRemoteAddresses in acl yaml config file
+     *
      * @return
      */
     boolean updateGlobalWhiteAddrsConfig(List<String> globalWhiteAddrsList);
 
     /**
      * get broker cluster acl config information
+     *
      * @return
      */
     AclConfig getAllAclConfig();
+
+    /**
+     * get all access resource config version information
+     *
+     * @return
+     */
+    Map<String, DataVersion> getAllAclConfigVersion();
 }

acl/src/main/java/org/apache/rocketmq/acl/common/AclUtils.java

@@ -163,7 +163,7 @@ public static boolean isColon(String netaddress) {
     }
 
     public static boolean isScope(String num) {
-        return isScope(Integer.valueOf(num.trim()));
+        return isScope(Integer.parseInt(num.trim()));
     }
 
     public static boolean isScope(int num) {

acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAccessValidator.java

@@ -27,6 +27,7 @@
 import org.apache.rocketmq.acl.common.Permission;
 import org.apache.rocketmq.acl.common.SessionCredentials;
 import org.apache.rocketmq.common.AclConfig;
+import org.apache.rocketmq.common.DataVersion;
 import org.apache.rocketmq.common.MixAll;
 import org.apache.rocketmq.common.PlainAccessConfig;
 import org.apache.rocketmq.common.protocol.RequestCode;
@@ -127,7 +128,7 @@ public AccessResource parse(RemotingCommand request, String remoteAddr) {
         SortedMap<String, String> map = new TreeMap<String, String>();
         for (Map.Entry<String, String> entry : request.getExtFields().entrySet()) {
             if (!SessionCredentials.SIGNATURE.equals(entry.getKey())
-                    && !MixAll.UNIQUE_MSG_QUERY_FLAG.equals(entry.getKey())) {
+                && !MixAll.UNIQUE_MSG_QUERY_FLAG.equals(entry.getKey())) {
                 map.put(entry.getKey(), entry.getValue());
             }
         }
@@ -150,7 +151,7 @@ public boolean deleteAccessConfig(String accesskey) {
         return aclPlugEngine.deleteAccessConfig(accesskey);
     }
 
-    @Override public String getAclConfigVersion() {
+    @Override public String  getAclConfigVersion() {
         return aclPlugEngine.getAclConfigDataVersion();
     }
 
@@ -161,4 +162,18 @@ public boolean deleteAccessConfig(String accesskey) {
     @Override public AclConfig getAllAclConfig() {
         return aclPlugEngine.getAllAclConfig();
     }
+    
+    public Map<String, Object> createAclAccessConfigMap(Map<String, Object> existedAccountMap,
+        PlainAccessConfig plainAccessConfig) {
+        return aclPlugEngine.createAclAccessConfigMap(existedAccountMap, plainAccessConfig);
+    }
+
+    public Map<String, Object> updateAclConfigFileVersion(Map<String, Object> updateAclConfigMap) {
+        return aclPlugEngine.updateAclConfigFileVersion(updateAclConfigMap);
+    }
+
+    @Override
+    public Map<String, DataVersion> getAllAclConfigVersion() {
+        return aclPlugEngine.getDataVersionMap();
+    }
 }