QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

CE-882 Better(?) toString

Browse Source
This commit is contained in:
darin.kelkhoff
2024-04-25 12:03:03 -05:00
parent fec96c39cb
commit 1e1b660979
1 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QQueryFilter.java
View File

@ -361,23 +361,44 @@ 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++;
} }
for(QQueryFilter subFilter : CollectionUtils.nonNullList(subFilters)) if(CollectionUtils.nullSafeHasContents(subFilters))
{ {
rs.append(subFilter); rs.append("Sub:{");
int subIndex = 0;
for(QQueryFilter subFilter : CollectionUtils.nonNullList(subFilters))
{
if(subIndex > 0)
{
rs.append(" ").append(getBooleanOperator()).append(" ");
}
rs.append(subFilter);
subIndex++;
}
rs.append("}");
} }
rs.append(")"); rs.append(")");
rs.append("OrderBy["); if(CollectionUtils.nullSafeHasContents(orderBys))
for(QFilterOrderBy orderBy : CollectionUtils.nonNullList(orderBys))
{ {
rs.append(orderBy).append(","); rs.append("OrderBy[");
for(QFilterOrderBy orderBy : CollectionUtils.nonNullList(orderBys))
{
rs.append(orderBy).append(",");
}
rs.append("]");
} }
rs.append("]");
} }
catch(Exception e) catch(Exception e)
{ {