From 811d298355cf865e10bc5d506f427e2b6cc46c3e Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Sun, 20 Apr 2014 17:01:36 +1200 Subject: [PATCH] WIP - rename EntityBeanIntercept lazy loading property methods --- .../java/com/avaje/ebean/bean/EntityBeanIntercept.java | 9 ++++++--- .../ebeaninternal/server/core/DefaultBeanLoader.java | 2 +- .../ebeaninternal/server/deploy/BeanDescriptor.java | 4 ++-- .../server/loadcontext/DLoadBeanContext.java | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/avaje/ebean/bean/EntityBeanIntercept.java b/src/main/java/com/avaje/ebean/bean/EntityBeanIntercept.java index 2d7911a2f..0b249f404 100644 --- a/src/main/java/com/avaje/ebean/bean/EntityBeanIntercept.java +++ b/src/main/java/com/avaje/ebean/bean/EntityBeanIntercept.java @@ -494,13 +494,16 @@ public final class EntityBeanIntercept implements Serializable { } /** - * Return the property read or write that triggered the lazy load. + * Return the index of the property that triggered the lazy load. */ - public int getLazyLoadProperty() { + public int getLazyLoadPropertyIndex() { return lazyLoadProperty; } - public String getLazyLoadProp() { + /** + * Return the property that triggered the lazy load. + */ + public String getLazyLoadProperty() { return getProperty(lazyLoadProperty); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java index 67cdd877a..a6c4348aa 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java @@ -364,7 +364,7 @@ public class DefaultBeanLoader { SpiQuery query = (SpiQuery) server.createQuery(desc.getBeanType()); if (ebi != null) { - query.setLazyLoadProperty(ebi.getLazyLoadProp()); + query.setLazyLoadProperty(ebi.getLazyLoadProperty()); } // don't collect autoFetch usage profiling information diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java index 85c79889d..d8dfab285 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java @@ -1108,7 +1108,7 @@ public class BeanDescriptor implements MetaBeanInfo { if (cacheData == null) { return false; } - int lazyLoadProperty = ebi.getLazyLoadProperty(); + int lazyLoadProperty = ebi.getLazyLoadPropertyIndex(); if (lazyLoadProperty > -1 && !cacheData.containsProperty(lazyLoadProperty)) { return false; } @@ -1586,7 +1586,7 @@ public class BeanDescriptor implements MetaBeanInfo { */ public boolean lazyLoadMany(EntityBeanIntercept ebi) { - int lazyLoadProperty = ebi.getLazyLoadProperty(); + int lazyLoadProperty = ebi.getLazyLoadPropertyIndex(); if (lazyLoadProperty == -1) { return false; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java index 65ed06aeb..b3d590643 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java +++ b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java @@ -173,7 +173,7 @@ public class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContex } } - LoadBeanRequest req = new LoadBeanRequest(this, null, true, ebi.getLazyLoadProp(), context.hitCache); + LoadBeanRequest req = new LoadBeanRequest(this, null, true, ebi.getLazyLoadProperty(), context.hitCache); context.desc.getEbeanServer().loadBean(req); }