diff --git a/web-services/query/src/main/java/datawave/webservice/query/logic/filtered/FilteredQueryLogic.java b/web-services/query/src/main/java/datawave/webservice/query/logic/filtered/FilteredQueryLogic.java index c9ea82250a4..5a9926fa36b 100644 --- a/web-services/query/src/main/java/datawave/webservice/query/logic/filtered/FilteredQueryLogic.java +++ b/web-services/query/src/main/java/datawave/webservice/query/logic/filtered/FilteredQueryLogic.java @@ -2,10 +2,12 @@ import datawave.webservice.query.Query; import datawave.webservice.query.configuration.GenericQueryConfiguration; +import datawave.webservice.query.iterator.DatawaveTransformIterator; import datawave.webservice.query.logic.DelegatingQueryLogic; import datawave.webservice.query.logic.QueryLogic; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.security.Authorizations; +import org.apache.commons.collections4.iterators.TransformIterator; import java.util.Collections; import java.util.Iterator; @@ -87,4 +89,13 @@ public Iterator iterator() { public Object clone() throws CloneNotSupportedException { return new FilteredQueryLogic(this); } + + @Override + public TransformIterator getTransformIterator(Query settings) { + if (!filtered) { + return super.getTransformIterator(settings); + } else { + return new DatawaveTransformIterator(iterator()); + } + } }