未验证 提交 0748aa0a 编写于 作者: youlixishia's avatar youlixishia 提交者: GitHub

Merge pull request #3322 from 844392610/develop_xm

[ISSUE #3347] Improve performance of expandIP, and readable
...@@ -206,64 +206,35 @@ public class AclUtils { ...@@ -206,64 +206,35 @@ public class AclUtils {
} }
public static String expandIP(String netaddress, int part) { public static String expandIP(String netaddress, int part) {
boolean compress = false; netaddress = netaddress.toUpperCase();
int compressIndex = -1; // expand netaddress
String[] strArray = StringUtils.split(netaddress, ":"); int separatorCount = StringUtils.countMatches(netaddress, ":");
ArrayList<Integer> indexes = new ArrayList<>(); int padCount = part - separatorCount;
for (int i = 0; i < netaddress.length(); i++) { if(padCount > 0){
if (netaddress.charAt(i) == ':') { StringBuilder padStr = new StringBuilder(":");
if (indexes.size() > 0 && i - indexes.get(indexes.size() - 1) == 1) { for(int i = 0; i < padCount; i++){
compressIndex = i; padStr.append(":");
compress = true;
}
indexes.add(i);
} }
netaddress = StringUtils.replace(netaddress, "::", padStr.toString());
} }
// pad netaddress
String[] strArray = StringUtils.splitPreserveAllTokens(netaddress, ":");
for (int i = 0; i < strArray.length; i++) { for (int i = 0; i < strArray.length; i++) {
if (strArray[i].length() < 4) { if(strArray[i].length() < 4){
strArray[i] = "0000".substring(0, 4 - strArray[i].length()) + strArray[i]; strArray[i] = StringUtils.leftPad(strArray[i], 4, '0');
} }
} }
// output
StringBuilder sb = new StringBuilder(); 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++) { for (int i = 0; i < strArray.length; i++) {
sb.append(strArray[i]); sb.append(strArray[i]);
if (i != strArray.length - 1) { if (i != strArray.length - 1) {
sb.append(":"); sb.append(":");
} }
} }
} return sb.toString();
return sb.toString().toUpperCase();
} }
public static <T> T getYamlDataObject(String path, Class<T> clazz) { public static <T> T getYamlDataObject(String path, Class<T> clazz) {
......
...@@ -202,6 +202,7 @@ public class AclUtilsTest { ...@@ -202,6 +202,7 @@ public class AclUtilsTest {
@Test @Test
public void expandIPTest() { 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("::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("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"); Assert.assertEquals(AclUtils.expandIP("2::2", 8), "0002:0000:0000:0000:0000:0000:0000:0002");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册