From 96a9def5139b57d0979a04b6b0cb02ff65dbd792 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Sat, 1 Aug 2015 22:35:35 +1200 Subject: [PATCH] No effective change - LoadBeanRequest / LoadManyRequest cleanup of constructors --- .../ebeaninternal/api/LoadBeanRequest.java | 18 ++++++++++++++---- .../ebeaninternal/api/LoadManyRequest.java | 17 +++++++++++++---- .../server/loadcontext/DLoadBeanContext.java | 4 ++-- .../server/loadcontext/DLoadManyContext.java | 4 ++-- 4 files changed, 31 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/avaje/ebeaninternal/api/LoadBeanRequest.java b/src/main/java/com/avaje/ebeaninternal/api/LoadBeanRequest.java index 9950fbf8c..ce56db5a9 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/LoadBeanRequest.java +++ b/src/main/java/com/avaje/ebeaninternal/api/LoadBeanRequest.java @@ -18,11 +18,21 @@ public class LoadBeanRequest extends LoadRequest { private final boolean loadCache; - public LoadBeanRequest(LoadBeanBuffer LoadBuffer, boolean lazy, String lazyLoadProperty, boolean loadCache) { - this(LoadBuffer, null, lazy, lazyLoadProperty, loadCache); + /** + * Construct for lazy load request. + */ + public LoadBeanRequest(LoadBeanBuffer LoadBuffer, String lazyLoadProperty, boolean loadCache) { + this(LoadBuffer, null, true, lazyLoadProperty, loadCache); } - - public LoadBeanRequest(LoadBeanBuffer LoadBuffer, OrmQueryRequest parentRequest, boolean lazy, String lazyLoadProperty, boolean loadCache) { + + /** + * Construct for secondary query. + */ + public LoadBeanRequest(LoadBeanBuffer LoadBuffer, OrmQueryRequest parentRequest) { + this(LoadBuffer, parentRequest, false, null, false); + } + + private LoadBeanRequest(LoadBeanBuffer LoadBuffer, OrmQueryRequest parentRequest, boolean lazy, String lazyLoadProperty, boolean loadCache) { super(parentRequest, lazy); this.LoadBuffer = LoadBuffer; this.batch = LoadBuffer.getBatch(); diff --git a/src/main/java/com/avaje/ebeaninternal/api/LoadManyRequest.java b/src/main/java/com/avaje/ebeaninternal/api/LoadManyRequest.java index 9f4065f80..16ef3f906 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/LoadManyRequest.java +++ b/src/main/java/com/avaje/ebeaninternal/api/LoadManyRequest.java @@ -18,12 +18,21 @@ public class LoadManyRequest extends LoadRequest { private final boolean loadCache; - public LoadManyRequest(LoadManyBuffer loadContext, boolean lazy, boolean onlyIds, boolean loadCache) { - this(loadContext, null, lazy, onlyIds, loadCache); + /** + * Construct for lazy loading. + */ + public LoadManyRequest(LoadManyBuffer loadContext, boolean onlyIds, boolean loadCache) { + this(loadContext, null, true, onlyIds, loadCache); } - - public LoadManyRequest(LoadManyBuffer loadContext, OrmQueryRequest parentRequest, boolean lazy, boolean onlyIds, boolean loadCache) { + /** + * Construct for secondary query. + */ + public LoadManyRequest(LoadManyBuffer loadContext, OrmQueryRequest parentRequest) { + this(loadContext, parentRequest, false, false, false); + } + + private LoadManyRequest(LoadManyBuffer loadContext, OrmQueryRequest parentRequest, boolean lazy, boolean onlyIds, boolean loadCache) { super(parentRequest, lazy); this.loadContext = loadContext; this.batch = loadContext.getBatch(); 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 bcda45037..b1f7adada 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java +++ b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java @@ -91,7 +91,7 @@ public class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContex if (bufferList != null) { for (LoadBuffer loadBuffer : bufferList) { if (!loadBuffer.list.isEmpty()) { - LoadBeanRequest req = new LoadBeanRequest(loadBuffer, parentRequest, false, null, false); + LoadBeanRequest req = new LoadBeanRequest(loadBuffer, parentRequest); parent.getEbeanServer().loadBean(req); if (!queryProps.isQueryFetchAll()) { // Stop - only fetch the first batch ... the rest will be lazy loaded @@ -200,7 +200,7 @@ public class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContex } } - LoadBeanRequest req = new LoadBeanRequest(this, true, ebi.getLazyLoadProperty(), context.hitCache); + LoadBeanRequest req = new LoadBeanRequest(this, ebi.getLazyLoadProperty(), context.hitCache); context.desc.getEbeanServer().loadBean(req); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadManyContext.java b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadManyContext.java index 87dde1179..2e726ee94 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadManyContext.java +++ b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadManyContext.java @@ -106,7 +106,7 @@ public class DLoadManyContext extends DLoadBaseContext implements LoadManyContex if (bufferList != null) { for (LoadBuffer loadBuffer : bufferList) { if (!loadBuffer.list.isEmpty()) { - LoadManyRequest req = new LoadManyRequest(loadBuffer, parentRequest, false, false, false); + LoadManyRequest req = new LoadManyRequest(loadBuffer, parentRequest); parent.getEbeanServer().loadMany(req); if (!queryProps.isQueryFetchAll()) { // Stop - only fetch the first batch ... the rest will be lazy loaded @@ -216,7 +216,7 @@ public class DLoadManyContext extends DLoadBaseContext implements LoadManyContex // Should reduce the list by checking each beanCollection in the L2 first before executing the query - LoadManyRequest req = new LoadManyRequest(this, true, onlyIds, useCache); + LoadManyRequest req = new LoadManyRequest(this, onlyIds, useCache); context.parent.getEbeanServer().loadMany(req); } }