ref[orm]: Refactoring project of orm，重构了orm

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;

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;

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;

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;

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;

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;
 

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;
 
 /**

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;

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

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;

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;

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;
 

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;

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;
 

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;
 

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;

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;

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;
 

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;

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;

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;

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;
 
 /**

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;