From b0d242658c2aad6dea9541accccf41d538573f79 Mon Sep 17 00:00:00 2001 From: godotg Date: Sat, 2 Sep 2023 19:23:07 +0800 Subject: [PATCH] ref[thread]: deprecated method in java 17 --- .../src/main/java/com/zfoo/event/manager/EventBus.java | 2 +- .../zfoo/net/consumer/registry/ZookeeperRegistry.java | 2 +- net/src/main/java/com/zfoo/net/task/TaskBus.java | 2 +- .../java/com/zfoo/scheduler/manager/SchedulerBus.java | 2 +- util/src/main/java/com/zfoo/util/ThreadUtils.java | 10 +--------- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/event/src/main/java/com/zfoo/event/manager/EventBus.java b/event/src/main/java/com/zfoo/event/manager/EventBus.java index b9b09c79..f000ea86 100644 --- a/event/src/main/java/com/zfoo/event/manager/EventBus.java +++ b/event/src/main/java/com/zfoo/event/manager/EventBus.java @@ -71,7 +71,7 @@ public abstract class EventBus { private final ThreadGroup group; public EventThreadFactory(int poolNumber) { - this.group = ThreadUtils.currentThreadGroup(); + this.group = Thread.currentThread().getThreadGroup(); this.poolNumber = poolNumber; } diff --git a/net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java b/net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java index 1a6dbfa8..55bc651e 100644 --- a/net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java +++ b/net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java @@ -85,7 +85,7 @@ public class ZookeeperRegistry implements IRegistry { // config-p1-t1 = config-pool-1-thread-1 ConfigThreadFactory() { - this.group = ThreadUtils.currentThreadGroup(); + this.group = Thread.currentThread().getThreadGroup(); namePrefix = "config-p" + poolNumber.getAndIncrement() + "-t"; } diff --git a/net/src/main/java/com/zfoo/net/task/TaskBus.java b/net/src/main/java/com/zfoo/net/task/TaskBus.java index 4a74eff1..129df285 100644 --- a/net/src/main/java/com/zfoo/net/task/TaskBus.java +++ b/net/src/main/java/com/zfoo/net/task/TaskBus.java @@ -81,7 +81,7 @@ public final class TaskBus { private final ThreadGroup group; public TaskThreadFactory(int poolNumber) { - this.group = ThreadUtils.currentThreadGroup(); + this.group = Thread.currentThread().getThreadGroup(); this.poolNumber = poolNumber; } diff --git a/scheduler/src/main/java/com/zfoo/scheduler/manager/SchedulerBus.java b/scheduler/src/main/java/com/zfoo/scheduler/manager/SchedulerBus.java index 6f23656c..eac314e6 100644 --- a/scheduler/src/main/java/com/zfoo/scheduler/manager/SchedulerBus.java +++ b/scheduler/src/main/java/com/zfoo/scheduler/manager/SchedulerBus.java @@ -78,7 +78,7 @@ public abstract class SchedulerBus { private final ThreadGroup group; public SchedulerThreadFactory(int poolNumber) { - this.group = ThreadUtils.currentThreadGroup(); + this.group = Thread.currentThread().getThreadGroup(); this.poolNumber = poolNumber; } diff --git a/util/src/main/java/com/zfoo/util/ThreadUtils.java b/util/src/main/java/com/zfoo/util/ThreadUtils.java index 9feecbdd..d41deda1 100644 --- a/util/src/main/java/com/zfoo/util/ThreadUtils.java +++ b/util/src/main/java/com/zfoo/util/ThreadUtils.java @@ -40,19 +40,11 @@ public abstract class ThreadUtils { } } - /** - * 获取当前线程的线程组 - */ - public static ThreadGroup currentThreadGroup() { - var s = System.getSecurityManager(); - return (null != s) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup(); - } - /** * 通过线程号寻找对应的线程 */ public static Thread findThread(long threadId) { - var group = currentThreadGroup(); + var group = Thread.currentThread().getThreadGroup(); while (group != null) { var threads = new Thread[group.activeCount() * 2]; var count = group.enumerate(threads, true);