Merge pull request #3322 from 844392610/develop_xm

[ISSUE #3347] Improve performance of expandIP, and readable

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

@@ -206,64 +206,35 @@ public class AclUtils {
     }
 
     public static String expandIP(String netaddress, int part) {
-        boolean compress = false;
-        int compressIndex = -1;
-        String[] strArray = StringUtils.split(netaddress, ":");
-        ArrayList<Integer> indexes = new ArrayList<>();
-        for (int i = 0; i < netaddress.length(); i++) {
-            if (netaddress.charAt(i) == ':') {
-                if (indexes.size() > 0 && i - indexes.get(indexes.size() - 1) == 1) {
-                    compressIndex = i;
-                    compress = true;
-                }
-                indexes.add(i);
+        netaddress = netaddress.toUpperCase();
+        // expand netaddress
+        int separatorCount = StringUtils.countMatches(netaddress, ":");
+        int padCount = part - separatorCount;
+        if(padCount > 0){
+            StringBuilder padStr = new StringBuilder(":");
+            for(int i = 0; i < padCount; i++){
+                padStr.append(":");
             }
+            netaddress = StringUtils.replace(netaddress, "::", padStr.toString());
         }
 
+        // pad netaddress
+        String[] strArray = StringUtils.splitPreserveAllTokens(netaddress, ":");
         for (int i = 0; i < strArray.length; i++) {
-            if (strArray[i].length() < 4) {
-                strArray[i] = "0000".substring(0, 4 - strArray[i].length()) + strArray[i];
+            if(strArray[i].length() < 4){
+                strArray[i] = StringUtils.leftPad(strArray[i], 4, '0');
             }
         }
 
+        // output
         StringBuilder sb = new StringBuilder();
-        if (compress) {
-            int pos = indexes.indexOf(compressIndex);
-            int index = 0;
-            if (!netaddress.startsWith(":")) {
-                for (int i = 0; i < pos; i++) {
-                    sb.append(strArray[index]).append(":");
-                    index += 1;
-                }
-            }
-            int zeroNum = part - strArray.length;
-            if (netaddress.endsWith(":")) {
-                for (int i = 0; i < zeroNum; i++) {
-                    sb.append("0000");
-                    if (i != zeroNum - 1) {
-                        sb.append(":");
-                    }
-                }
-            } else {
-                for (int i = 0; i < zeroNum; i++) {
-                    sb.append("0000").append(":");
-                }
-                for (int i = index; i < strArray.length; i++) {
-                    sb.append(strArray[i]);
-                    if (i != strArray.length - 1) {
-                        sb.append(":");
-                    }
-                }
-            }
-        } else {
-            for (int i = 0; i < strArray.length; i++) {
-                sb.append(strArray[i]);
-                if (i != strArray.length - 1) {
-                    sb.append(":");
-                }
+        for (int i = 0; i < strArray.length; i++) {
+            sb.append(strArray[i]);
+            if (i != strArray.length - 1) {
+                sb.append(":");
             }
         }
-        return sb.toString().toUpperCase();
+        return sb.toString();
     }
 
     public static <T> T getYamlDataObject(String path, Class<T> clazz) {
@@ -308,7 +279,7 @@ public class AclUtils {
         JSONObject yamlDataObject = null;
         try {
             yamlDataObject = AclUtils.getYamlDataObject(fileName,
-                JSONObject.class);
+                    JSONObject.class);
         } catch (Exception e) {
             log.error("Convert yaml file to data object error, ", e);
             return null;

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

@@ -202,6 +202,7 @@ public class AclUtilsTest {
 
     @Test
     public void expandIPTest() {
+        Assert.assertEquals(AclUtils.expandIP("::", 8), "0000:0000:0000:0000:0000:0000:0000:0000");
         Assert.assertEquals(AclUtils.expandIP("::1", 8), "0000:0000:0000:0000:0000:0000:0000:0001");
         Assert.assertEquals(AclUtils.expandIP("3::", 8), "0003:0000:0000:0000:0000:0000:0000:0000");
         Assert.assertEquals(AclUtils.expandIP("2::2", 8), "0002:0000:0000:0000:0000:0000:0000:0002");