Update to clone query filters

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/GenerateReportAction.java

@@ -222,7 +222,7 @@ public class GenerateReportAction
     *******************************************************************************/
    private void gatherData(ReportInput reportInput, QReportDataSource dataSource, QReportView tableView, List<QReportView> pivotViews, List<QReportView> variantViews) throws QException
    {
-      QQueryFilter queryFilter = dataSource.getQueryFilter();
+      QQueryFilter queryFilter = dataSource.getQueryFilter().clone();
       setInputValuesInQueryFilter(reportInput, queryFilter);
 
       ////////////////////////////////////////////////////////////////////////////////////////

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QFilterCriteria.java

@@ -23,6 +23,7 @@ package com.kingsrook.qqq.backend.core.model.actions.tables.query;
 
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -30,7 +31,7 @@ import java.util.List;
  * A single criteria Component of a Query
  *
  *******************************************************************************/
-public class QFilterCriteria implements Serializable
+public class QFilterCriteria implements Serializable, Cloneable
 {
    private String             fieldName;
    private QCriteriaOperator  operator;
@@ -38,6 +39,30 @@ public class QFilterCriteria implements Serializable
 
 
 
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   @Override
+   public QFilterCriteria clone()
+   {
+      try
+      {
+         QFilterCriteria clone = (QFilterCriteria) super.clone();
+         if(values != null)
+         {
+            clone.values = new ArrayList<>();
+            clone.values.addAll(values);
+         }
+         return clone;
+      }
+      catch(CloneNotSupportedException e)
+      {
+         throw new AssertionError();
+      }
+   }
+
+
+
    /*******************************************************************************
     **
     *******************************************************************************/

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QFilterOrderBy.java

@@ -29,13 +29,31 @@ import java.io.Serializable;
  ** Bean representing an element of a query order-by clause.
  **
  *******************************************************************************/
-public class QFilterOrderBy implements Serializable
+public class QFilterOrderBy implements Serializable, Cloneable
 {
    private String  fieldName;
    private boolean isAscending = true;
 
 
 
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   @Override
+   public QFilterOrderBy clone()
+   {
+      try
+      {
+         return (QFilterOrderBy) super.clone();
+      }
+      catch(CloneNotSupportedException e)
+      {
+         throw new AssertionError();
+      }
+   }
+
+
+
    /*******************************************************************************
     ** Default no-arg constructor
     *******************************************************************************/

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

@@ -31,13 +31,51 @@ import java.util.List;
  * Full "filter" for a query - a list of criteria and order-bys
  *
  *******************************************************************************/
-public class QQueryFilter implements Serializable
+public class QQueryFilter implements Serializable, Cloneable
 {
    private List<QFilterCriteria> criteria = new ArrayList<>();
    private List<QFilterOrderBy>  orderBys = new ArrayList<>();
 
 
 
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   @Override
+   public QQueryFilter clone()
+   {
+      try
+      {
+         QQueryFilter clone = (QQueryFilter) super.clone();
+
+         if(criteria != null)
+         {
+            clone.criteria = new ArrayList<>();
+            for(QFilterCriteria criterion : criteria)
+            {
+               clone.criteria.add(criterion.clone());
+            }
+         }
+
+         if(orderBys != null)
+         {
+            clone.orderBys = new ArrayList<>();
+            for(QFilterOrderBy orderBy : orderBys)
+            {
+               clone.orderBys.add(orderBy.clone());
+            }
+         }
+
+         return clone;
+      }
+      catch(CloneNotSupportedException e)
+      {
+         throw new AssertionError();
+      }
+   }
+
+
+
    /*******************************************************************************
     ** Getter for criteria
     **