This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 6d201e1 fix agent code style (#8434)
6d201e1 is described below
commit 6d201e130d78b783b32529ae1ce09b1876c08b06
Author: xiaoyu <[email protected]>
AuthorDate: Tue Dec 1 12:02:37 2020 +0800
fix agent code style (#8434)
---
.../shardingsphere/agent/core/LoggingListener.java | 12 ++---
.../agent/core/ShardingSphereTransformer.java | 11 ++---
.../core/config/AgentConfigurationLoader.java | 2 +-
.../agent/core/plugin/PluginAdviceDefine.java | 5 +-
.../agent/core/plugin/PluginDefine.java | 22 ++++-----
.../agent/core/plugin/PluginLoader.java | 53 +++++++++-------------
.../core/plugin/advice/ConstructorAdvice.java | 2 +-
.../advice/ConstructorMethodInterceptor.java | 6 +--
.../core/plugin/advice/MethodAroundAdvice.java | 6 +--
.../plugin/advice/MethodAroundInterceptor.java | 8 ++--
.../core/plugin/advice/MethodInvocationResult.java | 11 +++--
.../core/plugin/advice/OverrideArgsInvoker.java | 4 +-
.../plugin/advice/StaticMethodAroundAdvice.java | 6 +--
.../advice/StaticMethodAroundInterceptor.java | 8 ++--
.../agent/core/plugin/advice/TargetObject.java | 5 +-
.../core/plugin/point/ClassStaticMethodPoint.java | 15 +++---
.../agent/core/plugin/point/ConstructorPoint.java | 10 ++--
.../core/plugin/point/InstanceMethodPoint.java | 13 +++---
.../agent/core/utils/SingletonHolder.java | 6 +--
19 files changed, 92 insertions(+), 113 deletions(-)
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/LoggingListener.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/LoggingListener.java
index 34d0934..43411e7 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/LoggingListener.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/LoggingListener.java
@@ -29,30 +29,28 @@ import net.bytebuddy.utility.JavaModule;
*/
@Slf4j
public class LoggingListener implements AgentBuilder.Listener {
-
+
@Override
public void onDiscovery(final String typeName, final ClassLoader
classLoader, final JavaModule module, final boolean loaded) {
-
}
-
+
@Override
public void onTransformation(final TypeDescription typeDescription, final
ClassLoader classLoader, final JavaModule module, final boolean loaded, final
DynamicType dynamicType) {
if (log.isDebugEnabled()) {
log.debug("On transformation class {}.",
typeDescription.getTypeName());
}
}
-
+
@Override
public void onIgnored(final TypeDescription typeDescription, final
ClassLoader classLoader, final JavaModule module, final boolean loaded) {
}
-
+
@Override
public void onError(final String typeName, final ClassLoader classLoader,
final JavaModule module, final boolean loaded, final Throwable throwable) {
log.error("Failed to instrument {}.", typeName, throwable);
}
-
+
@Override
public void onComplete(final String typeName, final ClassLoader
classLoader, final JavaModule module, final boolean loaded) {
-
}
}
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/ShardingSphereTransformer.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/ShardingSphereTransformer.java
index 65de521..68e5e35 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/ShardingSphereTransformer.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/ShardingSphereTransformer.java
@@ -44,21 +44,19 @@ import java.util.Map;
*/
@Slf4j
public class ShardingSphereTransformer implements AgentBuilder.Transformer {
-
+
private final PluginLoader pluginLoader;
-
+
public ShardingSphereTransformer(final PluginLoader pluginLoader) {
this.pluginLoader = pluginLoader;
}
-
+
@Override
public DynamicType.Builder<?> transform(final DynamicType.Builder<?>
builder, final TypeDescription typeDescription, final ClassLoader classLoader,
final JavaModule module) {
if (pluginLoader.containsType(typeDescription)) {
-
DynamicType.Builder<?> newBuilder =
builder.defineField("_SSExtraData_", Map.class, Opcodes.ACC_PRIVATE |
Opcodes.ACC_VOLATILE)
.implement(TargetObject.class)
.intercept(FieldAccessor.ofField("_SSExtraData_"));
-
final PluginAdviceDefine define =
pluginLoader.loadPluginAdviceDefine(typeDescription);
for (ConstructorPoint point : define.getConstructorPoints()) {
try {
@@ -71,7 +69,6 @@ public class ShardingSphereTransformer implements
AgentBuilder.Transformer {
log.error("Failed to load advice class: {}",
point.getAdvice(), e);
}
}
-
for (ClassStaticMethodPoint point :
define.getClassStaticMethodPoints()) {
try {
final StaticMethodAroundInterceptor interceptor = new
StaticMethodAroundInterceptor(pluginLoader.getOrCreateInstance(point.getAdvice()));
@@ -83,7 +80,6 @@ public class ShardingSphereTransformer implements
AgentBuilder.Transformer {
log.error("Failed to load advice class: {}",
point.getAdvice(), e);
}
}
-
for (InstanceMethodPoint point : define.getInstanceMethodPoints())
{
try {
final MethodAroundInterceptor interceptor = new
MethodAroundInterceptor(pluginLoader.getOrCreateInstance(point.getAdvice()));
@@ -97,7 +93,6 @@ public class ShardingSphereTransformer implements
AgentBuilder.Transformer {
}
return newBuilder;
}
-
return builder;
}
}
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/config/AgentConfigurationLoader.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/config/AgentConfigurationLoader.java
index a9dc3ab..94c9c7f 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/config/AgentConfigurationLoader.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/config/AgentConfigurationLoader.java
@@ -46,7 +46,7 @@ public final class AgentConfigurationLoader {
File configFile = null == specifiedConfigPath ? new
File(AgentPathLocator.getAgentPath(), DEFAULT_CONFIG_PATH) : new
File(specifiedConfigPath);
return loadAgentConfiguration(configFile);
}
-
+
private static AgentConfiguration loadAgentConfiguration(final File
yamlFile) throws IOException {
AgentConfiguration result = YamlEngine.unmarshal(yamlFile,
AgentConfiguration.class);
Preconditions.checkNotNull(result, "Agent configuration file `%s` is
invalid.", yamlFile.getName());
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginAdviceDefine.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginAdviceDefine.java
index cbb74e2..8715355 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginAdviceDefine.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginAdviceDefine.java
@@ -108,6 +108,7 @@ public final class PluginAdviceDefine {
* Plugin advice configuration builder.
*/
public static final class Builder {
+
private final List<ConstructorPoint> constructorPoints =
Lists.newArrayList();
private final List<InstanceMethodPoint> instanceMethodPoints =
Lists.newArrayList();
@@ -150,7 +151,6 @@ public final class PluginAdviceDefine {
return new StaticMethodPointBuilder(this, matcher);
}
-
/**
* Build configuration.
*
@@ -214,6 +214,7 @@ public final class PluginAdviceDefine {
* Static method intercepting point configuration builder.
*/
public static final class StaticMethodPointBuilder {
+
private final Builder builder;
private String classNameOfAdvice;
@@ -258,13 +259,13 @@ public final class PluginAdviceDefine {
builder.classStaticMethodPoints.add(new
ClassStaticMethodPoint(matcher, classNameOfAdvice, overrideArgs));
return builder;
}
-
}
/**
* Instance constructor intercepting point configuration builder.
*/
public static final class ConstructorPointBuilder {
+
private final Builder builder;
private String classNameOfAdvice;
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginDefine.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginDefine.java
index 5490542..b8b4379 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginDefine.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginDefine.java
@@ -29,16 +29,16 @@ import java.util.stream.Collectors;
* Plugin definition.
*/
public abstract class PluginDefine {
-
+
private final Map<String, PluginAdviceDefine.Builder> defineMap =
Maps.newHashMap();
-
+
private final List<Class<? extends Service>> services =
Lists.newArrayList();
-
+
/**
- * Configure the plugin here.
+ * Define the plugin here.
*/
protected abstract void define();
-
+
protected PluginAdviceDefine.Builder intercept(final String
classNameOfTarget) {
if (defineMap.containsKey(classNameOfTarget)) {
return defineMap.get(classNameOfTarget);
@@ -47,7 +47,7 @@ public abstract class PluginDefine {
defineMap.put(classNameOfTarget, builder);
return builder;
}
-
+
/**
* Register service to agent.
*
@@ -56,7 +56,7 @@ public abstract class PluginDefine {
protected void registerService(final Class<? extends Service> service) {
services.add(service);
}
-
+
/**
* To build Plugin definition.
*
@@ -64,17 +64,15 @@ public abstract class PluginDefine {
*/
public final List<PluginAdviceDefine> build() {
define();
- return defineMap.values().stream()
- .map(PluginAdviceDefine.Builder::install)
- .collect(Collectors.toList());
+ return
defineMap.values().stream().map(PluginAdviceDefine.Builder::install).collect(Collectors.toList());
}
-
+
/**
* To get all services.
*
* @return all services.
*/
- public List<Class<? extends Service>> getAllServics() {
+ public List<Class<? extends Service>> getAllServices() {
return services;
}
}
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLoader.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLoader.java
index d35cff8..7e9f97a 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLoader.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLoader.java
@@ -48,19 +48,19 @@ import java.util.zip.ZipEntry;
*/
@Slf4j
public final class PluginLoader extends ClassLoader implements Closeable {
-
+
private static final PluginLoader INSTANCE = new PluginLoader();
-
+
private final ConcurrentHashMap<String, Object> objectPool = new
ConcurrentHashMap<>();
-
+
private final ReentrantLock lock = new ReentrantLock();
-
+
private final List<JarFile> jars = Lists.newArrayList();
-
+
private final List<Service> services = Lists.newArrayList();
-
+
private Map<String, PluginAdviceDefine> pluginDefineMap;
-
+
private PluginLoader() {
try {
pluginDefineMap = loadAllPlugins();
@@ -68,7 +68,7 @@ public final class PluginLoader extends ClassLoader
implements Closeable {
log.error("Failed to load plugins.");
}
}
-
+
@Override
protected Class<?> findClass(final String name) throws
ClassNotFoundException {
String path = classNameToPath(name);
@@ -85,7 +85,7 @@ public final class PluginLoader extends ClassLoader
implements Closeable {
}
throw new ClassNotFoundException("Class " + name + " not found.");
}
-
+
@Override
public void close() {
for (JarFile jar : jars) {
@@ -96,7 +96,7 @@ public final class PluginLoader extends ClassLoader
implements Closeable {
}
}
}
-
+
/**
* To get plugin loader instance.
*
@@ -105,43 +105,35 @@ public final class PluginLoader extends ClassLoader
implements Closeable {
public static PluginLoader getInstance() {
return INSTANCE;
}
-
+
private Map<String, PluginAdviceDefine> loadAllPlugins() throws
IOException {
File[] jarFiles = AgentPathLocator.getAgentPath().listFiles(file ->
file.getName().endsWith(".jar"));
ImmutableMap.Builder<String, PluginAdviceDefine> pluginDefineMap =
ImmutableMap.builder();
if (jarFiles == null) {
return pluginDefineMap.build();
}
-
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-
for (File jarFile : jarFiles) {
outputStream.reset();
-
JarFile jar = new JarFile(jarFile, true);
jars.add(jar);
-
Attributes attributes = jar.getManifest().getMainAttributes();
String entrypoint = attributes.getValue("Entrypoint");
if (Strings.isNullOrEmpty(entrypoint)) {
log.warn("Entrypoint is not setting in {}.",
jarFile.getName());
continue;
}
-
ByteStreams.copy(jar.getInputStream(jar.getEntry(classNameToPath(entrypoint))),
outputStream);
-
try {
PluginDefine config = (PluginDefine) defineClass(entrypoint,
outputStream.toByteArray(), 0, outputStream.size())
.newInstance();
-
- config.getAllServics().forEach(klass -> {
+ config.getAllServices().forEach(klass -> {
try {
services.add(klass.newInstance());
} catch (InstantiationException | IllegalAccessException
e) {
log.error("Failed to create service instance, {}.",
klass.getTypeName(), e);
}
});
-
config.build().forEach(plugin ->
pluginDefineMap.put(plugin.getClassNameOfTarget(), plugin));
} catch (InstantiationException | IllegalAccessException e) {
log.error("Failed to load plugin definition, {}.", entrypoint,
e);
@@ -149,11 +141,11 @@ public final class PluginLoader extends ClassLoader
implements Closeable {
}
return pluginDefineMap.build();
}
-
+
private String classNameToPath(final String className) {
return className.replace(".", "/") + ".class";
}
-
+
/**
* To find all intercepting target classes then to build TypeMatcher.
*
@@ -162,7 +154,7 @@ public final class PluginLoader extends ClassLoader
implements Closeable {
public ElementMatcher<? super TypeDescription> typeMatcher() {
return
ElementMatchers.anyOf(pluginDefineMap.keySet().stream().map(ElementMatchers::named).toArray());
}
-
+
/**
* To detect the type whether or not exists.
*
@@ -172,7 +164,7 @@ public final class PluginLoader extends ClassLoader
implements Closeable {
public boolean containsType(final TypeDescription typeDescription) {
return pluginDefineMap.containsKey(typeDescription.getTypeName());
}
-
+
/**
* Load the definition configuration by TypeDescription.
*
@@ -185,12 +177,12 @@ public final class PluginLoader extends ClassLoader
implements Closeable {
}
throw new AdviceNotFoundException();
}
-
+
/**
* To get or create instance of the advice class. Create new one and
caching when it is not exist.
*
- * @param classNameOfAdvice the class name of advice
- * @param <T> the advice type.
+ * @param classNameOfAdvice class name of advice
+ * @param <T> advice type.
* @return instance of advice
*/
@SneakyThrows({ClassNotFoundException.class, IllegalAccessException.class,
InstantiationException.class})
@@ -199,7 +191,6 @@ public final class PluginLoader extends ClassLoader
implements Closeable {
if (objectPool.containsKey(classNameOfAdvice)) {
return (T) objectPool.get(classNameOfAdvice);
}
-
lock.lock();
try {
Object inst = objectPool.get(classNameOfAdvice);
@@ -213,7 +204,7 @@ public final class PluginLoader extends ClassLoader
implements Closeable {
lock.unlock();
}
}
-
+
/**
* Initial all services.
*/
@@ -228,7 +219,7 @@ public final class PluginLoader extends ClassLoader
implements Closeable {
}
});
}
-
+
/**
* Start all services.
*/
@@ -243,7 +234,7 @@ public final class PluginLoader extends ClassLoader
implements Closeable {
}
});
}
-
+
/**
* Shutdown all services.
*/
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorAdvice.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorAdvice.java
index 560f4ad..c2d3999 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorAdvice.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorAdvice.java
@@ -22,7 +22,7 @@ package org.apache.shardingsphere.agent.core.plugin.advice;
* Weaving the advice around the constructor of target class.
*/
public interface ConstructorAdvice {
-
+
/**
* Intercept the target's constructor. This method is weaved after the
constructor execution.
*
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorMethodInterceptor.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorMethodInterceptor.java
index dfa3916..10e5169 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorMethodInterceptor.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorMethodInterceptor.java
@@ -28,12 +28,13 @@ import net.bytebuddy.implementation.bind.annotation.This;
*/
@Slf4j
public class ConstructorMethodInterceptor {
+
private final ConstructorAdvice advice;
-
+
public ConstructorMethodInterceptor(final ConstructorAdvice advice) {
this.advice = advice;
}
-
+
/**
* Intercept constructor.
*
@@ -50,5 +51,4 @@ public class ConstructorMethodInterceptor {
log.error("Constructor advice execution error. class: {}",
target.getClass().getTypeName(), throwable);
}
}
-
}
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/MethodAroundAdvice.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/MethodAroundAdvice.java
index cb43791..4db2771 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/MethodAroundAdvice.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/MethodAroundAdvice.java
@@ -24,7 +24,7 @@ import java.lang.reflect.Method;
* Weaving the advice around the target method.
*/
public interface MethodAroundAdvice {
-
+
/**
* Intercept the target method and weave the method before origin method.
It will invoke before the origin calling.
*
@@ -34,7 +34,7 @@ public interface MethodAroundAdvice {
* @param result wrapped class of result to detect whether or not to
execute the origin method.
*/
void beforeMethod(TargetObject target, Method method, Object[] args,
MethodInvocationResult result);
-
+
/**
* Intercept the target method and weave the method after origin method.
It will invoke after the origin calling.
*
@@ -44,7 +44,7 @@ public interface MethodAroundAdvice {
* @param result wrapped class of result to detect whether or not to
execute the origin method.
*/
void afterMethod(TargetObject target, Method method, Object[] args,
MethodInvocationResult result);
-
+
/**
* Weaving the method after origin method throwing.
*
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/MethodAroundInterceptor.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/MethodAroundInterceptor.java
index 123f50e..c439db1 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/MethodAroundInterceptor.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/MethodAroundInterceptor.java
@@ -34,12 +34,13 @@ import java.util.concurrent.Callable;
*/
@Slf4j
public class MethodAroundInterceptor {
+
private final MethodAroundAdvice advice;
-
+
public MethodAroundInterceptor(final MethodAroundAdvice advice) {
this.advice = advice;
}
-
+
/**
* Only intercept instance method.
*
@@ -54,9 +55,7 @@ public class MethodAroundInterceptor {
public Object intercept(final @This Object target, final @Origin Method
method, final @AllArguments Object[] args, final @SuperCall Callable<?> uber) {
final TargetObject instance = (TargetObject) target;
final MethodInvocationResult result = new MethodInvocationResult();
-
Object ret;
-
try {
advice.beforeMethod(instance, method, args, result);
// CHECKSTYLE:OFF
@@ -64,7 +63,6 @@ public class MethodAroundInterceptor {
// CHECKSTYLE:ON
log.error("Failed to execute the pre-method of method[{}] in
class[{}].", method.getName(), target.getClass(), throwable);
}
-
try {
if (result.isRebased()) {
ret = result.getResult();
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/MethodInvocationResult.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/MethodInvocationResult.java
index fea7038..9bcb77f 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/MethodInvocationResult.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/MethodInvocationResult.java
@@ -22,10 +22,11 @@ package org.apache.shardingsphere.agent.core.plugin.advice;
* The advice method invocation result.
*/
public class MethodInvocationResult {
+
private boolean isRebased;
-
+
private Object result;
-
+
/**
* To replace the origin result.
*
@@ -35,7 +36,7 @@ public class MethodInvocationResult {
isRebased = true;
this.result = result;
}
-
+
/**
* Whether or not to discard origin method.
*
@@ -44,7 +45,7 @@ public class MethodInvocationResult {
public boolean isRebased() {
return isRebased;
}
-
+
/**
* Result that is provided by per-method advice.
*
@@ -53,5 +54,5 @@ public class MethodInvocationResult {
public Object getResult() {
return result;
}
-
+
}
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/OverrideArgsInvoker.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/OverrideArgsInvoker.java
index cc1f2fc..bce2036 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/OverrideArgsInvoker.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/OverrideArgsInvoker.java
@@ -22,7 +22,7 @@ package org.apache.shardingsphere.agent.core.plugin.advice;
* Super(origin) method invoker for ByteBuddy only.
*/
public interface OverrideArgsInvoker {
-
+
/**
* Invocation origin method.
*
@@ -30,5 +30,5 @@ public interface OverrideArgsInvoker {
* @return the result of the origin method.
*/
Object call(Object[] args);
-
+
}
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundAdvice.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundAdvice.java
index 602ac41..c853f71 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundAdvice.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundAdvice.java
@@ -24,7 +24,7 @@ import java.lang.reflect.Method;
* Weaving the advice around the static methods of target class.
*/
public interface StaticMethodAroundAdvice {
-
+
/**
* Intercept the target method and weave the method before origin method.
It will invoke before the origin calling.
*
@@ -34,7 +34,7 @@ public interface StaticMethodAroundAdvice {
* @param result wrapped class of result to detect whether or not to
execute the origin method.
*/
void beforeMethod(Class<?> klass, Method method, Object[] args,
MethodInvocationResult result);
-
+
/**
* Intercept the target method and weave the method after origin method.
It will invoke after the origin calling.
*
@@ -44,7 +44,7 @@ public interface StaticMethodAroundAdvice {
* @param result wrapped class of result to detect whether or not to
execute the origin method.
*/
void afterMethod(Class<?> klass, Method method, Object[] args,
MethodInvocationResult result);
-
+
/**
* Weaving the method after origin method throwing.
*
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundInterceptor.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundInterceptor.java
index 32078ae..36f2daa 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundInterceptor.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundInterceptor.java
@@ -33,13 +33,13 @@ import java.util.concurrent.Callable;
*/
@Slf4j
public class StaticMethodAroundInterceptor {
-
+
private final StaticMethodAroundAdvice advice;
-
+
public StaticMethodAroundInterceptor(final StaticMethodAroundAdvice
advice) {
this.advice = advice;
}
-
+
/**
* Only intercept static method.
*
@@ -54,7 +54,6 @@ public class StaticMethodAroundInterceptor {
public Object intercept(final @Origin Class<?> klass, final @Origin Method
method, final @AllArguments Object[] args, final @SuperCall Callable<?> uber) {
final MethodInvocationResult result = new MethodInvocationResult();
final Object ret;
-
try {
advice.afterMethod(klass, method, args, result);
// CHECKSTYLE:OFF
@@ -62,7 +61,6 @@ public class StaticMethodAroundInterceptor {
// CHECKSTYLE:ON
log.error("Failed to execute the pre-method of method[{}] in
class[{}].", method.getName(), klass, throwable);
}
-
try {
if (result.isRebased()) {
ret = result.getResult();
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/TargetObject.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/TargetObject.java
index b959dad..a378ad0 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/TargetObject.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/TargetObject.java
@@ -22,19 +22,18 @@ package org.apache.shardingsphere.agent.core.plugin.advice;
* Wrapped class for target and provide a context to store variable during
invocation.
*/
public interface TargetObject {
-
+
/**
* Get the variable from context.
*
* @return the attachment.
*/
Object getAttachment();
-
+
/**
* Store a variable into context.
*
* @param attachment what variable you want to store.
*/
void setAttachment(Object attachment);
-
}
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/point/ClassStaticMethodPoint.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/point/ClassStaticMethodPoint.java
index d15c3b1..fc25bd5 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/point/ClassStaticMethodPoint.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/point/ClassStaticMethodPoint.java
@@ -25,19 +25,19 @@ import net.bytebuddy.matcher.ElementMatcher;
* Configuration of static method intercepting point.
*/
public class ClassStaticMethodPoint {
-
+
private final ElementMatcher<? super MethodDescription> matcher;
-
+
private final String advice;
-
+
private final boolean overrideArgs;
-
+
public ClassStaticMethodPoint(final ElementMatcher<? super
MethodDescription> matcher, final String advice, final boolean overrideArgs) {
this.matcher = matcher;
this.advice = advice;
this.overrideArgs = overrideArgs;
}
-
+
/**
* To detect target method constraints.
*
@@ -46,7 +46,7 @@ public class ClassStaticMethodPoint {
public ElementMatcher<? super MethodDescription> getMethodsMatcher() {
return matcher;
}
-
+
/**
* To get the class name of advice.
*
@@ -55,7 +55,7 @@ public class ClassStaticMethodPoint {
public String getAdvice() {
return advice;
}
-
+
/**
* To detect whether to override origin arguments.
*
@@ -64,5 +64,4 @@ public class ClassStaticMethodPoint {
public boolean isOverrideArgs() {
return overrideArgs;
}
-
}
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/point/ConstructorPoint.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/point/ConstructorPoint.java
index a64e789..1ce19ad 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/point/ConstructorPoint.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/point/ConstructorPoint.java
@@ -25,15 +25,16 @@ import net.bytebuddy.matcher.ElementMatcher;
* Configuration of constructor intercepting point.
*/
public class ConstructorPoint {
+
private final ElementMatcher<? super MethodDescription> matcher;
-
+
private final String advice;
-
+
public ConstructorPoint(final ElementMatcher<? super MethodDescription>
matcher, final String advice) {
this.matcher = matcher;
this.advice = advice;
}
-
+
/**
* To detect target constructor constraints.
*
@@ -42,7 +43,7 @@ public class ConstructorPoint {
public ElementMatcher<? super MethodDescription> getConstructorMatcher() {
return matcher;
}
-
+
/**
* To get the class name of advice.
*
@@ -51,5 +52,4 @@ public class ConstructorPoint {
public String getAdvice() {
return advice;
}
-
}
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/point/InstanceMethodPoint.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/point/InstanceMethodPoint.java
index b380023..d1b3c35 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/point/InstanceMethodPoint.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/point/InstanceMethodPoint.java
@@ -25,18 +25,19 @@ import net.bytebuddy.matcher.ElementMatcher;
* Configuration of instance method intercepting point.
*/
public class InstanceMethodPoint {
+
private final ElementMatcher<? super MethodDescription> matcher;
-
+
private final String advice;
-
+
private final boolean overrideArgs;
-
+
public InstanceMethodPoint(final ElementMatcher<? super MethodDescription>
matcher, final String advice, final boolean overrideArgs) {
this.matcher = matcher;
this.advice = advice;
this.overrideArgs = overrideArgs;
}
-
+
/**
* Detecting target method constraints but static methods.
*
@@ -45,7 +46,7 @@ public class InstanceMethodPoint {
public ElementMatcher<? super MethodDescription> getMethodMatcher() {
return matcher;
}
-
+
/**
* To get the class name of advice.
*
@@ -54,7 +55,7 @@ public class InstanceMethodPoint {
public String getAdvice() {
return advice;
}
-
+
/**
* To detect whether to override origin arguments.
*
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/utils/SingletonHolder.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/utils/SingletonHolder.java
index ae78b88..3d46153 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/utils/SingletonHolder.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/utils/SingletonHolder.java
@@ -24,14 +24,14 @@ import java.util.concurrent.ConcurrentHashMap;
* Singleton holder.
*/
public enum SingletonHolder {
-
+
/**
* Instance singleton.
*/
INSTANCE;
private static final Map<String, Object> SINGLES = new
ConcurrentHashMap<>();
-
+
/**
* Put entity object.
*
@@ -40,7 +40,7 @@ public enum SingletonHolder {
public void put(final Object entity) {
SINGLES.put(entity.getClass().getName(), entity);
}
-
+
/**
* Get object.
*
