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

---
 src/main/java/org/redkale/boot/Application.java        |  6 +++---
 .../caching/{CachedFactory.java => CacheFactory.java}  | 10 +++++-----
 .../{ScheduledFactory.java => ScheduleFactory.java}    | 10 +++++-----
 .../java/org/redkale/test/scheduling/ScheduleTest.java |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)
 rename src/main/java/org/redkale/caching/{CachedFactory.java => CacheFactory.java} (61%)
 rename src/main/java/org/redkale/scheduling/{ScheduledFactory.java => ScheduleFactory.java} (97%)

diff --git a/src/main/java/org/redkale/boot/Application.java b/src/main/java/org/redkale/boot/Application.java
index 5a4a80c00..a24f5c38b 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.ScheduledFactory;
+import org.redkale.scheduling.ScheduleFactory;
 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();
 
     //全局ScheduledFactory
-    private final ScheduledFactory scheduledFactory;
+    private final ScheduleFactory scheduledFactory;
 
     //服务配置项
     final AnyValue config;
@@ -626,7 +626,7 @@ public final class Application {
         }
 
         { //设置ScheduledFactory
-            this.scheduledFactory = ScheduledFactory.create(this::getPropertyValue).disable(isCompileMode());
+            this.scheduledFactory = ScheduleFactory.create(this::getPropertyValue).disable(isCompileMode());
         }
 
         { //加载原生sql解析器
diff --git a/src/main/java/org/redkale/caching/CachedFactory.java b/src/main/java/org/redkale/caching/CacheFactory.java
similarity index 61%
rename from src/main/java/org/redkale/caching/CachedFactory.java
rename to src/main/java/org/redkale/caching/CacheFactory.java
index 2aaa3675d..5e15b4733 100644
--- a/src/main/java/org/redkale/caching/CachedFactory.java
+++ b/src/main/java/org/redkale/caching/CacheFactory.java
@@ -11,17 +11,17 @@ import org.redkale.source.CacheSource;
  *
  * @author zhangjx
  */
-public class CachedFactory {
+public class CacheFactory {
 
-    protected CacheSource localSource = new CacheMemorySource("cacheing");
+    protected CacheSource localSource = new CacheMemorySource("caching");
 
     protected CacheSource remoteSource;
 
-    protected CachedFactory(CacheSource remoteSource) {
+    protected CacheFactory(CacheSource remoteSource) {
         this.remoteSource = remoteSource;
     }
 
-    public static CachedFactory create(CacheSource remoteSource) {
-        return new CachedFactory(remoteSource);
+    public static CacheFactory create(CacheSource remoteSource) {
+        return new CacheFactory(remoteSource);
     }
 }
diff --git a/src/main/java/org/redkale/scheduling/ScheduledFactory.java b/src/main/java/org/redkale/scheduling/ScheduleFactory.java
similarity index 97%
rename from src/main/java/org/redkale/scheduling/ScheduledFactory.java
rename to src/main/java/org/redkale/scheduling/ScheduleFactory.java
index 1ef339fcf..562dff4ea 100644
--- a/src/main/java/org/redkale/scheduling/ScheduledFactory.java
+++ b/src/main/java/org/redkale/scheduling/ScheduleFactory.java
@@ -40,7 +40,7 @@ import org.redkale.annotation.Scheduling;
  * @author zhangjx
  * @since 2.8.0
  */
-public class ScheduledFactory {
+public class ScheduleFactory {
 
     protected final Logger logger = Logger.getLogger(this.getClass().getSimpleName());
 
@@ -55,17 +55,17 @@ public class ScheduledFactory {
 
     private boolean disable;
 
-    protected ScheduledFactory(UnaryOperator<String> propertyFunc) {
+    protected ScheduleFactory(UnaryOperator<String> propertyFunc) {
         this.propertyFunc = propertyFunc;
         this.scheduler = new ScheduledThreadPoolExecutor(Utility.cpus(), Utility.newThreadFactory("Scheduled-Task-Thread-%s"));
         this.scheduler.setRemoveOnCancelPolicy(true);
     }
 
-    public static ScheduledFactory create(UnaryOperator<String> propertyFunc) {
-        return new ScheduledFactory(propertyFunc);
+    public static ScheduleFactory create(UnaryOperator<String> propertyFunc) {
+        return new ScheduleFactory(propertyFunc);
     }
 
-    public ScheduledFactory disable(boolean val) {
+    public ScheduleFactory disable(boolean val) {
         this.disable = val;
         return this;
     }
diff --git a/src/test/java/org/redkale/test/scheduling/ScheduleTest.java b/src/test/java/org/redkale/test/scheduling/ScheduleTest.java
index 63f54c240..8af16f195 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.ScheduledFactory;
+import org.redkale.scheduling.ScheduleFactory;
 import org.redkale.util.Utility;
 
 /**
@@ -20,7 +20,7 @@ public class ScheduleTest {
 
     @Test
     public void run() throws Exception {
-        ScheduledFactory factory = ScheduledFactory.create(null);
+        ScheduleFactory factory = ScheduleFactory.create(null);
         ScheduleService service = new ScheduleService();
         factory.schedule(service);
         Utility.sleep(3000);