From 76c20ff026a4271ac22dfc6ec4154f0c03931e41 Mon Sep 17 00:00:00 2001 From: godotg Date: Wed, 10 Apr 2024 19:38:26 +0800 Subject: [PATCH] ref[event]: rename --- event/src/main/java/com/zfoo/event/manager/EventBus.java | 6 +++--- net/src/test/java/com/zfoo/net/router/SignalBridgeTest.java | 2 +- orm/src/main/java/com/zfoo/orm/cache/EntityCache.java | 2 +- .../java/com/zfoo/orm/cache/persister/CronOrmPersister.java | 2 +- .../java/com/zfoo/orm/cache/persister/TimeOrmPersister.java | 2 +- 5 files changed, 7 insertions(+), 7 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 721a7bd7..3da9f45f 100644 --- a/event/src/main/java/com/zfoo/event/manager/EventBus.java +++ b/event/src/main/java/com/zfoo/event/manager/EventBus.java @@ -114,7 +114,7 @@ public abstract class EventBus { for (var receiver : receivers) { switch (receiver.bus()) { case CurrentThread -> doReceiver(receiver, event); - case AsyncThread -> execute(event.executorHash(), () -> doReceiver(receiver, event)); + case AsyncThread -> asyncExecute(event.executorHash(), () -> doReceiver(receiver, event)); // case VirtualThread -> Thread.ofVirtual().name("virtual-on" + clazz.getSimpleName()).start(() -> doReceiver(receiver, event)); } } @@ -132,13 +132,13 @@ public abstract class EventBus { } public static void asyncExecute(Runnable runnable) { - execute(RandomUtils.randomInt(), runnable); + asyncExecute(RandomUtils.randomInt(), runnable); } /** * Use the event thread specified by the hashcode to execute the task */ - public static void execute(int executorHash, Runnable runnable) { + public static void asyncExecute(int executorHash, Runnable runnable) { executors[Math.abs(executorHash % EXECUTORS_SIZE)].execute(ThreadUtils.safeRunnable(runnable)); } diff --git a/net/src/test/java/com/zfoo/net/router/SignalBridgeTest.java b/net/src/test/java/com/zfoo/net/router/SignalBridgeTest.java index dedb4024..69f6b574 100644 --- a/net/src/test/java/com/zfoo/net/router/SignalBridgeTest.java +++ b/net/src/test/java/com/zfoo/net/router/SignalBridgeTest.java @@ -45,7 +45,7 @@ public class SignalBridgeTest { var countDownLatch = new CountDownLatch(executorSize); for (var i = 0; i < executorSize; i++) { - EventBus.execute(i, new Runnable() { + EventBus.asyncExecute(i, new Runnable() { @Override public void run() { addAndRemoveArray(); diff --git a/orm/src/main/java/com/zfoo/orm/cache/EntityCache.java b/orm/src/main/java/com/zfoo/orm/cache/EntityCache.java index 14abbe29..9416af25 100644 --- a/orm/src/main/java/com/zfoo/orm/cache/EntityCache.java +++ b/orm/src/main/java/com/zfoo/orm/cache/EntityCache.java @@ -69,7 +69,7 @@ public class EntityCache, E extends IEntity> imple var entity = pnode.getEntity(); @SuppressWarnings("unchecked") var entityClass = (Class) entityDef.getClazz(); - EventBus.execute(entityClass.hashCode(), new Runnable() { + EventBus.asyncExecute(entityClass.hashCode(), new Runnable() { @Override public void run() { var collection = OrmContext.getOrmManager().getCollection(entityClass); diff --git a/orm/src/main/java/com/zfoo/orm/cache/persister/CronOrmPersister.java b/orm/src/main/java/com/zfoo/orm/cache/persister/CronOrmPersister.java index 4cb6757f..47938ee4 100644 --- a/orm/src/main/java/com/zfoo/orm/cache/persister/CronOrmPersister.java +++ b/orm/src/main/java/com/zfoo/orm/cache/persister/CronOrmPersister.java @@ -75,7 +75,7 @@ public class CronOrmPersister extends AbstractOrmPersister { if (!OrmContext.isStop()) { SchedulerBus.schedule(() -> { if (!OrmContext.isStop()) { - EventBus.execute(entityDef.getClazz().hashCode(), () -> { + EventBus.asyncExecute(entityDef.getClazz().hashCode(), () -> { entityCaches.persistAll(); schedulePersist(); }); diff --git a/orm/src/main/java/com/zfoo/orm/cache/persister/TimeOrmPersister.java b/orm/src/main/java/com/zfoo/orm/cache/persister/TimeOrmPersister.java index 723ad5d1..4efe6cae 100644 --- a/orm/src/main/java/com/zfoo/orm/cache/persister/TimeOrmPersister.java +++ b/orm/src/main/java/com/zfoo/orm/cache/persister/TimeOrmPersister.java @@ -44,7 +44,7 @@ public class TimeOrmPersister extends AbstractOrmPersister { public void start() { SchedulerBus.scheduleAtFixedRate(() -> { if (!OrmContext.isStop()) { - EventBus.execute(entityDef.getClazz().hashCode(), () -> entityCaches.persistAll()); + EventBus.asyncExecute(entityDef.getClazz().hashCode(), () -> entityCaches.persistAll()); } }, rate, TimeUnit.MILLISECONDS); }