From ce5125db9cf5e93f77dcdb7ccb52664dc2b69bff Mon Sep 17 00:00:00 2001 From: redkale Date: Mon, 11 Dec 2023 18:34:03 +0800 Subject: [PATCH] CacheManagerService --- .../java/org/redkale/boot/Application.java | 18 +++++++++--------- ...cheEngine.java => CacheManagerService.java} | 10 +++++----- ...Engine.java => ScheduleManagerService.java} | 10 +++++----- .../org/redkale/test/caching/CachingTest.java | 4 ++-- .../redkale/test/scheduling/ScheduleTest.java | 4 ++-- 5 files changed, 23 insertions(+), 23 deletions(-) rename src/main/java/org/redkale/caching/{CacheEngine.java => CacheManagerService.java} (97%) rename src/main/java/org/redkale/scheduling/{ScheduleEngine.java => ScheduleManagerService.java} (97%) diff --git a/src/main/java/org/redkale/boot/Application.java b/src/main/java/org/redkale/boot/Application.java index 2e7c3640e..b7e8d9ff4 100644 --- a/src/main/java/org/redkale/boot/Application.java +++ b/src/main/java/org/redkale/boot/Application.java @@ -31,7 +31,7 @@ import org.redkale.mq.*; import org.redkale.net.*; import org.redkale.net.http.*; import org.redkale.net.sncp.*; -import org.redkale.scheduling.ScheduleEngine; +import org.redkale.scheduling.ScheduleManagerService; import org.redkale.service.Service; import org.redkale.source.*; import org.redkale.util.*; @@ -209,7 +209,7 @@ public final class Application { final ResourceFactory resourceFactory = ResourceFactory.create(); //全局定时任务管理器 - private final ScheduleEngine scheduleEngine; + private final ScheduleManagerService scheduleManager; //服务配置项 final AnyValue config; @@ -626,8 +626,8 @@ public final class Application { } { //设置定时管理 - this.scheduleEngine = ScheduleEngine.create(this::getPropertyValue).enabled(!isCompileMode()); - this.resourceFactory.register("", this.scheduleEngine); + this.scheduleManager = ScheduleManagerService.create(this::getPropertyValue).enabled(!isCompileMode()); + this.resourceFactory.register("", this.scheduleManager); } { //加载原生sql解析器 @@ -2163,11 +2163,11 @@ public final class Application { } public void schedule(Object service) { - this.scheduleEngine.schedule(service); + this.scheduleManager.schedule(service); } public void unschedule(Object service) { - this.scheduleEngine.unschedule(service); + this.scheduleManager.unschedule(service); } void updateEnvironmentProperties(String namespace, List events) { @@ -2633,7 +2633,7 @@ public final class Application { if (this.workExecutor != null) { this.workExecutor.shutdownNow(); } - this.scheduleEngine.destroy(); + this.scheduleManager.destroy(); long intms = System.currentTimeMillis() - f; String ms = String.valueOf(intms); @@ -2747,8 +2747,8 @@ public final class Application { return clusterAgent; } - public ScheduleEngine getScheduleEngine() { - return this.scheduleEngine; + public ScheduleManagerService getScheduleManager() { + return this.scheduleManager; } public MessageAgent getMessageAgent(String name) { diff --git a/src/main/java/org/redkale/caching/CacheEngine.java b/src/main/java/org/redkale/caching/CacheManagerService.java similarity index 97% rename from src/main/java/org/redkale/caching/CacheEngine.java rename to src/main/java/org/redkale/caching/CacheManagerService.java index 612a15394..998674adf 100644 --- a/src/main/java/org/redkale/caching/CacheEngine.java +++ b/src/main/java/org/redkale/caching/CacheManagerService.java @@ -28,7 +28,7 @@ import org.redkale.util.TypeToken; @Component @AutoLoad(false) @ResourceType(CacheManager.class) -public class CacheEngine implements CacheManager, Service { +public class CacheManagerService implements CacheManager, Service { //缓存配置项 protected boolean enabled = true; @@ -45,12 +45,12 @@ public class CacheEngine implements CacheManager, Service { //远程缓存Source protected CacheSource remoteSource; - protected CacheEngine(@Nullable CacheSource remoteSource) { + protected CacheManagerService(@Nullable CacheSource remoteSource) { this.remoteSource = remoteSource; } - public static CacheEngine create(@Nullable CacheSource remoteSource) { - return new CacheEngine(remoteSource); + public static CacheManagerService create(@Nullable CacheSource remoteSource) { + return new CacheManagerService(remoteSource); } @Override @@ -76,7 +76,7 @@ public class CacheEngine implements CacheManager, Service { return enabled; } - public CacheEngine addHash(String hash) { + public CacheManagerService addHash(String hash) { this.hashNames.add(hash); return this; } diff --git a/src/main/java/org/redkale/scheduling/ScheduleEngine.java b/src/main/java/org/redkale/scheduling/ScheduleManagerService.java similarity index 97% rename from src/main/java/org/redkale/scheduling/ScheduleEngine.java rename to src/main/java/org/redkale/scheduling/ScheduleManagerService.java index ef38d066e..6648c9b38 100644 --- a/src/main/java/org/redkale/scheduling/ScheduleEngine.java +++ b/src/main/java/org/redkale/scheduling/ScheduleManagerService.java @@ -49,7 +49,7 @@ import org.redkale.util.Utility; @Component @AutoLoad(false) @ResourceType(ScheduleManager.class) -public class ScheduleEngine implements ScheduleManager, Service { +public class ScheduleManagerService implements ScheduleManager, Service { protected final Logger logger = Logger.getLogger(this.getClass().getSimpleName()); @@ -64,17 +64,17 @@ public class ScheduleEngine implements ScheduleManager, Service { private boolean enabled = true; - protected ScheduleEngine(UnaryOperator propertyFunc) { + protected ScheduleManagerService(UnaryOperator propertyFunc) { this.propertyFunc = propertyFunc; this.scheduler = new ScheduledThreadPoolExecutor(Utility.cpus(), Utility.newThreadFactory("Scheduled-Task-Thread-%s")); this.scheduler.setRemoveOnCancelPolicy(true); } - public static ScheduleEngine create(UnaryOperator propertyFunc) { - return new ScheduleEngine(propertyFunc); + public static ScheduleManagerService create(UnaryOperator propertyFunc) { + return new ScheduleManagerService(propertyFunc); } - public ScheduleEngine enabled(boolean val) { + public ScheduleManagerService enabled(boolean val) { this.enabled = val; return this; } diff --git a/src/test/java/org/redkale/test/caching/CachingTest.java b/src/test/java/org/redkale/test/caching/CachingTest.java index 47e765aa9..656f4aeff 100644 --- a/src/test/java/org/redkale/test/caching/CachingTest.java +++ b/src/test/java/org/redkale/test/caching/CachingTest.java @@ -6,7 +6,7 @@ package org.redkale.test.caching; import java.time.Duration; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.redkale.caching.CacheEngine; +import org.redkale.caching.CacheManagerService; import org.redkale.convert.json.JsonConvert; import org.redkale.source.CacheMemorySource; import org.redkale.util.Utility; @@ -26,7 +26,7 @@ public class CachingTest { public void run() throws Exception { CacheMemorySource remoteSource = new CacheMemorySource("remote"); remoteSource.init(null); - CacheEngine cache = CacheEngine.create(remoteSource); + CacheManagerService cache = CacheManagerService.create(remoteSource); cache.init(null); Duration expire = Duration.ofMillis(490); cache.localSetString("user", "name:haha", "myha", expire); diff --git a/src/test/java/org/redkale/test/scheduling/ScheduleTest.java b/src/test/java/org/redkale/test/scheduling/ScheduleTest.java index 4aad9f709..7308e6126 100644 --- a/src/test/java/org/redkale/test/scheduling/ScheduleTest.java +++ b/src/test/java/org/redkale/test/scheduling/ScheduleTest.java @@ -4,7 +4,7 @@ package org.redkale.test.scheduling; import org.junit.jupiter.api.Test; -import org.redkale.scheduling.ScheduleEngine; +import org.redkale.scheduling.ScheduleManagerService; import org.redkale.util.Utility; /** @@ -20,7 +20,7 @@ public class ScheduleTest { @Test public void run() throws Exception { - ScheduleEngine factory = ScheduleEngine.create(null); + ScheduleManagerService factory = ScheduleManagerService.create(null); ScheduleService service = new ScheduleService(); factory.schedule(service); Utility.sleep(3000);