CE-882 Better(?) toString

This commit is contained in:
2024-04-25 12:03:03 -05:00
parent fec96c39cb
commit 1e1b660979

View File

@ -361,17 +361,37 @@ public class QQueryFilter implements Serializable, Cloneable
StringBuilder rs = new StringBuilder("("); StringBuilder rs = new StringBuilder("(");
try try
{ {
int criteriaIndex = 0;
for(QFilterCriteria criterion : CollectionUtils.nonNullList(criteria)) for(QFilterCriteria criterion : CollectionUtils.nonNullList(criteria))
{ {
rs.append(criterion).append(" ").append(getBooleanOperator()).append(" "); if(criteriaIndex > 0)
{
rs.append(" ").append(getBooleanOperator()).append(" ");
}
rs.append(criterion);
criteriaIndex++;
} }
if(CollectionUtils.nullSafeHasContents(subFilters))
{
rs.append("Sub:{");
int subIndex = 0;
for(QQueryFilter subFilter : CollectionUtils.nonNullList(subFilters)) for(QQueryFilter subFilter : CollectionUtils.nonNullList(subFilters))
{ {
rs.append(subFilter); if(subIndex > 0)
{
rs.append(" ").append(getBooleanOperator()).append(" ");
} }
rs.append(subFilter);
subIndex++;
}
rs.append("}");
}
rs.append(")"); rs.append(")");
if(CollectionUtils.nullSafeHasContents(orderBys))
{
rs.append("OrderBy["); rs.append("OrderBy[");
for(QFilterOrderBy orderBy : CollectionUtils.nonNullList(orderBys)) for(QFilterOrderBy orderBy : CollectionUtils.nonNullList(orderBys))
{ {
@ -379,6 +399,7 @@ public class QQueryFilter implements Serializable, Cloneable
} }
rs.append("]"); rs.append("]");
} }
}
catch(Exception e) catch(Exception e)
{ {
LOG.warn("Error in toString", e); LOG.warn("Error in toString", e);