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;