diff --git a/src/org/redkale/source/EntityInfo.java b/src/org/redkale/source/EntityInfo.java index 35af48bb1..f5e8370ac 100644 --- a/src/org/redkale/source/EntityInfo.java +++ b/src/org/redkale/source/EntityInfo.java @@ -97,7 +97,7 @@ public final class EntityInfo { //------------------------------------------------------------ public static EntityInfo load(Class clazz, final int nodeid, final boolean cacheForbidden, final Properties conf, - Function fullloader) { + Function fullloader) { EntityInfo rs = entityInfos.get(clazz); if (rs != null) return rs; synchronized (entityInfos) { @@ -106,8 +106,7 @@ public final class EntityInfo { if (nodeid < 0) throw new IllegalArgumentException("nodeid(" + nodeid + ") is illegal"); rs = new EntityInfo(clazz, nodeid, cacheForbidden, conf); entityInfos.put(clazz, rs); - AutoLoad auto = clazz.getAnnotation(AutoLoad.class); - if (rs.cache != null && auto != null && auto.value()) { + if (rs.cache != null) { if (fullloader == null) throw new IllegalArgumentException(clazz.getName() + " auto loader is illegal"); rs.cache.fullLoad(fullloader.apply(clazz)); } @@ -178,7 +177,8 @@ public final class EntityInfo { // } DistributeGenerator dg = field.getAnnotation(DistributeGenerator.class); if (dg != null) { - if (!field.getType().isPrimitive()) throw new RuntimeException(cltmp.getName() + "'s @" + DistributeGenerator.class.getSimpleName() + " primary must be primitive class type field"); + if (!field.getType().isPrimitive()) + throw new RuntimeException(cltmp.getName() + "'s @" + DistributeGenerator.class.getSimpleName() + " primary must be primitive class type field"); sqldistribute = true; auto = false; allocationSize0 = dg.allocationSize(); @@ -339,7 +339,7 @@ public final class EntityInfo { //根据field字段名获取数据库对应的字段名 public String getSQLColumn(String tabalis, String fieldname) { return this.aliasmap == null ? (tabalis == null ? fieldname : (tabalis + '.' + fieldname)) - : (tabalis == null ? aliasmap.getOrDefault(fieldname, fieldname) : (tabalis + '.' + aliasmap.getOrDefault(fieldname, fieldname))); + : (tabalis == null ? aliasmap.getOrDefault(fieldname, fieldname) : (tabalis + '.' + aliasmap.getOrDefault(fieldname, fieldname))); } public String getPrimarySQLColumn() { diff --git a/src/org/redkale/util/AutoLoad.java b/src/org/redkale/util/AutoLoad.java index cb8afa383..65294f907 100644 --- a/src/org/redkale/util/AutoLoad.java +++ b/src/org/redkale/util/AutoLoad.java @@ -5,15 +5,14 @@ */ package org.redkale.util; -import java.lang.annotation.*; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.*; /** * 自动加载。 使用场景: * 1、被标记为@AutoLoad(false)的Service类不会被自动加载 * 2、被标记为@AutoLoad(false)的Servlet类不会被自动加载 - * 3、被标记为@AutoLoad且同时被标记为@javax.persistence.Cacheable的Entity类在被DataSource初始化时需要将Entity类对应的表数据全量加载进缓存中。 * *

详情见: http://redkale.org * @author zhangjx