From 1a49db8a1b89b2f9a8275aef249e3da4c1d32fac Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Tue, 19 Dec 2023 00:02:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8C=85=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/module-info.java                     |  2 --
 src/main/java/org/redkale/boot/Application.java    |  4 ++--
 .../redkale/cache/{support => }/CacheAction.java   |  2 +-
 .../redkale/cache/{support => }/CacheExpire.java   |  2 +-
 .../cache/{support => }/CacheModuleEngine.java     |  6 +++---
 .../redkale/cache/{support => }/CacheValue.java    |  2 +-
 ...anagerService.java => DefaultCacheManager.java} | 14 +++++++-------
 .../schedule/{support => }/CronExpression.java     |  2 +-
 ...gerService.java => DefaultScheduleManager.java} | 12 ++++++------
 .../{support => }/ScheduleModuleEngine.java        |  6 +++---
 .../java/org/redkale/util/RedkaleClassLoader.java  |  2 --
 .../org/redkale/test/cache/CacheManagerTest.java   |  6 +++---
 .../org/redkale/test/schedule/SchedulingTest.java  |  4 ++--
 13 files changed, 30 insertions(+), 34 deletions(-)
 rename src/main/java/org/redkale/cache/{support => }/CacheAction.java (95%)
 rename src/main/java/org/redkale/cache/{support => }/CacheExpire.java (95%)
 rename src/main/java/org/redkale/cache/{support => }/CacheModuleEngine.java (91%)
 rename src/main/java/org/redkale/cache/{support => }/CacheValue.java (97%)
 rename src/main/java/org/redkale/cache/{support/CacheManagerService.java => DefaultCacheManager.java} (98%)
 rename src/main/java/org/redkale/schedule/{support => }/CronExpression.java (99%)
 rename src/main/java/org/redkale/schedule/{support/ScheduleManagerService.java => DefaultScheduleManager.java} (97%)
 rename src/main/java/org/redkale/schedule/{support => }/ScheduleModuleEngine.java (93%)

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 7914e508c..8af11c6af 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -18,7 +18,6 @@ module org.redkale {
     exports org.redkale.boot;
     exports org.redkale.boot.watch;
     exports org.redkale.cache;
-    exports org.redkale.cache.support;
     exports org.redkale.cluster;
     exports org.redkale.convert;
     exports org.redkale.convert.bson;
@@ -34,7 +33,6 @@ module org.redkale {
     exports org.redkale.net.sncp;
     exports org.redkale.persistence;
     exports org.redkale.schedule;
-    exports org.redkale.schedule.support;
     exports org.redkale.service;
     exports org.redkale.source;
     exports org.redkale.util;
diff --git a/src/main/java/org/redkale/boot/Application.java b/src/main/java/org/redkale/boot/Application.java
index 2fa651ae6..9def91d9c 100644
--- a/src/main/java/org/redkale/boot/Application.java
+++ b/src/main/java/org/redkale/boot/Application.java
@@ -22,7 +22,7 @@ import java.util.logging.*;
 import org.redkale.annotation.Nonnull;
 import org.redkale.annotation.Resource;
 import org.redkale.boot.ClassFilter.FilterEntry;
-import org.redkale.cache.support.CacheModuleEngine;
+import org.redkale.cache.CacheModuleEngine;
 import org.redkale.cluster.*;
 import org.redkale.convert.Convert;
 import org.redkale.convert.bson.BsonFactory;
@@ -35,7 +35,7 @@ import org.redkale.mq.*;
 import org.redkale.net.*;
 import org.redkale.net.http.*;
 import org.redkale.net.sncp.*;
-import org.redkale.schedule.support.ScheduleModuleEngine;
+import org.redkale.schedule.ScheduleModuleEngine;
 import org.redkale.service.Service;
 import org.redkale.source.*;
 import org.redkale.util.*;
diff --git a/src/main/java/org/redkale/cache/support/CacheAction.java b/src/main/java/org/redkale/cache/CacheAction.java
similarity index 95%
rename from src/main/java/org/redkale/cache/support/CacheAction.java
rename to src/main/java/org/redkale/cache/CacheAction.java
index 4a3f4ffdc..1459b31eb 100644
--- a/src/main/java/org/redkale/cache/support/CacheAction.java
+++ b/src/main/java/org/redkale/cache/CacheAction.java
@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.cache.support;
+package org.redkale.cache;
 
 import java.lang.reflect.Method;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/src/main/java/org/redkale/cache/support/CacheExpire.java b/src/main/java/org/redkale/cache/CacheExpire.java
similarity index 95%
rename from src/main/java/org/redkale/cache/support/CacheExpire.java
rename to src/main/java/org/redkale/cache/CacheExpire.java
index 6b4132630..794e08c82 100644
--- a/src/main/java/org/redkale/cache/support/CacheExpire.java
+++ b/src/main/java/org/redkale/cache/CacheExpire.java
@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.cache.support;
+package org.redkale.cache;
 
 import org.redkale.convert.ConvertColumn;
 import org.redkale.convert.ConvertDisabled;
diff --git a/src/main/java/org/redkale/cache/support/CacheModuleEngine.java b/src/main/java/org/redkale/cache/CacheModuleEngine.java
similarity index 91%
rename from src/main/java/org/redkale/cache/support/CacheModuleEngine.java
rename to src/main/java/org/redkale/cache/CacheModuleEngine.java
index 1a96381b3..a2000438b 100644
--- a/src/main/java/org/redkale/cache/support/CacheModuleEngine.java
+++ b/src/main/java/org/redkale/cache/CacheModuleEngine.java
@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.cache.support;
+package org.redkale.cache;
 
 import org.redkale.boot.Application;
 import org.redkale.boot.ModuleEngine;
@@ -15,7 +15,7 @@ import org.redkale.util.AnyValue;
 public class CacheModuleEngine extends ModuleEngine {
 
     //全局缓存管理器
-    private CacheManagerService cacheManager;
+    private DefaultCacheManager cacheManager;
 
     public CacheModuleEngine(Application application) {
         super(application);
@@ -44,7 +44,7 @@ public class CacheModuleEngine extends ModuleEngine {
      */
     public void onAppPostInit() {
         //设置缓存管理器
-        this.cacheManager = CacheManagerService.create(null).enabled(false);
+        this.cacheManager = DefaultCacheManager.create(null).enabled(false);
         final AnyValue cacheConf = application.getAppConfig().getAnyValue("cache");
         if (cacheConf != null && !application.isCompileMode()) {
             this.resourceFactory.inject(this.cacheManager);
diff --git a/src/main/java/org/redkale/cache/support/CacheValue.java b/src/main/java/org/redkale/cache/CacheValue.java
similarity index 97%
rename from src/main/java/org/redkale/cache/support/CacheValue.java
rename to src/main/java/org/redkale/cache/CacheValue.java
index 599c26c11..dc5b8f81e 100644
--- a/src/main/java/org/redkale/cache/support/CacheValue.java
+++ b/src/main/java/org/redkale/cache/CacheValue.java
@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.cache.support;
+package org.redkale.cache;
 
 import java.time.Duration;
 import org.redkale.convert.ConvertColumn;
diff --git a/src/main/java/org/redkale/cache/support/CacheManagerService.java b/src/main/java/org/redkale/cache/DefaultCacheManager.java
similarity index 98%
rename from src/main/java/org/redkale/cache/support/CacheManagerService.java
rename to src/main/java/org/redkale/cache/DefaultCacheManager.java
index 49a8b607f..453e285a5 100644
--- a/src/main/java/org/redkale/cache/support/CacheManagerService.java
+++ b/src/main/java/org/redkale/cache/DefaultCacheManager.java
@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.cache.support;
+package org.redkale.cache;
 
 import java.lang.reflect.Type;
 import java.time.Duration;
@@ -40,7 +40,7 @@ import org.redkale.util.Utility;
 @Component
 @AutoLoad(false)
 @ResourceType(CacheManager.class)
-public class CacheManagerService implements CacheManager, Service {
+public class DefaultCacheManager implements CacheManager, Service {
 
     //是否开启缓存
     protected boolean enabled = true;
@@ -69,20 +69,20 @@ public class CacheManagerService implements CacheManager, Service {
     //远程缓存Source
     protected CacheSource remoteSource;
 
-    protected CacheManagerService(@Nullable CacheSource remoteSource) {
+    protected DefaultCacheManager(@Nullable CacheSource remoteSource) {
         this.remoteSource = remoteSource;
     }
 
     //一般用于独立组件
-    public static CacheManagerService create(@Nullable CacheSource remoteSource) {
-        return new CacheManagerService(remoteSource);
+    public static DefaultCacheManager create(@Nullable CacheSource remoteSource) {
+        return new DefaultCacheManager(remoteSource);
     }
 
     public boolean enabled() {
         return this.enabled;
     }
 
-    public CacheManagerService enabled(boolean val) {
+    public DefaultCacheManager enabled(boolean val) {
         this.enabled = val;
         return this;
     }
@@ -123,7 +123,7 @@ public class CacheManagerService implements CacheManager, Service {
         return enabled;
     }
 
-    public CacheManagerService addHash(String hash) {
+    public DefaultCacheManager addHash(String hash) {
         this.hashNames.add(hash);
         return this;
     }
diff --git a/src/main/java/org/redkale/schedule/support/CronExpression.java b/src/main/java/org/redkale/schedule/CronExpression.java
similarity index 99%
rename from src/main/java/org/redkale/schedule/support/CronExpression.java
rename to src/main/java/org/redkale/schedule/CronExpression.java
index f6c6ef298..b5dbfe527 100644
--- a/src/main/java/org/redkale/schedule/support/CronExpression.java
+++ b/src/main/java/org/redkale/schedule/CronExpression.java
@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.schedule.support;
+package org.redkale.schedule;
 
 import java.time.DateTimeException;
 import java.time.temporal.ChronoField;
diff --git a/src/main/java/org/redkale/schedule/support/ScheduleManagerService.java b/src/main/java/org/redkale/schedule/DefaultScheduleManager.java
similarity index 97%
rename from src/main/java/org/redkale/schedule/support/ScheduleManagerService.java
rename to src/main/java/org/redkale/schedule/DefaultScheduleManager.java
index 31e52f485..6d069df94 100644
--- a/src/main/java/org/redkale/schedule/support/ScheduleManagerService.java
+++ b/src/main/java/org/redkale/schedule/DefaultScheduleManager.java
@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.schedule.support;
+package org.redkale.schedule;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -54,7 +54,7 @@ import org.redkale.util.Utility;
 @Component
 @AutoLoad(false)
 @ResourceType(ScheduleManager.class)
-public class ScheduleManagerService implements ScheduleManager, Service {
+public class DefaultScheduleManager implements ScheduleManager, Service {
 
     protected final Logger logger = Logger.getLogger(this.getClass().getSimpleName());
 
@@ -76,20 +76,20 @@ public class ScheduleManagerService implements ScheduleManager, Service {
 
     private AnyValue config;
 
-    protected ScheduleManagerService(UnaryOperator<String> propertyFunc) {
+    protected DefaultScheduleManager(UnaryOperator<String> propertyFunc) {
         this.propertyFunc = propertyFunc;
     }
 
     //一般用于独立组件
-    public static ScheduleManagerService create(UnaryOperator<String> propertyFunc) {
-        return new ScheduleManagerService(propertyFunc);
+    public static DefaultScheduleManager create(UnaryOperator<String> propertyFunc) {
+        return new DefaultScheduleManager(propertyFunc);
     }
 
     public boolean enabled() {
         return this.enabled;
     }
 
-    public ScheduleManagerService enabled(boolean val) {
+    public DefaultScheduleManager enabled(boolean val) {
         this.enabled = val;
         return this;
     }
diff --git a/src/main/java/org/redkale/schedule/support/ScheduleModuleEngine.java b/src/main/java/org/redkale/schedule/ScheduleModuleEngine.java
similarity index 93%
rename from src/main/java/org/redkale/schedule/support/ScheduleModuleEngine.java
rename to src/main/java/org/redkale/schedule/ScheduleModuleEngine.java
index e40ff2962..848c2a695 100644
--- a/src/main/java/org/redkale/schedule/support/ScheduleModuleEngine.java
+++ b/src/main/java/org/redkale/schedule/ScheduleModuleEngine.java
@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.schedule.support;
+package org.redkale.schedule;
 
 import org.redkale.boot.Application;
 import org.redkale.boot.ModuleEngine;
@@ -16,7 +16,7 @@ import org.redkale.util.AnyValue;
 public class ScheduleModuleEngine extends ModuleEngine {
 
     //全局定时任务管理器
-    private ScheduleManagerService scheduleManager;
+    private DefaultScheduleManager scheduleManager;
 
     public ScheduleModuleEngine(Application application) {
         super(application);
@@ -45,7 +45,7 @@ public class ScheduleModuleEngine extends ModuleEngine {
      */
     public void onAppPostInit() {
         //设置定时管理器
-        this.scheduleManager = ScheduleManagerService.create(null).enabled(false);
+        this.scheduleManager = DefaultScheduleManager.create(null).enabled(false);
         final AnyValue scheduleConf = application.getAppConfig().getAnyValue("schedule");
         if (scheduleConf != null && !application.isCompileMode()) {
             this.resourceFactory.inject(this.scheduleManager);
diff --git a/src/main/java/org/redkale/util/RedkaleClassLoader.java b/src/main/java/org/redkale/util/RedkaleClassLoader.java
index c62f76da8..a6372c32f 100644
--- a/src/main/java/org/redkale/util/RedkaleClassLoader.java
+++ b/src/main/java/org/redkale/util/RedkaleClassLoader.java
@@ -48,7 +48,6 @@ public class RedkaleClassLoader extends URLClassLoader {
         "org.redkale.boot",
         "org.redkale.boot.watch",
         "org.redkale.cache",
-        "org.redkale.cache.support",
         "org.redkale.cluster",
         "org.redkale.convert",
         "org.redkale.convert.bson",
@@ -64,7 +63,6 @@ public class RedkaleClassLoader extends URLClassLoader {
         "org.redkale.net.sncp",
         "org.redkale.persistence",
         "org.redkale.schedule",
-        "org.redkale.schedule.support",
         "org.redkale.service",
         "org.redkale.source",
         "org.redkale.util",
diff --git a/src/test/java/org/redkale/test/cache/CacheManagerTest.java b/src/test/java/org/redkale/test/cache/CacheManagerTest.java
index db25f7e8c..e897fe61d 100644
--- a/src/test/java/org/redkale/test/cache/CacheManagerTest.java
+++ b/src/test/java/org/redkale/test/cache/CacheManagerTest.java
@@ -7,7 +7,7 @@ import java.time.Duration;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.jupiter.api.*;
-import org.redkale.cache.support.CacheManagerService;
+import org.redkale.cache.DefaultCacheManager;
 import org.redkale.convert.json.JsonConvert;
 import org.redkale.source.CacheMemorySource;
 import org.redkale.util.Utility;
@@ -18,7 +18,7 @@ import org.redkale.util.Utility;
  */
 public class CacheManagerTest {
 
-    private static CacheManagerService manager;
+    private static DefaultCacheManager manager;
 
     public static void main(String[] args) throws Throwable {
         CacheManagerTest test = new CacheManagerTest();
@@ -31,7 +31,7 @@ public class CacheManagerTest {
     public static void init() throws Exception {
         CacheMemorySource remoteSource = new CacheMemorySource("cache-remote");
         remoteSource.init(null);
-        manager = CacheManagerService.create(remoteSource);
+        manager = DefaultCacheManager.create(remoteSource);
         manager.init(null);
     }
 
diff --git a/src/test/java/org/redkale/test/schedule/SchedulingTest.java b/src/test/java/org/redkale/test/schedule/SchedulingTest.java
index 7ff368c44..cd06d933d 100644
--- a/src/test/java/org/redkale/test/schedule/SchedulingTest.java
+++ b/src/test/java/org/redkale/test/schedule/SchedulingTest.java
@@ -4,7 +4,7 @@
 package org.redkale.test.schedule;
 
 import org.junit.jupiter.api.Test;
-import org.redkale.schedule.support.ScheduleManagerService;
+import org.redkale.schedule.DefaultScheduleManager;
 import org.redkale.util.Utility;
 
 /**
@@ -20,7 +20,7 @@ public class SchedulingTest {
 
     @Test
     public void run() throws Exception {
-        ScheduleManagerService manager = ScheduleManagerService.create(null);
+        DefaultScheduleManager manager = DefaultScheduleManager.create(null);
         manager.init(null);
         ScheduleService service = new ScheduleService();
         manager.schedule(service);