No effective change - code cleanup - BeanPropertyOverride - unused override of sql formula

This commit is contained in:
Robin Bygrave
2015-08-01 17:21:09 +12:00
parent a27433dc11
commit 0c9bcca584
2 changed files with 14 additions and 31 deletions
@@ -322,9 +322,10 @@ public class BeanProperty implements ElPropertyValue {
this.indexed = source.isIndexed();
this.indexName = source.getIndexName();
this.dbColumn = InternString.intern(override.getDbColumn());
this.sqlFormulaJoin = InternString.intern(override.getSqlFormulaJoin());
this.sqlFormulaSelect = InternString.intern(override.getSqlFormulaSelect());
this.formula = sqlFormulaSelect != null;
// override with sqlFormula not currently supported
this.sqlFormulaJoin = null;
this.sqlFormulaSelect = null;
this.formula = false;
this.excludedFromHistory = source.excludedFromHistory;
this.fetchEager = source.fetchEager;
@@ -11,35 +11,17 @@ import com.avaje.ebeaninternal.server.lib.util.StringHelper;
*/
public class BeanPropertyOverride {
private final String dbColumn;
private final String sqlFormulaSelect;
private final String dbColumn;
private final String sqlFormulaJoin;
public BeanPropertyOverride(String dbColumn) {
this.dbColumn = InternString.intern(dbColumn);
}
public BeanPropertyOverride(String dbColumn) {
this(dbColumn, null, null);
}
public BeanPropertyOverride(String dbColumn, String sqlFormulaSelect, String sqlFormulaJoin) {
this.dbColumn = InternString.intern(dbColumn);
this.sqlFormulaSelect = InternString.intern(sqlFormulaSelect);
this.sqlFormulaJoin = InternString.intern(sqlFormulaJoin);
}
public String getDbColumn() {
return dbColumn;
}
public String getDbColumn() {
return dbColumn;
}
public String getSqlFormulaSelect() {
return sqlFormulaSelect;
}
public String getSqlFormulaJoin() {
return sqlFormulaJoin;
}
public String replace(String src, String srcDbColumn){
return StringHelper.replaceString(src, srcDbColumn, dbColumn);
}
public String replace(String src, String srcDbColumn) {
return StringHelper.replaceString(src, srcDbColumn, dbColumn);
}
}