From d02ee0af3e9af2bcdd72f51f921f8a096c076367 Mon Sep 17 00:00:00 2001 From: "Xin,Zhang" Date: Fri, 2 Oct 2020 15:57:11 +0800 Subject: [PATCH] Replace != with equals (#5617) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 吴晟 Wu Sheng --- .../apm/plugin/asf/dubbo/patch/MakeWrapperInterceptor.java | 2 +- .../apm/plugin/dubbo/patch/MakeWrapperInterceptor.java | 2 +- .../apm/plugin/graphql/v12/GraphqlInterceptor.java | 6 +++--- .../apm/plugin/graphql/v8/GraphqlInterceptor.java | 4 ++-- .../apm/plugin/graphql/v9/GraphqlInterceptor.java | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/patch/MakeWrapperInterceptor.java b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/patch/MakeWrapperInterceptor.java index 2d05deca4..4f7c78035 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/patch/MakeWrapperInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/patch/MakeWrapperInterceptor.java @@ -130,7 +130,7 @@ public class MakeWrapperInterceptor implements StaticMethodsAroundInterceptor { boolean override = false; for (Method m2 : methods) { - if (m != m2 && m.getName().equals(m2.getName())) { + if (!m.equals(m2) && m.getName().equals(m2.getName())) { override = true; break; } diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/dubbo/patch/MakeWrapperInterceptor.java b/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/dubbo/patch/MakeWrapperInterceptor.java index 4119b8f51..0cf542474 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/dubbo/patch/MakeWrapperInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/dubbo/patch/MakeWrapperInterceptor.java @@ -130,7 +130,7 @@ public class MakeWrapperInterceptor implements StaticMethodsAroundInterceptor { boolean override = false; for (Method m2 : methods) { - if (m != m2 && m.getName().equals(m2.getName())) { + if (!m.equals(m2) && m.getName().equals(m2.getName())) { override = true; break; } diff --git a/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v12/GraphqlInterceptor.java b/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v12/GraphqlInterceptor.java index 013aa5dfb..bbc704522 100644 --- a/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v12/GraphqlInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v12/GraphqlInterceptor.java @@ -35,7 +35,7 @@ public class GraphqlInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { ExecutionStrategyParameters parameters = (ExecutionStrategyParameters) allArguments[1]; - if (parameters == null || parameters.getParent().getPath() != ExecutionPath.rootPath()) { + if (parameters == null || !parameters.getParent().getPath().equals(ExecutionPath.rootPath())) { return; } AbstractSpan span = ContextManager.createLocalSpan(parameters.getField().getSingleField().getName()); @@ -46,7 +46,7 @@ public class GraphqlInterceptor implements InstanceMethodsAroundInterceptor { @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { ExecutionStrategyParameters parameters = (ExecutionStrategyParameters) allArguments[1]; - if (parameters == null || parameters.getParent().getPath() != ExecutionPath.rootPath()) { + if (parameters == null || !parameters.getParent().getPath().equals(ExecutionPath.rootPath())) { return ret; } ContextManager.stopSpan(); @@ -56,7 +56,7 @@ public class GraphqlInterceptor implements InstanceMethodsAroundInterceptor { @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ExecutionStrategyParameters parameters = (ExecutionStrategyParameters) allArguments[1]; - if (parameters == null || parameters.getParent().getPath() != ExecutionPath.rootPath()) { + if (parameters == null || !parameters.getParent().getPath().equals(ExecutionPath.rootPath())) { return; } dealException(t); diff --git a/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v8/GraphqlInterceptor.java b/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v8/GraphqlInterceptor.java index b6c9ea203..91f50be88 100644 --- a/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v8/GraphqlInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v8/GraphqlInterceptor.java @@ -65,7 +65,7 @@ public class GraphqlInterceptor implements InstanceMethodsAroundInterceptor { Field field = ExecutionPath.class.getDeclaredField("parent"); field.setAccessible(true); ExecutionPath parentPath = (ExecutionPath) field.get(path); - if (parentPath != ExecutionPath.rootPath()) { + if (!parentPath.equals(ExecutionPath.rootPath())) { return ret; } ContextManager.stopSpan(); @@ -85,7 +85,7 @@ public class GraphqlInterceptor implements InstanceMethodsAroundInterceptor { Field field = ExecutionPath.class.getDeclaredField("parent"); field.setAccessible(true); ExecutionPath parentPath = (ExecutionPath) field.get(path); - if (parentPath != ExecutionPath.rootPath()) { + if (!parentPath.equals(ExecutionPath.rootPath())) { return; } dealException(t); diff --git a/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v9/GraphqlInterceptor.java b/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v9/GraphqlInterceptor.java index 7ddca7504..177d765f3 100644 --- a/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v9/GraphqlInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v9/GraphqlInterceptor.java @@ -35,7 +35,7 @@ public class GraphqlInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { ExecutionStrategyParameters parameters = (ExecutionStrategyParameters) allArguments[1]; - if (parameters == null || parameters.getParent().getPath() != ExecutionPath.rootPath()) { + if (parameters == null || !parameters.getParent().getPath().equals(ExecutionPath.rootPath())) { return; } AbstractSpan span = ContextManager.createLocalSpan(parameters.getField().get(0).getName()); @@ -46,7 +46,7 @@ public class GraphqlInterceptor implements InstanceMethodsAroundInterceptor { @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { ExecutionStrategyParameters parameters = (ExecutionStrategyParameters) allArguments[1]; - if (parameters == null || parameters.getParent().getPath() != ExecutionPath.rootPath()) { + if (parameters == null || !parameters.getParent().getPath().equals(ExecutionPath.rootPath())) { return ret; } ContextManager.stopSpan(); @@ -56,7 +56,7 @@ public class GraphqlInterceptor implements InstanceMethodsAroundInterceptor { @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ExecutionStrategyParameters parameters = (ExecutionStrategyParameters) allArguments[1]; - if (parameters == null || parameters.getParent().getPath() != ExecutionPath.rootPath()) { + if (parameters == null || !parameters.getParent().getPath().equals(ExecutionPath.rootPath())) { return; } dealException(t);