未验证 提交 336f55c2 编写于 作者: fantow111's avatar fantow111 提交者: GitHub

[ISSUE #2171] fix the spell error in ACL (#2175)

* fix issue#2171

* fix the issue#2171

Co-authored-by: fantow <hahaha>
上级 fac30c35
...@@ -120,7 +120,7 @@ public class AclUtils { ...@@ -120,7 +120,7 @@ public class AclUtils {
} }
} }
public static String[] getAddreeStrArray(String netaddress, String partialAddress) { public static String[] getAddresses(String netaddress, String partialAddress) {
String[] parAddStrArray = StringUtils.split(partialAddress.substring(1, partialAddress.length() - 1), ","); String[] parAddStrArray = StringUtils.split(partialAddress.substring(1, partialAddress.length() - 1), ",");
String address = netaddress.substring(0, netaddress.indexOf("{")); String address = netaddress.substring(0, netaddress.indexOf("{"));
String[] addreeStrArray = new String[parAddStrArray.length]; String[] addreeStrArray = new String[parAddStrArray.length];
......
...@@ -52,14 +52,14 @@ public class RemoteAddressStrategyFactory { ...@@ -52,14 +52,14 @@ public class RemoteAddressStrategyFactory {
if (!last.startsWith("{")) { if (!last.startsWith("{")) {
throw new AclException(String.format("MultipleRemoteAddressStrategy netaddress examine scope Exception netaddress", remoteAddr)); throw new AclException(String.format("MultipleRemoteAddressStrategy netaddress examine scope Exception netaddress", remoteAddr));
} }
return new MultipleRemoteAddressStrategy(AclUtils.getAddreeStrArray(remoteAddr, last)); return new MultipleRemoteAddressStrategy(AclUtils.getAddresses(remoteAddr, last));
} else { } else {
String[] strArray = StringUtils.split(remoteAddr, "."); String[] strArray = StringUtils.split(remoteAddr, ".");
String four = strArray[3]; String four = strArray[3];
if (!four.startsWith("{")) { if (!four.startsWith("{")) {
throw new AclException(String.format("MultipleRemoteAddressStrategy netaddress examine scope Exception netaddress", remoteAddr)); throw new AclException(String.format("MultipleRemoteAddressStrategy netaddress examine scope Exception netaddress", remoteAddr));
} }
return new MultipleRemoteAddressStrategy(AclUtils.getAddreeStrArray(remoteAddr, four)); return new MultipleRemoteAddressStrategy(AclUtils.getAddresses(remoteAddr, four));
} }
} else if (AclUtils.isComma(remoteAddr)) { } else if (AclUtils.isComma(remoteAddr)) {
return new MultipleRemoteAddressStrategy(StringUtils.split(remoteAddr, ",")); return new MultipleRemoteAddressStrategy(StringUtils.split(remoteAddr, ","));
......
...@@ -32,9 +32,9 @@ import org.junit.Test; ...@@ -32,9 +32,9 @@ import org.junit.Test;
public class AclUtilsTest { public class AclUtilsTest {
@Test @Test
public void getAddreeStrArray() { public void getAddresses() {
String address = "1.1.1.{1,2,3,4}"; String address = "1.1.1.{1,2,3,4}";
String[] addressArray = AclUtils.getAddreeStrArray(address, "{1,2,3,4}"); String[] addressArray = AclUtils.getAddresses(address, "{1,2,3,4}");
List<String> newAddressList = new ArrayList<>(); List<String> newAddressList = new ArrayList<>();
for (String a : addressArray) { for (String a : addressArray) {
newAddressList.add(a); newAddressList.add(a);
...@@ -49,7 +49,7 @@ public class AclUtilsTest { ...@@ -49,7 +49,7 @@ public class AclUtilsTest {
// IPv6 test // IPv6 test
String ipv6Address = "1:ac41:9987::bb22:666:{1,2,3,4}"; String ipv6Address = "1:ac41:9987::bb22:666:{1,2,3,4}";
String[] ipv6AddressArray = AclUtils.getAddreeStrArray(ipv6Address, "{1,2,3,4}"); String[] ipv6AddressArray = AclUtils.getAddresses(ipv6Address, "{1,2,3,4}");
List<String> newIPv6AddressList = new ArrayList<>(); List<String> newIPv6AddressList = new ArrayList<>();
for (String a : ipv6AddressArray) { for (String a : ipv6AddressArray) {
newIPv6AddressList.add(a); newIPv6AddressList.add(a);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册