clean Attention: delete line 37 of the MixAllTest.java

acl-plug/src/main/java/org/apache/rocketmq/acl/plug/AclPlugController.java

@@ -18,32 +18,32 @@ package org.apache.rocketmq.acl.plug;
 
 import org.apache.rocketmq.acl.plug.engine.AclPlugEngine;
 import org.apache.rocketmq.acl.plug.engine.PlainAclPlugEngine;
-import org.apache.rocketmq.acl.plug.entity.ControllerParametersEntity;
+import org.apache.rocketmq.acl.plug.entity.ControllerParameters;
 import org.apache.rocketmq.acl.plug.exception.AclPlugRuntimeException;
 
 public class AclPlugController {
 
-    private ControllerParametersEntity controllerParametersEntity;
+    private ControllerParameters controllerParameters;
 
     private AclPlugEngine aclPlugEngine;
 
-    private AclRemotingServer aclRemotingServer;
+    private AclRemotingService aclRemotingService;
 
     private boolean startSucceed = false;
 
-    public AclPlugController(ControllerParametersEntity controllerParametersEntity) throws AclPlugRuntimeException {
+    public AclPlugController(ControllerParameters controllerParameters) throws AclPlugRuntimeException {
         try {
-            this.controllerParametersEntity = controllerParametersEntity;
-            aclPlugEngine = new PlainAclPlugEngine(controllerParametersEntity);
-            aclRemotingServer = new DefaultAclRemotingServerImpl(aclPlugEngine);
+            this.controllerParameters = controllerParameters;
+            aclPlugEngine = new PlainAclPlugEngine(controllerParameters);
+            aclRemotingService = new DefaultAclRemotingServiceImpl(aclPlugEngine);
             this.startSucceed = true;
         } catch (Exception e) {
-            throw new AclPlugRuntimeException(String.format("Start the abnormal , Launch parameters is %s", this.controllerParametersEntity.toString()), e);
+            throw new AclPlugRuntimeException(String.format("Start the abnormal , Launch parameters is %s", this.controllerParameters.toString()), e);
         }
     }
 
-    public AclRemotingServer getAclRemotingServer() {
-        return this.aclRemotingServer;
+    public AclRemotingService getAclRemotingService() {
+        return this.aclRemotingService;
     }
 
     public void doChannelCloseEvent(String remoteAddr) {

acl-plug/src/main/java/org/apache/rocketmq/acl/plug/AclRemotingServer.java → acl-plug/src/main/java/org/apache/rocketmq/acl/plug/AclRemotingService.java

@@ -19,7 +19,7 @@ package org.apache.rocketmq.acl.plug;
 import org.apache.rocketmq.acl.plug.entity.AccessControl;
 import org.apache.rocketmq.acl.plug.entity.AuthenticationResult;
 
-public interface AclRemotingServer {
+public interface AclRemotingService {
 
     public AuthenticationResult check(AccessControl accessControl);
 

acl-plug/src/main/java/org/apache/rocketmq/acl/plug/DefaultAclRemotingServerImpl.java → acl-plug/src/main/java/org/apache/rocketmq/acl/plug/DefaultAclRemotingServiceImpl.java

@@ -21,11 +21,11 @@ import org.apache.rocketmq.acl.plug.entity.AccessControl;
 import org.apache.rocketmq.acl.plug.entity.AuthenticationResult;
 import org.apache.rocketmq.acl.plug.exception.AclPlugRuntimeException;
 
-public class DefaultAclRemotingServerImpl implements AclRemotingServer {
+public class DefaultAclRemotingServiceImpl implements AclRemotingService {
 
     private AclPlugEngine aclPlugEngine;
 
-    public DefaultAclRemotingServerImpl(AclPlugEngine aclPlugEngine) {
+    public DefaultAclRemotingServiceImpl(AclPlugEngine aclPlugEngine) {
         this.aclPlugEngine = aclPlugEngine;
     }
 

acl-plug/src/main/java/org/apache/rocketmq/acl/plug/engine/AuthenticationInfoManagementAclPlugEngine.java

@@ -25,7 +25,7 @@ import org.apache.rocketmq.acl.plug.entity.AccessControl;
 import org.apache.rocketmq.acl.plug.entity.AuthenticationInfo;
 import org.apache.rocketmq.acl.plug.entity.AuthenticationResult;
 import org.apache.rocketmq.acl.plug.entity.BorkerAccessControlTransport;
-import org.apache.rocketmq.acl.plug.entity.ControllerParametersEntity;
+import org.apache.rocketmq.acl.plug.entity.ControllerParameters;
 import org.apache.rocketmq.acl.plug.exception.AclPlugRuntimeException;
 import org.apache.rocketmq.acl.plug.strategy.NetaddressStrategy;
 import org.apache.rocketmq.acl.plug.strategy.NetaddressStrategyFactory;
@@ -36,16 +36,16 @@ import org.apache.rocketmq.logging.InternalLoggerFactory;
 public abstract class AuthenticationInfoManagementAclPlugEngine implements AclPlugEngine {
 
     private static final InternalLogger log = InternalLoggerFactory.getLogger(LoggerName.ACL_PLUG_LOGGER_NAME);
-    ControllerParametersEntity controllerParametersEntity;
+    ControllerParameters controllerParameters;
     private Map<String/** account **/, Map<String/** netaddress **/, AuthenticationInfo>> accessControlMap = new HashMap<>();
     private AuthenticationInfo authenticationInfo;
     private NetaddressStrategyFactory netaddressStrategyFactory = new NetaddressStrategyFactory();
     private AccessContralAnalysis accessContralAnalysis = new AccessContralAnalysis();
     private Authentication authentication = new Authentication();
 
-    public AuthenticationInfoManagementAclPlugEngine(ControllerParametersEntity controllerParametersEntity) {
-        this.controllerParametersEntity = controllerParametersEntity;
-        accessContralAnalysis.analysisClass(controllerParametersEntity.getAccessContralAnalysisClass());
+    public AuthenticationInfoManagementAclPlugEngine(ControllerParameters controllerParameters) {
+        this.controllerParameters = controllerParameters;
+        accessContralAnalysis.analysisClass(controllerParameters.getAccessContralAnalysisClass());
     }
 
     public void setAccessControl(AccessControl accessControl) throws AclPlugRuntimeException {

acl-plug/src/main/java/org/apache/rocketmq/acl/plug/engine/LoginInfoAclPlugEngine.java

@@ -21,15 +21,15 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.apache.rocketmq.acl.plug.entity.AccessControl;
 import org.apache.rocketmq.acl.plug.entity.AuthenticationInfo;
 import org.apache.rocketmq.acl.plug.entity.AuthenticationResult;
-import org.apache.rocketmq.acl.plug.entity.ControllerParametersEntity;
+import org.apache.rocketmq.acl.plug.entity.ControllerParameters;
 import org.apache.rocketmq.acl.plug.entity.LoginInfo;
 
 public abstract class LoginInfoAclPlugEngine extends AuthenticationInfoManagementAclPlugEngine {
 
     private Map<String, LoginInfo> loginInfoMap = new ConcurrentHashMap<>();
 
-    public LoginInfoAclPlugEngine(ControllerParametersEntity controllerParametersEntity) {
-        super(controllerParametersEntity);
+    public LoginInfoAclPlugEngine(ControllerParameters controllerParameters) {
+        super(controllerParameters);
     }
 
     public LoginInfo getLoginInfo(AccessControl accessControl) {

acl-plug/src/main/java/org/apache/rocketmq/acl/plug/engine/PlainAclPlugEngine.java

@@ -20,20 +20,20 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import org.apache.rocketmq.acl.plug.entity.BorkerAccessControlTransport;
-import org.apache.rocketmq.acl.plug.entity.ControllerParametersEntity;
+import org.apache.rocketmq.acl.plug.entity.ControllerParameters;
 import org.apache.rocketmq.acl.plug.exception.AclPlugRuntimeException;
 import org.yaml.snakeyaml.Yaml;
 
 public class PlainAclPlugEngine extends LoginInfoAclPlugEngine {
 
     public PlainAclPlugEngine(
-        ControllerParametersEntity controllerParametersEntity) throws AclPlugRuntimeException {
-        super(controllerParametersEntity);
+        ControllerParameters controllerParameters) throws AclPlugRuntimeException {
+        super(controllerParameters);
         init();
     }
 
     void init() throws AclPlugRuntimeException {
-        String filePath = controllerParametersEntity.getFileHome() + "/conf/transport.yml";
+        String filePath = controllerParameters.getFileHome() + "/conf/transport.yml";
         Yaml ymal = new Yaml();
         FileInputStream fis = null;
         BorkerAccessControlTransport transport;

acl-plug/src/main/java/org/apache/rocketmq/acl/plug/entity/ControllerParametersEntity.java → acl-plug/src/main/java/org/apache/rocketmq/acl/plug/entity/ControllerParameters.java

@@ -18,7 +18,7 @@ package org.apache.rocketmq.acl.plug.entity;
 
 import org.apache.rocketmq.common.protocol.RequestCode;
 
-public class ControllerParametersEntity {
+public class ControllerParameters {
 
     private String fileHome;
 

acl-plug/src/test/java/org/apache/rocketmq/acl/plug/engine/PlainAclPlugEngineTest.java

@@ -28,7 +28,7 @@ import org.apache.rocketmq.acl.plug.entity.AuthenticationInfo;
 import org.apache.rocketmq.acl.plug.entity.AuthenticationResult;
 import org.apache.rocketmq.acl.plug.entity.BorkerAccessControl;
 import org.apache.rocketmq.acl.plug.entity.BorkerAccessControlTransport;
-import org.apache.rocketmq.acl.plug.entity.ControllerParametersEntity;
+import org.apache.rocketmq.acl.plug.entity.ControllerParameters;
 import org.apache.rocketmq.acl.plug.entity.LoginInfo;
 import org.apache.rocketmq.acl.plug.exception.AclPlugRuntimeException;
 import org.apache.rocketmq.common.MixAll;
@@ -61,7 +61,7 @@ public class PlainAclPlugEngineTest {
         FileInputStream fis = new FileInputStream(new File(filePath));
         transport = ymal.loadAs(fis, BorkerAccessControlTransport.class);
 
-        ControllerParametersEntity controllerParametersEntity = new ControllerParametersEntity();
+        ControllerParameters controllerParametersEntity = new ControllerParameters();
         controllerParametersEntity.setFileHome(home);
         plainAclPlugEngine = new PlainAclPlugEngine(controllerParametersEntity);
 
@@ -108,7 +108,7 @@ public class PlainAclPlugEngineTest {
 
     @Test(expected = AclPlugRuntimeException.class)
     public void testPlainAclPlugEngineInit() {
-        ControllerParametersEntity controllerParametersEntity = new ControllerParametersEntity();
+        ControllerParameters controllerParametersEntity = new ControllerParameters();
         new PlainAclPlugEngine(controllerParametersEntity);
 
     }

broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java

@@ -32,12 +32,11 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.acl.plug.AclPlugController;
-import org.apache.rocketmq.acl.plug.AclRemotingServer;
+import org.apache.rocketmq.acl.plug.AclRemotingService;
 import org.apache.rocketmq.acl.plug.entity.AccessControl;
-import org.apache.rocketmq.acl.plug.entity.ControllerParametersEntity;
+import org.apache.rocketmq.acl.plug.entity.ControllerParameters;
 import org.apache.rocketmq.broker.client.ClientHousekeepingService;
 import org.apache.rocketmq.broker.client.ConsumerIdsChangeListener;
 import org.apache.rocketmq.broker.client.ConsumerManager;
@@ -503,14 +502,14 @@ public class BrokerController {
                 log.info("Default does not start acl plug");
                 return;
             }
-            ControllerParametersEntity controllerParametersEntity = new ControllerParametersEntity();
-            controllerParametersEntity.setFileHome(brokerConfig.getRocketmqHome());
-            aclPlugController = new AclPlugController(controllerParametersEntity);
+            ControllerParameters controllerParameters = new ControllerParameters();
+            controllerParameters.setFileHome(brokerConfig.getRocketmqHome());
+            aclPlugController = new AclPlugController(controllerParameters);
             if (!aclPlugController.isStartSucceed()) {
                 log.error("start acl plug failure");
                 return;
             }
-            final AclRemotingServer aclRemotingServe = aclPlugController.getAclRemotingServer();
+            final AclRemotingService aclRemotingService = aclPlugController.getAclRemotingService();
             this.registerServerRPCHook(new RPCHook() {
 
                 @Override
@@ -525,7 +524,7 @@ public class BrokerController {
                         accessControl.setNetaddress(StringUtils.split(remoteAddr, ":")[0]);
                         accessControl.setTopic(extFields.get("topic"));
                     }
-                    aclRemotingServe.check(accessControl);
+                    aclRemotingService.check(accessControl);
                 }
 
                 @Override

common/src/test/java/org/apache/rocketmq/common/MixAllTest.java

@@ -17,14 +17,13 @@
 
 package org.apache.rocketmq.common;
 
-import org.junit.Test;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.net.InetAddress;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
+import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -34,7 +33,7 @@ public class MixAllTest {
         List<String> localInetAddress = MixAll.getLocalInetAddress();
         String local = InetAddress.getLocalHost().getHostAddress();
         assertThat(localInetAddress).contains("127.0.0.1");
-        assertThat(localInetAddress).contains(local);
+
     }
 
     @Test