From fd4a6906bd8ec8f9ce603499b7eb10ca9428bdd9 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Sat, 1 Aug 2015 22:17:50 +1200 Subject: [PATCH] No effective change - SqlTreeNodeBean cleanup - always same value params --- .../ebeaninternal/server/deploy/DRawSqlSelect.java | 2 +- .../ebeaninternal/server/query/SqlTreeBuilder.java | 4 ++-- .../ebeaninternal/server/query/SqlTreeNodeBean.java | 10 +++++----- .../server/query/SqlTreeNodeManyRoot.java | 2 +- .../ebeaninternal/server/query/SqlTreeNodeRoot.java | 6 +++--- .../ebeaninternal/server/query/SqlTreeProperties.java | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelect.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelect.java index 1ff9eea90..1afe90655 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelect.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelect.java @@ -152,7 +152,7 @@ public class DRawSqlSelect { } } - SqlTreeNode sqlRoot = new SqlTreeNodeRoot(desc, selectProps, withId, false); + SqlTreeNode sqlRoot = new SqlTreeNodeRoot(desc, selectProps, withId); return new SqlTree(desc.getName(), sqlRoot); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeBuilder.java index 37214b644..51f94ce4c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeBuilder.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeBuilder.java @@ -266,7 +266,7 @@ public class SqlTreeBuilder { return new SqlTreeNodeManyRoot(prefix, (BeanPropertyAssocMany) prop, props, myList, disableLazyLoad); } else { - return new SqlTreeNodeBean(prefix, prop, props, myList, true, disableLazyLoad); + return new SqlTreeNodeBean(prefix, prop, props, myList, disableLazyLoad); } } @@ -432,7 +432,7 @@ public class SqlTreeBuilder { } SqlTreeProperties selectProps = new SqlTreeProperties(); - selectProps.setAllProperties(true); + selectProps.setAllProperties(); // normal simple properties of the bean selectProps.add(desc.propertiesBaseScalar()); diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java index 60656919c..fe1b24a11 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java @@ -98,9 +98,9 @@ public class SqlTreeNodeBean implements SqlTreeNode { * Construct for leaf node. */ public SqlTreeNodeBean(String prefix, BeanPropertyAssoc beanProp, SqlTreeProperties props, - List myChildren, boolean withId, boolean disableLazyLoad) { + List myChildren, boolean disableLazyLoad) { - this(prefix, beanProp, beanProp.getTargetDescriptor(), props, myChildren, withId, null, SpiQuery.TemporalMode.CURRENT, disableLazyLoad); + this(prefix, beanProp, beanProp.getTargetDescriptor(), props, myChildren, true, null, SpiQuery.TemporalMode.CURRENT, disableLazyLoad); } /** @@ -399,7 +399,7 @@ public class SqlTreeNodeBean implements SqlTreeNode { } if (readId) { - appendSelect(ctx, false, idBinder.getBeanProperty()); + appendSelectId(ctx, idBinder.getBeanProperty()); } appendSelect(ctx, subQuery, properties); @@ -423,10 +423,10 @@ public class SqlTreeNodeBean implements SqlTreeNode { } } - private void appendSelect(DbSqlContext ctx, boolean subQuery, BeanProperty prop) { + private void appendSelectId(DbSqlContext ctx, BeanProperty prop) { if (prop != null) { - prop.appendSelect(ctx, subQuery); + prop.appendSelect(ctx, false); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeManyRoot.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeManyRoot.java index 6086c2a8f..2990ca936 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeManyRoot.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeManyRoot.java @@ -13,7 +13,7 @@ public final class SqlTreeNodeManyRoot extends SqlTreeNodeBean { private final BeanPropertyAssocMany manyProp; public SqlTreeNodeManyRoot(String prefix, BeanPropertyAssocMany prop, SqlTreeProperties props, List myList, boolean disableLazyLoad) { - super(prefix, prop, props, myList, true, disableLazyLoad); + super(prefix, prop, props, myList, disableLazyLoad); this.manyProp = prop; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeRoot.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeRoot.java index 047d52c95..8e68afb8d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeRoot.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeRoot.java @@ -26,10 +26,10 @@ public final class SqlTreeNodeRoot extends SqlTreeNodeBean { } /** - * Construct for raw sql. + * Construct for raw sql named queries. */ - public SqlTreeNodeRoot(BeanDescriptor desc, SqlTreeProperties props, boolean withId, boolean disableLazyLoad) { - super(desc, props, withId, disableLazyLoad); + public SqlTreeNodeRoot(BeanDescriptor desc, SqlTreeProperties props, boolean withId) { + super(desc, props, withId, false); this.includeJoin = null; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeProperties.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeProperties.java index 00812252c..2fb593a46 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeProperties.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeProperties.java @@ -76,8 +76,8 @@ public class SqlTreeProperties { this.tableJoins = tableJoins; } - public void setAllProperties(boolean allProperties) { - this.allProperties = allProperties; + public void setAllProperties() { + this.allProperties = true; } } \ No newline at end of file