From 5da44ccbc8e0c7f09e811fab959cb40a060d1af4 Mon Sep 17 00:00:00 2001
From: Darin Kelkhoff <darin.kelkhoff@gmail.com>
Date: Tue, 19 Jul 2022 10:50:49 -0500
Subject: [PATCH] QQQ-26 update backend-core, queryOutput interface

---
 .circleci/config.yml                                  |  2 ++
 .gitignore                                            |  1 +
 pom.xml                                               |  2 +-
 .../base/actions/AbstractBaseFilesystemAction.java    | 11 ++++-------
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 573814e9..87d7748d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,6 +37,8 @@ commands:
           name: Run Maven
           command: |
             mvn -s .circleci/mvn-settings.xml << parameters.maven_subcommand >>
+      - store_artifacts:
+          path: target/site/jacoco
       - run:
           name: Save test results
           command: |
diff --git a/.gitignore b/.gitignore
index ae1ac990..edbffa9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ target/
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+.DS_Store
diff --git a/pom.xml b/pom.xml
index a27d5b7b..b34c7073 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
       <dependency>
          <groupId>com.kingsrook.qqq</groupId>
          <artifactId>qqq-backend-core</artifactId>
-         <version>0.2.0-20220714.175901-2</version>
+         <version>0.2.0-20220719.154219-3</version>
       </dependency>
 
       <!-- 3rd party deps specifically for this module -->
diff --git a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/base/actions/AbstractBaseFilesystemAction.java b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/base/actions/AbstractBaseFilesystemAction.java
index f932f3a6..84341c17 100644
--- a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/base/actions/AbstractBaseFilesystemAction.java
+++ b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/base/actions/AbstractBaseFilesystemAction.java
@@ -25,7 +25,6 @@ package com.kingsrook.qqq.backend.module.filesystem.base.actions;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
@@ -186,9 +185,7 @@ public abstract class AbstractBaseFilesystemAction<FILE>
 
       try
       {
-         QueryOutput   rs      = new QueryOutput();
-         List<QRecord> records = new ArrayList<>();
-         rs.setRecords(records);
+         QueryOutput queryOutput = new QueryOutput(queryInput);
 
          QTableMetaData                        table        = queryInput.getTable();
          AbstractFilesystemTableBackendDetails tableDetails = getTableBackendDetails(AbstractFilesystemTableBackendDetails.class, table);
@@ -207,7 +204,7 @@ public abstract class AbstractBaseFilesystemAction<FILE>
                   List<QRecord> recordsInFile = new CsvToQRecordAdapter().buildRecordsFromCsv(fileContents, table, null);
                   addBackendDetailsToRecords(recordsInFile, file);
 
-                  records.addAll(recordsInFile);
+                  queryOutput.addRecords(recordsInFile);
                   break;
                }
                case JSON:
@@ -218,7 +215,7 @@ public abstract class AbstractBaseFilesystemAction<FILE>
                   List<QRecord> recordsInFile = new JsonToQRecordAdapter().buildRecordsFromJson(fileContents, table, null);
                   addBackendDetailsToRecords(recordsInFile, file);
 
-                  records.addAll(recordsInFile);
+                  queryOutput.addRecords(recordsInFile);
                   break;
                }
                default:
@@ -228,7 +225,7 @@ public abstract class AbstractBaseFilesystemAction<FILE>
             }
          }
 
-         return rs;
+         return queryOutput;
       }
       catch(Exception e)
       {