No effective change - SqlTreeNodeBean cleanup - always same value params

This commit is contained in:
Robin Bygrave
2015-08-01 22:17:50 +12:00
parent da65256208
commit fd4a6906bd
6 changed files with 14 additions and 14 deletions
@@ -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);
}
@@ -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());
@@ -98,9 +98,9 @@ public class SqlTreeNodeBean implements SqlTreeNode {
* Construct for leaf node.
*/
public SqlTreeNodeBean(String prefix, BeanPropertyAssoc<?> beanProp, SqlTreeProperties props,
List<SqlTreeNode> myChildren, boolean withId, boolean disableLazyLoad) {
List<SqlTreeNode> 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);
}
}
@@ -13,7 +13,7 @@ public final class SqlTreeNodeManyRoot extends SqlTreeNodeBean {
private final BeanPropertyAssocMany<?> manyProp;
public SqlTreeNodeManyRoot(String prefix, BeanPropertyAssocMany<?> prop, SqlTreeProperties props, List<SqlTreeNode> myList, boolean disableLazyLoad) {
super(prefix, prop, props, myList, true, disableLazyLoad);
super(prefix, prop, props, myList, disableLazyLoad);
this.manyProp = prop;
}
@@ -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;
}
@@ -76,8 +76,8 @@ public class SqlTreeProperties {
this.tableJoins = tableJoins;
}
public void setAllProperties(boolean allProperties) {
this.allProperties = allProperties;
public void setAllProperties() {
this.allProperties = true;
}
}