diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/loader/AgentClassLoader.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/loader/AgentClassLoader.java index 35eba4f25ecf4e5e192f0bb39889b4db46d04931..2ba28c433fc76099403e9a40f9a4e526c1cece7a 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/loader/AgentClassLoader.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/loader/AgentClassLoader.java @@ -18,11 +18,13 @@ package org.skywalking.apm.agent.core.plugin.loader; -import java.io.BufferedInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FilenameFilter; -import java.io.IOException; +import org.skywalking.apm.agent.core.boot.AgentPackageNotFoundException; +import org.skywalking.apm.agent.core.boot.AgentPackagePath; +import org.skywalking.apm.agent.core.plugin.PluginBootstrap; +import org.skywalking.apm.logging.ILog; +import org.skywalking.apm.logging.LogManager; + +import java.io.*; import java.net.MalformedURLException; import java.net.URL; import java.util.Enumeration; @@ -32,11 +34,6 @@ import java.util.List; import java.util.concurrent.locks.ReentrantLock; import java.util.jar.JarEntry; import java.util.jar.JarFile; -import org.skywalking.apm.agent.core.boot.AgentPackageNotFoundException; -import org.skywalking.apm.agent.core.boot.AgentPackagePath; -import org.skywalking.apm.agent.core.plugin.PluginBootstrap; -import org.skywalking.apm.logging.ILog; -import org.skywalking.apm.logging.LogManager; /** * The AgentClassLoader represents a classloader, @@ -61,6 +58,7 @@ public class AgentClassLoader extends ClassLoader { /** * Init the default + * * @return * @throws AgentPackageNotFoundException */ @@ -149,11 +147,13 @@ public class AgentClassLoader extends ClassLoader { final Iterator iterator = allResources.iterator(); return new Enumeration() { - @Override public boolean hasMoreElements() { + @Override + public boolean hasMoreElements() { return iterator.hasNext(); } - @Override public URL nextElement() { + @Override + public URL nextElement() { return iterator.next(); } }; @@ -168,7 +168,8 @@ public class AgentClassLoader extends ClassLoader { for (File path : classpath) { if (path.exists() && path.isDirectory()) { String[] jarFileNames = path.list(new FilenameFilter() { - @Override public boolean accept(File dir, String name) { + @Override + public boolean accept(File dir, String name) { return name.endsWith(".jar"); } }); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/loader/InterceptorInstanceLoader.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/loader/InterceptorInstanceLoader.java index 6d51e286b4d1c37cba1bdaa90be23c84300da703..5eb409f1337b6612111ba18c05a0b5f28c35e668 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/loader/InterceptorInstanceLoader.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/loader/InterceptorInstanceLoader.java @@ -18,24 +18,16 @@ package org.skywalking.apm.agent.core.plugin.loader; -import java.io.BufferedInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; +import org.skywalking.apm.agent.core.boot.AgentPackageNotFoundException; +import org.skywalking.apm.logging.ILog; +import org.skywalking.apm.logging.LogManager; + import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.security.ProtectionDomain; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.ReentrantLock; -import org.skywalking.apm.agent.core.boot.AgentPackageNotFoundException; -import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; -import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import org.skywalking.apm.agent.core.plugin.interceptor.enhance.StaticMethodsAroundInterceptor; -import org.skywalking.apm.logging.ILog; -import org.skywalking.apm.logging.LogManager; - /** * The InterceptorInstanceLoader is a classes finder and container. *

@@ -56,9 +48,9 @@ public class InterceptorInstanceLoader { * Create {@link AgentClassLoader} for each targetClassLoader, as an extend classloader. * It can load interceptor classes from plugins, activations folders. * - * @param className the interceptor class, which is expected to be found + * @param className the interceptor class, which is expected to be found * @param targetClassLoader the class loader for current application context - * @param expected type + * @param expected type * @return the type reference. * @throws InvocationTargetException * @throws IllegalAccessException