From f56bb656ae1936b79efc4e9aeaed4c8d8de97e4c Mon Sep 17 00:00:00 2001 From: godotg Date: Tue, 26 Mar 2024 11:21:12 +0800 Subject: [PATCH] ref[cache]: move LazyCache from orm to scheduler --- orm/src/main/java/com/zfoo/orm/cache/EntityCache.java | 2 +- .../src/main/java/com/zfoo/scheduler}/util/LazyCache.java | 3 +-- .../src/test/java/com/zfoo/scheduler/util}/LazyCacheTest.java | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) rename {orm/src/main/java/com/zfoo/orm => scheduler/src/main/java/com/zfoo/scheduler}/util/LazyCache.java (98%) rename {orm/src/test/java/com/zfoo/orm/cache => scheduler/src/test/java/com/zfoo/scheduler/util}/LazyCacheTest.java (96%) 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 8c3b6a94..c88e908a 100644 --- a/orm/src/main/java/com/zfoo/orm/cache/EntityCache.java +++ b/orm/src/main/java/com/zfoo/orm/cache/EntityCache.java @@ -22,12 +22,12 @@ import com.zfoo.orm.cache.persister.PNode; import com.zfoo.orm.model.EntityDef; import com.zfoo.orm.model.IEntity; import com.zfoo.orm.query.Page; -import com.zfoo.orm.util.LazyCache; import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.exception.RunException; import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.util.AssertionUtils; import com.zfoo.protocol.util.ThreadUtils; +import com.zfoo.scheduler.util.LazyCache; import com.zfoo.scheduler.util.TimeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/orm/src/main/java/com/zfoo/orm/util/LazyCache.java b/scheduler/src/main/java/com/zfoo/scheduler/util/LazyCache.java similarity index 98% rename from orm/src/main/java/com/zfoo/orm/util/LazyCache.java rename to scheduler/src/main/java/com/zfoo/scheduler/util/LazyCache.java index 8ae92d1d..8f673f3c 100644 --- a/orm/src/main/java/com/zfoo/orm/util/LazyCache.java +++ b/scheduler/src/main/java/com/zfoo/scheduler/util/LazyCache.java @@ -1,7 +1,6 @@ -package com.zfoo.orm.util; +package com.zfoo.scheduler.util; import com.zfoo.protocol.model.Pair; -import com.zfoo.scheduler.util.TimeUtils; import java.util.ArrayList; import java.util.concurrent.ConcurrentHashMap; diff --git a/orm/src/test/java/com/zfoo/orm/cache/LazyCacheTest.java b/scheduler/src/test/java/com/zfoo/scheduler/util/LazyCacheTest.java similarity index 96% rename from orm/src/test/java/com/zfoo/orm/cache/LazyCacheTest.java rename to scheduler/src/test/java/com/zfoo/scheduler/util/LazyCacheTest.java index 09ec63c5..b2e64dac 100644 --- a/orm/src/test/java/com/zfoo/orm/cache/LazyCacheTest.java +++ b/scheduler/src/test/java/com/zfoo/scheduler/util/LazyCacheTest.java @@ -1,10 +1,8 @@ -package com.zfoo.orm.cache; +package com.zfoo.scheduler.util; -import com.zfoo.orm.util.LazyCache; import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.util.StringUtils; import com.zfoo.protocol.util.ThreadUtils; -import com.zfoo.scheduler.util.TimeUtils; import org.junit.Ignore; import org.junit.Test;