diff --git a/boot/src/main/java/com/zfoo/boot/OrmAutoConfiguration.java b/boot/src/main/java/com/zfoo/boot/OrmAutoConfiguration.java index b9ba7363..5a71907f 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.accessor.MongodbAccessor; +import com.zfoo.orm.anno.GraalvmNativeEntityCache; +import com.zfoo.orm.config.OrmConfig; import com.zfoo.orm.manager.OrmManager; -import com.zfoo.orm.model.anno.GraalvmNativeEntityCache; -import com.zfoo.orm.model.config.OrmConfig; import com.zfoo.orm.query.MongodbQuery; import com.zfoo.protocol.util.ClassUtils; import org.slf4j.Logger; diff --git a/orm/src/main/java/com/zfoo/orm/OrmContext.java b/orm/src/main/java/com/zfoo/orm/OrmContext.java index 86933714..8af22931 100644 --- a/orm/src/main/java/com/zfoo/orm/OrmContext.java +++ b/orm/src/main/java/com/zfoo/orm/OrmContext.java @@ -17,7 +17,7 @@ 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.model.entity.IEntity; +import com.zfoo.orm.model.IEntity; import com.zfoo.orm.query.IQuery; import com.zfoo.orm.query.IQueryBuilder; import com.zfoo.protocol.util.ReflectionUtils; diff --git a/orm/src/main/java/com/zfoo/orm/accessor/IAccessor.java b/orm/src/main/java/com/zfoo/orm/accessor/IAccessor.java index c7046759..2fbeedfe 100644 --- a/orm/src/main/java/com/zfoo/orm/accessor/IAccessor.java +++ b/orm/src/main/java/com/zfoo/orm/accessor/IAccessor.java @@ -13,7 +13,7 @@ package com.zfoo.orm.accessor; -import com.zfoo.orm.model.entity.IEntity; +import com.zfoo.orm.model.IEntity; import org.springframework.lang.Nullable; import java.util.List; diff --git a/orm/src/main/java/com/zfoo/orm/accessor/MongodbAccessor.java b/orm/src/main/java/com/zfoo/orm/accessor/MongodbAccessor.java index 209603ba..cb3a3822 100644 --- a/orm/src/main/java/com/zfoo/orm/accessor/MongodbAccessor.java +++ b/orm/src/main/java/com/zfoo/orm/accessor/MongodbAccessor.java @@ -17,7 +17,7 @@ import com.mongodb.client.model.BulkWriteOptions; 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.IEntity; import com.zfoo.protocol.collection.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/orm/src/main/java/com/zfoo/orm/model/anno/Cache.java b/orm/src/main/java/com/zfoo/orm/anno/Cache.java similarity index 96% rename from orm/src/main/java/com/zfoo/orm/model/anno/Cache.java rename to orm/src/main/java/com/zfoo/orm/anno/Cache.java index 521387fd..30559eb4 100644 --- a/orm/src/main/java/com/zfoo/orm/model/anno/Cache.java +++ b/orm/src/main/java/com/zfoo/orm/anno/Cache.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.anno; +package com.zfoo.orm.anno; import org.springframework.aot.hint.annotation.Reflective; diff --git a/orm/src/main/java/com/zfoo/orm/model/anno/EntityCache.java b/orm/src/main/java/com/zfoo/orm/anno/EntityCache.java similarity index 96% rename from orm/src/main/java/com/zfoo/orm/model/anno/EntityCache.java rename to orm/src/main/java/com/zfoo/orm/anno/EntityCache.java index 23452ba5..4b0f72c1 100644 --- a/orm/src/main/java/com/zfoo/orm/model/anno/EntityCache.java +++ b/orm/src/main/java/com/zfoo/orm/anno/EntityCache.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.anno; +package com.zfoo.orm.anno; import org.springframework.aot.hint.annotation.Reflective; diff --git a/orm/src/main/java/com/zfoo/orm/model/anno/EntityCachesInjection.java b/orm/src/main/java/com/zfoo/orm/anno/EntityCacheAutowired.java similarity index 91% rename from orm/src/main/java/com/zfoo/orm/model/anno/EntityCachesInjection.java rename to orm/src/main/java/com/zfoo/orm/anno/EntityCacheAutowired.java index b59277f1..432f206f 100644 --- a/orm/src/main/java/com/zfoo/orm/model/anno/EntityCachesInjection.java +++ b/orm/src/main/java/com/zfoo/orm/anno/EntityCacheAutowired.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.anno; +package com.zfoo.orm.anno; import org.springframework.aot.hint.annotation.Reflective; @@ -25,5 +24,5 @@ import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD}) @Reflective -public @interface EntityCachesInjection { +public @interface EntityCacheAutowired { } diff --git a/orm/src/main/java/com/zfoo/orm/model/anno/GraalvmNativeEntityCache.java b/orm/src/main/java/com/zfoo/orm/anno/GraalvmNativeEntityCache.java similarity index 96% rename from orm/src/main/java/com/zfoo/orm/model/anno/GraalvmNativeEntityCache.java rename to orm/src/main/java/com/zfoo/orm/anno/GraalvmNativeEntityCache.java index 0293853b..71e8f081 100644 --- a/orm/src/main/java/com/zfoo/orm/model/anno/GraalvmNativeEntityCache.java +++ b/orm/src/main/java/com/zfoo/orm/anno/GraalvmNativeEntityCache.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.anno; +package com.zfoo.orm.anno; import org.springframework.aot.hint.annotation.Reflective; import org.springframework.stereotype.Component; diff --git a/orm/src/main/java/com/zfoo/orm/model/anno/Id.java b/orm/src/main/java/com/zfoo/orm/anno/Id.java similarity index 95% rename from orm/src/main/java/com/zfoo/orm/model/anno/Id.java rename to orm/src/main/java/com/zfoo/orm/anno/Id.java index abca2ef4..1ebe58da 100644 --- a/orm/src/main/java/com/zfoo/orm/model/anno/Id.java +++ b/orm/src/main/java/com/zfoo/orm/anno/Id.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.anno; +package com.zfoo.orm.anno; import org.springframework.aot.hint.annotation.Reflective; diff --git a/orm/src/main/java/com/zfoo/orm/model/anno/Index.java b/orm/src/main/java/com/zfoo/orm/anno/Index.java similarity index 96% rename from orm/src/main/java/com/zfoo/orm/model/anno/Index.java rename to orm/src/main/java/com/zfoo/orm/anno/Index.java index a4eaf066..b541a758 100644 --- a/orm/src/main/java/com/zfoo/orm/model/anno/Index.java +++ b/orm/src/main/java/com/zfoo/orm/anno/Index.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.anno; +package com.zfoo.orm.anno; import org.springframework.aot.hint.annotation.Reflective; diff --git a/orm/src/main/java/com/zfoo/orm/model/anno/IndexText.java b/orm/src/main/java/com/zfoo/orm/anno/IndexText.java similarity index 96% rename from orm/src/main/java/com/zfoo/orm/model/anno/IndexText.java rename to orm/src/main/java/com/zfoo/orm/anno/IndexText.java index 5cfb47f7..547e574e 100644 --- a/orm/src/main/java/com/zfoo/orm/model/anno/IndexText.java +++ b/orm/src/main/java/com/zfoo/orm/anno/IndexText.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.anno; +package com.zfoo.orm.anno; import org.springframework.aot.hint.annotation.Reflective; diff --git a/orm/src/main/java/com/zfoo/orm/model/anno/Persister.java b/orm/src/main/java/com/zfoo/orm/anno/Persister.java similarity index 96% rename from orm/src/main/java/com/zfoo/orm/model/anno/Persister.java rename to orm/src/main/java/com/zfoo/orm/anno/Persister.java index 2d90d236..8a901c34 100644 --- a/orm/src/main/java/com/zfoo/orm/model/anno/Persister.java +++ b/orm/src/main/java/com/zfoo/orm/anno/Persister.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.anno; +package com.zfoo.orm.anno; import org.springframework.aot.hint.annotation.Reflective; diff --git a/orm/src/main/java/com/zfoo/orm/cache/EntityCaches.java b/orm/src/main/java/com/zfoo/orm/cache/EntityCaches.java index cfaecb65..1c41a2c7 100644 --- a/orm/src/main/java/com/zfoo/orm/cache/EntityCaches.java +++ b/orm/src/main/java/com/zfoo/orm/cache/EntityCaches.java @@ -18,16 +18,16 @@ import com.mongodb.client.model.BulkWriteOptions; 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.cache.persister.IOrmPersister; 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.model.vo.EntityDef; import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.util.AssertionUtils; import com.zfoo.protocol.util.StringUtils; -import com.zfoo.scheduler.util.TimeUtils; import com.zfoo.protocol.util.ThreadUtils; +import com.zfoo.scheduler.util.TimeUtils; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.slf4j.Logger; diff --git a/orm/src/main/java/com/zfoo/orm/cache/IEntityCaches.java b/orm/src/main/java/com/zfoo/orm/cache/IEntityCaches.java index 2d3073b3..c15e9193 100644 --- a/orm/src/main/java/com/zfoo/orm/cache/IEntityCaches.java +++ b/orm/src/main/java/com/zfoo/orm/cache/IEntityCaches.java @@ -12,7 +12,7 @@ package com.zfoo.orm.cache; -import com.zfoo.orm.model.entity.IEntity; +import com.zfoo.orm.model.IEntity; import java.util.List; import java.util.function.BiConsumer; diff --git a/orm/src/main/java/com/zfoo/orm/cache/persister/AbstractOrmPersister.java b/orm/src/main/java/com/zfoo/orm/cache/persister/AbstractOrmPersister.java index c8d46591..e9bdd6c0 100644 --- a/orm/src/main/java/com/zfoo/orm/cache/persister/AbstractOrmPersister.java +++ b/orm/src/main/java/com/zfoo/orm/cache/persister/AbstractOrmPersister.java @@ -14,7 +14,7 @@ package com.zfoo.orm.cache.persister; import com.zfoo.orm.cache.EntityCaches; -import com.zfoo.orm.model.vo.EntityDef; +import com.zfoo.orm.model.EntityDef; /** * @author godotg diff --git a/orm/src/main/java/com/zfoo/orm/cache/persister/CronOrmPersister.java b/orm/src/main/java/com/zfoo/orm/cache/persister/CronOrmPersister.java index 54917ab8..6247dbdd 100644 --- a/orm/src/main/java/com/zfoo/orm/cache/persister/CronOrmPersister.java +++ b/orm/src/main/java/com/zfoo/orm/cache/persister/CronOrmPersister.java @@ -16,7 +16,7 @@ package com.zfoo.orm.cache.persister; import com.zfoo.event.manager.EventBus; import com.zfoo.orm.OrmContext; import com.zfoo.orm.cache.EntityCaches; -import com.zfoo.orm.model.vo.EntityDef; +import com.zfoo.orm.model.EntityDef; import com.zfoo.protocol.exception.ExceptionUtils; import com.zfoo.scheduler.manager.SchedulerBus; import com.zfoo.scheduler.util.TimeUtils; diff --git a/orm/src/main/java/com/zfoo/orm/cache/persister/PNode.java b/orm/src/main/java/com/zfoo/orm/cache/persister/PNode.java index aa6e4687..d72e91c8 100644 --- a/orm/src/main/java/com/zfoo/orm/cache/persister/PNode.java +++ b/orm/src/main/java/com/zfoo/orm/cache/persister/PNode.java @@ -13,7 +13,7 @@ package com.zfoo.orm.cache.persister; -import com.zfoo.orm.model.entity.IEntity; +import com.zfoo.orm.model.IEntity; import com.zfoo.scheduler.util.TimeUtils; /** diff --git a/orm/src/main/java/com/zfoo/orm/cache/persister/TimeOrmPersister.java b/orm/src/main/java/com/zfoo/orm/cache/persister/TimeOrmPersister.java index 77c0c0ea..f45f2b72 100644 --- a/orm/src/main/java/com/zfoo/orm/cache/persister/TimeOrmPersister.java +++ b/orm/src/main/java/com/zfoo/orm/cache/persister/TimeOrmPersister.java @@ -16,7 +16,7 @@ package com.zfoo.orm.cache.persister; import com.zfoo.event.manager.EventBus; import com.zfoo.orm.OrmContext; import com.zfoo.orm.cache.EntityCaches; -import com.zfoo.orm.model.vo.EntityDef; +import com.zfoo.orm.model.EntityDef; import com.zfoo.protocol.util.StringUtils; import com.zfoo.scheduler.manager.SchedulerBus; diff --git a/orm/src/main/java/com/zfoo/orm/model/config/CacheStrategy.java b/orm/src/main/java/com/zfoo/orm/config/CacheStrategy.java similarity index 97% rename from orm/src/main/java/com/zfoo/orm/model/config/CacheStrategy.java rename to orm/src/main/java/com/zfoo/orm/config/CacheStrategy.java index 98d0636e..9606fe9b 100644 --- a/orm/src/main/java/com/zfoo/orm/model/config/CacheStrategy.java +++ b/orm/src/main/java/com/zfoo/orm/config/CacheStrategy.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.config; +package com.zfoo.orm.config; /** * @author godotg diff --git a/orm/src/main/java/com/zfoo/orm/model/config/HostConfig.java b/orm/src/main/java/com/zfoo/orm/config/HostConfig.java similarity index 97% rename from orm/src/main/java/com/zfoo/orm/model/config/HostConfig.java rename to orm/src/main/java/com/zfoo/orm/config/HostConfig.java index 389d95e7..c5bb57f6 100644 --- a/orm/src/main/java/com/zfoo/orm/model/config/HostConfig.java +++ b/orm/src/main/java/com/zfoo/orm/config/HostConfig.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.config; +package com.zfoo.orm.config; import java.util.Map; diff --git a/orm/src/main/java/com/zfoo/orm/model/config/OrmConfig.java b/orm/src/main/java/com/zfoo/orm/config/OrmConfig.java similarity index 97% rename from orm/src/main/java/com/zfoo/orm/model/config/OrmConfig.java rename to orm/src/main/java/com/zfoo/orm/config/OrmConfig.java index 4daed8e7..0157e404 100644 --- a/orm/src/main/java/com/zfoo/orm/model/config/OrmConfig.java +++ b/orm/src/main/java/com/zfoo/orm/config/OrmConfig.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.config; +package com.zfoo.orm.config; import java.util.List; diff --git a/orm/src/main/java/com/zfoo/orm/model/config/PersisterStrategy.java b/orm/src/main/java/com/zfoo/orm/config/PersisterStrategy.java similarity index 97% rename from orm/src/main/java/com/zfoo/orm/model/config/PersisterStrategy.java rename to orm/src/main/java/com/zfoo/orm/config/PersisterStrategy.java index 85b446a1..f6247fd8 100644 --- a/orm/src/main/java/com/zfoo/orm/model/config/PersisterStrategy.java +++ b/orm/src/main/java/com/zfoo/orm/config/PersisterStrategy.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.config; +package com.zfoo.orm.config; /** * @author godotg diff --git a/orm/src/main/java/com/zfoo/orm/model/config/PersisterTypeEnum.java b/orm/src/main/java/com/zfoo/orm/config/PersisterTypeEnum.java similarity index 96% rename from orm/src/main/java/com/zfoo/orm/model/config/PersisterTypeEnum.java rename to orm/src/main/java/com/zfoo/orm/config/PersisterTypeEnum.java index f4b6f45f..a3d8f696 100644 --- a/orm/src/main/java/com/zfoo/orm/model/config/PersisterTypeEnum.java +++ b/orm/src/main/java/com/zfoo/orm/config/PersisterTypeEnum.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,13 +10,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.model.config; +package com.zfoo.orm.config; 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.orm.model.EntityDef; import com.zfoo.protocol.util.StringUtils; /** 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 82982a37..ced81b29 100644 --- a/orm/src/main/java/com/zfoo/orm/manager/IOrmManager.java +++ b/orm/src/main/java/com/zfoo/orm/manager/IOrmManager.java @@ -16,7 +16,7 @@ package com.zfoo.orm.manager; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoCollection; import com.zfoo.orm.cache.IEntityCaches; -import com.zfoo.orm.model.entity.IEntity; +import com.zfoo.orm.model.IEntity; import org.bson.Document; import java.util.Collection; 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 36dac9de..30f4fe88 100644 --- a/orm/src/main/java/com/zfoo/orm/manager/OrmManager.java +++ b/orm/src/main/java/com/zfoo/orm/manager/OrmManager.java @@ -23,14 +23,14 @@ import com.mongodb.client.MongoDatabase; import com.mongodb.client.model.IndexOptions; import com.mongodb.client.model.Indexes; import com.zfoo.orm.OrmContext; +import com.zfoo.orm.anno.*; import com.zfoo.orm.cache.EntityCaches; import com.zfoo.orm.cache.IEntityCaches; -import com.zfoo.orm.model.anno.*; -import com.zfoo.orm.model.config.OrmConfig; -import com.zfoo.orm.model.entity.IEntity; -import com.zfoo.orm.model.vo.EntityDef; -import com.zfoo.orm.model.vo.IndexDef; -import com.zfoo.orm.model.vo.IndexTextDef; +import com.zfoo.orm.config.OrmConfig; +import com.zfoo.orm.model.EntityDef; +import com.zfoo.orm.model.IEntity; +import com.zfoo.orm.model.IndexDef; +import com.zfoo.orm.model.IndexTextDef; import com.zfoo.protocol.collection.ArrayUtils; import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.exception.RunException; @@ -189,7 +189,7 @@ public class OrmManager implements IOrmManager { var componentBeans = applicationContext.getBeansWithAnnotation(Component.class); for (var bean : componentBeans.values()) { ReflectionUtils.filterFieldsInClass(bean.getClass() - , field -> field.isAnnotationPresent(EntityCachesInjection.class) + , field -> field.isAnnotationPresent(EntityCacheAutowired.class) , field -> { Type type = field.getGenericType(); diff --git a/orm/src/main/java/com/zfoo/orm/model/vo/EntityDef.java b/orm/src/main/java/com/zfoo/orm/model/EntityDef.java similarity index 94% rename from orm/src/main/java/com/zfoo/orm/model/vo/EntityDef.java rename to orm/src/main/java/com/zfoo/orm/model/EntityDef.java index 9ad866d5..2521df18 100644 --- a/orm/src/main/java/com/zfoo/orm/model/vo/EntityDef.java +++ b/orm/src/main/java/com/zfoo/orm/model/EntityDef.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,10 +10,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.model.vo; +package com.zfoo.orm.model; -import com.zfoo.orm.model.config.PersisterStrategy; -import com.zfoo.orm.model.entity.IEntity; +import com.zfoo.orm.config.PersisterStrategy; import com.zfoo.protocol.util.ReflectionUtils; import java.lang.reflect.Field; diff --git a/orm/src/main/java/com/zfoo/orm/model/entity/IEntity.java b/orm/src/main/java/com/zfoo/orm/model/IEntity.java similarity index 98% rename from orm/src/main/java/com/zfoo/orm/model/entity/IEntity.java rename to orm/src/main/java/com/zfoo/orm/model/IEntity.java index 9a3cb725..131c7024 100644 --- a/orm/src/main/java/com/zfoo/orm/model/entity/IEntity.java +++ b/orm/src/main/java/com/zfoo/orm/model/IEntity.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.entity; +package com.zfoo.orm.model; import com.zfoo.protocol.util.StringUtils; diff --git a/orm/src/main/java/com/zfoo/orm/model/vo/IndexDef.java b/orm/src/main/java/com/zfoo/orm/model/IndexDef.java similarity index 98% rename from orm/src/main/java/com/zfoo/orm/model/vo/IndexDef.java rename to orm/src/main/java/com/zfoo/orm/model/IndexDef.java index a62a5303..84e43c24 100644 --- a/orm/src/main/java/com/zfoo/orm/model/vo/IndexDef.java +++ b/orm/src/main/java/com/zfoo/orm/model/IndexDef.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.vo; +package com.zfoo.orm.model; import java.lang.reflect.Field; diff --git a/orm/src/main/java/com/zfoo/orm/model/vo/IndexTextDef.java b/orm/src/main/java/com/zfoo/orm/model/IndexTextDef.java similarity index 95% rename from orm/src/main/java/com/zfoo/orm/model/vo/IndexTextDef.java rename to orm/src/main/java/com/zfoo/orm/model/IndexTextDef.java index 038afef8..3e3e1601 100644 --- a/orm/src/main/java/com/zfoo/orm/model/vo/IndexTextDef.java +++ b/orm/src/main/java/com/zfoo/orm/model/IndexTextDef.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,9 +10,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.orm.model.vo; +package com.zfoo.orm.model; -import com.zfoo.orm.model.anno.IndexText; +import com.zfoo.orm.anno.IndexText; import com.zfoo.protocol.util.AssertionUtils; import com.zfoo.protocol.util.ReflectionUtils; import com.zfoo.protocol.util.StringUtils; diff --git a/orm/src/main/java/com/zfoo/orm/query/IQuery.java b/orm/src/main/java/com/zfoo/orm/query/IQuery.java index 2fc5d5ec..293e02ec 100644 --- a/orm/src/main/java/com/zfoo/orm/query/IQuery.java +++ b/orm/src/main/java/com/zfoo/orm/query/IQuery.java @@ -13,7 +13,7 @@ package com.zfoo.orm.query; -import com.zfoo.orm.model.entity.IEntity; +import com.zfoo.orm.model.IEntity; /** * 对数据库进行（查找）的相关方法 diff --git a/orm/src/main/java/com/zfoo/orm/query/IQueryBuilder.java b/orm/src/main/java/com/zfoo/orm/query/IQueryBuilder.java index dff08a5f..908e7c5d 100644 --- a/orm/src/main/java/com/zfoo/orm/query/IQueryBuilder.java +++ b/orm/src/main/java/com/zfoo/orm/query/IQueryBuilder.java @@ -13,7 +13,7 @@ package com.zfoo.orm.query; -import com.zfoo.orm.model.entity.IEntity; +import com.zfoo.orm.model.IEntity; import com.zfoo.protocol.model.Pair; import java.util.List; diff --git a/orm/src/main/java/com/zfoo/orm/query/MongoQueryBuilder.java b/orm/src/main/java/com/zfoo/orm/query/MongoQueryBuilder.java index c25cd71b..58e2f4d1 100644 --- a/orm/src/main/java/com/zfoo/orm/query/MongoQueryBuilder.java +++ b/orm/src/main/java/com/zfoo/orm/query/MongoQueryBuilder.java @@ -15,7 +15,7 @@ package com.zfoo.orm.query; import com.mongodb.client.model.Filters; import com.zfoo.orm.OrmContext; -import com.zfoo.orm.model.entity.IEntity; +import com.zfoo.orm.model.IEntity; import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.util.StringUtils; import org.bson.conversions.Bson; diff --git a/orm/src/main/java/com/zfoo/orm/query/MongodbQuery.java b/orm/src/main/java/com/zfoo/orm/query/MongodbQuery.java index 48226328..ed960da9 100644 --- a/orm/src/main/java/com/zfoo/orm/query/MongodbQuery.java +++ b/orm/src/main/java/com/zfoo/orm/query/MongodbQuery.java @@ -13,7 +13,7 @@ package com.zfoo.orm.query; -import com.zfoo.orm.model.entity.IEntity; +import com.zfoo.orm.model.IEntity; /** * @author godotg 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 aecda597..b854ca1e 100644 --- a/orm/src/main/java/com/zfoo/orm/schema/OrmDefinitionParser.java +++ b/orm/src/main/java/com/zfoo/orm/schema/OrmDefinitionParser.java @@ -14,12 +14,12 @@ package com.zfoo.orm.schema; import com.zfoo.orm.OrmContext; -import com.zfoo.orm.manager.OrmManager; 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.config.CacheStrategy; +import com.zfoo.orm.config.HostConfig; +import com.zfoo.orm.config.OrmConfig; +import com.zfoo.orm.config.PersisterStrategy; +import com.zfoo.orm.manager.OrmManager; import com.zfoo.orm.query.MongodbQuery; import com.zfoo.protocol.util.DomUtils; import com.zfoo.protocol.util.StringUtils; 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 bce2c7e5..92f70fc2 100644 --- a/orm/src/test/java/com/zfoo/orm/cache/UserManager.java +++ b/orm/src/test/java/com/zfoo/orm/cache/UserManager.java @@ -13,8 +13,8 @@ package com.zfoo.orm.cache; +import com.zfoo.orm.anno.EntityCacheAutowired; import com.zfoo.orm.entity.UserEntity; -import com.zfoo.orm.model.anno.EntityCachesInjection; import org.springframework.stereotype.Component; /** @@ -24,7 +24,7 @@ import org.springframework.stereotype.Component; @Component public class UserManager { - @EntityCachesInjection + @EntityCacheAutowired public IEntityCaches userEntityCaches; } diff --git a/orm/src/test/java/com/zfoo/orm/entity/MailEntity.java b/orm/src/test/java/com/zfoo/orm/entity/MailEntity.java index fe0b47e3..42e476a7 100644 --- a/orm/src/test/java/com/zfoo/orm/entity/MailEntity.java +++ b/orm/src/test/java/com/zfoo/orm/entity/MailEntity.java @@ -13,10 +13,10 @@ package com.zfoo.orm.entity; -import com.zfoo.orm.model.anno.EntityCache; -import com.zfoo.orm.model.anno.Id; -import com.zfoo.orm.model.anno.Index; -import com.zfoo.orm.model.entity.IEntity; +import com.zfoo.orm.anno.EntityCache; +import com.zfoo.orm.anno.Id; +import com.zfoo.orm.anno.Index; +import com.zfoo.orm.model.IEntity; import java.util.Date; diff --git a/orm/src/test/java/com/zfoo/orm/entity/UserEntity.java b/orm/src/test/java/com/zfoo/orm/entity/UserEntity.java index 12a49d12..567b523f 100644 --- a/orm/src/test/java/com/zfoo/orm/entity/UserEntity.java +++ b/orm/src/test/java/com/zfoo/orm/entity/UserEntity.java @@ -13,11 +13,11 @@ package com.zfoo.orm.entity; -import com.zfoo.orm.model.anno.EntityCache; -import com.zfoo.orm.model.anno.Id; -import com.zfoo.orm.model.anno.Index; -import com.zfoo.orm.model.anno.IndexText; -import com.zfoo.orm.model.entity.IEntity; +import com.zfoo.orm.anno.EntityCache; +import com.zfoo.orm.anno.Id; +import com.zfoo.orm.anno.Index; +import com.zfoo.orm.anno.IndexText; +import com.zfoo.orm.model.IEntity; import java.util.List; diff --git a/orm/src/test/java/com/zfoo/orm/entity/bag/MapEntity.java b/orm/src/test/java/com/zfoo/orm/entity/bag/MapEntity.java index 17cdd5d1..22ec12bd 100644 --- a/orm/src/test/java/com/zfoo/orm/entity/bag/MapEntity.java +++ b/orm/src/test/java/com/zfoo/orm/entity/bag/MapEntity.java @@ -13,10 +13,10 @@ package com.zfoo.orm.entity.bag; -import com.zfoo.orm.model.anno.EntityCache; -import com.zfoo.orm.model.anno.Id; -import com.zfoo.orm.model.anno.Persister; -import com.zfoo.orm.model.entity.IEntity; +import com.zfoo.orm.anno.EntityCache; +import com.zfoo.orm.anno.Id; +import com.zfoo.orm.anno.Persister; +import com.zfoo.orm.model.IEntity; import java.util.HashMap; import java.util.Map;