From 87d85991b9e54325223714201ec30edc2f68b654 Mon Sep 17 00:00:00 2001 From: dongeforever Date: Mon, 3 Dec 2018 22:36:47 +0800 Subject: [PATCH] Rename some files in acl --- .../acl/plain/AclPlugRuntimeException.java | 4 + .../acl/plain/AuthenticationInfo.java | 19 +-- .../acl/plain/AuthenticationResult.java | 2 + .../acl/plain/BrokerAccessControl.java | 1 + .../acl/plain/PlainAccessValidator.java | 4 +- ...Engine.java => PlainPermissionLoader.java} | 18 +-- ...rategy.java => RemoteAddressStrategy.java} | 2 +- ...java => RemoteAddressStrategyFactory.java} | 34 ++--- .../acl/plain/PlainAclPlugEngineTest.java | 118 +++++++++--------- ...st.java => RemoteAddressStrategyTest.java} | 94 +++++++------- 10 files changed, 152 insertions(+), 144 deletions(-) rename acl/src/main/java/org/apache/rocketmq/acl/plain/{PlainAclPlugEngine.java => PlainPermissionLoader.java} (94%) rename acl/src/main/java/org/apache/rocketmq/acl/plain/{NetaddressStrategy.java => RemoteAddressStrategy.java} (95%) rename acl/src/main/java/org/apache/rocketmq/acl/plain/{NetaddressStrategyFactory.java => RemoteAddressStrategyFactory.java} (77%) rename acl/src/test/java/org/apache/rocketmq/acl/plain/{NetaddressStrategyTest.java => RemoteAddressStrategyTest.java} (53%) diff --git a/acl/src/main/java/org/apache/rocketmq/acl/plain/AclPlugRuntimeException.java b/acl/src/main/java/org/apache/rocketmq/acl/plain/AclPlugRuntimeException.java index d13a29f9..29c06d5d 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/plain/AclPlugRuntimeException.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/plain/AclPlugRuntimeException.java @@ -16,6 +16,10 @@ */ package org.apache.rocketmq.acl.plain; +/** + * Use AclException instead + */ +@Deprecated public class AclPlugRuntimeException extends RuntimeException { private static final long serialVersionUID = 6062101368637228900L; diff --git a/acl/src/main/java/org/apache/rocketmq/acl/plain/AuthenticationInfo.java b/acl/src/main/java/org/apache/rocketmq/acl/plain/AuthenticationInfo.java index 009ca30f..7ff22508 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/plain/AuthenticationInfo.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/plain/AuthenticationInfo.java @@ -20,20 +20,21 @@ import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; +@Deprecated public class AuthenticationInfo { private PlainAccessResource plainAccessResource; - private NetaddressStrategy netaddressStrategy; + private RemoteAddressStrategy remoteAddressStrategy; private Map authority; public AuthenticationInfo(Map authority, PlainAccessResource plainAccessResource, - NetaddressStrategy netaddressStrategy) { + RemoteAddressStrategy remoteAddressStrategy) { super(); this.authority = authority; this.plainAccessResource = plainAccessResource; - this.netaddressStrategy = netaddressStrategy; + this.remoteAddressStrategy = remoteAddressStrategy; } public PlainAccessResource getPlainAccessResource() { @@ -44,12 +45,12 @@ public class AuthenticationInfo { this.plainAccessResource = plainAccessResource; } - public NetaddressStrategy getNetaddressStrategy() { - return netaddressStrategy; + public RemoteAddressStrategy getRemoteAddressStrategy() { + return remoteAddressStrategy; } - public void setNetaddressStrategy(NetaddressStrategy netaddressStrategy) { - this.netaddressStrategy = netaddressStrategy; + public void setRemoteAddressStrategy(RemoteAddressStrategy remoteAddressStrategy) { + this.remoteAddressStrategy = remoteAddressStrategy; } public Map getAuthority() { @@ -63,8 +64,8 @@ public class AuthenticationInfo { @Override public String toString() { StringBuilder builder = new StringBuilder(); - builder.append("AuthenticationInfo [plainAccessResource=").append(plainAccessResource).append(", netaddressStrategy=") - .append(netaddressStrategy).append(", authority={"); + builder.append("AuthenticationInfo [plainAccessResource=").append(plainAccessResource).append(", remoteAddressStrategy=") + .append(remoteAddressStrategy).append(", authority={"); Iterator> it = authority.entrySet().iterator(); while (it.hasNext()) { Entry e = it.next(); diff --git a/acl/src/main/java/org/apache/rocketmq/acl/plain/AuthenticationResult.java b/acl/src/main/java/org/apache/rocketmq/acl/plain/AuthenticationResult.java index 18f98447..68eb05d1 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/plain/AuthenticationResult.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/plain/AuthenticationResult.java @@ -16,6 +16,8 @@ */ package org.apache.rocketmq.acl.plain; + +@Deprecated public class AuthenticationResult { private PlainAccessResource plainAccessResource; diff --git a/acl/src/main/java/org/apache/rocketmq/acl/plain/BrokerAccessControl.java b/acl/src/main/java/org/apache/rocketmq/acl/plain/BrokerAccessControl.java index a1d5db03..cfb59e59 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/plain/BrokerAccessControl.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/plain/BrokerAccessControl.java @@ -19,6 +19,7 @@ package org.apache.rocketmq.acl.plain; import java.util.HashSet; import java.util.Set; +@Deprecated public class BrokerAccessControl extends PlainAccessResource { private boolean admin; diff --git a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAccessValidator.java b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAccessValidator.java index b38bcfe7..57ece527 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAccessValidator.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAccessValidator.java @@ -38,10 +38,10 @@ import static org.apache.rocketmq.acl.plain.PlainAccessResource.getRetryTopic; public class PlainAccessValidator implements AccessValidator { - private PlainAclPlugEngine aclPlugEngine; + private PlainPermissionLoader aclPlugEngine; public PlainAccessValidator() { - aclPlugEngine = new PlainAclPlugEngine(); + aclPlugEngine = new PlainPermissionLoader(); } @Override diff --git a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAclPlugEngine.java b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionLoader.java similarity index 94% rename from acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAclPlugEngine.java rename to acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionLoader.java index 73b76ccb..0ef01374 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAclPlugEngine.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionLoader.java @@ -40,7 +40,7 @@ import org.apache.rocketmq.common.protocol.RequestCode; import org.apache.rocketmq.logging.InternalLogger; import org.apache.rocketmq.logging.InternalLoggerFactory; -public class PlainAclPlugEngine { +public class PlainPermissionLoader { private static final InternalLogger log = InternalLoggerFactory.getLogger(LoggerName.ACL_PLUG_LOGGER_NAME); @@ -51,7 +51,7 @@ public class PlainAclPlugEngine { private AuthenticationInfo authenticationInfo; - private NetaddressStrategyFactory netaddressStrategyFactory = new NetaddressStrategyFactory(); + private RemoteAddressStrategyFactory remoteAddressStrategyFactory = new RemoteAddressStrategyFactory(); private AccessContralAnalysis accessContralAnalysis = new AccessContralAnalysis(); @@ -59,7 +59,7 @@ public class PlainAclPlugEngine { private boolean isWatchStart; - public PlainAclPlugEngine() { + public PlainPermissionLoader() { initialize(); watch(); } @@ -98,7 +98,7 @@ public class PlainAclPlugEngine { if ("transport.yml".equals(event.context().toString()) && (StandardWatchEventKinds.ENTRY_MODIFY.equals(event.kind()) || StandardWatchEventKinds.ENTRY_CREATE.equals(event.kind()))) { log.info("transprot.yml make a difference change is : ", event.toString()); - PlainAclPlugEngine.this.cleanAuthenticationInfo(); + PlainPermissionLoader.this.cleanAuthenticationInfo(); initialize(); } } @@ -151,14 +151,14 @@ public class PlainAclPlugEngine { } try { handleAccessControl(plainAccessResource); - NetaddressStrategy netaddressStrategy = netaddressStrategyFactory.getNetaddressStrategy(plainAccessResource); + RemoteAddressStrategy remoteAddressStrategy = remoteAddressStrategyFactory.getNetaddressStrategy(plainAccessResource); List accessControlAddressList = accessControlMap.get(plainAccessResource.getAccessKey()); if (accessControlAddressList == null) { accessControlAddressList = new ArrayList<>(); accessControlMap.put(plainAccessResource.getAccessKey(), accessControlAddressList); } AuthenticationInfo authenticationInfo = new AuthenticationInfo( - accessContralAnalysis.analysis(plainAccessResource), plainAccessResource, netaddressStrategy); + accessContralAnalysis.analysis(plainAccessResource), plainAccessResource, remoteAddressStrategy); accessControlAddressList.add(authenticationInfo); log.info("authenticationInfo is {}", authenticationInfo.toString()); } catch (Exception e) { @@ -175,7 +175,7 @@ public class PlainAclPlugEngine { public void setNetaddressAccessControl(PlainAccessResource plainAccessResource) throws AclPlugRuntimeException { try { - authenticationInfo = new AuthenticationInfo(accessContralAnalysis.analysis(plainAccessResource), plainAccessResource, netaddressStrategyFactory.getNetaddressStrategy(plainAccessResource)); + authenticationInfo = new AuthenticationInfo(accessContralAnalysis.analysis(plainAccessResource), plainAccessResource, remoteAddressStrategyFactory.getNetaddressStrategy(plainAccessResource)); log.info("default authenticationInfo is {}", authenticationInfo.toString()); } catch (Exception e) { throw new AclPlugRuntimeException(plainAccessResource.toString(), e); @@ -185,12 +185,12 @@ public class PlainAclPlugEngine { public AuthenticationInfo getAccessControl(PlainAccessResource plainAccessResource) { if (plainAccessResource.getAccessKey() == null && authenticationInfo != null) { - return authenticationInfo.getNetaddressStrategy().match(plainAccessResource) ? authenticationInfo : null; + return authenticationInfo.getRemoteAddressStrategy().match(plainAccessResource) ? authenticationInfo : null; } else { List accessControlAddressList = accessControlMap.get(plainAccessResource.getAccessKey()); if (accessControlAddressList != null) { for (AuthenticationInfo ai : accessControlAddressList) { - if (ai.getNetaddressStrategy().match(plainAccessResource) && ai.getPlainAccessResource().getSignature().equals(plainAccessResource.getSignature())) { + if (ai.getRemoteAddressStrategy().match(plainAccessResource) && ai.getPlainAccessResource().getSignature().equals(plainAccessResource.getSignature())) { return ai; } } diff --git a/acl/src/main/java/org/apache/rocketmq/acl/plain/NetaddressStrategy.java b/acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategy.java similarity index 95% rename from acl/src/main/java/org/apache/rocketmq/acl/plain/NetaddressStrategy.java rename to acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategy.java index d639c068..60e92960 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/plain/NetaddressStrategy.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategy.java @@ -16,7 +16,7 @@ */ package org.apache.rocketmq.acl.plain; -public interface NetaddressStrategy { +public interface RemoteAddressStrategy { public boolean match(PlainAccessResource plainAccessResource); } diff --git a/acl/src/main/java/org/apache/rocketmq/acl/plain/NetaddressStrategyFactory.java b/acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategyFactory.java similarity index 77% rename from acl/src/main/java/org/apache/rocketmq/acl/plain/NetaddressStrategyFactory.java rename to acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategyFactory.java index 3b20ebe4..fb07a499 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/plain/NetaddressStrategyFactory.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategyFactory.java @@ -21,11 +21,11 @@ import java.util.Set; import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.acl.common.AclUtils; -public class NetaddressStrategyFactory { +public class RemoteAddressStrategyFactory { - public static final NullNetaddressStrategy NULL_NET_ADDRESS_STRATEGY = new NullNetaddressStrategy(); + public static final NullRemoteAddressStrategy NULL_NET_ADDRESS_STRATEGY = new NullRemoteAddressStrategy(); - public NetaddressStrategy getNetaddressStrategy(PlainAccessResource plainAccessResource) { + public RemoteAddressStrategy getNetaddressStrategy(PlainAccessResource plainAccessResource) { String netaddress = plainAccessResource.getRemoteAddr(); if (StringUtils.isBlank(netaddress) || "*".equals(netaddress)) { return NULL_NET_ADDRESS_STRATEGY; @@ -34,19 +34,19 @@ public class NetaddressStrategyFactory { String[] strArray = StringUtils.split(netaddress, "."); String four = strArray[3]; if (!four.startsWith("{")) { - throw new AclPlugRuntimeException(String.format("MultipleNetaddressStrategy netaddress examine scope Exception netaddress", netaddress)); + throw new AclPlugRuntimeException(String.format("MultipleRemoteAddressStrategy netaddress examine scope Exception netaddress", netaddress)); } - return new MultipleNetaddressStrategy(AclUtils.getAddreeStrArray(netaddress, four)); + return new MultipleRemoteAddressStrategy(AclUtils.getAddreeStrArray(netaddress, four)); } else if (AclUtils.isColon(netaddress)) { - return new MultipleNetaddressStrategy(StringUtils.split(netaddress, ",")); + return new MultipleRemoteAddressStrategy(StringUtils.split(netaddress, ",")); } else if (AclUtils.isAsterisk(netaddress) || AclUtils.isMinus(netaddress)) { - return new RangeNetaddressStrategy(netaddress); + return new RangeRemoteAddressStrategy(netaddress); } - return new OneNetaddressStrategy(netaddress); + return new OneRemoteAddressStrategy(netaddress); } - public static class NullNetaddressStrategy implements NetaddressStrategy { + public static class NullRemoteAddressStrategy implements RemoteAddressStrategy { @Override public boolean match(PlainAccessResource plainAccessResource) { return true; @@ -54,11 +54,11 @@ public class NetaddressStrategyFactory { } - public static class MultipleNetaddressStrategy implements NetaddressStrategy { + public static class MultipleRemoteAddressStrategy implements RemoteAddressStrategy { private final Set multipleSet = new HashSet<>(); - public MultipleNetaddressStrategy(String[] strArray) { + public MultipleRemoteAddressStrategy(String[] strArray) { for (String netaddress : strArray) { AclUtils.verify(netaddress, 4); multipleSet.add(netaddress); @@ -72,11 +72,11 @@ public class NetaddressStrategyFactory { } - public static class OneNetaddressStrategy implements NetaddressStrategy { + public static class OneRemoteAddressStrategy implements RemoteAddressStrategy { private String netaddress; - public OneNetaddressStrategy(String netaddress) { + public OneRemoteAddressStrategy(String netaddress) { this.netaddress = netaddress; AclUtils.verify(netaddress, 4); } @@ -88,7 +88,7 @@ public class NetaddressStrategyFactory { } - public static class RangeNetaddressStrategy implements NetaddressStrategy { + public static class RangeRemoteAddressStrategy implements RemoteAddressStrategy { private String head; @@ -98,7 +98,7 @@ public class NetaddressStrategyFactory { private int index; - public RangeNetaddressStrategy(String netaddress) { + public RangeRemoteAddressStrategy(String netaddress) { String[] strArray = StringUtils.split(netaddress, "."); if (analysis(strArray, 2) || analysis(strArray, 3)) { AclUtils.verify(netaddress, index - 1); @@ -117,14 +117,14 @@ public class NetaddressStrategyFactory { setValue(0, 255); } else if (AclUtils.isMinus(value)) { if (value.indexOf("-") == 0) { - throw new AclPlugRuntimeException(String.format("RangeNetaddressStrategy netaddress examine scope Exception value %s ", value)); + throw new AclPlugRuntimeException(String.format("RangeRemoteAddressStrategy netaddress examine scope Exception value %s ", value)); } String[] valueArray = StringUtils.split(value, "-"); this.start = Integer.valueOf(valueArray[0]); this.end = Integer.valueOf(valueArray[1]); if (!(AclUtils.isScope(end) && AclUtils.isScope(start) && start <= end)) { - throw new AclPlugRuntimeException(String.format("RangeNetaddressStrategy netaddress examine scope Exception start is %s , end is %s", start, end)); + throw new AclPlugRuntimeException(String.format("RangeRemoteAddressStrategy netaddress examine scope Exception start is %s , end is %s", start, end)); } } return this.end > 0 ? true : false; diff --git a/acl/src/test/java/org/apache/rocketmq/acl/plain/PlainAclPlugEngineTest.java b/acl/src/test/java/org/apache/rocketmq/acl/plain/PlainAclPlugEngineTest.java index 0ce308a4..20105774 100644 --- a/acl/src/test/java/org/apache/rocketmq/acl/plain/PlainAclPlugEngineTest.java +++ b/acl/src/test/java/org/apache/rocketmq/acl/plain/PlainAclPlugEngineTest.java @@ -26,8 +26,8 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.rocketmq.acl.plain.PlainAclPlugEngine.AccessContralAnalysis; -import org.apache.rocketmq.acl.plain.PlainAclPlugEngine.BrokerAccessControlTransport; +import org.apache.rocketmq.acl.plain.PlainPermissionLoader.AccessContralAnalysis; +import org.apache.rocketmq.acl.plain.PlainPermissionLoader.BrokerAccessControlTransport; import org.apache.rocketmq.common.protocol.RequestCode; import org.junit.Assert; import org.junit.Before; @@ -38,7 +38,7 @@ import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class PlainAclPlugEngineTest { - PlainAclPlugEngine plainAclPlugEngine; + PlainPermissionLoader plainPermissionLoader; AccessContralAnalysis accessContralAnalysis = new AccessContralAnalysis(); @@ -91,10 +91,10 @@ public class PlainAclPlugEngineTest { accessContralAnalysis.analysisClass(RequestCode.class); Map map = accessContralAnalysis.analysis(brokerAccessControl); - authenticationInfo = new AuthenticationInfo(map, brokerAccessControl, NetaddressStrategyFactory.NULL_NET_ADDRESS_STRATEGY); + authenticationInfo = new AuthenticationInfo(map, brokerAccessControl, RemoteAddressStrategyFactory.NULL_NET_ADDRESS_STRATEGY); System.setProperty("rocketmq.home.dir", "src/test/resources"); - plainAclPlugEngine = new PlainAclPlugEngine(); + plainPermissionLoader = new PlainPermissionLoader(); plainAccessResource = new BrokerAccessControl(); plainAccessResource.setAccessKey("rokcetmq"); @@ -113,38 +113,38 @@ public class PlainAclPlugEngineTest { @Test(expected = AclPlugRuntimeException.class) public void accountNullTest() { plainAccessResource.setAccessKey(null); - plainAclPlugEngine.setAccessControl(plainAccessResource); + plainPermissionLoader.setAccessControl(plainAccessResource); } @Test(expected = AclPlugRuntimeException.class) public void accountThanTest() { plainAccessResource.setAccessKey("123"); - plainAclPlugEngine.setAccessControl(plainAccessResource); + plainPermissionLoader.setAccessControl(plainAccessResource); } @Test(expected = AclPlugRuntimeException.class) public void passWordtNullTest() { plainAccessResource.setAccessKey(null); - plainAclPlugEngine.setAccessControl(plainAccessResource); + plainPermissionLoader.setAccessControl(plainAccessResource); } @Test(expected = AclPlugRuntimeException.class) public void passWordThanTest() { plainAccessResource.setAccessKey("123"); - plainAclPlugEngine.setAccessControl(plainAccessResource); + plainPermissionLoader.setAccessControl(plainAccessResource); } @Test(expected = AclPlugRuntimeException.class) public void testPlainAclPlugEngineInit() { System.setProperty("rocketmq.home.dir", ""); - new PlainAclPlugEngine().initialize(); + new PlainPermissionLoader().initialize(); } @Test public void authenticationInfoOfSetAccessControl() { - plainAclPlugEngine.setAccessControl(plainAccessResource); + plainPermissionLoader.setAccessControl(plainAccessResource); - AuthenticationInfo authenticationInfo = plainAclPlugEngine.getAccessControl(plainAccessResource); + AuthenticationInfo authenticationInfo = plainPermissionLoader.getAccessControl(plainAccessResource); PlainAccessResource getPlainAccessResource = authenticationInfo.getPlainAccessResource(); Assert.assertEquals(plainAccessResource, getPlainAccessResource); @@ -156,16 +156,16 @@ public class PlainAclPlugEngineTest { testPlainAccessResource.setRecognition("127.0.0.1:1"); testPlainAccessResource.setAccessKey("rokcetmq1"); - authenticationInfo = plainAclPlugEngine.getAccessControl(testPlainAccessResource); + authenticationInfo = plainPermissionLoader.getAccessControl(testPlainAccessResource); Assert.assertNull(authenticationInfo); testPlainAccessResource.setAccessKey("rokcetmq"); testPlainAccessResource.setSignature("1234567"); - authenticationInfo = plainAclPlugEngine.getAccessControl(testPlainAccessResource); + authenticationInfo = plainPermissionLoader.getAccessControl(testPlainAccessResource); Assert.assertNull(authenticationInfo); testPlainAccessResource.setRemoteAddr("127.0.0.2"); - authenticationInfo = plainAclPlugEngine.getAccessControl(testPlainAccessResource); + authenticationInfo = plainPermissionLoader.getAccessControl(testPlainAccessResource); Assert.assertNull(authenticationInfo); } @@ -176,12 +176,12 @@ public class PlainAclPlugEngineTest { plainAccessResourceList.add(plainAccessResourceTwo); - plainAclPlugEngine.setAccessControlList(plainAccessResourceList); + plainPermissionLoader.setAccessControlList(plainAccessResourceList); - AuthenticationInfo newAccessControl = plainAclPlugEngine.getAccessControl(plainAccessResource); + AuthenticationInfo newAccessControl = plainPermissionLoader.getAccessControl(plainAccessResource); Assert.assertEquals(plainAccessResource, newAccessControl.getPlainAccessResource()); - newAccessControl = plainAclPlugEngine.getAccessControl(plainAccessResourceTwo); + newAccessControl = plainPermissionLoader.getAccessControl(plainAccessResourceTwo); Assert.assertEquals(plainAccessResourceTwo, newAccessControl.getPlainAccessResource()); } @@ -192,16 +192,16 @@ public class PlainAclPlugEngineTest { plainAccessResource.setAccessKey("RocketMQ"); plainAccessResource.setSignature("RocketMQ"); plainAccessResource.setRemoteAddr("127.0.0.1"); - plainAclPlugEngine.setAccessControl(plainAccessResource); - plainAclPlugEngine.setNetaddressAccessControl(plainAccessResource); + plainPermissionLoader.setAccessControl(plainAccessResource); + plainPermissionLoader.setNetaddressAccessControl(plainAccessResource); - AuthenticationInfo authenticationInfo = plainAclPlugEngine.getAccessControl(plainAccessResource); + AuthenticationInfo authenticationInfo = plainPermissionLoader.getAccessControl(plainAccessResource); PlainAccessResource getPlainAccessResource = authenticationInfo.getPlainAccessResource(); Assert.assertEquals(plainAccessResource, getPlainAccessResource); plainAccessResource.setRemoteAddr("127.0.0.2"); - authenticationInfo = plainAclPlugEngine.getAccessControl(plainAccessResource); + authenticationInfo = plainPermissionLoader.getAccessControl(plainAccessResource); Assert.assertNull(authenticationInfo); } @@ -212,7 +212,7 @@ public class PlainAclPlugEngineTest { @Test(expected = AclPlugRuntimeException.class) public void BrokerAccessControlTransportTestNull() { BrokerAccessControlTransport accessControlTransport = new BrokerAccessControlTransport(); - plainAclPlugEngine.setBrokerAccessControlTransport(accessControlTransport); + plainPermissionLoader.setBrokerAccessControlTransport(accessControlTransport); } @Test @@ -222,17 +222,17 @@ public class PlainAclPlugEngineTest { list.add((BrokerAccessControl) this.plainAccessResourceTwo); accessControlTransport.setOnlyNetAddress((BrokerAccessControl) this.plainAccessResource); accessControlTransport.setList(list); - plainAclPlugEngine.setBrokerAccessControlTransport(accessControlTransport); + plainPermissionLoader.setBrokerAccessControlTransport(accessControlTransport); PlainAccessResource plainAccessResource = new BrokerAccessControl(); plainAccessResource.setAccessKey("RocketMQ"); plainAccessResource.setSignature("RocketMQ"); plainAccessResource.setRemoteAddr("127.0.0.1"); - plainAclPlugEngine.setAccessControl(plainAccessResource); - AuthenticationInfo authenticationInfo = plainAclPlugEngine.getAccessControl(plainAccessResource); + plainPermissionLoader.setAccessControl(plainAccessResource); + AuthenticationInfo authenticationInfo = plainPermissionLoader.getAccessControl(plainAccessResource); Assert.assertNotNull(authenticationInfo.getPlainAccessResource()); - authenticationInfo = plainAclPlugEngine.getAccessControl(plainAccessResourceTwo); + authenticationInfo = plainPermissionLoader.getAccessControl(plainAccessResourceTwo); Assert.assertEquals(plainAccessResourceTwo, authenticationInfo.getPlainAccessResource()); } @@ -242,45 +242,45 @@ public class PlainAclPlugEngineTest { AuthenticationResult authenticationResult = new AuthenticationResult(); plainAccessResource.setRequestCode(317); - boolean isReturn = plainAclPlugEngine.authentication(authenticationInfo, plainAccessResource, authenticationResult); + boolean isReturn = plainPermissionLoader.authentication(authenticationInfo, plainAccessResource, authenticationResult); Assert.assertTrue(isReturn); plainAccessResource.setRequestCode(321); - isReturn = plainAclPlugEngine.authentication(authenticationInfo, plainAccessResource, authenticationResult); + isReturn = plainPermissionLoader.authentication(authenticationInfo, plainAccessResource, authenticationResult); Assert.assertFalse(isReturn); plainAccessResource.setRequestCode(10); plainAccessResource.setTopic("permitSendTopic"); - isReturn = plainAclPlugEngine.authentication(authenticationInfo, plainAccessResource, authenticationResult); + isReturn = plainPermissionLoader.authentication(authenticationInfo, plainAccessResource, authenticationResult); Assert.assertTrue(isReturn); plainAccessResource.setRequestCode(310); - isReturn = plainAclPlugEngine.authentication(authenticationInfo, plainAccessResource, authenticationResult); + isReturn = plainPermissionLoader.authentication(authenticationInfo, plainAccessResource, authenticationResult); Assert.assertTrue(isReturn); plainAccessResource.setRequestCode(320); - isReturn = plainAclPlugEngine.authentication(authenticationInfo, plainAccessResource, authenticationResult); + isReturn = plainPermissionLoader.authentication(authenticationInfo, plainAccessResource, authenticationResult); Assert.assertTrue(isReturn); plainAccessResource.setTopic("noPermitSendTopic"); - isReturn = plainAclPlugEngine.authentication(authenticationInfo, plainAccessResource, authenticationResult); + isReturn = plainPermissionLoader.authentication(authenticationInfo, plainAccessResource, authenticationResult); Assert.assertFalse(isReturn); plainAccessResource.setTopic("nopermitSendTopic"); - isReturn = plainAclPlugEngine.authentication(authenticationInfo, plainAccessResource, authenticationResult); + isReturn = plainPermissionLoader.authentication(authenticationInfo, plainAccessResource, authenticationResult); Assert.assertFalse(isReturn); plainAccessResource.setRequestCode(11); plainAccessResource.setTopic("permitPullTopic"); - isReturn = plainAclPlugEngine.authentication(authenticationInfo, plainAccessResource, authenticationResult); + isReturn = plainPermissionLoader.authentication(authenticationInfo, plainAccessResource, authenticationResult); Assert.assertTrue(isReturn); plainAccessResource.setTopic("noPermitPullTopic"); - isReturn = plainAclPlugEngine.authentication(authenticationInfo, plainAccessResource, authenticationResult); + isReturn = plainPermissionLoader.authentication(authenticationInfo, plainAccessResource, authenticationResult); Assert.assertFalse(isReturn); plainAccessResource.setTopic("nopermitPullTopic"); - isReturn = plainAclPlugEngine.authentication(authenticationInfo, plainAccessResource, authenticationResult); + isReturn = plainPermissionLoader.authentication(authenticationInfo, plainAccessResource, authenticationResult); Assert.assertFalse(isReturn); } @@ -290,20 +290,20 @@ public class PlainAclPlugEngineTest { AuthenticationResult authenticationResult = new AuthenticationResult(); plainAccessResource.setRequestCode(10); plainAccessResource.setTopic("absentTopic"); - boolean isReturn = plainAclPlugEngine.authentication(authenticationInfo, plainAccessResource, authenticationResult); + boolean isReturn = plainPermissionLoader.authentication(authenticationInfo, plainAccessResource, authenticationResult); Assert.assertFalse(isReturn); Set permitSendTopic = new HashSet<>(); brokerAccessControl.setPermitSendTopic(permitSendTopic); - isReturn = plainAclPlugEngine.authentication(authenticationInfo, plainAccessResource, authenticationResult); + isReturn = plainPermissionLoader.authentication(authenticationInfo, plainAccessResource, authenticationResult); Assert.assertTrue(isReturn); plainAccessResource.setRequestCode(11); - isReturn = plainAclPlugEngine.authentication(authenticationInfo, plainAccessResource, authenticationResult); + isReturn = plainPermissionLoader.authentication(authenticationInfo, plainAccessResource, authenticationResult); Assert.assertFalse(isReturn); brokerAccessControl.setPermitPullTopic(permitSendTopic); - isReturn = plainAclPlugEngine.authentication(authenticationInfo, plainAccessResource, authenticationResult); + isReturn = plainPermissionLoader.authentication(authenticationInfo, plainAccessResource, authenticationResult); Assert.assertTrue(isReturn); } @@ -313,11 +313,11 @@ public class PlainAclPlugEngineTest { admin.setAccessKey("adminTest"); admin.setSignature("adminTest"); admin.setRemoteAddr("127.0.0.1"); - plainAclPlugEngine.setAccessControl(admin); + plainPermissionLoader.setAccessControl(admin); Assert.assertFalse(admin.isUpdateAndCreateTopic()); admin.setAdmin(true); - plainAclPlugEngine.setAccessControl(admin); + plainPermissionLoader.setAccessControl(admin); Assert.assertTrue(admin.isUpdateAndCreateTopic()); } @@ -327,41 +327,41 @@ public class PlainAclPlugEngineTest { accessControl.setAccessKey("RocketMQ1"); accessControl.setSignature("1234567"); accessControl.setRemoteAddr("127.0.0.1"); - plainAclPlugEngine.setAccessControl(accessControl); + plainPermissionLoader.setAccessControl(accessControl); for (Integer code : adminCode) { accessControl.setRequestCode(code); - AuthenticationResult authenticationResult = plainAclPlugEngine.eachCheckAuthentication(accessControl); + AuthenticationResult authenticationResult = plainPermissionLoader.eachCheckAuthentication(accessControl); Assert.assertFalse(authenticationResult.isSucceed()); } - plainAclPlugEngine.cleanAuthenticationInfo(); + plainPermissionLoader.cleanAuthenticationInfo(); accessControl.setAdmin(true); - plainAclPlugEngine.setAccessControl(accessControl); + plainPermissionLoader.setAccessControl(accessControl); for (Integer code : adminCode) { accessControl.setRequestCode(code); - AuthenticationResult authenticationResult = plainAclPlugEngine.eachCheckAuthentication(accessControl); + AuthenticationResult authenticationResult = plainPermissionLoader.eachCheckAuthentication(accessControl); Assert.assertTrue(authenticationResult.isSucceed()); } } @Test public void cleanAuthenticationInfoTest() { - plainAclPlugEngine.setAccessControl(plainAccessResource); + plainPermissionLoader.setAccessControl(plainAccessResource); plainAccessResource.setRequestCode(202); - AuthenticationResult authenticationResult = plainAclPlugEngine.eachCheckAuthentication(plainAccessResource); + AuthenticationResult authenticationResult = plainPermissionLoader.eachCheckAuthentication(plainAccessResource); Assert.assertTrue(authenticationResult.isSucceed()); - plainAclPlugEngine.cleanAuthenticationInfo(); - authenticationResult = plainAclPlugEngine.eachCheckAuthentication(plainAccessResource); + plainPermissionLoader.cleanAuthenticationInfo(); + authenticationResult = plainPermissionLoader.eachCheckAuthentication(plainAccessResource); Assert.assertFalse(authenticationResult.isSucceed()); } @Test public void isWatchStartTest() { - PlainAclPlugEngine plainAclPlugEngine = new PlainAclPlugEngine(); - Assert.assertTrue(plainAclPlugEngine.isWatchStart()); + PlainPermissionLoader plainPermissionLoader = new PlainPermissionLoader(); + Assert.assertTrue(plainPermissionLoader.isWatchStart()); System.setProperty("java.version", "1.6.11"); - plainAclPlugEngine = new PlainAclPlugEngine(); - Assert.assertFalse(plainAclPlugEngine.isWatchStart()); + plainPermissionLoader = new PlainPermissionLoader(); + Assert.assertFalse(plainPermissionLoader.isWatchStart()); } @Test @@ -379,9 +379,9 @@ public class PlainAclPlugEngineTest { writer.write(" netaddress: 127.0.0.1\r\n"); writer.flush(); writer.close(); - PlainAclPlugEngine plainAclPlugEngine = new PlainAclPlugEngine(); + PlainPermissionLoader plainPermissionLoader = new PlainPermissionLoader(); plainAccessResource.setRequestCode(203); - AuthenticationResult authenticationResult = plainAclPlugEngine.eachCheckAuthentication(plainAccessResource); + AuthenticationResult authenticationResult = plainPermissionLoader.eachCheckAuthentication(plainAccessResource); Assert.assertTrue(authenticationResult.isSucceed()); writer = new FileWriter(new File("src/test/resources/watch/conf/transport.yml"), true); @@ -397,7 +397,7 @@ public class PlainAclPlugEngineTest { e.printStackTrace(); } plainAccessResourceTwo.setRequestCode(203); - authenticationResult = plainAclPlugEngine.eachCheckAuthentication(plainAccessResourceTwo); + authenticationResult = plainPermissionLoader.eachCheckAuthentication(plainAccessResourceTwo); Assert.assertTrue(authenticationResult.isSucceed()); transport.delete(); diff --git a/acl/src/test/java/org/apache/rocketmq/acl/plain/NetaddressStrategyTest.java b/acl/src/test/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategyTest.java similarity index 53% rename from acl/src/test/java/org/apache/rocketmq/acl/plain/NetaddressStrategyTest.java rename to acl/src/test/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategyTest.java index 9ea34c9a..8e0d3c60 100644 --- a/acl/src/test/java/org/apache/rocketmq/acl/plain/NetaddressStrategyTest.java +++ b/acl/src/test/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategyTest.java @@ -19,74 +19,74 @@ package org.apache.rocketmq.acl.plain; import org.junit.Assert; import org.junit.Test; -public class NetaddressStrategyTest { +public class RemoteAddressStrategyTest { - NetaddressStrategyFactory netaddressStrategyFactory = new NetaddressStrategyFactory(); + RemoteAddressStrategyFactory remoteAddressStrategyFactory = new RemoteAddressStrategyFactory(); @Test public void NetaddressStrategyFactoryTest() { PlainAccessResource plainAccessResource = new PlainAccessResource(); - NetaddressStrategy netaddressStrategy = netaddressStrategyFactory.getNetaddressStrategy(plainAccessResource); - Assert.assertEquals(netaddressStrategy, NetaddressStrategyFactory.NULL_NET_ADDRESS_STRATEGY); + RemoteAddressStrategy remoteAddressStrategy = remoteAddressStrategyFactory.getNetaddressStrategy(plainAccessResource); + Assert.assertEquals(remoteAddressStrategy, RemoteAddressStrategyFactory.NULL_NET_ADDRESS_STRATEGY); plainAccessResource.setRemoteAddr("*"); - netaddressStrategy = netaddressStrategyFactory.getNetaddressStrategy(plainAccessResource); - Assert.assertEquals(netaddressStrategy, NetaddressStrategyFactory.NULL_NET_ADDRESS_STRATEGY); + remoteAddressStrategy = remoteAddressStrategyFactory.getNetaddressStrategy(plainAccessResource); + Assert.assertEquals(remoteAddressStrategy, RemoteAddressStrategyFactory.NULL_NET_ADDRESS_STRATEGY); plainAccessResource.setRemoteAddr("127.0.0.1"); - netaddressStrategy = netaddressStrategyFactory.getNetaddressStrategy(plainAccessResource); - Assert.assertEquals(netaddressStrategy.getClass(), NetaddressStrategyFactory.OneNetaddressStrategy.class); + remoteAddressStrategy = remoteAddressStrategyFactory.getNetaddressStrategy(plainAccessResource); + Assert.assertEquals(remoteAddressStrategy.getClass(), RemoteAddressStrategyFactory.OneRemoteAddressStrategy.class); plainAccessResource.setRemoteAddr("127.0.0.1,127.0.0.2,127.0.0.3"); - netaddressStrategy = netaddressStrategyFactory.getNetaddressStrategy(plainAccessResource); - Assert.assertEquals(netaddressStrategy.getClass(), NetaddressStrategyFactory.MultipleNetaddressStrategy.class); + remoteAddressStrategy = remoteAddressStrategyFactory.getNetaddressStrategy(plainAccessResource); + Assert.assertEquals(remoteAddressStrategy.getClass(), RemoteAddressStrategyFactory.MultipleRemoteAddressStrategy.class); plainAccessResource.setRemoteAddr("127.0.0.{1,2,3}"); - netaddressStrategy = netaddressStrategyFactory.getNetaddressStrategy(plainAccessResource); - Assert.assertEquals(netaddressStrategy.getClass(), NetaddressStrategyFactory.MultipleNetaddressStrategy.class); + remoteAddressStrategy = remoteAddressStrategyFactory.getNetaddressStrategy(plainAccessResource); + Assert.assertEquals(remoteAddressStrategy.getClass(), RemoteAddressStrategyFactory.MultipleRemoteAddressStrategy.class); plainAccessResource.setRemoteAddr("127.0.0.1-200"); - netaddressStrategy = netaddressStrategyFactory.getNetaddressStrategy(plainAccessResource); - Assert.assertEquals(netaddressStrategy.getClass(), NetaddressStrategyFactory.RangeNetaddressStrategy.class); + remoteAddressStrategy = remoteAddressStrategyFactory.getNetaddressStrategy(plainAccessResource); + Assert.assertEquals(remoteAddressStrategy.getClass(), RemoteAddressStrategyFactory.RangeRemoteAddressStrategy.class); plainAccessResource.setRemoteAddr("127.0.0.*"); - netaddressStrategy = netaddressStrategyFactory.getNetaddressStrategy(plainAccessResource); - Assert.assertEquals(netaddressStrategy.getClass(), NetaddressStrategyFactory.RangeNetaddressStrategy.class); + remoteAddressStrategy = remoteAddressStrategyFactory.getNetaddressStrategy(plainAccessResource); + Assert.assertEquals(remoteAddressStrategy.getClass(), RemoteAddressStrategyFactory.RangeRemoteAddressStrategy.class); plainAccessResource.setRemoteAddr("127.0.1-20.*"); - netaddressStrategy = netaddressStrategyFactory.getNetaddressStrategy(plainAccessResource); - Assert.assertEquals(netaddressStrategy.getClass(), NetaddressStrategyFactory.RangeNetaddressStrategy.class); + remoteAddressStrategy = remoteAddressStrategyFactory.getNetaddressStrategy(plainAccessResource); + Assert.assertEquals(remoteAddressStrategy.getClass(), RemoteAddressStrategyFactory.RangeRemoteAddressStrategy.class); } @Test(expected = AclPlugRuntimeException.class) public void verifyTest() { PlainAccessResource plainAccessResource = new PlainAccessResource(); plainAccessResource.setRemoteAddr("127.0.0.1"); - netaddressStrategyFactory.getNetaddressStrategy(plainAccessResource); + remoteAddressStrategyFactory.getNetaddressStrategy(plainAccessResource); plainAccessResource.setRemoteAddr("256.0.0.1"); - netaddressStrategyFactory.getNetaddressStrategy(plainAccessResource); + remoteAddressStrategyFactory.getNetaddressStrategy(plainAccessResource); } @Test public void nullNetaddressStrategyTest() { - boolean isMatch = NetaddressStrategyFactory.NULL_NET_ADDRESS_STRATEGY.match(new PlainAccessResource()); + boolean isMatch = RemoteAddressStrategyFactory.NULL_NET_ADDRESS_STRATEGY.match(new PlainAccessResource()); Assert.assertTrue(isMatch); } public void oneNetaddressStrategyTest() { PlainAccessResource plainAccessResource = new PlainAccessResource(); plainAccessResource.setRemoteAddr("127.0.0.1"); - NetaddressStrategy netaddressStrategy = netaddressStrategyFactory.getNetaddressStrategy(plainAccessResource); + RemoteAddressStrategy remoteAddressStrategy = remoteAddressStrategyFactory.getNetaddressStrategy(plainAccessResource); plainAccessResource.setRemoteAddr(""); - boolean match = netaddressStrategy.match(plainAccessResource); + boolean match = remoteAddressStrategy.match(plainAccessResource); Assert.assertFalse(match); plainAccessResource.setRemoteAddr("127.0.0.2"); - match = netaddressStrategy.match(plainAccessResource); + match = remoteAddressStrategy.match(plainAccessResource); Assert.assertFalse(match); plainAccessResource.setRemoteAddr("127.0.0.1"); - match = netaddressStrategy.match(plainAccessResource); + match = remoteAddressStrategy.match(plainAccessResource); Assert.assertTrue(match); } @@ -94,12 +94,12 @@ public class NetaddressStrategyTest { public void multipleNetaddressStrategyTest() { PlainAccessResource plainAccessResource = new PlainAccessResource(); plainAccessResource.setRemoteAddr("127.0.0.1,127.0.0.2,127.0.0.3"); - NetaddressStrategy netaddressStrategy = netaddressStrategyFactory.getNetaddressStrategy(plainAccessResource); - multipleNetaddressStrategyTest(netaddressStrategy); + RemoteAddressStrategy remoteAddressStrategy = remoteAddressStrategyFactory.getNetaddressStrategy(plainAccessResource); + multipleNetaddressStrategyTest(remoteAddressStrategy); plainAccessResource.setRemoteAddr("127.0.0.{1,2,3}"); - netaddressStrategy = netaddressStrategyFactory.getNetaddressStrategy(plainAccessResource); - multipleNetaddressStrategyTest(netaddressStrategy); + remoteAddressStrategy = remoteAddressStrategyFactory.getNetaddressStrategy(plainAccessResource); + multipleNetaddressStrategyTest(remoteAddressStrategy); } @@ -107,29 +107,29 @@ public class NetaddressStrategyTest { public void multipleNetaddressStrategyExceptionTest() { PlainAccessResource plainAccessResource = new PlainAccessResource(); plainAccessResource.setRemoteAddr("127.0.0.1,2,3}"); - netaddressStrategyFactory.getNetaddressStrategy(plainAccessResource); + remoteAddressStrategyFactory.getNetaddressStrategy(plainAccessResource); } - private void multipleNetaddressStrategyTest(NetaddressStrategy netaddressStrategy) { + private void multipleNetaddressStrategyTest(RemoteAddressStrategy remoteAddressStrategy) { PlainAccessResource plainAccessResource = new PlainAccessResource(); plainAccessResource.setRemoteAddr("127.0.0.1"); - boolean match = netaddressStrategy.match(plainAccessResource); + boolean match = remoteAddressStrategy.match(plainAccessResource); Assert.assertTrue(match); plainAccessResource.setRemoteAddr("127.0.0.2"); - match = netaddressStrategy.match(plainAccessResource); + match = remoteAddressStrategy.match(plainAccessResource); Assert.assertTrue(match); plainAccessResource.setRemoteAddr("127.0.0.3"); - match = netaddressStrategy.match(plainAccessResource); + match = remoteAddressStrategy.match(plainAccessResource); Assert.assertTrue(match); plainAccessResource.setRemoteAddr("127.0.0.4"); - match = netaddressStrategy.match(plainAccessResource); + match = remoteAddressStrategy.match(plainAccessResource); Assert.assertFalse(match); plainAccessResource.setRemoteAddr("127.0.0.0"); - match = netaddressStrategy.match(plainAccessResource); + match = remoteAddressStrategy.match(plainAccessResource); Assert.assertFalse(match); } @@ -139,23 +139,23 @@ public class NetaddressStrategyTest { String head = "127.0.0."; PlainAccessResource plainAccessResource = new PlainAccessResource(); plainAccessResource.setRemoteAddr("127.0.0.1-200"); - NetaddressStrategy netaddressStrategy = netaddressStrategyFactory.getNetaddressStrategy(plainAccessResource); - rangeNetaddressStrategyTest(netaddressStrategy, head, 1, 200, true); + RemoteAddressStrategy remoteAddressStrategy = remoteAddressStrategyFactory.getNetaddressStrategy(plainAccessResource); + rangeNetaddressStrategyTest(remoteAddressStrategy, head, 1, 200, true); plainAccessResource.setRemoteAddr("127.0.0.*"); - netaddressStrategy = netaddressStrategyFactory.getNetaddressStrategy(plainAccessResource); - rangeNetaddressStrategyTest(netaddressStrategy, head, 0, 255, true); + remoteAddressStrategy = remoteAddressStrategyFactory.getNetaddressStrategy(plainAccessResource); + rangeNetaddressStrategyTest(remoteAddressStrategy, head, 0, 255, true); plainAccessResource.setRemoteAddr("127.0.1-200.*"); - netaddressStrategy = netaddressStrategyFactory.getNetaddressStrategy(plainAccessResource); - rangeNetaddressStrategyThirdlyTest(netaddressStrategy, head, 1, 200); + remoteAddressStrategy = remoteAddressStrategyFactory.getNetaddressStrategy(plainAccessResource); + rangeNetaddressStrategyThirdlyTest(remoteAddressStrategy, head, 1, 200); } - private void rangeNetaddressStrategyTest(NetaddressStrategy netaddressStrategy, String head, int start, int end, + private void rangeNetaddressStrategyTest(RemoteAddressStrategy remoteAddressStrategy, String head, int start, int end, boolean isFalse) { PlainAccessResource plainAccessResource = new PlainAccessResource(); for (int i = -10; i < 300; i++) { plainAccessResource.setRemoteAddr(head + i); - boolean match = netaddressStrategy.match(plainAccessResource); + boolean match = remoteAddressStrategy.match(plainAccessResource); if (isFalse && i >= start && i <= end) { Assert.assertTrue(match); continue; @@ -165,13 +165,13 @@ public class NetaddressStrategyTest { } } - private void rangeNetaddressStrategyThirdlyTest(NetaddressStrategy netaddressStrategy, String head, int start, + private void rangeNetaddressStrategyThirdlyTest(RemoteAddressStrategy remoteAddressStrategy, String head, int start, int end) { String newHead; for (int i = -10; i < 300; i++) { newHead = head + i; if (i >= start && i <= end) { - rangeNetaddressStrategyTest(netaddressStrategy, newHead, 0, 255, false); + rangeNetaddressStrategyTest(remoteAddressStrategy, newHead, 0, 255, false); } } } @@ -194,7 +194,7 @@ public class NetaddressStrategyTest { private void rangeNetaddressStrategyExceptionTest(String netaddress) { PlainAccessResource plainAccessResource = new PlainAccessResource(); plainAccessResource.setRemoteAddr(netaddress); - netaddressStrategyFactory.getNetaddressStrategy(plainAccessResource); + remoteAddressStrategyFactory.getNetaddressStrategy(plainAccessResource); } } -- GitLab