[#noissue] Cleanup

pinpoint-apm · May 26, 2023 · 39e5384 · 39e5384
1 parent aad5b95
commit 39e5384
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 31 deletions.
diff --git a/...va/com/navercorp/pinpoint/plugin/redis/lettuce/interceptor/AttachEndPointInterceptor.java b/...va/com/navercorp/pinpoint/plugin/redis/lettuce/interceptor/AttachEndPointInterceptor.java
@@ -16,16 +16,10 @@
 
 package com.navercorp.pinpoint.plugin.redis.lettuce.interceptor;
 
-import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor;
-import com.navercorp.pinpoint.bootstrap.context.TraceContext;
 import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor;
 import com.navercorp.pinpoint.bootstrap.logging.PLogger;
 import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
 import com.navercorp.pinpoint.plugin.redis.lettuce.EndPointAccessor;
-import io.lettuce.core.ConnectionFuture;
-import io.lettuce.core.cluster.StatefulRedisClusterConnectionImpl;
-
-import java.util.concurrent.CompletableFuture;
 
 /**
  * @author jaehong.kim

diff --git a/...avercorp/pinpoint/plugin/redis/lettuce/interceptor/RedisClientConstructorInterceptor.java b/...avercorp/pinpoint/plugin/redis/lettuce/interceptor/RedisClientConstructorInterceptor.java
@@ -16,16 +16,13 @@
 
 package com.navercorp.pinpoint.plugin.redis.lettuce.interceptor;
 
-import com.navercorp.pinpoint.common.plugin.util.HostAndPort;
-import com.navercorp.pinpoint.common.util.ArrayUtils;
-import io.lettuce.core.RedisURI;
-
-import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor;
-import com.navercorp.pinpoint.bootstrap.context.TraceContext;
 import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor;
 import com.navercorp.pinpoint.bootstrap.logging.PLogger;
 import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
+import com.navercorp.pinpoint.common.plugin.util.HostAndPort;
+import com.navercorp.pinpoint.common.util.ArrayUtils;
 import com.navercorp.pinpoint.plugin.redis.lettuce.EndPointAccessor;
+import io.lettuce.core.RedisURI;
 
 /**
  * @author jaehong.kim
@@ -34,7 +31,7 @@ public class RedisClientConstructorInterceptor implements AroundInterceptor {
     private final PLogger logger = PLoggerFactory.getLogger(this.getClass());
     private final boolean isDebug = logger.isDebugEnabled();
 
-    public RedisClientConstructorInterceptor(final TraceContext traceContext, final MethodDescriptor methodDescriptor) {
+    public RedisClientConstructorInterceptor() {
     }
 
     @Override

diff --git a/...p/pinpoint/plugin/redis/lettuce/interceptor/RedisClusterClientConstructorInterceptor.java b/...p/pinpoint/plugin/redis/lettuce/interceptor/RedisClusterClientConstructorInterceptor.java
@@ -16,29 +16,25 @@
 
 package com.navercorp.pinpoint.plugin.redis.lettuce.interceptor;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor;
-import com.navercorp.pinpoint.bootstrap.context.TraceContext;
 import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor;
 import com.navercorp.pinpoint.bootstrap.logging.PLogger;
 import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
 import com.navercorp.pinpoint.common.plugin.util.HostAndPort;
 import com.navercorp.pinpoint.common.util.ArrayUtils;
 import com.navercorp.pinpoint.plugin.redis.lettuce.EndPointAccessor;
-
 import io.lettuce.core.RedisURI;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author messi-gao
  */
 public class RedisClusterClientConstructorInterceptor implements AroundInterceptor {
     private final PLogger logger = PLoggerFactory.getLogger(this.getClass());
     private final boolean isDebug = logger.isDebugEnabled();
 
-    public RedisClusterClientConstructorInterceptor(final TraceContext traceContext,
-                                                    final MethodDescriptor methodDescriptor) {
+    public RedisClusterClientConstructorInterceptor() {
     }
 
     @Override

diff --git a/...m/navercorp/pinpoint/plugin/redis/lettuce/interceptor/RunnableNewInstanceInterceptor.java b/...m/navercorp/pinpoint/plugin/redis/lettuce/interceptor/RunnableNewInstanceInterceptor.java
@@ -18,8 +18,6 @@
 
 import com.navercorp.pinpoint.bootstrap.async.AsyncContextAccessorUtils;
 import com.navercorp.pinpoint.bootstrap.context.AsyncContext;
-import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor;
-import com.navercorp.pinpoint.bootstrap.context.TraceContext;
 import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor;
 import com.navercorp.pinpoint.bootstrap.logging.PLogger;
 import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
@@ -31,7 +29,7 @@ public class RunnableNewInstanceInterceptor implements AroundInterceptor {
     private final PLogger logger = PLoggerFactory.getLogger(getClass());
     private final boolean isDebug = logger.isDebugEnabled();
 
-    public RunnableNewInstanceInterceptor(TraceContext traceContext, MethodDescriptor methodDescriptor) {
+    public RunnableNewInstanceInterceptor() {
     }
 
     @Override

diff --git a/...java/com/navercorp/pinpoint/plugin/redis/jedis/interceptor/AttachEndPointInterceptor.java b/...java/com/navercorp/pinpoint/plugin/redis/jedis/interceptor/AttachEndPointInterceptor.java
@@ -15,13 +15,12 @@
  */
 package com.navercorp.pinpoint.plugin.redis.jedis.interceptor;
 
-import com.navercorp.pinpoint.common.util.ArrayUtils;
-import redis.clients.jedis.Client;
-
 import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor;
 import com.navercorp.pinpoint.bootstrap.logging.PLogger;
 import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
+import com.navercorp.pinpoint.common.util.ArrayArgumentUtils;
 import com.navercorp.pinpoint.plugin.redis.jedis.EndPointAccessor;
+import redis.clients.jedis.Client;
 
 /**
  * @author jaehong.kim
@@ -54,21 +53,22 @@ public void before(Object target, Object[] args) {
     }
 
     private boolean validate(final Object target, final Object[] args) {
-        if (ArrayUtils.isEmpty(args) || args[0] == null) {
+        final Object arg0 = ArrayArgumentUtils.getArgument(args, 0, Object.class);
+        if (arg0 == null) {
             if (isDebug) {
                 logger.debug("Invalid arguments. Null or not found args({}).", args);
             }
             return false;
         }
 
-        if (!(args[0] instanceof Client)) {
+        if (!(arg0 instanceof Client)) {
             if (isDebug) {
-                logger.debug("Invalid arguments. Expect Client but args[0]({}).", args[0]);
+                logger.debug("Invalid arguments. Expect Client but args[0]({}).", arg0);
             }
             return false;
         }
 
-        if (!(args[0] instanceof EndPointAccessor)) {
+        if (!(arg0 instanceof EndPointAccessor)) {
             if (isDebug) {
                 logger.debug("Invalid args[0] object. Need field accessor({}).", EndPointAccessor.class.getName());
             }