QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-19 21:50:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

QQQ-26 update backend-core, queryOutput interface

Browse Source
This commit is contained in:
darin.kelkhoff
2022-07-19 10:50:49 -05:00
parent 5e7be3b406
commit 5da44ccbc8
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -37,6 +37,8 @@ commands:
name: Run Maven name: Run Maven
command: | command: |
mvn -s .circleci/mvn-settings.xml << parameters.maven_subcommand >> mvn -s .circleci/mvn-settings.xml << parameters.maven_subcommand >>
- store_artifacts:
path: target/site/jacoco
- run: - run:
name: Save test results name: Save test results
command: | command: |

1
.gitignore vendored
View File

@ -27,3 +27,4 @@ target/
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid* hs_err_pid*
.DS_Store

2
pom.xml
View File

@ -53,7 +53,7 @@
<dependency> <dependency>
<groupId>com.kingsrook.qqq</groupId> <groupId>com.kingsrook.qqq</groupId>
<artifactId>qqq-backend-core</artifactId> <artifactId>qqq-backend-core</artifactId>
<version>0.2.0-20220714.175901-2</version> <version>0.2.0-20220719.154219-3</version>
</dependency> </dependency>
<!-- 3rd party deps specifically for this module --> <!-- 3rd party deps specifically for this module -->

11
src/main/java/com/kingsrook/qqq/backend/module/filesystem/base/actions/AbstractBaseFilesystemAction.java
View File

@ -25,7 +25,6 @@ package com.kingsrook.qqq.backend.module.filesystem.base.actions;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.function.Function; import java.util.function.Function;
@ -186,9 +185,7 @@ public abstract class AbstractBaseFilesystemAction<FILE>
try try
{ {
QueryOutput rs = new QueryOutput(); QueryOutput queryOutput = new QueryOutput(queryInput);
List<QRecord> records = new ArrayList<>();
rs.setRecords(records);
QTableMetaData table = queryInput.getTable(); QTableMetaData table = queryInput.getTable();
AbstractFilesystemTableBackendDetails tableDetails = getTableBackendDetails(AbstractFilesystemTableBackendDetails.class, table); AbstractFilesystemTableBackendDetails tableDetails = getTableBackendDetails(AbstractFilesystemTableBackendDetails.class, table);
@ -207,7 +204,7 @@ public abstract class AbstractBaseFilesystemAction<FILE>
List<QRecord> recordsInFile = new CsvToQRecordAdapter().buildRecordsFromCsv(fileContents, table, null); List<QRecord> recordsInFile = new CsvToQRecordAdapter().buildRecordsFromCsv(fileContents, table, null);
addBackendDetailsToRecords(recordsInFile, file); addBackendDetailsToRecords(recordsInFile, file);
records.addAll(recordsInFile); queryOutput.addRecords(recordsInFile);
break; break;
} }
case JSON: case JSON:
@ -218,7 +215,7 @@ public abstract class AbstractBaseFilesystemAction<FILE>
List<QRecord> recordsInFile = new JsonToQRecordAdapter().buildRecordsFromJson(fileContents, table, null); List<QRecord> recordsInFile = new JsonToQRecordAdapter().buildRecordsFromJson(fileContents, table, null);
addBackendDetailsToRecords(recordsInFile, file); addBackendDetailsToRecords(recordsInFile, file);
records.addAll(recordsInFile); queryOutput.addRecords(recordsInFile);
break; break;
} }
default: default:
@ -228,7 +225,7 @@ public abstract class AbstractBaseFilesystemAction<FILE>
} }
} }
return rs; return queryOutput;
} }
catch(Exception e) catch(Exception e)
{ {