From a1d5ca8b68772fb67988a58b92f0228ed968c1c5 Mon Sep 17 00:00:00 2001 From: yult97 <1904282367@qq.com> Date: Thu, 16 Mar 2023 00:33:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:ZipkinExecutorAdapter=20=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E5=87=BA=E7=8E=B0=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=20#1114?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/executor/support/adpter/ZipkinExecutorAdapter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/adpter/ZipkinExecutorAdapter.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/adpter/ZipkinExecutorAdapter.java index eb344c8c..09ae0223 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/adpter/ZipkinExecutorAdapter.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/adpter/ZipkinExecutorAdapter.java @@ -40,10 +40,10 @@ public class ZipkinExecutorAdapter implements DynamicThreadPoolAdapter { } public boolean matchSuper(Object executor) { - if (Objects.equals(MATCH_CLASS_NAME, executor.getClass().getName())) { + if (Objects.equals(MATCH_CLASS_NAME, Optional.ofNullable(executor.getClass().getName()))) { return true; } else { - return Objects.equals(MATCH_CLASS_NAME, executor.getClass().getSuperclass().getName()); + return Objects.equals(MATCH_CLASS_NAME, Optional.ofNullable(executor.getClass().getSuperclass().getName())); } } From 6c946b80d9f19d5a15d5fa3a19c5dae5991701cf Mon Sep 17 00:00:00 2001 From: yult97 <1904282367@qq.com> Date: Thu, 16 Mar 2023 11:09:30 +0800 Subject: [PATCH 2/4] fix:ZipkinExecutorAdapter NullPointerException handling --- .../core/executor/support/adpter/ZipkinExecutorAdapter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/adpter/ZipkinExecutorAdapter.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/adpter/ZipkinExecutorAdapter.java index 09ae0223..37f11208 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/adpter/ZipkinExecutorAdapter.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/adpter/ZipkinExecutorAdapter.java @@ -23,6 +23,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.lang.reflect.Field; import java.util.Objects; +import java.util.Optional; import java.util.concurrent.Executor; /** @@ -40,10 +41,10 @@ public class ZipkinExecutorAdapter implements DynamicThreadPoolAdapter { } public boolean matchSuper(Object executor) { - if (Objects.equals(MATCH_CLASS_NAME, Optional.ofNullable(executor.getClass().getName()))) { + if (Objects.equals(MATCH_CLASS_NAME, Optional.ofNullable(executor).map(executorName -> executor.getClass().getName()))) { return true; } else { - return Objects.equals(MATCH_CLASS_NAME, Optional.ofNullable(executor.getClass().getSuperclass().getName())); + return Objects.equals(MATCH_CLASS_NAME, Optional.ofNullable(executor).map(executorName -> executor.getClass().getSuperclass().getName())); } } From dde4a611e636fdefa47fa604b0d0014e347b7aad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=95=B5=E5=95=B5?= <42901410+yult97@users.noreply.github.com> Date: Thu, 16 Mar 2023 11:21:27 +0800 Subject: [PATCH 3/4] Update ZipkinExecutorAdapter.java fix:ZipkinExecutorAdapter NullPointerException handling --- .../core/executor/support/adpter/ZipkinExecutorAdapter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/adpter/ZipkinExecutorAdapter.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/adpter/ZipkinExecutorAdapter.java index eb344c8c..b77e1525 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/adpter/ZipkinExecutorAdapter.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/adpter/ZipkinExecutorAdapter.java @@ -23,6 +23,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.lang.reflect.Field; import java.util.Objects; +import java.util.Optional; import java.util.concurrent.Executor; /** @@ -40,10 +41,10 @@ public class ZipkinExecutorAdapter implements DynamicThreadPoolAdapter { } public boolean matchSuper(Object executor) { - if (Objects.equals(MATCH_CLASS_NAME, executor.getClass().getName())) { + if (Objects.equals(MATCH_CLASS_NAME, Optional.ofNullable(executor).map(executorName -> executor.getClass().getName()))) { return true; } else { - return Objects.equals(MATCH_CLASS_NAME, executor.getClass().getSuperclass().getName()); + return Objects.equals(MATCH_CLASS_NAME, Optional.ofNullable(executor).map(executorName -> executor.getClass().getSuperclass().getName())); } } From e0577ca74d544abd9e1ecaeceadbbc2dd9dea0eb Mon Sep 17 00:00:00 2001 From: yult97 <1904282367@qq.com> Date: Thu, 16 Mar 2023 14:20:16 +0800 Subject: [PATCH 4/4] fix:ZipkinExecutorAdapter NullPointerException handling --- .../core/executor/support/adpter/ZipkinExecutorAdapter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/adpter/ZipkinExecutorAdapter.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/adpter/ZipkinExecutorAdapter.java index 37f11208..9de29d56 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/adpter/ZipkinExecutorAdapter.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/adpter/ZipkinExecutorAdapter.java @@ -41,10 +41,10 @@ public class ZipkinExecutorAdapter implements DynamicThreadPoolAdapter { } public boolean matchSuper(Object executor) { - if (Objects.equals(MATCH_CLASS_NAME, Optional.ofNullable(executor).map(executorName -> executor.getClass().getName()))) { + if (Objects.equals(MATCH_CLASS_NAME, Optional.ofNullable(executor).map(Object::getClass).map(Class::getName).orElse(null))) { return true; } else { - return Objects.equals(MATCH_CLASS_NAME, Optional.ofNullable(executor).map(executorName -> executor.getClass().getSuperclass().getName())); + return Objects.equals(MATCH_CLASS_NAME, Optional.ofNullable(executor).map(Object::getClass).map(Class::getSuperclass).map(Class::getName).orElse(null)); } }