From b1ac3ed538eef241ce0ba3c38f54743538594f28 Mon Sep 17 00:00:00 2001 From: godotg Date: Sun, 9 Oct 2022 12:07:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?doc[zfoo]:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/FAQ.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/FAQ.md b/doc/FAQ.md index 72e4fdb9..e79876e2 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -78,3 +78,12 @@ SignalAttachment的signalId就是用于RPC的同步和异步的信号，通过 - icon使用的material font，mdi 5.3.45，https://pictogrammers.github.io/@mdi/font/5.3.45/ --- + + +#### orm为什么不选择Spring的官方驱动SpringData mongodb + +- SpringData mongodb 里面会生成一个class字段，比较占内存，而且你移动class类的时候体验不友好，不知道现在版本改了没有 +- mongodb的官方驱动轻量，mongodb的官方驱动基本上什么功能都有，SpringData mongodb这个封装太重了 +- zfoo的orm接近0封装，简单的封装可以极大提高上层的自由度 + +--- From 46aeeb1d5a6fa6e780c746d3e63a4f22ae95a58e Mon Sep 17 00:00:00 2001 From: godotg Date: Sun, 9 Oct 2022 12:16:53 +0800 Subject: [PATCH 2/3] ref[lpmap]: move lpmap from orm to protocol --- .../lpmap/ConcurrentFileChannelHeapMap.java | 2 +- .../lpmap/ConcurrentFileChannelMap.java | 2 +- .../collection}/lpmap/ConcurrentHeapMap.java | 2 +- .../collection}/lpmap/FileChannelHeapMap.java | 2 +- .../collection}/lpmap/FileChannelMap.java | 2 +- .../collection}/lpmap/FileHeapMap.java | 2 +- .../protocol/collection}/lpmap/HeapMap.java | 2 +- .../protocol/collection}/lpmap/LpMap.java | 2 +- .../protocol/collection/ConcurrentTest.java | 11 +++---- .../lpmap/ConcurrentFileChannelMapTest.java | 15 +++++----- .../lpmap/ConcurrentHeapMapTest.java | 30 +++++++++++-------- .../collection}/lpmap/FileChannelMapTest.java | 4 +-- .../collection}/lpmap/FileHeapMapTest.java | 4 +-- .../collection}/lpmap/HeapMapTest.java | 4 +-- .../collection}/lpmap/model/MyPacket.java | 2 +- 15 files changed, 46 insertions(+), 40 deletions(-) rename {orm/src/main/java/com/zfoo/orm => protocol/src/main/java/com/zfoo/protocol/collection}/lpmap/ConcurrentFileChannelHeapMap.java (98%) rename {orm/src/main/java/com/zfoo/orm => protocol/src/main/java/com/zfoo/protocol/collection}/lpmap/ConcurrentFileChannelMap.java (98%) rename {orm/src/main/java/com/zfoo/orm => protocol/src/main/java/com/zfoo/protocol/collection}/lpmap/ConcurrentHeapMap.java (98%) rename {orm/src/main/java/com/zfoo/orm => protocol/src/main/java/com/zfoo/protocol/collection}/lpmap/FileChannelHeapMap.java (97%) rename {orm/src/main/java/com/zfoo/orm => protocol/src/main/java/com/zfoo/protocol/collection}/lpmap/FileChannelMap.java (99%) rename {orm/src/main/java/com/zfoo/orm => protocol/src/main/java/com/zfoo/protocol/collection}/lpmap/FileHeapMap.java (99%) rename {orm/src/main/java/com/zfoo/orm => protocol/src/main/java/com/zfoo/protocol/collection}/lpmap/HeapMap.java (97%) rename {orm/src/main/java/com/zfoo/orm => protocol/src/main/java/com/zfoo/protocol/collection}/lpmap/LpMap.java (97%) rename {orm/src/test/java/com/zfoo/orm => protocol/src/test/java/com/zfoo/protocol/collection}/lpmap/ConcurrentFileChannelMapTest.java (86%) rename {orm/src/test/java/com/zfoo/orm => protocol/src/test/java/com/zfoo/protocol/collection}/lpmap/ConcurrentHeapMapTest.java (71%) rename {orm/src/test/java/com/zfoo/orm => protocol/src/test/java/com/zfoo/protocol/collection}/lpmap/FileChannelMapTest.java (96%) rename {orm/src/test/java/com/zfoo/orm => protocol/src/test/java/com/zfoo/protocol/collection}/lpmap/FileHeapMapTest.java (96%) rename {orm/src/test/java/com/zfoo/orm => protocol/src/test/java/com/zfoo/protocol/collection}/lpmap/HeapMapTest.java (94%) rename {orm/src/test/java/com/zfoo/orm => protocol/src/test/java/com/zfoo/protocol/collection}/lpmap/model/MyPacket.java (97%) diff --git a/orm/src/main/java/com/zfoo/orm/lpmap/ConcurrentFileChannelHeapMap.java b/protocol/src/main/java/com/zfoo/protocol/collection/lpmap/ConcurrentFileChannelHeapMap.java similarity index 98% rename from orm/src/main/java/com/zfoo/orm/lpmap/ConcurrentFileChannelHeapMap.java rename to protocol/src/main/java/com/zfoo/protocol/collection/lpmap/ConcurrentFileChannelHeapMap.java index 0ef32a8f..db0228cb 100644 --- a/orm/src/main/java/com/zfoo/orm/lpmap/ConcurrentFileChannelHeapMap.java +++ b/protocol/src/main/java/com/zfoo/protocol/collection/lpmap/ConcurrentFileChannelHeapMap.java @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.lpmap; +package com.zfoo.protocol.collection.lpmap; import com.zfoo.protocol.IPacket; diff --git a/orm/src/main/java/com/zfoo/orm/lpmap/ConcurrentFileChannelMap.java b/protocol/src/main/java/com/zfoo/protocol/collection/lpmap/ConcurrentFileChannelMap.java similarity index 98% rename from orm/src/main/java/com/zfoo/orm/lpmap/ConcurrentFileChannelMap.java rename to protocol/src/main/java/com/zfoo/protocol/collection/lpmap/ConcurrentFileChannelMap.java index a33dc5bc..37ce0165 100644 --- a/orm/src/main/java/com/zfoo/orm/lpmap/ConcurrentFileChannelMap.java +++ b/protocol/src/main/java/com/zfoo/protocol/collection/lpmap/ConcurrentFileChannelMap.java @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.lpmap; +package com.zfoo.protocol.collection.lpmap; import com.zfoo.protocol.IPacket; diff --git a/orm/src/main/java/com/zfoo/orm/lpmap/ConcurrentHeapMap.java b/protocol/src/main/java/com/zfoo/protocol/collection/lpmap/ConcurrentHeapMap.java similarity index 98% rename from orm/src/main/java/com/zfoo/orm/lpmap/ConcurrentHeapMap.java rename to protocol/src/main/java/com/zfoo/protocol/collection/lpmap/ConcurrentHeapMap.java index 7ee4d65a..66441691 100644 --- a/orm/src/main/java/com/zfoo/orm/lpmap/ConcurrentHeapMap.java +++ b/protocol/src/main/java/com/zfoo/protocol/collection/lpmap/ConcurrentHeapMap.java @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.lpmap; +package com.zfoo.protocol.collection.lpmap; import com.zfoo.protocol.IPacket; diff --git a/orm/src/main/java/com/zfoo/orm/lpmap/FileChannelHeapMap.java b/protocol/src/main/java/com/zfoo/protocol/collection/lpmap/FileChannelHeapMap.java similarity index 97% rename from orm/src/main/java/com/zfoo/orm/lpmap/FileChannelHeapMap.java rename to protocol/src/main/java/com/zfoo/protocol/collection/lpmap/FileChannelHeapMap.java index 41234daa..9111e21c 100644 --- a/orm/src/main/java/com/zfoo/orm/lpmap/FileChannelHeapMap.java +++ b/protocol/src/main/java/com/zfoo/protocol/collection/lpmap/FileChannelHeapMap.java @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.lpmap; +package com.zfoo.protocol.collection.lpmap; import com.zfoo.protocol.IPacket; diff --git a/orm/src/main/java/com/zfoo/orm/lpmap/FileChannelMap.java b/protocol/src/main/java/com/zfoo/protocol/collection/lpmap/FileChannelMap.java similarity index 99% rename from orm/src/main/java/com/zfoo/orm/lpmap/FileChannelMap.java rename to protocol/src/main/java/com/zfoo/protocol/collection/lpmap/FileChannelMap.java index d77b3736..ab281f48 100644 --- a/orm/src/main/java/com/zfoo/orm/lpmap/FileChannelMap.java +++ b/protocol/src/main/java/com/zfoo/protocol/collection/lpmap/FileChannelMap.java @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.lpmap; +package com.zfoo.protocol.collection.lpmap; import com.zfoo.protocol.IPacket; import com.zfoo.protocol.ProtocolManager; diff --git a/orm/src/main/java/com/zfoo/orm/lpmap/FileHeapMap.java b/protocol/src/main/java/com/zfoo/protocol/collection/lpmap/FileHeapMap.java similarity index 99% rename from orm/src/main/java/com/zfoo/orm/lpmap/FileHeapMap.java rename to protocol/src/main/java/com/zfoo/protocol/collection/lpmap/FileHeapMap.java index ea9469b4..4b7f99a1 100644 --- a/orm/src/main/java/com/zfoo/orm/lpmap/FileHeapMap.java +++ b/protocol/src/main/java/com/zfoo/protocol/collection/lpmap/FileHeapMap.java @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.lpmap; +package com.zfoo.protocol.collection.lpmap; import com.zfoo.protocol.IPacket; import com.zfoo.protocol.ProtocolManager; diff --git a/orm/src/main/java/com/zfoo/orm/lpmap/HeapMap.java b/protocol/src/main/java/com/zfoo/protocol/collection/lpmap/HeapMap.java similarity index 97% rename from orm/src/main/java/com/zfoo/orm/lpmap/HeapMap.java rename to protocol/src/main/java/com/zfoo/protocol/collection/lpmap/HeapMap.java index 1a5c9345..ac87a666 100644 --- a/orm/src/main/java/com/zfoo/orm/lpmap/HeapMap.java +++ b/protocol/src/main/java/com/zfoo/protocol/collection/lpmap/HeapMap.java @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.lpmap; +package com.zfoo.protocol.collection.lpmap; import com.zfoo.protocol.IPacket; import io.netty.util.collection.LongObjectHashMap; diff --git a/orm/src/main/java/com/zfoo/orm/lpmap/LpMap.java b/protocol/src/main/java/com/zfoo/protocol/collection/lpmap/LpMap.java similarity index 97% rename from orm/src/main/java/com/zfoo/orm/lpmap/LpMap.java rename to protocol/src/main/java/com/zfoo/protocol/collection/lpmap/LpMap.java index 8f04b201..d3d4de12 100644 --- a/orm/src/main/java/com/zfoo/orm/lpmap/LpMap.java +++ b/protocol/src/main/java/com/zfoo/protocol/collection/lpmap/LpMap.java @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.lpmap; +package com.zfoo.protocol.collection.lpmap; import com.zfoo.protocol.IPacket; import com.zfoo.protocol.exception.RunException; diff --git a/protocol/src/test/java/com/zfoo/protocol/collection/ConcurrentTest.java b/protocol/src/test/java/com/zfoo/protocol/collection/ConcurrentTest.java index 09d7db03..2b6ba153 100644 --- a/protocol/src/test/java/com/zfoo/protocol/collection/ConcurrentTest.java +++ b/protocol/src/test/java/com/zfoo/protocol/collection/ConcurrentTest.java @@ -26,13 +26,14 @@ import java.util.concurrent.CountDownLatch; @Ignore public class ConcurrentTest { + private static final int EXECUTOR_SIZE = Runtime.getRuntime().availableProcessors(); + @Test public void test() throws InterruptedException { var map = new CopyOnWriteHashMapLongObject(); var num = 1_0000; - var executorSize = Runtime.getRuntime().availableProcessors(); - var countDownLatch = new CountDownLatch(executorSize); - for (var i = 0; i < executorSize; i++) { + var countDownLatch = new CountDownLatch(EXECUTOR_SIZE); + for (var i = 0; i < EXECUTOR_SIZE; i++) { new Thread(new Runnable() { @Override public void run() { @@ -46,8 +47,8 @@ public class ConcurrentTest { countDownLatch.await(); Assert.assertEquals(map.size(), num); - var countDownLatch2 = new CountDownLatch(executorSize); - for (var i = 0; i < executorSize; i++) { + var countDownLatch2 = new CountDownLatch(EXECUTOR_SIZE); + for (var i = 0; i < EXECUTOR_SIZE; i++) { new Thread(new Runnable() { @Override public void run() { diff --git a/orm/src/test/java/com/zfoo/orm/lpmap/ConcurrentFileChannelMapTest.java b/protocol/src/test/java/com/zfoo/protocol/collection/lpmap/ConcurrentFileChannelMapTest.java similarity index 86% rename from orm/src/test/java/com/zfoo/orm/lpmap/ConcurrentFileChannelMapTest.java rename to protocol/src/test/java/com/zfoo/protocol/collection/lpmap/ConcurrentFileChannelMapTest.java index ee9c6f9e..67c0aead 100644 --- a/orm/src/test/java/com/zfoo/orm/lpmap/ConcurrentFileChannelMapTest.java +++ b/protocol/src/test/java/com/zfoo/protocol/collection/lpmap/ConcurrentFileChannelMapTest.java @@ -10,11 +10,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.lpmap; +package com.zfoo.protocol.collection.lpmap; -import com.zfoo.event.manager.EventBus; -import com.zfoo.orm.lpmap.model.MyPacket; import com.zfoo.protocol.ProtocolManager; +import com.zfoo.protocol.collection.lpmap.model.MyPacket; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -31,6 +30,8 @@ import java.util.concurrent.atomic.AtomicInteger; @Ignore public class ConcurrentFileChannelMapTest { + private static final int EXECUTOR_SIZE = Runtime.getRuntime().availableProcessors(); + @Test public void benchmarkTest() throws IOException, InterruptedException { ProtocolManager.initProtocol(Set.of(MyPacket.class)); @@ -39,9 +40,9 @@ public class ConcurrentFileChannelMapTest { var atomicInt = new AtomicInteger(0); var count = 1000_0000; - var countdown = new CountDownLatch(EventBus.EXECUTORS_SIZE); - for (int i = 0; i < EventBus.EXECUTORS_SIZE; i++) { - EventBus.asyncExecute(new Runnable() { + var countdown = new CountDownLatch(EXECUTOR_SIZE); + for (int i = 0; i < EXECUTOR_SIZE; i++) { + new Thread(new Runnable() { @Override public void run() { var key = atomicInt.getAndIncrement(); @@ -52,7 +53,7 @@ public class ConcurrentFileChannelMapTest { } countdown.countDown(); } - }); + }).start(); } countdown.await(); for (var i = 0; i < count; i++) { diff --git a/orm/src/test/java/com/zfoo/orm/lpmap/ConcurrentHeapMapTest.java b/protocol/src/test/java/com/zfoo/protocol/collection/lpmap/ConcurrentHeapMapTest.java similarity index 71% rename from orm/src/test/java/com/zfoo/orm/lpmap/ConcurrentHeapMapTest.java rename to protocol/src/test/java/com/zfoo/protocol/collection/lpmap/ConcurrentHeapMapTest.java index 69c45ed2..e690dfba 100644 --- a/orm/src/test/java/com/zfoo/orm/lpmap/ConcurrentHeapMapTest.java +++ b/protocol/src/test/java/com/zfoo/protocol/collection/lpmap/ConcurrentHeapMapTest.java @@ -10,10 +10,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.lpmap; +package com.zfoo.protocol.collection.lpmap; -import com.zfoo.event.manager.EventBus; -import com.zfoo.orm.lpmap.model.MyPacket; +import com.zfoo.protocol.collection.lpmap.model.MyPacket; import com.zfoo.protocol.ProtocolManager; import org.junit.Assert; import org.junit.Ignore; @@ -31,6 +30,8 @@ import java.util.concurrent.atomic.AtomicInteger; @Ignore public class ConcurrentHeapMapTest { + private static final int EXECUTOR_SIZE = Runtime.getRuntime().availableProcessors(); + @Test public void putIfAbsentTest() { ProtocolManager.initProtocol(Set.of(MyPacket.class)); @@ -56,17 +57,20 @@ public class ConcurrentHeapMapTest { var atomicInt = new AtomicInteger(0); var count = 1000_0000; - var countdown = new CountDownLatch(EventBus.EXECUTORS_SIZE); - for (int i = 0; i < EventBus.EXECUTORS_SIZE; i++) { - EventBus.asyncExecute(() -> { - var key = atomicInt.getAndIncrement(); - while (key < count) { - var myPacket = MyPacket.valueOf(key, String.valueOf(key)); - map.put(key, myPacket); - key = atomicInt.getAndIncrement(); + var countdown = new CountDownLatch(EXECUTOR_SIZE); + for (int i = 0; i < EXECUTOR_SIZE; i++) { + new Thread(new Runnable() { + @Override + public void run() { + var key = atomicInt.getAndIncrement(); + while (key < count) { + var myPacket = MyPacket.valueOf(key, String.valueOf(key)); + map.put(key, myPacket); + key = atomicInt.getAndIncrement(); + } + countdown.countDown(); } - countdown.countDown(); - }); + }).start(); } countdown.await(); for (var i = 0; i < count; i++) { diff --git a/orm/src/test/java/com/zfoo/orm/lpmap/FileChannelMapTest.java b/protocol/src/test/java/com/zfoo/protocol/collection/lpmap/FileChannelMapTest.java similarity index 96% rename from orm/src/test/java/com/zfoo/orm/lpmap/FileChannelMapTest.java rename to protocol/src/test/java/com/zfoo/protocol/collection/lpmap/FileChannelMapTest.java index 810bbb4f..d93f6b0a 100644 --- a/orm/src/test/java/com/zfoo/orm/lpmap/FileChannelMapTest.java +++ b/protocol/src/test/java/com/zfoo/protocol/collection/lpmap/FileChannelMapTest.java @@ -10,9 +10,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.lpmap; +package com.zfoo.protocol.collection.lpmap; -import com.zfoo.orm.lpmap.model.MyPacket; +import com.zfoo.protocol.collection.lpmap.model.MyPacket; import com.zfoo.protocol.ProtocolManager; import org.junit.Assert; import org.junit.Ignore; diff --git a/orm/src/test/java/com/zfoo/orm/lpmap/FileHeapMapTest.java b/protocol/src/test/java/com/zfoo/protocol/collection/lpmap/FileHeapMapTest.java similarity index 96% rename from orm/src/test/java/com/zfoo/orm/lpmap/FileHeapMapTest.java rename to protocol/src/test/java/com/zfoo/protocol/collection/lpmap/FileHeapMapTest.java index 03a5752e..d9d309a4 100644 --- a/orm/src/test/java/com/zfoo/orm/lpmap/FileHeapMapTest.java +++ b/protocol/src/test/java/com/zfoo/protocol/collection/lpmap/FileHeapMapTest.java @@ -10,9 +10,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.lpmap; +package com.zfoo.protocol.collection.lpmap; -import com.zfoo.orm.lpmap.model.MyPacket; +import com.zfoo.protocol.collection.lpmap.model.MyPacket; import com.zfoo.protocol.ProtocolManager; import org.junit.Assert; import org.junit.Ignore; diff --git a/orm/src/test/java/com/zfoo/orm/lpmap/HeapMapTest.java b/protocol/src/test/java/com/zfoo/protocol/collection/lpmap/HeapMapTest.java similarity index 94% rename from orm/src/test/java/com/zfoo/orm/lpmap/HeapMapTest.java rename to protocol/src/test/java/com/zfoo/protocol/collection/lpmap/HeapMapTest.java index 3ab52bc1..15cdfcaf 100644 --- a/orm/src/test/java/com/zfoo/orm/lpmap/HeapMapTest.java +++ b/protocol/src/test/java/com/zfoo/protocol/collection/lpmap/HeapMapTest.java @@ -10,9 +10,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.lpmap; +package com.zfoo.protocol.collection.lpmap; -import com.zfoo.orm.lpmap.model.MyPacket; +import com.zfoo.protocol.collection.lpmap.model.MyPacket; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/orm/src/test/java/com/zfoo/orm/lpmap/model/MyPacket.java b/protocol/src/test/java/com/zfoo/protocol/collection/lpmap/model/MyPacket.java similarity index 97% rename from orm/src/test/java/com/zfoo/orm/lpmap/model/MyPacket.java rename to protocol/src/test/java/com/zfoo/protocol/collection/lpmap/model/MyPacket.java index 65b5494d..b744848c 100644 --- a/orm/src/test/java/com/zfoo/orm/lpmap/model/MyPacket.java +++ b/protocol/src/test/java/com/zfoo/protocol/collection/lpmap/model/MyPacket.java @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.lpmap.model; +package com.zfoo.protocol.collection.lpmap.model; import com.zfoo.protocol.IPacket; From 75f3df55db2ec21e9435519d00f4d0fb0fcca358 Mon Sep 17 00:00:00 2001 From: godotg Date: Sun, 9 Oct 2022 12:28:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ref[orm]:=20Refactoring=20project=20of=20or?= =?UTF-8?q?m=EF=BC=8C=E9=87=8D=E6=9E=84=E4=BA=86orm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/zfoo/boot/OrmAutoConfiguration.java | 4 ++-- orm/src/main/java/com/zfoo/orm/OrmContext.java | 6 +++--- .../com/zfoo/orm/{model => }/accessor/IAccessor.java | 2 +- .../zfoo/orm/{model => }/accessor/MongodbAccessor.java | 2 +- .../com/zfoo/orm/{model => }/cache/EntityCaches.java | 9 ++++----- .../com/zfoo/orm/{model => }/cache/IEntityCaches.java | 3 +-- .../{model => cache}/persister/AbstractOrmPersister.java | 4 ++-- .../orm/{model => cache}/persister/CronOrmPersister.java | 4 ++-- .../orm/{model => cache}/persister/IOrmPersister.java | 2 +- .../com/zfoo/orm/{model => cache}/persister/PNode.java | 2 +- .../orm/{model => cache}/persister/TimeOrmPersister.java | 4 ++-- orm/src/main/java/com/zfoo/orm/manager/IOrmManager.java | 2 +- orm/src/main/java/com/zfoo/orm/manager/OrmManager.java | 4 ++-- .../com/zfoo/orm/model/config/PersisterTypeEnum.java | 8 ++++---- .../main/java/com/zfoo/orm/{model => }/query/IQuery.java | 2 +- .../com/zfoo/orm/{model => }/query/IQueryBuilder.java | 2 +- .../zfoo/orm/{model => }/query/MongoQueryBuilder.java | 2 +- .../com/zfoo/orm/{model => }/query/MongodbQuery.java | 2 +- .../main/java/com/zfoo/orm/{model => }/query/Page.java | 2 +- .../java/com/zfoo/orm/schema/OrmDefinitionParser.java | 4 ++-- .../test/java/com/zfoo/orm/cache/EntityCachesTest.java | 1 - orm/src/test/java/com/zfoo/orm/cache/UserManager.java | 1 - orm/src/test/java/com/zfoo/orm/query/PageTest.java | 1 - 23 files changed, 34 insertions(+), 39 deletions(-) rename orm/src/main/java/com/zfoo/orm/{model => }/accessor/IAccessor.java (97%) rename orm/src/main/java/com/zfoo/orm/{model => }/accessor/MongodbAccessor.java (99%) rename orm/src/main/java/com/zfoo/orm/{model => }/cache/EntityCaches.java (98%) rename orm/src/main/java/com/zfoo/orm/{model => }/cache/IEntityCaches.java (97%) rename orm/src/main/java/com/zfoo/orm/{model => cache}/persister/AbstractOrmPersister.java (92%) rename orm/src/main/java/com/zfoo/orm/{model => cache}/persister/CronOrmPersister.java (97%) rename orm/src/main/java/com/zfoo/orm/{model => cache}/persister/IOrmPersister.java (94%) rename orm/src/main/java/com/zfoo/orm/{model => cache}/persister/PNode.java (98%) rename orm/src/main/java/com/zfoo/orm/{model => cache}/persister/TimeOrmPersister.java (95%) rename orm/src/main/java/com/zfoo/orm/{model => }/query/IQuery.java (96%) rename orm/src/main/java/com/zfoo/orm/{model => }/query/IQueryBuilder.java (98%) rename orm/src/main/java/com/zfoo/orm/{model => }/query/MongoQueryBuilder.java (99%) rename orm/src/main/java/com/zfoo/orm/{model => }/query/MongodbQuery.java (96%) rename orm/src/main/java/com/zfoo/orm/{model => }/query/Page.java (98%) diff --git a/boot/src/main/java/com/zfoo/boot/OrmAutoConfiguration.java b/boot/src/main/java/com/zfoo/boot/OrmAutoConfiguration.java index 268a1cad..01092601 100644 --- a/boot/src/main/java/com/zfoo/boot/OrmAutoConfiguration.java +++ b/boot/src/main/java/com/zfoo/boot/OrmAutoConfiguration.java @@ -14,9 +14,9 @@ package com.zfoo.boot; import com.zfoo.orm.OrmContext; import com.zfoo.orm.manager.OrmManager; -import com.zfoo.orm.model.accessor.MongodbAccessor; +import com.zfoo.orm.accessor.MongodbAccessor; import com.zfoo.orm.model.config.OrmConfig; -import com.zfoo.orm.model.query.MongodbQuery; +import com.zfoo.orm.query.MongodbQuery; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; diff --git a/orm/src/main/java/com/zfoo/orm/OrmContext.java b/orm/src/main/java/com/zfoo/orm/OrmContext.java index 0fbeadaf..f473586e 100644 --- a/orm/src/main/java/com/zfoo/orm/OrmContext.java +++ b/orm/src/main/java/com/zfoo/orm/OrmContext.java @@ -16,10 +16,10 @@ package com.zfoo.orm; import com.mongodb.client.MongoClient; import com.zfoo.orm.manager.IOrmManager; import com.zfoo.orm.manager.OrmManager; -import com.zfoo.orm.model.accessor.IAccessor; +import com.zfoo.orm.accessor.IAccessor; import com.zfoo.orm.model.entity.IEntity; -import com.zfoo.orm.model.query.IQuery; -import com.zfoo.orm.model.query.IQueryBuilder; +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; diff --git a/orm/src/main/java/com/zfoo/orm/model/accessor/IAccessor.java b/orm/src/main/java/com/zfoo/orm/accessor/IAccessor.java similarity index 97% rename from orm/src/main/java/com/zfoo/orm/model/accessor/IAccessor.java rename to orm/src/main/java/com/zfoo/orm/accessor/IAccessor.java index c2d8f59f..c7046759 100644 --- a/orm/src/main/java/com/zfoo/orm/model/accessor/IAccessor.java +++ b/orm/src/main/java/com/zfoo/orm/accessor/IAccessor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.model.accessor; +package com.zfoo.orm.accessor; import com.zfoo.orm.model.entity.IEntity; import org.springframework.lang.Nullable; diff --git a/orm/src/main/java/com/zfoo/orm/model/accessor/MongodbAccessor.java b/orm/src/main/java/com/zfoo/orm/accessor/MongodbAccessor.java similarity index 99% rename from orm/src/main/java/com/zfoo/orm/model/accessor/MongodbAccessor.java rename to orm/src/main/java/com/zfoo/orm/accessor/MongodbAccessor.java index 31f9af0c..213bfce6 100644 --- a/orm/src/main/java/com/zfoo/orm/model/accessor/MongodbAccessor.java +++ b/orm/src/main/java/com/zfoo/orm/accessor/MongodbAccessor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.model.accessor; +package com.zfoo.orm.accessor; import com.mongodb.client.model.BulkWriteOptions; import com.mongodb.client.model.Filters; diff --git a/orm/src/main/java/com/zfoo/orm/model/cache/EntityCaches.java b/orm/src/main/java/com/zfoo/orm/cache/EntityCaches.java similarity index 98% rename from orm/src/main/java/com/zfoo/orm/model/cache/EntityCaches.java rename to orm/src/main/java/com/zfoo/orm/cache/EntityCaches.java index 829d6c2e..4c591d78 100644 --- a/orm/src/main/java/com/zfoo/orm/model/cache/EntityCaches.java +++ b/orm/src/main/java/com/zfoo/orm/cache/EntityCaches.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.orm.model.cache; +package com.zfoo.orm.cache; import com.github.benmanes.caffeine.cache.*; import com.mongodb.WriteConcern; @@ -20,9 +19,9 @@ import com.mongodb.client.model.Filters; import com.mongodb.client.model.ReplaceOneModel; import com.zfoo.orm.OrmContext; import com.zfoo.orm.model.entity.IEntity; -import com.zfoo.orm.model.persister.IOrmPersister; -import com.zfoo.orm.model.persister.PNode; -import com.zfoo.orm.model.query.Page; +import com.zfoo.orm.cache.persister.IOrmPersister; +import com.zfoo.orm.cache.persister.PNode; +import com.zfoo.orm.query.Page; import com.zfoo.orm.model.vo.EntityDef; import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.util.AssertionUtils; diff --git a/orm/src/main/java/com/zfoo/orm/model/cache/IEntityCaches.java b/orm/src/main/java/com/zfoo/orm/cache/IEntityCaches.java similarity index 97% rename from orm/src/main/java/com/zfoo/orm/model/cache/IEntityCaches.java rename to orm/src/main/java/com/zfoo/orm/cache/IEntityCaches.java index c460efd6..2d3073b3 100644 --- a/orm/src/main/java/com/zfoo/orm/model/cache/IEntityCaches.java +++ b/orm/src/main/java/com/zfoo/orm/cache/IEntityCaches.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.orm.model.cache; +package com.zfoo.orm.cache; import com.zfoo.orm.model.entity.IEntity; diff --git a/orm/src/main/java/com/zfoo/orm/model/persister/AbstractOrmPersister.java b/orm/src/main/java/com/zfoo/orm/cache/persister/AbstractOrmPersister.java similarity index 92% rename from orm/src/main/java/com/zfoo/orm/model/persister/AbstractOrmPersister.java rename to orm/src/main/java/com/zfoo/orm/cache/persister/AbstractOrmPersister.java index 6b90d27f..c8d46591 100644 --- a/orm/src/main/java/com/zfoo/orm/model/persister/AbstractOrmPersister.java +++ b/orm/src/main/java/com/zfoo/orm/cache/persister/AbstractOrmPersister.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.model.persister; +package com.zfoo.orm.cache.persister; -import com.zfoo.orm.model.cache.EntityCaches; +import com.zfoo.orm.cache.EntityCaches; import com.zfoo.orm.model.vo.EntityDef; /** diff --git a/orm/src/main/java/com/zfoo/orm/model/persister/CronOrmPersister.java b/orm/src/main/java/com/zfoo/orm/cache/persister/CronOrmPersister.java similarity index 97% rename from orm/src/main/java/com/zfoo/orm/model/persister/CronOrmPersister.java rename to orm/src/main/java/com/zfoo/orm/cache/persister/CronOrmPersister.java index af5573d0..54917ab8 100644 --- a/orm/src/main/java/com/zfoo/orm/model/persister/CronOrmPersister.java +++ b/orm/src/main/java/com/zfoo/orm/cache/persister/CronOrmPersister.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.model.persister; +package com.zfoo.orm.cache.persister; import com.zfoo.event.manager.EventBus; import com.zfoo.orm.OrmContext; -import com.zfoo.orm.model.cache.EntityCaches; +import com.zfoo.orm.cache.EntityCaches; import com.zfoo.orm.model.vo.EntityDef; import com.zfoo.protocol.exception.ExceptionUtils; import com.zfoo.scheduler.manager.SchedulerBus; diff --git a/orm/src/main/java/com/zfoo/orm/model/persister/IOrmPersister.java b/orm/src/main/java/com/zfoo/orm/cache/persister/IOrmPersister.java similarity index 94% rename from orm/src/main/java/com/zfoo/orm/model/persister/IOrmPersister.java rename to orm/src/main/java/com/zfoo/orm/cache/persister/IOrmPersister.java index 51c3f2a5..977bf5f4 100644 --- a/orm/src/main/java/com/zfoo/orm/model/persister/IOrmPersister.java +++ b/orm/src/main/java/com/zfoo/orm/cache/persister/IOrmPersister.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.model.persister; +package com.zfoo.orm.cache.persister; /** * @author godotg diff --git a/orm/src/main/java/com/zfoo/orm/model/persister/PNode.java b/orm/src/main/java/com/zfoo/orm/cache/persister/PNode.java similarity index 98% rename from orm/src/main/java/com/zfoo/orm/model/persister/PNode.java rename to orm/src/main/java/com/zfoo/orm/cache/persister/PNode.java index fe431f9c..aa6e4687 100644 --- a/orm/src/main/java/com/zfoo/orm/model/persister/PNode.java +++ b/orm/src/main/java/com/zfoo/orm/cache/persister/PNode.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.model.persister; +package com.zfoo.orm.cache.persister; import com.zfoo.orm.model.entity.IEntity; import com.zfoo.scheduler.util.TimeUtils; diff --git a/orm/src/main/java/com/zfoo/orm/model/persister/TimeOrmPersister.java b/orm/src/main/java/com/zfoo/orm/cache/persister/TimeOrmPersister.java similarity index 95% rename from orm/src/main/java/com/zfoo/orm/model/persister/TimeOrmPersister.java rename to orm/src/main/java/com/zfoo/orm/cache/persister/TimeOrmPersister.java index cafc9121..77c0c0ea 100644 --- a/orm/src/main/java/com/zfoo/orm/model/persister/TimeOrmPersister.java +++ b/orm/src/main/java/com/zfoo/orm/cache/persister/TimeOrmPersister.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.model.persister; +package com.zfoo.orm.cache.persister; import com.zfoo.event.manager.EventBus; import com.zfoo.orm.OrmContext; -import com.zfoo.orm.model.cache.EntityCaches; +import com.zfoo.orm.cache.EntityCaches; import com.zfoo.orm.model.vo.EntityDef; import com.zfoo.protocol.util.StringUtils; import com.zfoo.scheduler.manager.SchedulerBus; diff --git a/orm/src/main/java/com/zfoo/orm/manager/IOrmManager.java b/orm/src/main/java/com/zfoo/orm/manager/IOrmManager.java index f9b98681..36bfa062 100644 --- a/orm/src/main/java/com/zfoo/orm/manager/IOrmManager.java +++ b/orm/src/main/java/com/zfoo/orm/manager/IOrmManager.java @@ -15,7 +15,7 @@ package com.zfoo.orm.manager; import com.mongodb.client.ClientSession; import com.mongodb.client.MongoCollection; -import com.zfoo.orm.model.cache.IEntityCaches; +import com.zfoo.orm.cache.IEntityCaches; import com.zfoo.orm.model.entity.IEntity; import org.bson.Document; diff --git a/orm/src/main/java/com/zfoo/orm/manager/OrmManager.java b/orm/src/main/java/com/zfoo/orm/manager/OrmManager.java index a9187317..94642507 100644 --- a/orm/src/main/java/com/zfoo/orm/manager/OrmManager.java +++ b/orm/src/main/java/com/zfoo/orm/manager/OrmManager.java @@ -21,8 +21,8 @@ import com.mongodb.client.model.IndexOptions; import com.mongodb.client.model.Indexes; import com.zfoo.orm.OrmContext; import com.zfoo.orm.model.anno.*; -import com.zfoo.orm.model.cache.EntityCaches; -import com.zfoo.orm.model.cache.IEntityCaches; +import com.zfoo.orm.cache.EntityCaches; +import com.zfoo.orm.cache.IEntityCaches; import com.zfoo.orm.model.config.OrmConfig; import com.zfoo.orm.model.entity.IEntity; import com.zfoo.orm.model.vo.EntityDef; diff --git a/orm/src/main/java/com/zfoo/orm/model/config/PersisterTypeEnum.java b/orm/src/main/java/com/zfoo/orm/model/config/PersisterTypeEnum.java index 424ded1c..f4b6f45f 100644 --- a/orm/src/main/java/com/zfoo/orm/model/config/PersisterTypeEnum.java +++ b/orm/src/main/java/com/zfoo/orm/model/config/PersisterTypeEnum.java @@ -13,10 +13,10 @@ package com.zfoo.orm.model.config; -import com.zfoo.orm.model.cache.EntityCaches; -import com.zfoo.orm.model.persister.CronOrmPersister; -import com.zfoo.orm.model.persister.IOrmPersister; -import com.zfoo.orm.model.persister.TimeOrmPersister; +import com.zfoo.orm.cache.EntityCaches; +import com.zfoo.orm.cache.persister.CronOrmPersister; +import com.zfoo.orm.cache.persister.IOrmPersister; +import com.zfoo.orm.cache.persister.TimeOrmPersister; import com.zfoo.orm.model.vo.EntityDef; import com.zfoo.protocol.util.StringUtils; diff --git a/orm/src/main/java/com/zfoo/orm/model/query/IQuery.java b/orm/src/main/java/com/zfoo/orm/query/IQuery.java similarity index 96% rename from orm/src/main/java/com/zfoo/orm/model/query/IQuery.java rename to orm/src/main/java/com/zfoo/orm/query/IQuery.java index 70b8af7d..2fc5d5ec 100644 --- a/orm/src/main/java/com/zfoo/orm/model/query/IQuery.java +++ b/orm/src/main/java/com/zfoo/orm/query/IQuery.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.model.query; +package com.zfoo.orm.query; import com.zfoo.orm.model.entity.IEntity; diff --git a/orm/src/main/java/com/zfoo/orm/model/query/IQueryBuilder.java b/orm/src/main/java/com/zfoo/orm/query/IQueryBuilder.java similarity index 98% rename from orm/src/main/java/com/zfoo/orm/model/query/IQueryBuilder.java rename to orm/src/main/java/com/zfoo/orm/query/IQueryBuilder.java index 85546100..dff08a5f 100644 --- a/orm/src/main/java/com/zfoo/orm/model/query/IQueryBuilder.java +++ b/orm/src/main/java/com/zfoo/orm/query/IQueryBuilder.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.model.query; +package com.zfoo.orm.query; import com.zfoo.orm.model.entity.IEntity; import com.zfoo.protocol.model.Pair; diff --git a/orm/src/main/java/com/zfoo/orm/model/query/MongoQueryBuilder.java b/orm/src/main/java/com/zfoo/orm/query/MongoQueryBuilder.java similarity index 99% rename from orm/src/main/java/com/zfoo/orm/model/query/MongoQueryBuilder.java rename to orm/src/main/java/com/zfoo/orm/query/MongoQueryBuilder.java index f69f26eb..c25cd71b 100644 --- a/orm/src/main/java/com/zfoo/orm/model/query/MongoQueryBuilder.java +++ b/orm/src/main/java/com/zfoo/orm/query/MongoQueryBuilder.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.model.query; +package com.zfoo.orm.query; import com.mongodb.client.model.Filters; import com.zfoo.orm.OrmContext; diff --git a/orm/src/main/java/com/zfoo/orm/model/query/MongodbQuery.java b/orm/src/main/java/com/zfoo/orm/query/MongodbQuery.java similarity index 96% rename from orm/src/main/java/com/zfoo/orm/model/query/MongodbQuery.java rename to orm/src/main/java/com/zfoo/orm/query/MongodbQuery.java index 9e5c845a..48226328 100644 --- a/orm/src/main/java/com/zfoo/orm/model/query/MongodbQuery.java +++ b/orm/src/main/java/com/zfoo/orm/query/MongodbQuery.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.model.query; +package com.zfoo.orm.query; import com.zfoo.orm.model.entity.IEntity; diff --git a/orm/src/main/java/com/zfoo/orm/model/query/Page.java b/orm/src/main/java/com/zfoo/orm/query/Page.java similarity index 98% rename from orm/src/main/java/com/zfoo/orm/model/query/Page.java rename to orm/src/main/java/com/zfoo/orm/query/Page.java index 50793898..06d18f4f 100644 --- a/orm/src/main/java/com/zfoo/orm/model/query/Page.java +++ b/orm/src/main/java/com/zfoo/orm/query/Page.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.model.query; +package com.zfoo.orm.query; import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.util.StringUtils; diff --git a/orm/src/main/java/com/zfoo/orm/schema/OrmDefinitionParser.java b/orm/src/main/java/com/zfoo/orm/schema/OrmDefinitionParser.java index 38ff2a7d..aecda597 100644 --- a/orm/src/main/java/com/zfoo/orm/schema/OrmDefinitionParser.java +++ b/orm/src/main/java/com/zfoo/orm/schema/OrmDefinitionParser.java @@ -15,12 +15,12 @@ package com.zfoo.orm.schema; import com.zfoo.orm.OrmContext; import com.zfoo.orm.manager.OrmManager; -import com.zfoo.orm.model.accessor.MongodbAccessor; +import com.zfoo.orm.accessor.MongodbAccessor; import com.zfoo.orm.model.config.CacheStrategy; import com.zfoo.orm.model.config.HostConfig; import com.zfoo.orm.model.config.OrmConfig; import com.zfoo.orm.model.config.PersisterStrategy; -import com.zfoo.orm.model.query.MongodbQuery; +import com.zfoo.orm.query.MongodbQuery; import com.zfoo.protocol.util.DomUtils; import com.zfoo.protocol.util.StringUtils; import org.springframework.beans.factory.config.BeanDefinitionHolder; diff --git a/orm/src/test/java/com/zfoo/orm/cache/EntityCachesTest.java b/orm/src/test/java/com/zfoo/orm/cache/EntityCachesTest.java index 670fef24..7aaa9883 100644 --- a/orm/src/test/java/com/zfoo/orm/cache/EntityCachesTest.java +++ b/orm/src/test/java/com/zfoo/orm/cache/EntityCachesTest.java @@ -16,7 +16,6 @@ package com.zfoo.orm.cache; import com.mongodb.client.model.Filters; import com.zfoo.orm.OrmContext; import com.zfoo.orm.entity.UserEntity; -import com.zfoo.orm.model.cache.IEntityCaches; import com.zfoo.util.ThreadUtils; import org.bson.Document; import org.junit.Ignore; diff --git a/orm/src/test/java/com/zfoo/orm/cache/UserManager.java b/orm/src/test/java/com/zfoo/orm/cache/UserManager.java index 91d8ea02..bce2c7e5 100644 --- a/orm/src/test/java/com/zfoo/orm/cache/UserManager.java +++ b/orm/src/test/java/com/zfoo/orm/cache/UserManager.java @@ -15,7 +15,6 @@ package com.zfoo.orm.cache; import com.zfoo.orm.entity.UserEntity; import com.zfoo.orm.model.anno.EntityCachesInjection; -import com.zfoo.orm.model.cache.IEntityCaches; import org.springframework.stereotype.Component; /** diff --git a/orm/src/test/java/com/zfoo/orm/query/PageTest.java b/orm/src/test/java/com/zfoo/orm/query/PageTest.java index 2671a30c..1bbe5ac7 100644 --- a/orm/src/test/java/com/zfoo/orm/query/PageTest.java +++ b/orm/src/test/java/com/zfoo/orm/query/PageTest.java @@ -13,7 +13,6 @@ package com.zfoo.orm.query; -import com.zfoo.orm.model.query.Page; import org.junit.Assert; import org.junit.Test;