diff --git a/net/src/main/java/com/zfoo/net/NetContext.java b/net/src/main/java/com/zfoo/net/NetContext.java index 4fa847bb..d7893123 100644 --- a/net/src/main/java/com/zfoo/net/NetContext.java +++ b/net/src/main/java/com/zfoo/net/NetContext.java @@ -24,9 +24,9 @@ import com.zfoo.net.task.TaskBus; import com.zfoo.protocol.exception.ExceptionUtils; import com.zfoo.protocol.util.IOUtils; import com.zfoo.protocol.util.ReflectionUtils; -import com.zfoo.scheduler.SchedulerContext; -import com.zfoo.scheduler.model.StopWatch; import com.zfoo.protocol.util.ThreadUtils; +import com.zfoo.scheduler.SchedulerContext; +import com.zfoo.scheduler.util.StopWatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; diff --git a/orm/src/main/java/com/zfoo/orm/OrmContext.java b/orm/src/main/java/com/zfoo/orm/OrmContext.java index f473586e..86933714 100644 --- a/orm/src/main/java/com/zfoo/orm/OrmContext.java +++ b/orm/src/main/java/com/zfoo/orm/OrmContext.java @@ -14,15 +14,15 @@ package com.zfoo.orm; import com.mongodb.client.MongoClient; +import com.zfoo.orm.accessor.IAccessor; import com.zfoo.orm.manager.IOrmManager; import com.zfoo.orm.manager.OrmManager; -import com.zfoo.orm.accessor.IAccessor; import com.zfoo.orm.model.entity.IEntity; import com.zfoo.orm.query.IQuery; import com.zfoo.orm.query.IQueryBuilder; import com.zfoo.protocol.util.ReflectionUtils; import com.zfoo.scheduler.SchedulerContext; -import com.zfoo.scheduler.model.StopWatch; +import com.zfoo.scheduler.util.StopWatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; diff --git a/scheduler/src/main/java/com/zfoo/scheduler/SchedulerContext.java b/scheduler/src/main/java/com/zfoo/scheduler/SchedulerContext.java index d42c6c33..5f2671dd 100644 --- a/scheduler/src/main/java/com/zfoo/scheduler/SchedulerContext.java +++ b/scheduler/src/main/java/com/zfoo/scheduler/SchedulerContext.java @@ -16,10 +16,10 @@ package com.zfoo.scheduler; import com.zfoo.protocol.collection.ArrayUtils; import com.zfoo.protocol.util.ReflectionUtils; import com.zfoo.protocol.util.StringUtils; -import com.zfoo.scheduler.manager.SchedulerBus; -import com.zfoo.scheduler.model.anno.Scheduler; -import com.zfoo.scheduler.model.vo.SchedulerDefinition; import com.zfoo.protocol.util.ThreadUtils; +import com.zfoo.scheduler.anno.Scheduler; +import com.zfoo.scheduler.enhance.SchedulerDefinition; +import com.zfoo.scheduler.manager.SchedulerBus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; diff --git a/scheduler/src/main/java/com/zfoo/scheduler/model/anno/Scheduler.java b/scheduler/src/main/java/com/zfoo/scheduler/anno/Scheduler.java similarity index 95% rename from scheduler/src/main/java/com/zfoo/scheduler/model/anno/Scheduler.java rename to scheduler/src/main/java/com/zfoo/scheduler/anno/Scheduler.java index f3ea1a34..29489eac 100644 --- a/scheduler/src/main/java/com/zfoo/scheduler/model/anno/Scheduler.java +++ b/scheduler/src/main/java/com/zfoo/scheduler/anno/Scheduler.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.scheduler.model.anno; +package com.zfoo.scheduler.anno; import org.springframework.aot.hint.annotation.Reflective; diff --git a/scheduler/src/main/java/com/zfoo/scheduler/model/vo/EnhanceUtils.java b/scheduler/src/main/java/com/zfoo/scheduler/enhance/EnhanceUtils.java similarity index 98% rename from scheduler/src/main/java/com/zfoo/scheduler/model/vo/EnhanceUtils.java rename to scheduler/src/main/java/com/zfoo/scheduler/enhance/EnhanceUtils.java index c3724484..e1620afe 100644 --- a/scheduler/src/main/java/com/zfoo/scheduler/model/vo/EnhanceUtils.java +++ b/scheduler/src/main/java/com/zfoo/scheduler/enhance/EnhanceUtils.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.scheduler.model.vo; +package com.zfoo.scheduler.enhance; import com.zfoo.protocol.util.StringUtils; import com.zfoo.protocol.util.UuidUtils; diff --git a/scheduler/src/main/java/com/zfoo/scheduler/model/vo/IScheduler.java b/scheduler/src/main/java/com/zfoo/scheduler/enhance/IScheduler.java similarity index 94% rename from scheduler/src/main/java/com/zfoo/scheduler/model/vo/IScheduler.java rename to scheduler/src/main/java/com/zfoo/scheduler/enhance/IScheduler.java index 8259792c..36e82f19 100644 --- a/scheduler/src/main/java/com/zfoo/scheduler/model/vo/IScheduler.java +++ b/scheduler/src/main/java/com/zfoo/scheduler/enhance/IScheduler.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.scheduler.model.vo; +package com.zfoo.scheduler.enhance; /** * @author godotg diff --git a/scheduler/src/main/java/com/zfoo/scheduler/model/vo/ReflectScheduler.java b/scheduler/src/main/java/com/zfoo/scheduler/enhance/ReflectScheduler.java similarity index 97% rename from scheduler/src/main/java/com/zfoo/scheduler/model/vo/ReflectScheduler.java rename to scheduler/src/main/java/com/zfoo/scheduler/enhance/ReflectScheduler.java index c45566fd..e1fcbb65 100644 --- a/scheduler/src/main/java/com/zfoo/scheduler/model/vo/ReflectScheduler.java +++ b/scheduler/src/main/java/com/zfoo/scheduler/enhance/ReflectScheduler.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.scheduler.model.vo; +package com.zfoo.scheduler.enhance; import com.zfoo.protocol.util.ReflectionUtils; diff --git a/scheduler/src/main/java/com/zfoo/scheduler/model/vo/RunnableScheduler.java b/scheduler/src/main/java/com/zfoo/scheduler/enhance/RunnableScheduler.java similarity index 96% rename from scheduler/src/main/java/com/zfoo/scheduler/model/vo/RunnableScheduler.java rename to scheduler/src/main/java/com/zfoo/scheduler/enhance/RunnableScheduler.java index 9cb233ae..c017c596 100644 --- a/scheduler/src/main/java/com/zfoo/scheduler/model/vo/RunnableScheduler.java +++ b/scheduler/src/main/java/com/zfoo/scheduler/enhance/RunnableScheduler.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.scheduler.model.vo; +package com.zfoo.scheduler.enhance; /** * @author godotg diff --git a/scheduler/src/main/java/com/zfoo/scheduler/model/vo/SchedulerDefinition.java b/scheduler/src/main/java/com/zfoo/scheduler/enhance/SchedulerDefinition.java similarity index 98% rename from scheduler/src/main/java/com/zfoo/scheduler/model/vo/SchedulerDefinition.java rename to scheduler/src/main/java/com/zfoo/scheduler/enhance/SchedulerDefinition.java index a8829e79..0fd8d6ad 100644 --- a/scheduler/src/main/java/com/zfoo/scheduler/model/vo/SchedulerDefinition.java +++ b/scheduler/src/main/java/com/zfoo/scheduler/enhance/SchedulerDefinition.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,11 +10,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.scheduler.model.vo; +package com.zfoo.scheduler.enhance; +import com.zfoo.protocol.util.GraalVmUtils; import com.zfoo.protocol.util.ReflectionUtils; import com.zfoo.scheduler.util.TimeUtils; -import com.zfoo.protocol.util.GraalVmUtils; import javassist.CannotCompileException; import javassist.NotFoundException; import org.springframework.scheduling.support.CronExpression; 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 95a32183..3f9146ca 100644 --- a/scheduler/src/main/java/com/zfoo/scheduler/manager/SchedulerBus.java +++ b/scheduler/src/main/java/com/zfoo/scheduler/manager/SchedulerBus.java @@ -15,10 +15,10 @@ package com.zfoo.scheduler.manager; import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.util.StringUtils; -import com.zfoo.scheduler.SchedulerContext; -import com.zfoo.scheduler.model.vo.SchedulerDefinition; -import com.zfoo.scheduler.util.TimeUtils; import com.zfoo.protocol.util.ThreadUtils; +import com.zfoo.scheduler.SchedulerContext; +import com.zfoo.scheduler.enhance.SchedulerDefinition; +import com.zfoo.scheduler.util.TimeUtils; import io.netty.util.concurrent.FastThreadLocalThread; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/scheduler/src/main/java/com/zfoo/scheduler/model/StopWatch.java b/scheduler/src/main/java/com/zfoo/scheduler/util/StopWatch.java similarity index 95% rename from scheduler/src/main/java/com/zfoo/scheduler/model/StopWatch.java rename to scheduler/src/main/java/com/zfoo/scheduler/util/StopWatch.java index 487a2b79..12aa8006 100644 --- a/scheduler/src/main/java/com/zfoo/scheduler/model/StopWatch.java +++ b/scheduler/src/main/java/com/zfoo/scheduler/util/StopWatch.java @@ -10,9 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.scheduler.model; - -import com.zfoo.scheduler.util.TimeUtils; +package com.zfoo.scheduler.util; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/scheduler/src/test/java/com/zfoo/scheduler/SchedulerController.java b/scheduler/src/test/java/com/zfoo/scheduler/SchedulerController.java index 9c5e4482..84d6eccb 100644 --- a/scheduler/src/test/java/com/zfoo/scheduler/SchedulerController.java +++ b/scheduler/src/test/java/com/zfoo/scheduler/SchedulerController.java @@ -13,7 +13,7 @@ package com.zfoo.scheduler; -import com.zfoo.scheduler.model.anno.Scheduler; +import com.zfoo.scheduler.anno.Scheduler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/storage/src/main/java/com/zfoo/storage/StorageContext.java b/storage/src/main/java/com/zfoo/storage/StorageContext.java index 1b2126a2..729def08 100644 --- a/storage/src/main/java/com/zfoo/storage/StorageContext.java +++ b/storage/src/main/java/com/zfoo/storage/StorageContext.java @@ -13,7 +13,7 @@ package com.zfoo.storage; -import com.zfoo.scheduler.model.StopWatch; +import com.zfoo.scheduler.util.StopWatch; import com.zfoo.storage.manager.IStorageManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory;