From 58f484fd5cd3d01cb4357e56e753fe94afc31548 Mon Sep 17 00:00:00 2001 From: godotg Date: Wed, 26 Jun 2024 17:50:25 +0800 Subject: [PATCH] feat[entity]: entity without @EntityCache annotation is allowed --- .../main/java/com/zfoo/orm/OrmContext.java | 10 ++-- .../com/zfoo/orm/config/CacheStrategy.java | 4 ++ .../zfoo/orm/config/PersisterStrategy.java | 4 ++ .../java/com/zfoo/orm/manager/OrmManager.java | 60 ++++++++++++------- 4 files changed, 52 insertions(+), 26 deletions(-) diff --git a/orm/src/main/java/com/zfoo/orm/OrmContext.java b/orm/src/main/java/com/zfoo/orm/OrmContext.java index 1ad3d0b4..8b653585 100644 --- a/orm/src/main/java/com/zfoo/orm/OrmContext.java +++ b/orm/src/main/java/com/zfoo/orm/OrmContext.java @@ -93,11 +93,6 @@ public class OrmContext implements ApplicationListener, } } - @Override - public int getOrder() { - return 1; - } - public static synchronized void shutdown() { if (isStop()) { return; @@ -115,4 +110,9 @@ public class OrmContext implements ApplicationListener, logger.info("Orm shutdown gracefully."); } + @Override + public int getOrder() { + return 1; + } + } diff --git a/orm/src/main/java/com/zfoo/orm/config/CacheStrategy.java b/orm/src/main/java/com/zfoo/orm/config/CacheStrategy.java index 9816ea2b..7565f909 100644 --- a/orm/src/main/java/com/zfoo/orm/config/CacheStrategy.java +++ b/orm/src/main/java/com/zfoo/orm/config/CacheStrategy.java @@ -12,11 +12,15 @@ package com.zfoo.orm.config; +import com.zfoo.scheduler.util.TimeUtils; + /** * @author godotg */ public class CacheStrategy { + public static final CacheStrategy DEFAULT = new CacheStrategy("default", 6000, 60 * TimeUtils.MILLIS_PER_SECOND); + private String strategy; private int size; private long expireMillisecond; diff --git a/orm/src/main/java/com/zfoo/orm/config/PersisterStrategy.java b/orm/src/main/java/com/zfoo/orm/config/PersisterStrategy.java index 1ebbb0a7..61464e72 100644 --- a/orm/src/main/java/com/zfoo/orm/config/PersisterStrategy.java +++ b/orm/src/main/java/com/zfoo/orm/config/PersisterStrategy.java @@ -12,11 +12,15 @@ package com.zfoo.orm.config; +import com.zfoo.scheduler.util.TimeUtils; + /** * @author godotg */ public class PersisterStrategy { + public static final PersisterStrategy DEFAULT = new PersisterStrategy("default", "time", String.valueOf(30 * TimeUtils.MILLIS_PER_SECOND)); + private String strategy; private PersisterTypeEnum type; 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 70663378..172f0b9c 100644 --- a/orm/src/main/java/com/zfoo/orm/manager/OrmManager.java +++ b/orm/src/main/java/com/zfoo/orm/manager/OrmManager.java @@ -27,7 +27,9 @@ import com.zfoo.orm.anno.*; import com.zfoo.orm.cache.EntityCache; import com.zfoo.orm.cache.IEntityCache; import com.zfoo.orm.codec.MapCodecProvider; +import com.zfoo.orm.config.CacheStrategy; import com.zfoo.orm.config.OrmConfig; +import com.zfoo.orm.config.PersisterStrategy; import com.zfoo.orm.model.EntityDef; import com.zfoo.orm.model.IEntity; import com.zfoo.orm.model.IndexDef; @@ -306,14 +308,21 @@ public class OrmManager implements IOrmManager { String packageSearchPath = prefixPattern + scanLocation.replace(StringUtils.PERIOD, StringUtils.SLASH) + StringUtils.SLASH + suffixPattern; Resource[] resources = resourcePatternResolver.getResources(packageSearchPath); var result = new HashSet>(); - String name = com.zfoo.orm.anno.EntityCache.class.getName(); + String annoEntityCacheName = com.zfoo.orm.anno.EntityCache.class.getName(); + String interfaceEntityName = IEntity.class.getName(); for (Resource resource : resources) { if (resource.isReadable()) { MetadataReader metadataReader = metadataReaderFactory.getMetadataReader(resource); AnnotationMetadata annoMeta = metadataReader.getAnnotationMetadata(); - if (annoMeta.hasAnnotation(name)) { - ClassMetadata clazzMeta = metadataReader.getClassMetadata(); - result.add(Class.forName(clazzMeta.getClassName())); + ClassMetadata classMeta = metadataReader.getClassMetadata(); + + if (annoMeta.hasAnnotation(annoEntityCacheName)) { + result.add(Class.forName(classMeta.getClassName())); + } + + List interfaces = ArrayUtils.toList(classMeta.getInterfaceNames()); + if (interfaces.stream().anyMatch(it -> it.equals(interfaceEntityName))) { + result.add(Class.forName(classMeta.getClassName())); } } } @@ -333,25 +342,36 @@ public class OrmManager implements IOrmManager { var cacheStrategies = ormConfig.getCaches(); var persisterStrategies = ormConfig.getPersisters(); - var entityCache = clazz.getAnnotation(com.zfoo.orm.anno.EntityCache.class); - var cache = entityCache.cache(); - var cacheStrategyOptional = cacheStrategies.stream().filter(it -> it.getStrategy().equals(cache.value())).findFirst(); - // Entity需要有@Cache注解的缓存策略 - AssertionUtils.isTrue(cacheStrategyOptional.isPresent(), "No Entity[{}] @Cache policy found[{}]", clazz.getSimpleName(), cache.value()); + var cacheStrategy = CacheStrategy.DEFAULT; + var persisterStrategy = PersisterStrategy.DEFAULT; + // Entity如果有被@EntityCache注解标识，则使用被标识的缓存和持久化策略，否则使用默认的策略 + if (clazz.isAnnotationPresent(com.zfoo.orm.anno.EntityCache.class)) { + var entityCache = clazz.getAnnotation(com.zfoo.orm.anno.EntityCache.class); + var cache = entityCache.cache().value(); + var cacheStrategyOptional = cacheStrategies.stream().filter(it -> it.getStrategy().equals(cache)).findFirst(); + // Entity需要有@Cache注解的缓存策略 + AssertionUtils.isTrue(cacheStrategyOptional.isPresent(), "No Entity[{}] @Cache policy found[{}]", clazz.getSimpleName(), cache); + cacheStrategy = cacheStrategyOptional.get(); - var cacheStrategy = cacheStrategyOptional.get(); - var cacheSize = cacheStrategy.getSize(); - var expireMillisecond = cacheStrategy.getExpireMillisecond(); + var persister = entityCache.persister().value(); + var persisterStrategyOptional = persisterStrategies.stream().filter(it -> it.getStrategy().equals(persister)).findFirst(); + // 实体类Entity需要有持久化策略 + AssertionUtils.isTrue(persisterStrategyOptional.isPresent(), "Entity[{}] No persistence strategy found[{}]", clazz.getSimpleName(), persister); + persisterStrategy = persisterStrategyOptional.get(); + } else { + cacheStrategy = cacheStrategies.stream() + .filter(it -> it.getStrategy().equals(CacheStrategy.DEFAULT.getStrategy())) + .findFirst() + .orElse(CacheStrategy.DEFAULT); + persisterStrategy = persisterStrategies.stream() + .filter(it -> it.getStrategy().equals(PersisterStrategy.DEFAULT.getStrategy())) + .findFirst() + .orElse(PersisterStrategy.DEFAULT); + } var idField = ReflectionUtils.getFieldsByAnnoInPOJOClass(clazz, Id.class)[0]; ReflectionUtils.makeAccessible(idField); - var persister = entityCache.persister(); - var persisterStrategyOptional = persisterStrategies.stream().filter(it -> it.getStrategy().equals(persister.value())).findFirst(); - // 实体类Entity需要有持久化策略 - AssertionUtils.isTrue(persisterStrategyOptional.isPresent(), "Entity[{}] No persistence strategy found[{}]", clazz.getSimpleName(), persister.value()); - - var persisterStrategy = persisterStrategyOptional.get(); var indexDefMap = new HashMap(); var fields = ReflectionUtils.getFieldsByAnnoInPOJOClass(clazz, Index.class); for (var field : fields) { @@ -376,15 +396,13 @@ public class OrmManager implements IOrmManager { indexTextDefMap.put(field.getName(), indexTextDef); } - return EntityDef.valueOf(idField, clazz, !hasUnsafeCollection, cacheSize, expireMillisecond, persisterStrategy, indexDefMap, indexTextDefMap); + return EntityDef.valueOf(idField, clazz, !hasUnsafeCollection, cacheStrategy.getSize(), cacheStrategy.getExpireMillisecond(), persisterStrategy, indexDefMap, indexTextDefMap); } private void checkEntity(Class clazz) { // 是否实现了IEntity接口 AssertionUtils.isTrue(IEntity.class.isAssignableFrom(clazz), "The entity:[{}] annotated by the [{}] annotation does not implement the interface [{}]" , com.zfoo.orm.anno.EntityCache.class.getName(), clazz.getCanonicalName(), IEntity.class.getCanonicalName()); - // 实体类Entity必须被注解EntityCache标注 - AssertionUtils.notNull(clazz.getAnnotation(com.zfoo.orm.anno.EntityCache.class), "The Entity[{}] must be annotated with the annotation [{}].", clazz.getCanonicalName(), com.zfoo.orm.anno.EntityCache.class.getName()); // 校验id字段和id()方法的格式，一个Entity类只能有一个@Id注解 var idFields = ReflectionUtils.getFieldsByAnnoInPOJOClass(clazz, Id.class);