Merge a2c96fd into 6f5cd4a

.travis.yml

@@ -7,7 +7,7 @@ notifications:
     if: branch = develop OR branch = master
   on_success: change
   on_failure: always
-  
+
 
 language: java
 
@@ -48,7 +48,7 @@ before_script:
   - ulimit -c unlimited
 
 script:
-  - mvn -B verify -DskipTests
+  - mvn verify -DskipTests
   - travis_retry mvn -B clean apache-rat:check
   - travis_retry mvn -B install jacoco:report coveralls:report
   - travis_retry mvn -B clean install -pl test -Pit-test

acl/pom.xml

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

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

@@ -20,9 +20,11 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.nio.channels.FileChannel;
 import java.util.Map;
 import java.util.SortedMap;
 import org.apache.commons.lang3.StringUtils;
@@ -274,6 +276,43 @@ public static boolean writeDataObject(String path, Map<String, Object> dataMap)
         return true;
     }
 
+    public static boolean copyFile(String from, String to) {
+        FileChannel input = null;
+        FileChannel output = null;
+        try {
+            input = new FileInputStream(new File(from)).getChannel();
+            output = new FileOutputStream(new File(to)).getChannel();
+            output.transferFrom(input, 0, input.size());
+            return true;
+        } catch (Exception e) {
+            log.error("file copy error. from={}, to={}", from, to, e);
+        } finally {
+            closeFileChannel(input);
+            closeFileChannel(output);
+        }
+        return false;
+    }
+
+    public static boolean moveFile(String from, String to) {
+        try {
+            File file = new File(from);
+            return file.renameTo(new File(to));
+        } catch (Exception e) {
+            log.error("file move error. from={}, to={}", from, to, e);
+        }
+        return false;
+    }
+
+    private static void closeFileChannel(FileChannel fileChannel) {
+        if (fileChannel != null) {
+            try {
+                fileChannel.close();
+            } catch (IOException e) {
+                log.error("Close file channel error.", e);
+            }
+        }
+    }
+
     public static RPCHook getAclRPCHook(String fileName) {
         JSONObject yamlDataObject = null;
         try {

acl/src/test/java/org/apache/rocketmq/acl/common/AclUtilsTest.java

@@ -311,4 +311,25 @@ public void getAclRPCHookTest() {
         Assert.assertNull(incompleteContRPCHook);
     }
 
+    @Test
+    public void testCopyAndMoveFile() {
+        String path = "src/test/resources/conf/plain_acl.yml";
+        String backupPath = "src/test/resources/conf/plain_acl.yml_backup";
+        Map<String, Object> aclYamlData = AclUtils.getYamlDataObject(path, Map.class);
+
+        AclUtils.copyFile(path, backupPath);
+        Assert.assertEquals(aclYamlData, AclUtils.getYamlDataObject(backupPath, Map.class));
+
+        Map<String, Object> aclYamlMap = new HashMap<String, Object>();
+        List<String> globalWhiteRemoteAddrs = new ArrayList<String>();
+        globalWhiteRemoteAddrs.add("10.10.103.*");
+        globalWhiteRemoteAddrs.add("192.168.0.*");
+        aclYamlMap.put("globalWhiteRemoteAddrs", globalWhiteRemoteAddrs);
+        AclUtils.writeDataObject(path, aclYamlMap);
+        Assert.assertNotEquals(aclYamlData, AclUtils.getYamlDataObject(path, Map.class));
+
+        AclUtils.moveFile(backupPath, path);
+        Assert.assertEquals(aclYamlData, AclUtils.getYamlDataObject(path, Map.class));
+    }
+
 }

acl/src/test/resources/conf/plain_acl.yml

@@ -18,7 +18,6 @@
 globalWhiteRemoteAddresses:
 - 10.10.103.*
 - 192.168.0.*
-
 accounts:
 - accessKey: RocketMQ
   secretKey: 12345678
@@ -31,14 +30,10 @@ accounts:
   - topicB=PUB|SUB
   - topicC=SUB
   groupPerms:
-  # the group should convert to retry topic
   - groupA=DENY
   - groupB=SUB
   - groupC=SUB
-
 - accessKey: rocketmq2
   secretKey: 12345678
   whiteRemoteAddress: 192.168.1.*
-  # if it is admin, it could access all resources
   admin: true
-

broker/pom.xml

@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.apache.rocketmq</groupId>
         <artifactId>rocketmq-all</artifactId>
-        <version>4.9.5-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -50,6 +50,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>rocketmq-acl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
@@ -70,6 +74,10 @@
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
+            <artifactId>concurrentlinkedhashmap-lru</artifactId>
+        </dependency>
     </dependencies>
 
     <build>