fix: clean code.

Author: ‘niuerzhuang’

dongtai-agent/src/main/java/io/dongtai/iast/agent/fallback/checker/MetricsBindCheckerEnum.java

@@ -33,7 +33,7 @@ public enum MetricsBindCheckerEnum {
     /**
      * 检查器类型
      */
-    private Class<? extends IPerformanceChecker> checker;
+    private final Class<? extends IPerformanceChecker> checker;
 
     /**
      * 描述

dongtai-agent/src/main/java/io/dongtai/iast/agent/manager/EngineManager.java

@@ -2,7 +2,6 @@
 
 import io.dongtai.iast.agent.*;
 import io.dongtai.iast.agent.fallback.FallbackManager;
-import io.dongtai.iast.agent.monitor.MonitorDaemonThread;
 import io.dongtai.iast.agent.report.AgentRegisterReport;
 import io.dongtai.iast.agent.util.*;
 import io.dongtai.iast.common.state.AgentState;
@@ -24,11 +23,8 @@ public class EngineManager {
 
     private static final String ENGINE_ENTRYPOINT_CLASS = "com.secnium.iast.core.AgentEngine";
     private static final String INJECT_PACKAGE_REMOTE_URI = "/api/v1/engine/download?engineName=dongtai-spy";
-    private static final String INJECT_PACKAGE_REMOTE_URI_JDK6 = "/api/v1/engine/download?engineName=dongtai-spy-jdk6";
     private static final String ENGINE_PACKAGE_REMOTE_URI = "/api/v1/engine/download?engineName=dongtai-core";
-    private static final String ENGINE_PACKAGE_REMOTE_URI_JDK6 = "/api/v1/engine/download?engineName=dongtai-core-jdk6";
     private static final String API_PACKAGE_REMOTE_URI = "/api/v1/engine/download?engineName=dongtai-api";
-    private static final String API_PACKAGE_REMOTE_URI_JDK6 = "/api/v1/engine/download?engineName=dongtai-api-jdk6";
     private final static String TMP_DIR = IastProperties.getInstance().getTmpDir();
     private static IastClassLoader IAST_CLASS_LOADER;
     private static EngineManager INSTANCE;
@@ -187,7 +183,6 @@ public boolean install() {
      * 启动检测引擎
      */
     public boolean start() {
-        // 将Spy注入到BootstrapClassLoader，todo: 异常卸载时，需要特定处理spy模块
         try {
             if (classOfEngine != null) {
                 classOfEngine.getMethod("start").invoke(null);
@@ -207,7 +202,6 @@ public boolean start() {
      * @return 布尔值，表示stop成功或失败
      */
     public boolean stop() {
-        // 将Spy注入到BootstrapClassLoader，todo: 异常卸载时，需要特定处理spy模块
         try {
             if (classOfEngine != null) {
                 classOfEngine.getMethod("stop").invoke(null);

dongtai-agent/src/main/java/io/dongtai/iast/agent/middlewarerecognition/jboss/JBoss.java

@@ -52,8 +52,7 @@ public String getVersion() {
                     if (matcher.find()) {
                         version = matcher.group(1);
                     }
-                } catch (IOException iOException) {
-                    ;
+                } catch (IOException ignored) {
                 }
             }
         }

dongtai-agent/src/main/java/io/dongtai/iast/agent/middlewarerecognition/spring/Tomcat.java

@@ -10,8 +10,8 @@
  */
 public class Tomcat implements IServer {
 
-    private static String TOMCAT_BOOTSTAP = " org.apache.catalina.startup.Bootstrap".substring(1);
-    private static String TOMCAT_SERVER_INFO = " org.apache.catalina.util.ServerInfo".substring(1);
+    private static final String TOMCAT_BOOTSTAP = " org.apache.catalina.startup.Bootstrap".substring(1);
+    private static final String TOMCAT_SERVER_INFO = " org.apache.catalina.util.ServerInfo".substring(1);
     private String name;
     private String version;
 

dongtai-agent/src/main/java/io/dongtai/iast/agent/monitor/collector/MetricsBindCollectorEnum.java

@@ -31,7 +31,7 @@ public enum MetricsBindCollectorEnum {
     /**
      * 收集器类型
      */
-    private Class<? extends IPerformanceCollector> collector;
+    private final Class<? extends IPerformanceCollector> collector;
 
     /**
      * 描述

dongtai-agent/src/main/java/io/dongtai/iast/agent/report/AgentRegisterReport.java

@@ -17,7 +17,7 @@
 
 import java.io.*;
 import java.net.*;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Enumeration;
 import java.util.UUID;
 
@@ -58,7 +58,7 @@ private String generateAgentRegisterMsg() {
         object.put("language", AgentConstant.LANGUAGE);
         object.put("network", readIpInfo());
         object.put("serverEnv", Base64Encoder
-                .encodeBase64String(System.getProperties().toString().getBytes(Charset.forName("UTF-8")))
+                .encodeBase64String(System.getProperties().toString().getBytes(StandardCharsets.UTF_8))
                 .replaceAll("\n", "").replaceAll("\r", ""));
         object.put("containerName", null == server ? "" : server.getName());
         object.put("containerVersion", null == server ? "" : server.getVersion());

dongtai-common/src/main/java/io/dongtai/iast/common/utils/base64/CharacterEncoder.java

@@ -80,7 +80,7 @@ public void encode(InputStream var1, OutputStream var2) throws IOException {
 
     public void encode(byte[] var1, OutputStream var2) throws IOException {
         ByteArrayInputStream var3 = new ByteArrayInputStream(var1);
-        this.encode((InputStream) var3, var2);
+        this.encode(var3, var2);
     }
 
     public String encode(byte[] var1) {
@@ -89,7 +89,7 @@ public String encode(byte[] var1) {
         String var4 = null;
 
         try {
-            this.encode((InputStream) var3, var2);
+            this.encode(var3, var2);
             var4 = var2.toString("8859_1");
             return var4;
         } catch (Throwable e) {
@@ -157,15 +157,15 @@ public void encodeBuffer(InputStream var1, OutputStream var2) throws IOException
 
     public void encodeBuffer(byte[] var1, OutputStream var2) throws IOException {
         ByteArrayInputStream var3 = new ByteArrayInputStream(var1);
-        this.encodeBuffer((InputStream) var3, var2);
+        this.encodeBuffer(var3, var2);
     }
 
     public String encodeBuffer(byte[] var1) {
         ByteArrayOutputStream var2 = new ByteArrayOutputStream();
         ByteArrayInputStream var3 = new ByteArrayInputStream(var1);
 
         try {
-            this.encodeBuffer((InputStream) var3, var2);
+            this.encodeBuffer(var3, var2);
         } catch (Throwable e) {
             DongTaiLog.trace("CharacterEncoder.encodeBuffer internal error: {}, {}",
                     e.getMessage(), e.getCause() != null ? e.getCause().getMessage() : "");

dongtai-common/src/main/java/io/dongtai/iast/common/utils/serialize/SerializeUtils.java

@@ -14,7 +14,7 @@ public class SerializeUtils {
 
     private static final String DEFAULT_CHARSET = "ISO-8859-1";
 
-    private static List<Class<?>> DEFAULT_SAFE_CLASSES = new ArrayList<Class<?>>() {
+    private static final List<Class<?>> DEFAULT_SAFE_CLASSES = new ArrayList<Class<?>>() {
         private static final long serialVersionUID = -2140605358789870025L;
 
         {

dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/core/adapter/PropagatorAdapter.java

@@ -54,21 +54,13 @@ private void enterScope(MethodAdviceAdapter adapter, String signature, PolicyNod
         }
 
         adapter.invokeStatic(ASM_TYPE_SPY_HANDLER, SPY_HANDLER$getDispatcher);
-        if (PropagatorImpl.isSkipScope(signature)) {
-            adapter.push(true);
-        } else {
-            adapter.push(false);
-        }
+        adapter.push(PropagatorImpl.isSkipScope(signature));
         adapter.invokeInterface(ASM_TYPE_SPY_DISPATCHER, SPY$enterPropagator);
     }
 
     private void leaveScope(MethodAdviceAdapter adapter, String signature, PolicyNode policyNode) {
         adapter.invokeStatic(ASM_TYPE_SPY_HANDLER, SPY_HANDLER$getDispatcher);
-        if (PropagatorImpl.isSkipScope(signature)) {
-            adapter.push(true);
-        } else {
-            adapter.push(false);
-        }
+        adapter.push(PropagatorImpl.isSkipScope(signature));
         adapter.invokeInterface(ASM_TYPE_SPY_DISPATCHER, SPY$leavePropagator);
 
         if (policyNode.isIgnoreInternal()) {

dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/framework/j2ee/dispatch/PrintWriterAdapter.java

@@ -33,9 +33,6 @@ public MethodVisitor visitMethod(final int access, final String name, final Stri
     }
 
     private boolean isWrite(String name, String desc) {
-        if ("write".equals(name) && WRITE_DESC.contains(desc)) {
-            return true;
-        }
-        return false;
+        return "write".equals(name) && WRITE_DESC.contains(desc);
     }
 }