Merge pull request #4 from Kingsrook/feature/QQQ-26-exports-poc

QQQ-26 update backend-core, queryOutput interface

.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: |

.gitignore

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

pom.xml

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

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,8 +185,7 @@ public abstract class AbstractBaseFilesystemAction<FILE>
 
       try
       {
-         QueryOutput   rs      = new QueryOutput(queryInput);
+         QueryOutput queryOutput = new QueryOutput(queryInput);
-         List<QRecord> records = new ArrayList<>();
 
          QTableMetaData                        table        = queryInput.getTable();
          AbstractFilesystemTableBackendDetails tableDetails = getTableBackendDetails(AbstractFilesystemTableBackendDetails.class, table);
@@ -206,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:
@@ -217,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:
@@ -227,8 +225,7 @@ public abstract class AbstractBaseFilesystemAction<FILE>
             }
          }
 
-         rs.addRecords(records);
+         return queryOutput;
-         return rs;
       }
       catch(Exception e)
       {

src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java

@@ -220,9 +220,9 @@ public class TestUtils
    /*******************************************************************************
     **
     *******************************************************************************/
-   public static QSession getMockSession()
+   public static QSession getMockSession() throws QInstanceValidationException
    {
       MockAuthenticationModule mockAuthenticationModule = new MockAuthenticationModule();
-      return (mockAuthenticationModule.createSession(null, null));
+      return (mockAuthenticationModule.createSession(defineInstance(), null));
    }
 }

src/test/java/com/kingsrook/qqq/backend/module/filesystem/local/model/metadata/FilesystemBackendMetaDataTest.java

@@ -70,8 +70,7 @@ class FilesystemBackendMetaDataTest
       String    json      = qInstanceAdapter.qInstanceToJsonIncludingBackend(qInstance);
 
       QInstance deserialized = qInstanceAdapter.jsonToQInstanceIncludingBackends(json);
-      assertThat(deserialized).usingRecursiveComparison()
+      assertThat(deserialized.getBackends()).usingRecursiveComparison()
-         .ignoringFields("hasBeenValidated") // note, this field is @JsonIgnore
+         .isEqualTo(qInstance.getBackends());
-         .isEqualTo(qInstance);
    }
 }

src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/model/metadata/S3BackendMetaDataTest.java

@@ -70,8 +70,7 @@ class S3BackendMetaDataTest
       String    json      = qInstanceAdapter.qInstanceToJsonIncludingBackend(qInstance);
 
       QInstance deserialized = qInstanceAdapter.jsonToQInstanceIncludingBackends(json);
-      assertThat(deserialized).usingRecursiveComparison()
+      assertThat(deserialized.getBackends()).usingRecursiveComparison()
-         .ignoringFields("hasBeenValidated") // note, this field is @JsonIgnore
+         .isEqualTo(qInstance.getBackends());
-         .isEqualTo(qInstance);
    }
 }