From 265fffc5aa8a1dc338fc189871f118b2410fa6ae Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Thu, 14 Jul 2022 09:44:45 -0500 Subject: [PATCH 01/15] Update for next development version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 552639b9..78a92ed5 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ com.kingsrook.qqq qqq-backend-module-filesystem - 0.1.0 + 0.2.0-SNAPSHOT scm:git:git@github.com:Kingsrook/qqq-backend-module-rdbms.git From cc532c62db96a0efe9913c2bf5ed2aa67368356c Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Thu, 14 Jul 2022 09:51:43 -0500 Subject: [PATCH 02/15] Update qqq-backend-core to 0.2.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 78a92ed5..2ed5feec 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ com.kingsrook.qqq qqq-backend-core - 0.1.0-20220708.195335-5 + 0.2.0-SNAPSHOT From 4cae1ae9008808ceaa48c5545ef025288b3567e1 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Thu, 14 Jul 2022 12:09:19 -0500 Subject: [PATCH 03/15] Reset qqq-backend-core to 0.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2ed5feec..f5c2ab48 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ com.kingsrook.qqq qqq-backend-core - 0.2.0-SNAPSHOT + 0.1.0 From bd4b6edb1363b41c8a90d37f344d5506ad114ecd Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Thu, 14 Jul 2022 13:03:31 -0500 Subject: [PATCH 04/15] Reorganize packages; rename Request to Input and Response to Output --- pom.xml | 2 +- .../actions/AbstractBaseFilesystemAction.java | 20 +++++----- ...AbstractFilesystemTableBackendDetails.java | 2 +- .../local/FilesystemBackendModule.java | 12 +++--- .../actions/AbstractFilesystemAction.java | 2 +- .../local/actions/FilesystemDeleteAction.java | 8 ++-- .../local/actions/FilesystemInsertAction.java | 8 ++-- .../local/actions/FilesystemQueryAction.java | 10 ++--- .../local/actions/FilesystemUpdateAction.java | 8 ++-- .../basic/BasicETLCleanupSourceFilesStep.java | 40 +++++++++---------- .../BasicETLCollectSourceFileNamesStep.java | 22 +++++----- .../sync/FilesystemSyncProcess.java | 10 ++--- .../filesystem/sync/FilesystemSyncStep.java | 26 ++++++------ .../module/filesystem/s3/S3BackendModule.java | 12 +++--- .../s3/actions/AbstractS3Action.java | 2 +- .../filesystem/s3/actions/S3DeleteAction.java | 8 ++-- .../filesystem/s3/actions/S3InsertAction.java | 8 ++-- .../filesystem/s3/actions/S3QueryAction.java | 10 ++--- .../filesystem/s3/actions/S3UpdateAction.java | 8 ++-- .../backend/module/filesystem/TestUtils.java | 8 ++-- .../local/FilesystemBackendModuleTest.java | 2 +- .../actions/FilesystemQueryActionTest.java | 38 +++++++++--------- .../BasicETLCleanupSourceFilesStepTest.java | 34 ++++++++-------- ...asicETLCollectSourceFileNamesStepTest.java | 18 ++++----- .../sync/FilesystemSyncProcessS3Test.java | 34 ++++++++-------- .../sync/FilesystemSyncProcessTest.java | 22 +++++----- .../filesystem/s3/S3BackendModuleTest.java | 2 +- .../s3/actions/S3QueryActionTest.java | 22 +++++----- 28 files changed, 199 insertions(+), 199 deletions(-) diff --git a/pom.xml b/pom.xml index f5c2ab48..2ed5feec 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ com.kingsrook.qqq qqq-backend-core - 0.1.0 + 0.2.0-SNAPSHOT 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 8b211f7f..f932f3a6 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 @@ -32,14 +32,14 @@ import java.util.function.Function; import com.kingsrook.qqq.backend.core.adapters.CsvToQRecordAdapter; import com.kingsrook.qqq.backend.core.adapters.JsonToQRecordAdapter; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.query.QueryRequest; -import com.kingsrook.qqq.backend.core.model.actions.query.QueryResult; +import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryInput; +import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryOutput; import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData; -import com.kingsrook.qqq.backend.core.model.metadata.QCodeReference; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; -import com.kingsrook.qqq.backend.core.model.metadata.QTableBackendDetails; -import com.kingsrook.qqq.backend.core.model.metadata.QTableMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference; +import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableBackendDetails; +import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.module.filesystem.base.FilesystemBackendModuleInterface; import com.kingsrook.qqq.backend.module.filesystem.base.FilesystemRecordBackendDetailFields; @@ -180,19 +180,19 @@ public abstract class AbstractBaseFilesystemAction /******************************************************************************* ** Generic implementation of the execute method from the QueryInterface *******************************************************************************/ - public QueryResult executeQuery(QueryRequest queryRequest) throws QException + public QueryOutput executeQuery(QueryInput queryInput) throws QException { - preAction(queryRequest.getBackend()); + preAction(queryInput.getBackend()); try { - QueryResult rs = new QueryResult(); + QueryOutput rs = new QueryOutput(); List records = new ArrayList<>(); rs.setRecords(records); - QTableMetaData table = queryRequest.getTable(); + QTableMetaData table = queryInput.getTable(); AbstractFilesystemTableBackendDetails tableDetails = getTableBackendDetails(AbstractFilesystemTableBackendDetails.class, table); - List files = listFiles(table, queryRequest.getBackend()); + List files = listFiles(table, queryInput.getBackend()); for(FILE file : files) { diff --git a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/base/model/metadata/AbstractFilesystemTableBackendDetails.java b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/base/model/metadata/AbstractFilesystemTableBackendDetails.java index e98e4fad..32bfa2d6 100644 --- a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/base/model/metadata/AbstractFilesystemTableBackendDetails.java +++ b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/base/model/metadata/AbstractFilesystemTableBackendDetails.java @@ -22,7 +22,7 @@ package com.kingsrook.qqq.backend.module.filesystem.base.model.metadata; -import com.kingsrook.qqq.backend.core.model.metadata.QTableBackendDetails; +import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableBackendDetails; /******************************************************************************* diff --git a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/FilesystemBackendModule.java b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/FilesystemBackendModule.java index f432ec7b..2bc14244 100644 --- a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/FilesystemBackendModule.java +++ b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/FilesystemBackendModule.java @@ -23,13 +23,13 @@ package com.kingsrook.qqq.backend.module.filesystem.local; import java.io.File; +import com.kingsrook.qqq.backend.core.actions.interfaces.DeleteInterface; +import com.kingsrook.qqq.backend.core.actions.interfaces.InsertInterface; +import com.kingsrook.qqq.backend.core.actions.interfaces.QueryInterface; +import com.kingsrook.qqq.backend.core.actions.interfaces.UpdateInterface; import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData; -import com.kingsrook.qqq.backend.core.model.metadata.QTableBackendDetails; -import com.kingsrook.qqq.backend.core.modules.interfaces.DeleteInterface; -import com.kingsrook.qqq.backend.core.modules.interfaces.InsertInterface; -import com.kingsrook.qqq.backend.core.modules.interfaces.QBackendModuleInterface; -import com.kingsrook.qqq.backend.core.modules.interfaces.QueryInterface; -import com.kingsrook.qqq.backend.core.modules.interfaces.UpdateInterface; +import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableBackendDetails; +import com.kingsrook.qqq.backend.core.modules.backend.QBackendModuleInterface; import com.kingsrook.qqq.backend.module.filesystem.base.FilesystemBackendModuleInterface; import com.kingsrook.qqq.backend.module.filesystem.base.actions.AbstractBaseFilesystemAction; import com.kingsrook.qqq.backend.module.filesystem.local.actions.AbstractFilesystemAction; diff --git a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/AbstractFilesystemAction.java b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/AbstractFilesystemAction.java index be5dd44b..f1110b54 100644 --- a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/AbstractFilesystemAction.java +++ b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/AbstractFilesystemAction.java @@ -31,7 +31,7 @@ import java.util.Collections; import java.util.List; import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; -import com.kingsrook.qqq.backend.core.model.metadata.QTableMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.module.filesystem.base.actions.AbstractBaseFilesystemAction; import com.kingsrook.qqq.backend.module.filesystem.exceptions.FilesystemException; import org.apache.commons.io.FileUtils; diff --git a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemDeleteAction.java b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemDeleteAction.java index 9843bb4e..6d304f00 100644 --- a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemDeleteAction.java +++ b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemDeleteAction.java @@ -22,10 +22,10 @@ package com.kingsrook.qqq.backend.module.filesystem.local.actions; +import com.kingsrook.qqq.backend.core.actions.interfaces.DeleteInterface; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.delete.DeleteRequest; -import com.kingsrook.qqq.backend.core.model.actions.delete.DeleteResult; -import com.kingsrook.qqq.backend.core.modules.interfaces.DeleteInterface; +import com.kingsrook.qqq.backend.core.model.actions.tables.delete.DeleteInput; +import com.kingsrook.qqq.backend.core.model.actions.tables.delete.DeleteOutput; import org.apache.commons.lang.NotImplementedException; @@ -38,7 +38,7 @@ public class FilesystemDeleteAction implements DeleteInterface /******************************************************************************* ** *******************************************************************************/ - public DeleteResult execute(DeleteRequest deleteRequest) throws QException + public DeleteOutput execute(DeleteInput deleteInput) throws QException { throw new NotImplementedException("Filesystem delete not implemented"); /* diff --git a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemInsertAction.java b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemInsertAction.java index 9a8ca832..651e5c44 100644 --- a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemInsertAction.java +++ b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemInsertAction.java @@ -22,10 +22,10 @@ package com.kingsrook.qqq.backend.module.filesystem.local.actions; +import com.kingsrook.qqq.backend.core.actions.interfaces.InsertInterface; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.insert.InsertRequest; -import com.kingsrook.qqq.backend.core.model.actions.insert.InsertResult; -import com.kingsrook.qqq.backend.core.modules.interfaces.InsertInterface; +import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertInput; +import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertOutput; import org.apache.commons.lang.NotImplementedException; @@ -38,7 +38,7 @@ public class FilesystemInsertAction implements InsertInterface /******************************************************************************* ** *******************************************************************************/ - public InsertResult execute(InsertRequest insertRequest) throws QException + public InsertOutput execute(InsertInput insertInput) throws QException { throw new NotImplementedException("Filesystem insert not implemented"); /* diff --git a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemQueryAction.java b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemQueryAction.java index 56dc6d5d..8ef74230 100644 --- a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemQueryAction.java +++ b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemQueryAction.java @@ -22,10 +22,10 @@ package com.kingsrook.qqq.backend.module.filesystem.local.actions; +import com.kingsrook.qqq.backend.core.actions.interfaces.QueryInterface; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.query.QueryRequest; -import com.kingsrook.qqq.backend.core.model.actions.query.QueryResult; -import com.kingsrook.qqq.backend.core.modules.interfaces.QueryInterface; +import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryInput; +import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryOutput; /******************************************************************************* @@ -37,9 +37,9 @@ public class FilesystemQueryAction extends AbstractFilesystemAction implements Q /******************************************************************************* ** *******************************************************************************/ - public QueryResult execute(QueryRequest queryRequest) throws QException + public QueryOutput execute(QueryInput queryInput) throws QException { - return executeQuery(queryRequest); + return executeQuery(queryInput); } } diff --git a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemUpdateAction.java b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemUpdateAction.java index 1f762164..19bd15bb 100644 --- a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemUpdateAction.java +++ b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemUpdateAction.java @@ -22,10 +22,10 @@ package com.kingsrook.qqq.backend.module.filesystem.local.actions; +import com.kingsrook.qqq.backend.core.actions.interfaces.UpdateInterface; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.update.UpdateRequest; -import com.kingsrook.qqq.backend.core.model.actions.update.UpdateResult; -import com.kingsrook.qqq.backend.core.modules.interfaces.UpdateInterface; +import com.kingsrook.qqq.backend.core.model.actions.tables.update.UpdateInput; +import com.kingsrook.qqq.backend.core.model.actions.tables.update.UpdateOutput; import org.apache.commons.lang.NotImplementedException; @@ -38,7 +38,7 @@ public class FilesystemUpdateAction implements UpdateInterface /******************************************************************************* ** *******************************************************************************/ - public UpdateResult execute(UpdateRequest updateRequest) throws QException + public UpdateOutput execute(UpdateInput updateInput) throws QException { throw new NotImplementedException("Filesystem update not implemented"); /* diff --git a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/etl/basic/BasicETLCleanupSourceFilesStep.java b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/etl/basic/BasicETLCleanupSourceFilesStep.java index f2d3826b..f455f018 100644 --- a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/etl/basic/BasicETLCleanupSourceFilesStep.java +++ b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/etl/basic/BasicETLCleanupSourceFilesStep.java @@ -23,21 +23,21 @@ package com.kingsrook.qqq.backend.module.filesystem.processes.implementations.et import java.io.File; +import com.kingsrook.qqq.backend.core.actions.processes.BackendStep; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.interfaces.BackendStep; -import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepRequest; -import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepResult; +import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput; +import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutput; import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData; -import com.kingsrook.qqq.backend.core.model.metadata.QCodeReference; -import com.kingsrook.qqq.backend.core.model.metadata.QCodeType; -import com.kingsrook.qqq.backend.core.model.metadata.QCodeUsage; -import com.kingsrook.qqq.backend.core.model.metadata.QFieldMetaData; -import com.kingsrook.qqq.backend.core.model.metadata.QFieldType; -import com.kingsrook.qqq.backend.core.model.metadata.QTableMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference; +import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeType; +import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeUsage; +import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType; import com.kingsrook.qqq.backend.core.model.metadata.processes.QBackendStepMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QFunctionInputMetaData; -import com.kingsrook.qqq.backend.core.modules.QBackendModuleDispatcher; -import com.kingsrook.qqq.backend.core.modules.interfaces.QBackendModuleInterface; +import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; +import com.kingsrook.qqq.backend.core.modules.backend.QBackendModuleDispatcher; +import com.kingsrook.qqq.backend.core.modules.backend.QBackendModuleInterface; import com.kingsrook.qqq.backend.core.processes.implementations.etl.basic.BasicETLProcess; import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.module.filesystem.base.FilesystemBackendModuleInterface; @@ -67,11 +67,11 @@ public class BasicETLCleanupSourceFilesStep implements BackendStep ** Execute the step - using the request as input, and the result as output. *******************************************************************************/ @Override - public void run(RunBackendStepRequest runBackendStepRequest, RunBackendStepResult runBackendStepResult) throws QException + public void run(RunBackendStepInput runBackendStepInput, RunBackendStepOutput runBackendStepOutput) throws QException { - String sourceTableName = runBackendStepRequest.getValueString(BasicETLProcess.FIELD_SOURCE_TABLE); - QTableMetaData table = runBackendStepRequest.getInstance().getTable(sourceTableName); - QBackendMetaData backend = runBackendStepRequest.getInstance().getBackendForTable(sourceTableName); + String sourceTableName = runBackendStepInput.getValueString(BasicETLProcess.FIELD_SOURCE_TABLE); + QTableMetaData table = runBackendStepInput.getInstance().getTable(sourceTableName); + QBackendMetaData backend = runBackendStepInput.getInstance().getBackendForTable(sourceTableName); QBackendModuleInterface module = new QBackendModuleDispatcher().getQBackendModule(backend); if(!(module instanceof FilesystemBackendModuleInterface filesystemModule)) @@ -81,7 +81,7 @@ public class BasicETLCleanupSourceFilesStep implements BackendStep AbstractBaseFilesystemAction actionBase = filesystemModule.getActionBase(); actionBase.preAction(backend); - String sourceFilePaths = runBackendStepRequest.getValueString(BasicETLCollectSourceFileNamesStep.FIELD_SOURCE_FILE_PATHS); + String sourceFilePaths = runBackendStepInput.getValueString(BasicETLCollectSourceFileNamesStep.FIELD_SOURCE_FILE_PATHS); if(!StringUtils.hasContent(sourceFilePaths)) { LOG.info("No source file paths were specified in field [" + BasicETLCollectSourceFileNamesStep.FIELD_SOURCE_FILE_PATHS + "]"); @@ -91,21 +91,21 @@ public class BasicETLCleanupSourceFilesStep implements BackendStep String[] sourceFiles = sourceFilePaths.split(","); for(String sourceFile : sourceFiles) { - String moveOrDelete = runBackendStepRequest.getValueString(FIELD_MOVE_OR_DELETE); + String moveOrDelete = runBackendStepInput.getValueString(FIELD_MOVE_OR_DELETE); if(VALUE_DELETE.equals(moveOrDelete)) { - actionBase.deleteFile(runBackendStepRequest.getInstance(), table, sourceFile); + actionBase.deleteFile(runBackendStepInput.getInstance(), table, sourceFile); } else if(VALUE_MOVE.equals(moveOrDelete)) { - String destinationForMoves = runBackendStepRequest.getValueString(FIELD_DESTINATION_FOR_MOVES); + String destinationForMoves = runBackendStepInput.getValueString(FIELD_DESTINATION_FOR_MOVES); if(!StringUtils.hasContent(destinationForMoves)) { throw (new QException("Field [" + FIELD_DESTINATION_FOR_MOVES + "] is missing a value.")); } String filePathWithoutBase = actionBase.stripBackendAndTableBasePathsFromFileName(sourceFile, backend, table); String destinationPath = destinationForMoves + File.separator + filePathWithoutBase; - actionBase.moveFile(runBackendStepRequest.getInstance(), table, sourceFile, destinationPath); + actionBase.moveFile(runBackendStepInput.getInstance(), table, sourceFile, destinationPath); } else { diff --git a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/etl/basic/BasicETLCollectSourceFileNamesStep.java b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/etl/basic/BasicETLCollectSourceFileNamesStep.java index d0e8581c..b444a42d 100644 --- a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/etl/basic/BasicETLCollectSourceFileNamesStep.java +++ b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/etl/basic/BasicETLCollectSourceFileNamesStep.java @@ -24,15 +24,15 @@ package com.kingsrook.qqq.backend.module.filesystem.processes.implementations.et import java.util.Set; import java.util.stream.Collectors; +import com.kingsrook.qqq.backend.core.actions.processes.BackendStep; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.interfaces.BackendStep; -import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepRequest; -import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepResult; -import com.kingsrook.qqq.backend.core.model.metadata.QCodeReference; -import com.kingsrook.qqq.backend.core.model.metadata.QCodeType; -import com.kingsrook.qqq.backend.core.model.metadata.QCodeUsage; -import com.kingsrook.qqq.backend.core.model.metadata.QFieldMetaData; -import com.kingsrook.qqq.backend.core.model.metadata.QFieldType; +import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput; +import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutput; +import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference; +import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeType; +import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeUsage; +import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType; import com.kingsrook.qqq.backend.core.model.metadata.processes.QBackendStepMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QFunctionOutputMetaData; import com.kingsrook.qqq.backend.core.utils.StringUtils; @@ -57,12 +57,12 @@ public class BasicETLCollectSourceFileNamesStep implements BackendStep ** Execute the step - using the request as input, and the result as output. *******************************************************************************/ @Override - public void run(RunBackendStepRequest runBackendStepRequest, RunBackendStepResult runBackendStepResult) throws QException + public void run(RunBackendStepInput runBackendStepInput, RunBackendStepOutput runBackendStepOutput) throws QException { - Set sourceFiles = runBackendStepRequest.getRecords().stream() + Set sourceFiles = runBackendStepInput.getRecords().stream() .map(record -> record.getBackendDetailString(FilesystemRecordBackendDetailFields.FULL_PATH)) .collect(Collectors.toSet()); - runBackendStepResult.addValue(FIELD_SOURCE_FILE_PATHS, StringUtils.join(",", sourceFiles)); + runBackendStepOutput.addValue(FIELD_SOURCE_FILE_PATHS, StringUtils.join(",", sourceFiles)); } diff --git a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncProcess.java b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncProcess.java index aca2347a..349bbbc1 100644 --- a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncProcess.java +++ b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncProcess.java @@ -22,11 +22,11 @@ package com.kingsrook.qqq.backend.module.filesystem.processes.implementations.filesystem.sync; -import com.kingsrook.qqq.backend.core.model.metadata.QCodeReference; -import com.kingsrook.qqq.backend.core.model.metadata.QCodeType; -import com.kingsrook.qqq.backend.core.model.metadata.QCodeUsage; -import com.kingsrook.qqq.backend.core.model.metadata.QFieldMetaData; -import com.kingsrook.qqq.backend.core.model.metadata.QFieldType; +import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference; +import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeType; +import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeUsage; +import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType; import com.kingsrook.qqq.backend.core.model.metadata.processes.QBackendStepMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QFunctionInputMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QProcessMetaData; diff --git a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncStep.java b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncStep.java index bedf2616..1ea36990 100644 --- a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncStep.java +++ b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncStep.java @@ -28,13 +28,13 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; +import com.kingsrook.qqq.backend.core.actions.processes.BackendStep; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.interfaces.BackendStep; -import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepRequest; -import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepResult; +import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput; +import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutput; import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData; -import com.kingsrook.qqq.backend.core.model.metadata.QTableMetaData; -import com.kingsrook.qqq.backend.core.modules.QBackendModuleDispatcher; +import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; +import com.kingsrook.qqq.backend.core.modules.backend.QBackendModuleDispatcher; import com.kingsrook.qqq.backend.module.filesystem.base.FilesystemBackendModuleInterface; import com.kingsrook.qqq.backend.module.filesystem.base.actions.AbstractBaseFilesystemAction; import org.apache.logging.log4j.LogManager; @@ -59,30 +59,30 @@ public class FilesystemSyncStep implements BackendStep ** Execute the step - using the request as input, and the result as output. *******************************************************************************/ @Override - public void run(RunBackendStepRequest runBackendStepRequest, RunBackendStepResult runBackendStepResult) throws QException + public void run(RunBackendStepInput runBackendStepInput, RunBackendStepOutput runBackendStepOutput) throws QException { - QTableMetaData sourceTable = runBackendStepRequest.getInstance().getTable(runBackendStepRequest.getValueString(FilesystemSyncProcess.FIELD_SOURCE_TABLE)); - QTableMetaData archiveTable = runBackendStepRequest.getInstance().getTable(runBackendStepRequest.getValueString(FilesystemSyncProcess.FIELD_ARCHIVE_TABLE)); - QTableMetaData processingTable = runBackendStepRequest.getInstance().getTable(runBackendStepRequest.getValueString(FilesystemSyncProcess.FIELD_PROCESSING_TABLE)); + QTableMetaData sourceTable = runBackendStepInput.getInstance().getTable(runBackendStepInput.getValueString(FilesystemSyncProcess.FIELD_SOURCE_TABLE)); + QTableMetaData archiveTable = runBackendStepInput.getInstance().getTable(runBackendStepInput.getValueString(FilesystemSyncProcess.FIELD_ARCHIVE_TABLE)); + QTableMetaData processingTable = runBackendStepInput.getInstance().getTable(runBackendStepInput.getValueString(FilesystemSyncProcess.FIELD_PROCESSING_TABLE)); - QBackendMetaData sourceBackend = runBackendStepRequest.getInstance().getBackendForTable(sourceTable.getName()); + QBackendMetaData sourceBackend = runBackendStepInput.getInstance().getBackendForTable(sourceTable.getName()); FilesystemBackendModuleInterface sourceModule = (FilesystemBackendModuleInterface) new QBackendModuleDispatcher().getQBackendModule(sourceBackend); AbstractBaseFilesystemAction sourceActionBase = sourceModule.getActionBase(); sourceActionBase.preAction(sourceBackend); Map sourceFiles = getFileNames(sourceActionBase, sourceTable, sourceBackend); - QBackendMetaData archiveBackend = runBackendStepRequest.getInstance().getBackendForTable(archiveTable.getName()); + QBackendMetaData archiveBackend = runBackendStepInput.getInstance().getBackendForTable(archiveTable.getName()); FilesystemBackendModuleInterface archiveModule = (FilesystemBackendModuleInterface) new QBackendModuleDispatcher().getQBackendModule(archiveBackend); AbstractBaseFilesystemAction archiveActionBase = archiveModule.getActionBase(); archiveActionBase.preAction(archiveBackend); Set archiveFiles = getFileNames(archiveActionBase, archiveTable, archiveBackend).keySet(); - QBackendMetaData processingBackend = runBackendStepRequest.getInstance().getBackendForTable(processingTable.getName()); + QBackendMetaData processingBackend = runBackendStepInput.getInstance().getBackendForTable(processingTable.getName()); FilesystemBackendModuleInterface processingModule = (FilesystemBackendModuleInterface) new QBackendModuleDispatcher().getQBackendModule(processingBackend); AbstractBaseFilesystemAction processingActionBase = processingModule.getActionBase(); processingActionBase.preAction(processingBackend); - Integer maxFilesToSync = runBackendStepRequest.getValueInteger(FilesystemSyncProcess.FIELD_MAX_FILES_TO_ARCHIVE); + Integer maxFilesToSync = runBackendStepInput.getValueInteger(FilesystemSyncProcess.FIELD_MAX_FILES_TO_ARCHIVE); int syncedFileCount = 0; for(Map.Entry sourceEntry : sourceFiles.entrySet()) { diff --git a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/S3BackendModule.java b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/S3BackendModule.java index 38a54535..fe742f59 100644 --- a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/S3BackendModule.java +++ b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/S3BackendModule.java @@ -23,13 +23,13 @@ package com.kingsrook.qqq.backend.module.filesystem.s3; import com.amazonaws.services.s3.model.S3ObjectSummary; +import com.kingsrook.qqq.backend.core.actions.interfaces.DeleteInterface; +import com.kingsrook.qqq.backend.core.actions.interfaces.InsertInterface; +import com.kingsrook.qqq.backend.core.actions.interfaces.QueryInterface; +import com.kingsrook.qqq.backend.core.actions.interfaces.UpdateInterface; import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData; -import com.kingsrook.qqq.backend.core.model.metadata.QTableBackendDetails; -import com.kingsrook.qqq.backend.core.modules.interfaces.DeleteInterface; -import com.kingsrook.qqq.backend.core.modules.interfaces.InsertInterface; -import com.kingsrook.qqq.backend.core.modules.interfaces.QBackendModuleInterface; -import com.kingsrook.qqq.backend.core.modules.interfaces.QueryInterface; -import com.kingsrook.qqq.backend.core.modules.interfaces.UpdateInterface; +import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableBackendDetails; +import com.kingsrook.qqq.backend.core.modules.backend.QBackendModuleInterface; import com.kingsrook.qqq.backend.module.filesystem.base.FilesystemBackendModuleInterface; import com.kingsrook.qqq.backend.module.filesystem.base.actions.AbstractBaseFilesystemAction; import com.kingsrook.qqq.backend.module.filesystem.s3.actions.AbstractS3Action; diff --git a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/AbstractS3Action.java b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/AbstractS3Action.java index b7fc6ca7..2b697cc6 100644 --- a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/AbstractS3Action.java +++ b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/AbstractS3Action.java @@ -32,7 +32,7 @@ import com.amazonaws.services.s3.AmazonS3ClientBuilder; import com.amazonaws.services.s3.model.S3ObjectSummary; import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; -import com.kingsrook.qqq.backend.core.model.metadata.QTableMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.module.filesystem.base.actions.AbstractBaseFilesystemAction; import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.AbstractFilesystemTableBackendDetails; diff --git a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3DeleteAction.java b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3DeleteAction.java index 2a4a8448..f96c07df 100644 --- a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3DeleteAction.java +++ b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3DeleteAction.java @@ -22,10 +22,10 @@ package com.kingsrook.qqq.backend.module.filesystem.s3.actions; +import com.kingsrook.qqq.backend.core.actions.interfaces.DeleteInterface; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.delete.DeleteRequest; -import com.kingsrook.qqq.backend.core.model.actions.delete.DeleteResult; -import com.kingsrook.qqq.backend.core.modules.interfaces.DeleteInterface; +import com.kingsrook.qqq.backend.core.model.actions.tables.delete.DeleteInput; +import com.kingsrook.qqq.backend.core.model.actions.tables.delete.DeleteOutput; import org.apache.commons.lang.NotImplementedException; @@ -38,7 +38,7 @@ public class S3DeleteAction implements DeleteInterface /******************************************************************************* ** *******************************************************************************/ - public DeleteResult execute(DeleteRequest deleteRequest) throws QException + public DeleteOutput execute(DeleteInput deleteInput) throws QException { throw new NotImplementedException("S3 delete not implemented"); /* diff --git a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3InsertAction.java b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3InsertAction.java index caeed82b..2882f3ac 100644 --- a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3InsertAction.java +++ b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3InsertAction.java @@ -22,10 +22,10 @@ package com.kingsrook.qqq.backend.module.filesystem.s3.actions; +import com.kingsrook.qqq.backend.core.actions.interfaces.InsertInterface; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.insert.InsertRequest; -import com.kingsrook.qqq.backend.core.model.actions.insert.InsertResult; -import com.kingsrook.qqq.backend.core.modules.interfaces.InsertInterface; +import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertInput; +import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertOutput; import org.apache.commons.lang.NotImplementedException; @@ -38,7 +38,7 @@ public class S3InsertAction implements InsertInterface /******************************************************************************* ** *******************************************************************************/ - public InsertResult execute(InsertRequest insertRequest) throws QException + public InsertOutput execute(InsertInput insertInput) throws QException { throw new NotImplementedException("S3 insert not implemented"); /* diff --git a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3QueryAction.java b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3QueryAction.java index 46e71e25..e9daf3d5 100644 --- a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3QueryAction.java +++ b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3QueryAction.java @@ -22,10 +22,10 @@ package com.kingsrook.qqq.backend.module.filesystem.s3.actions; +import com.kingsrook.qqq.backend.core.actions.interfaces.QueryInterface; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.query.QueryRequest; -import com.kingsrook.qqq.backend.core.model.actions.query.QueryResult; -import com.kingsrook.qqq.backend.core.modules.interfaces.QueryInterface; +import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryInput; +import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryOutput; /******************************************************************************* @@ -37,9 +37,9 @@ public class S3QueryAction extends AbstractS3Action implements QueryInterface /******************************************************************************* ** *******************************************************************************/ - public QueryResult execute(QueryRequest queryRequest) throws QException + public QueryOutput execute(QueryInput queryInput) throws QException { - return (super.executeQuery(queryRequest)); + return (super.executeQuery(queryInput)); } } diff --git a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3UpdateAction.java b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3UpdateAction.java index 4955ffb2..16493be2 100644 --- a/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3UpdateAction.java +++ b/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3UpdateAction.java @@ -22,10 +22,10 @@ package com.kingsrook.qqq.backend.module.filesystem.s3.actions; +import com.kingsrook.qqq.backend.core.actions.interfaces.UpdateInterface; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.update.UpdateRequest; -import com.kingsrook.qqq.backend.core.model.actions.update.UpdateResult; -import com.kingsrook.qqq.backend.core.modules.interfaces.UpdateInterface; +import com.kingsrook.qqq.backend.core.model.actions.tables.update.UpdateInput; +import com.kingsrook.qqq.backend.core.model.actions.tables.update.UpdateOutput; import org.apache.commons.lang.NotImplementedException; @@ -38,7 +38,7 @@ public class S3UpdateAction implements UpdateInterface /******************************************************************************* ** *******************************************************************************/ - public UpdateResult execute(UpdateRequest updateRequest) throws QException + public UpdateOutput execute(UpdateInput updateInput) throws QException { throw new NotImplementedException("S3 update not implemented"); /* diff --git a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java index 676e3f96..6dbef157 100644 --- a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java +++ b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java @@ -27,12 +27,12 @@ import java.io.IOException; import com.kingsrook.qqq.backend.core.exceptions.QInstanceValidationException; import com.kingsrook.qqq.backend.core.instances.QInstanceValidator; import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationMetaData; -import com.kingsrook.qqq.backend.core.model.metadata.QFieldMetaData; -import com.kingsrook.qqq.backend.core.model.metadata.QFieldType; +import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; -import com.kingsrook.qqq.backend.core.model.metadata.QTableMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.model.session.QSession; -import com.kingsrook.qqq.backend.core.modules.mock.MockAuthenticationModule; +import com.kingsrook.qqq.backend.core.modules.authentication.MockAuthenticationModule; import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.Cardinality; import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.RecordFormat; import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemBackendMetaData; diff --git a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/local/FilesystemBackendModuleTest.java b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/local/FilesystemBackendModuleTest.java index 9d172573..17318fd3 100644 --- a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/local/FilesystemBackendModuleTest.java +++ b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/local/FilesystemBackendModuleTest.java @@ -26,7 +26,7 @@ import java.io.File; import java.io.IOException; import java.util.List; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; -import com.kingsrook.qqq.backend.core.model.metadata.QTableMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.module.filesystem.TestUtils; import com.kingsrook.qqq.backend.module.filesystem.exceptions.FilesystemException; import com.kingsrook.qqq.backend.module.filesystem.local.actions.AbstractFilesystemAction; diff --git a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemQueryActionTest.java b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemQueryActionTest.java index 04a152e9..cc90a4bc 100644 --- a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemQueryActionTest.java +++ b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemQueryActionTest.java @@ -24,13 +24,13 @@ package com.kingsrook.qqq.backend.module.filesystem.local.actions; import java.util.function.Function; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.query.QueryRequest; -import com.kingsrook.qqq.backend.core.model.actions.query.QueryResult; -import com.kingsrook.qqq.backend.core.model.metadata.QCodeReference; -import com.kingsrook.qqq.backend.core.model.metadata.QCodeType; -import com.kingsrook.qqq.backend.core.model.metadata.QCodeUsage; +import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryInput; +import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryOutput; +import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference; +import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeType; +import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeUsage; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; -import com.kingsrook.qqq.backend.core.model.metadata.QTableMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.module.filesystem.TestUtils; import com.kingsrook.qqq.backend.module.filesystem.base.FilesystemBackendModuleInterface; import com.kingsrook.qqq.backend.module.filesystem.base.FilesystemRecordBackendDetailFields; @@ -50,12 +50,12 @@ public class FilesystemQueryActionTest extends FilesystemActionTest @Test public void testQuery1() throws QException { - QueryRequest queryRequest = new QueryRequest(); - queryRequest.setInstance(TestUtils.defineInstance()); - queryRequest.setTableName(TestUtils.defineLocalFilesystemJSONPersonTable().getName()); - QueryResult queryResult = new FilesystemQueryAction().execute(queryRequest); - Assertions.assertEquals(3, queryResult.getRecords().size(), "Unfiltered query should find all rows"); - Assertions.assertTrue(queryResult.getRecords().stream() + QueryInput queryInput = new QueryInput(); + queryInput.setInstance(TestUtils.defineInstance()); + queryInput.setTableName(TestUtils.defineLocalFilesystemJSONPersonTable().getName()); + QueryOutput queryOutput = new FilesystemQueryAction().execute(queryInput); + Assertions.assertEquals(3, queryOutput.getRecords().size(), "Unfiltered query should find all rows"); + Assertions.assertTrue(queryOutput.getRecords().stream() .allMatch(record -> record.getBackendDetailString(FilesystemRecordBackendDetailFields.FULL_PATH).contains(TestUtils.BASE_PATH)), "All records should have a full-path in their backend details, matching the test folder name"); } @@ -68,8 +68,8 @@ public class FilesystemQueryActionTest extends FilesystemActionTest @Test public void testQueryWithFileCustomizer() throws QException { - QueryRequest queryRequest = new QueryRequest(); - QInstance instance = TestUtils.defineInstance(); + QueryInput queryInput = new QueryInput(); + QInstance instance = TestUtils.defineInstance(); QTableMetaData table = instance.getTable(TestUtils.TABLE_NAME_PERSON_LOCAL_FS); table.withCustomizer(FilesystemBackendModuleInterface.CUSTOMIZER_FILE_POST_FILE_READ, new QCodeReference() @@ -77,12 +77,12 @@ public class FilesystemQueryActionTest extends FilesystemActionTest .withCodeType(QCodeType.JAVA) .withCodeUsage(QCodeUsage.CUSTOMIZER)); - queryRequest.setInstance(instance); - queryRequest.setTableName(TestUtils.defineLocalFilesystemJSONPersonTable().getName()); - QueryResult queryResult = new FilesystemQueryAction().execute(queryRequest); - Assertions.assertEquals(3, queryResult.getRecords().size(), "Unfiltered query should find all rows"); + queryInput.setInstance(instance); + queryInput.setTableName(TestUtils.defineLocalFilesystemJSONPersonTable().getName()); + QueryOutput queryOutput = new FilesystemQueryAction().execute(queryInput); + Assertions.assertEquals(3, queryOutput.getRecords().size(), "Unfiltered query should find all rows"); Assertions.assertTrue( - queryResult.getRecords().stream().allMatch(record -> record.getValueString("email").matches(".*KINGSROOK.COM")), + queryOutput.getRecords().stream().allMatch(record -> record.getValueString("email").matches(".*KINGSROOK.COM")), "All records should have their email addresses up-shifted."); } diff --git a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/etl/basic/BasicETLCleanupSourceFilesStepTest.java b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/etl/basic/BasicETLCleanupSourceFilesStepTest.java index e3a508d4..3a43066a 100644 --- a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/etl/basic/BasicETLCleanupSourceFilesStepTest.java +++ b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/etl/basic/BasicETLCleanupSourceFilesStepTest.java @@ -27,9 +27,9 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.UUID; -import com.kingsrook.qqq.backend.core.actions.RunBackendStepAction; -import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepRequest; -import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepResult; +import com.kingsrook.qqq.backend.core.actions.processes.RunBackendStepAction; +import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput; +import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutput; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.metadata.processes.QBackendStepMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QProcessMetaData; @@ -136,13 +136,13 @@ public class BasicETLCleanupSourceFilesStepTest *******************************************************************************/ private void testDelete(QInstance qInstance, List filePaths) throws Exception { - RunBackendStepResult runBackendStepResult = runFunction(qInstance, filePaths, Map.of( + RunBackendStepOutput runBackendStepOutput = runFunction(qInstance, filePaths, Map.of( BasicETLCleanupSourceFilesStep.FIELD_MOVE_OR_DELETE, BasicETLCleanupSourceFilesStep.VALUE_DELETE, // todo - even though this field isn't needed, since we gave a value of "delete" // the RunFunctionAction considers any missing input to be an error... BasicETLCleanupSourceFilesStep.FIELD_DESTINATION_FOR_MOVES, "")); - assertNull(runBackendStepResult.getException()); + assertNull(runBackendStepOutput.getException()); for(String filePath : filePaths) { assertFalse(new File(filePath).exists(), "File should have been deleted."); @@ -157,11 +157,11 @@ public class BasicETLCleanupSourceFilesStepTest private void testMove(QInstance qInstance, List filePaths) throws Exception { String trashDir = File.separator + "tmp" + File.separator + "trash"; - RunBackendStepResult runBackendStepResult = runFunction(qInstance, filePaths, Map.of( + RunBackendStepOutput runBackendStepOutput = runFunction(qInstance, filePaths, Map.of( BasicETLCleanupSourceFilesStep.FIELD_MOVE_OR_DELETE, BasicETLCleanupSourceFilesStep.VALUE_MOVE, BasicETLCleanupSourceFilesStep.FIELD_DESTINATION_FOR_MOVES, trashDir)); - assertNull(runBackendStepResult.getException()); + assertNull(runBackendStepOutput.getException()); for(String filePath : filePaths) { @@ -177,7 +177,7 @@ public class BasicETLCleanupSourceFilesStepTest /******************************************************************************* ** *******************************************************************************/ - private RunBackendStepResult runFunction(QInstance qInstance, List filePaths, Map values) throws Exception + private RunBackendStepOutput runFunction(QInstance qInstance, List filePaths, Map values) throws Exception { QBackendStepMetaData backendStepMetaData = new BasicETLCleanupSourceFilesStep().defineStepMetaData(); QProcessMetaData qProcessMetaData = new QProcessMetaData().withName("testScaffold").addStep(backendStepMetaData); @@ -193,22 +193,22 @@ public class BasicETLCleanupSourceFilesStepTest // List records = filePaths.stream() // .map(filePath -> new QRecord().withBackendDetail(FilesystemRecordBackendDetailFields.FULL_PATH, filePath)).toList(); - RunBackendStepRequest runBackendStepRequest = new RunBackendStepRequest(qInstance); - runBackendStepRequest.setStepName(backendStepMetaData.getName()); - runBackendStepRequest.setProcessName(qProcessMetaData.getName()); + RunBackendStepInput runBackendStepInput = new RunBackendStepInput(qInstance); + runBackendStepInput.setStepName(backendStepMetaData.getName()); + runBackendStepInput.setProcessName(qProcessMetaData.getName()); // runFunctionRequest.setRecords(records); - runBackendStepRequest.setSession(TestUtils.getMockSession()); - runBackendStepRequest.addValue(BasicETLProcess.FIELD_SOURCE_TABLE, TestUtils.TABLE_NAME_PERSON_LOCAL_FS); - runBackendStepRequest.addValue(BasicETLProcess.FIELD_DESTINATION_TABLE, TestUtils.TABLE_NAME_PERSON_S3); - runBackendStepRequest.addValue(BasicETLCollectSourceFileNamesStep.FIELD_SOURCE_FILE_PATHS, StringUtils.join(",", filePathsSet)); + runBackendStepInput.setSession(TestUtils.getMockSession()); + runBackendStepInput.addValue(BasicETLProcess.FIELD_SOURCE_TABLE, TestUtils.TABLE_NAME_PERSON_LOCAL_FS); + runBackendStepInput.addValue(BasicETLProcess.FIELD_DESTINATION_TABLE, TestUtils.TABLE_NAME_PERSON_S3); + runBackendStepInput.addValue(BasicETLCollectSourceFileNamesStep.FIELD_SOURCE_FILE_PATHS, StringUtils.join(",", filePathsSet)); for(Map.Entry entry : values.entrySet()) { - runBackendStepRequest.addValue(entry.getKey(), entry.getValue()); + runBackendStepInput.addValue(entry.getKey(), entry.getValue()); } RunBackendStepAction runFunctionAction = new RunBackendStepAction(); - return (runFunctionAction.execute(runBackendStepRequest)); + return (runFunctionAction.execute(runBackendStepInput)); } diff --git a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/etl/basic/BasicETLCollectSourceFileNamesStepTest.java b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/etl/basic/BasicETLCollectSourceFileNamesStepTest.java index db56b418..0a2091c1 100644 --- a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/etl/basic/BasicETLCollectSourceFileNamesStepTest.java +++ b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/etl/basic/BasicETLCollectSourceFileNamesStepTest.java @@ -24,9 +24,9 @@ package com.kingsrook.qqq.backend.module.filesystem.processes.implementations.et import java.util.Arrays; import java.util.List; -import com.kingsrook.qqq.backend.core.actions.RunBackendStepAction; -import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepRequest; -import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepResult; +import com.kingsrook.qqq.backend.core.actions.processes.RunBackendStepAction; +import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput; +import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutput; import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.metadata.processes.QBackendStepMetaData; @@ -101,14 +101,14 @@ class BasicETLCollectSourceFileNamesStepTest List records = Arrays.stream(fileNames).map(fileName -> new QRecord().withBackendDetail(FilesystemRecordBackendDetailFields.FULL_PATH, fileName)).toList(); - RunBackendStepRequest runBackendStepRequest = new RunBackendStepRequest(qInstance); - runBackendStepRequest.setSession(TestUtils.getMockSession()); - runBackendStepRequest.setStepName(backendStepMetaData.getName()); - runBackendStepRequest.setProcessName(qProcessMetaData.getName()); - runBackendStepRequest.setRecords(records); + RunBackendStepInput runBackendStepInput = new RunBackendStepInput(qInstance); + runBackendStepInput.setSession(TestUtils.getMockSession()); + runBackendStepInput.setStepName(backendStepMetaData.getName()); + runBackendStepInput.setProcessName(qProcessMetaData.getName()); + runBackendStepInput.setRecords(records); RunBackendStepAction runBackendStepAction = new RunBackendStepAction(); - RunBackendStepResult result = runBackendStepAction.execute(runBackendStepRequest); + RunBackendStepOutput result = runBackendStepAction.execute(runBackendStepInput); return ((String) result.getValues().get(BasicETLCollectSourceFileNamesStep.FIELD_SOURCE_FILE_PATHS)); } diff --git a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncProcessS3Test.java b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncProcessS3Test.java index 4b3d87b7..551f5f0b 100644 --- a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncProcessS3Test.java +++ b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncProcessS3Test.java @@ -25,18 +25,18 @@ package com.kingsrook.qqq.backend.module.filesystem.processes.implementations.fi import java.util.List; import java.util.stream.Collectors; import com.amazonaws.services.s3.model.S3ObjectSummary; -import com.kingsrook.qqq.backend.core.actions.RunBackendStepAction; +import com.kingsrook.qqq.backend.core.actions.processes.RunBackendStepAction; import com.kingsrook.qqq.backend.core.exceptions.QModuleDispatchException; -import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepRequest; -import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepResult; +import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput; +import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutput; import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData; -import com.kingsrook.qqq.backend.core.model.metadata.QFieldMetaData; -import com.kingsrook.qqq.backend.core.model.metadata.QFieldType; +import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; -import com.kingsrook.qqq.backend.core.model.metadata.QTableMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QBackendStepMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QProcessMetaData; -import com.kingsrook.qqq.backend.core.modules.QBackendModuleDispatcher; +import com.kingsrook.qqq.backend.core.modules.backend.QBackendModuleDispatcher; import com.kingsrook.qqq.backend.module.filesystem.TestUtils; import com.kingsrook.qqq.backend.module.filesystem.s3.BaseS3Test; import com.kingsrook.qqq.backend.module.filesystem.s3.S3BackendModule; @@ -102,13 +102,13 @@ class FilesystemSyncProcessS3Test extends BaseS3Test ////////////////// // run the step // ////////////////// - RunBackendStepRequest runBackendStepRequest = new RunBackendStepRequest(qInstance); - runBackendStepRequest.setStepName(step.getName()); - runBackendStepRequest.setProcessName(process.getName()); - runBackendStepRequest.setSession(TestUtils.getMockSession()); + RunBackendStepInput runBackendStepInput = new RunBackendStepInput(qInstance); + runBackendStepInput.setStepName(step.getName()); + runBackendStepInput.setProcessName(process.getName()); + runBackendStepInput.setSession(TestUtils.getMockSession()); RunBackendStepAction runFunctionAction = new RunBackendStepAction(); - RunBackendStepResult runBackendStepResult = runFunctionAction.execute(runBackendStepRequest); + RunBackendStepOutput runBackendStepOutput = runFunctionAction.execute(runBackendStepInput); // System.out.println(runBackendStepResult); printTableListing(sourceBackend, sourceTable); @@ -165,13 +165,13 @@ class FilesystemSyncProcessS3Test extends BaseS3Test ////////////////// // run the step // ////////////////// - RunBackendStepRequest runBackendStepRequest = new RunBackendStepRequest(qInstance); - runBackendStepRequest.setStepName(step.getName()); - runBackendStepRequest.setProcessName(process.getName()); - runBackendStepRequest.setSession(TestUtils.getMockSession()); + RunBackendStepInput runBackendStepInput = new RunBackendStepInput(qInstance); + runBackendStepInput.setStepName(step.getName()); + runBackendStepInput.setProcessName(process.getName()); + runBackendStepInput.setSession(TestUtils.getMockSession()); RunBackendStepAction runFunctionAction = new RunBackendStepAction(); - RunBackendStepResult runBackendStepResult = runFunctionAction.execute(runBackendStepRequest); + RunBackendStepOutput runBackendStepOutput = runFunctionAction.execute(runBackendStepInput); // System.out.println(runBackendStepResult); printTableListing(vendorBackend, sourceTable); diff --git a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncProcessTest.java b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncProcessTest.java index 9f0e3933..a9845a2b 100644 --- a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncProcessTest.java +++ b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncProcessTest.java @@ -24,13 +24,13 @@ package com.kingsrook.qqq.backend.module.filesystem.processes.implementations.fi import java.io.File; import java.io.IOException; -import com.kingsrook.qqq.backend.core.actions.RunBackendStepAction; -import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepRequest; -import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepResult; -import com.kingsrook.qqq.backend.core.model.metadata.QFieldMetaData; -import com.kingsrook.qqq.backend.core.model.metadata.QFieldType; +import com.kingsrook.qqq.backend.core.actions.processes.RunBackendStepAction; +import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput; +import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutput; +import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; -import com.kingsrook.qqq.backend.core.model.metadata.QTableMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QBackendStepMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QProcessMetaData; import com.kingsrook.qqq.backend.module.filesystem.TestUtils; @@ -83,13 +83,13 @@ class FilesystemSyncProcessTest ////////////////////// // run the step // ////////////////////// - RunBackendStepRequest runBackendStepRequest = new RunBackendStepRequest(qInstance); - runBackendStepRequest.setStepName(step.getName()); - runBackendStepRequest.setProcessName(process.getName()); - runBackendStepRequest.setSession(TestUtils.getMockSession()); + RunBackendStepInput runBackendStepInput = new RunBackendStepInput(qInstance); + runBackendStepInput.setStepName(step.getName()); + runBackendStepInput.setProcessName(process.getName()); + runBackendStepInput.setSession(TestUtils.getMockSession()); RunBackendStepAction runFunctionAction = new RunBackendStepAction(); - RunBackendStepResult runBackendStepResult = runFunctionAction.execute(runBackendStepRequest); + RunBackendStepOutput runBackendStepOutput = runFunctionAction.execute(runBackendStepInput); // System.out.println(runBackendStepResult); } diff --git a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/S3BackendModuleTest.java b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/S3BackendModuleTest.java index 44d1796d..8474e5ae 100644 --- a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/S3BackendModuleTest.java +++ b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/S3BackendModuleTest.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.UUID; import com.amazonaws.services.s3.model.S3ObjectSummary; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; -import com.kingsrook.qqq.backend.core.model.metadata.QTableMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.module.filesystem.TestUtils; import com.kingsrook.qqq.backend.module.filesystem.exceptions.FilesystemException; import com.kingsrook.qqq.backend.module.filesystem.s3.actions.AbstractS3Action; diff --git a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3QueryActionTest.java b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3QueryActionTest.java index ae490a44..ef84e292 100644 --- a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3QueryActionTest.java +++ b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3QueryActionTest.java @@ -24,8 +24,8 @@ package com.kingsrook.qqq.backend.module.filesystem.s3.actions; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QInstanceValidationException; -import com.kingsrook.qqq.backend.core.model.actions.query.QueryRequest; -import com.kingsrook.qqq.backend.core.model.actions.query.QueryResult; +import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryInput; +import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryOutput; import com.kingsrook.qqq.backend.module.filesystem.TestUtils; import com.kingsrook.qqq.backend.module.filesystem.base.FilesystemRecordBackendDetailFields; import com.kingsrook.qqq.backend.module.filesystem.s3.BaseS3Test; @@ -45,12 +45,12 @@ public class S3QueryActionTest extends BaseS3Test @Test public void testQuery1() throws QException { - QueryRequest queryRequest = initQueryRequest(); + QueryInput queryInput = initQueryRequest(); S3QueryAction s3QueryAction = new S3QueryAction(); s3QueryAction.setS3Utils(getS3Utils()); - QueryResult queryResult = s3QueryAction.execute(queryRequest); - Assertions.assertEquals(5, queryResult.getRecords().size(), "Expected # of rows from unfiltered query"); - Assertions.assertTrue(queryResult.getRecords().stream() + QueryOutput queryOutput = s3QueryAction.execute(queryInput); + Assertions.assertEquals(5, queryOutput.getRecords().size(), "Expected # of rows from unfiltered query"); + Assertions.assertTrue(queryOutput.getRecords().stream() .allMatch(record -> record.getBackendDetailString(FilesystemRecordBackendDetailFields.FULL_PATH).contains(BaseS3Test.TEST_FOLDER)), "All records should have a full-path in their backend details, matching the test folder name"); } @@ -60,12 +60,12 @@ public class S3QueryActionTest extends BaseS3Test /******************************************************************************* ** *******************************************************************************/ - private QueryRequest initQueryRequest() throws QInstanceValidationException + private QueryInput initQueryRequest() throws QInstanceValidationException { - QueryRequest queryRequest = new QueryRequest(); - queryRequest.setInstance(TestUtils.defineInstance()); - queryRequest.setTableName(TestUtils.defineS3CSVPersonTable().getName()); - return queryRequest; + QueryInput queryInput = new QueryInput(); + queryInput.setInstance(TestUtils.defineInstance()); + queryInput.setTableName(TestUtils.defineS3CSVPersonTable().getName()); + return queryInput; } } \ No newline at end of file From 5e7be3b40613763b9011fd2b5b674db7c409af7c Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Thu, 14 Jul 2022 13:08:15 -0500 Subject: [PATCH 05/15] Update qqq-backend-core snapshot --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2ed5feec..a27d5b7b 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ com.kingsrook.qqq qqq-backend-core - 0.2.0-SNAPSHOT + 0.2.0-20220714.175901-2 From 141d4e1f8083675a146c5dc8b71d37e8533b7953 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Jul 2022 21:14:21 +0000 Subject: [PATCH 06/15] Bump aws-java-sdk-s3 from 1.12.243 to 1.12.261 Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.243 to 1.12.261. - [Release notes](https://github.com/aws/aws-sdk-java/releases) - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.243...1.12.261) --- updated-dependencies: - dependency-name: com.amazonaws:aws-java-sdk-s3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a27d5b7b..10ae1e0d 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ com.amazonaws aws-java-sdk-s3 - 1.12.243 + 1.12.261 cloud.localstack From 5da44ccbc8e0c7f09e811fab959cb40a060d1af4 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Tue, 19 Jul 2022 10:50:49 -0500 Subject: [PATCH 07/15] 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 @@ com.kingsrook.qqq qqq-backend-core - 0.2.0-20220714.175901-2 + 0.2.0-20220719.154219-3 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 try { - QueryOutput rs = new QueryOutput(); - List 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 List 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 List 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 } } - return rs; + return queryOutput; } catch(Exception e) { From 0d1f8a876fdc9bbc898292d069532e4973bcaf0e Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Mon, 25 Jul 2022 12:07:44 -0500 Subject: [PATCH 08/15] Update qqq-backend-core snapshot --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b34c7073..aa0876fa 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ com.kingsrook.qqq qqq-backend-core - 0.2.0-20220719.154219-3 + 0.2.0-20220725.165612-12 From fb8c6ac80d130eda4c95b893fa7223a754a3f06d Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Mon, 25 Jul 2022 13:23:15 -0500 Subject: [PATCH 09/15] Updated for updated deps --- .../qqq/backend/module/filesystem/TestUtils.java | 11 ++++++----- .../model/metadata/FilesystemBackendMetaDataTest.java | 5 ++--- .../s3/model/metadata/S3BackendMetaDataTest.java | 5 ++--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java index 6dbef157..fd7d0714 100644 --- a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java +++ b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java @@ -26,13 +26,14 @@ import java.io.File; import java.io.IOException; import com.kingsrook.qqq.backend.core.exceptions.QInstanceValidationException; import com.kingsrook.qqq.backend.core.instances.QInstanceValidator; -import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationType; +import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType; -import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.model.session.QSession; import com.kingsrook.qqq.backend.core.modules.authentication.MockAuthenticationModule; +import com.kingsrook.qqq.backend.core.modules.authentication.metadata.QAuthenticationMetaData; import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.Cardinality; import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.RecordFormat; import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemBackendMetaData; @@ -135,7 +136,7 @@ public class TestUtils { return new QAuthenticationMetaData() .withName("mock") - .withType("mock"); + .withType(QAuthenticationType.MOCK); } @@ -219,9 +220,9 @@ public class TestUtils /******************************************************************************* ** *******************************************************************************/ - public static QSession getMockSession() + public static QSession getMockSession() throws QInstanceValidationException { MockAuthenticationModule mockAuthenticationModule = new MockAuthenticationModule(); - return (mockAuthenticationModule.createSession(null)); + return (mockAuthenticationModule.createSession(defineInstance(), null)); } } diff --git a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/local/model/metadata/FilesystemBackendMetaDataTest.java b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/local/model/metadata/FilesystemBackendMetaDataTest.java index 7c6515f6..e293c89a 100644 --- a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/local/model/metadata/FilesystemBackendMetaDataTest.java +++ b/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() - .ignoringFields("hasBeenValidated") // note, this field is @JsonIgnore - .isEqualTo(qInstance); + assertThat(deserialized.getBackends()).usingRecursiveComparison() + .isEqualTo(qInstance.getBackends()); } } \ No newline at end of file diff --git a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/model/metadata/S3BackendMetaDataTest.java b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/model/metadata/S3BackendMetaDataTest.java index 58b57634..001fc6cb 100644 --- a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/model/metadata/S3BackendMetaDataTest.java +++ b/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() - .ignoringFields("hasBeenValidated") // note, this field is @JsonIgnore - .isEqualTo(qInstance); + assertThat(deserialized.getBackends()).usingRecursiveComparison() + .isEqualTo(qInstance.getBackends()); } } \ No newline at end of file From 09d3fbfd2c95096ddccb71dc72f2ff5aea3ae1ce Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Mon, 25 Jul 2022 13:35:09 -0500 Subject: [PATCH 10/15] Update core version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aa0876fa..cc20fdde 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ com.kingsrook.qqq qqq-backend-core - 0.2.0-20220725.165612-12 + 0.2.0-20220725.183211-13 From 69e8519359b8bcf1c0e89f2ece86e67fcdf64d43 Mon Sep 17 00:00:00 2001 From: Tim Chamberlain Date: Tue, 26 Jul 2022 10:16:38 -0500 Subject: [PATCH 11/15] QQQ-27: fixes due to some updates in core version --- pom.xml | 2 +- .../base/actions/AbstractBaseFilesystemAction.java | 4 ++-- .../qqq/backend/module/filesystem/TestUtils.java | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 10ae1e0d..56e0d11c 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ com.kingsrook.qqq qqq-backend-core - 0.2.0-20220714.175901-2 + 0.2.0-20220726.150942-14 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..9ff23830 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 @@ -186,9 +186,8 @@ public abstract class AbstractBaseFilesystemAction try { - QueryOutput rs = new QueryOutput(); + QueryOutput rs = new QueryOutput(queryInput); List records = new ArrayList<>(); - rs.setRecords(records); QTableMetaData table = queryInput.getTable(); AbstractFilesystemTableBackendDetails tableDetails = getTableBackendDetails(AbstractFilesystemTableBackendDetails.class, table); @@ -228,6 +227,7 @@ public abstract class AbstractBaseFilesystemAction } } + rs.addRecords(records); return rs; } catch(Exception e) diff --git a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java index 6dbef157..177266a1 100644 --- a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java +++ b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java @@ -26,13 +26,14 @@ import java.io.File; import java.io.IOException; import com.kingsrook.qqq.backend.core.exceptions.QInstanceValidationException; import com.kingsrook.qqq.backend.core.instances.QInstanceValidator; -import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationType; +import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType; -import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.model.session.QSession; import com.kingsrook.qqq.backend.core.modules.authentication.MockAuthenticationModule; +import com.kingsrook.qqq.backend.core.modules.authentication.metadata.QAuthenticationMetaData; import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.Cardinality; import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.RecordFormat; import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemBackendMetaData; @@ -135,7 +136,7 @@ public class TestUtils { return new QAuthenticationMetaData() .withName("mock") - .withType("mock"); + .withType(QAuthenticationType.MOCK); } @@ -222,6 +223,6 @@ public class TestUtils public static QSession getMockSession() { MockAuthenticationModule mockAuthenticationModule = new MockAuthenticationModule(); - return (mockAuthenticationModule.createSession(null)); + return (mockAuthenticationModule.createSession(null, null)); } } From 955bc9c7e399763f1e9d89fc4594393eb5b68b10 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Tue, 26 Jul 2022 16:44:16 -0500 Subject: [PATCH 12/15] Update backend-core --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cc20fdde..e6d624f6 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ com.kingsrook.qqq qqq-backend-core - 0.2.0-20220725.183211-13 + 0.2.0-20220726.214150-15 From 4193bb124213b71d4fe25a50d6eb7bb3fa5eeff7 Mon Sep 17 00:00:00 2001 From: Tim Chamberlain Date: Wed, 27 Jul 2022 23:43:49 -0500 Subject: [PATCH 13/15] QQQ-27: gitignore .env --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ae1ac990..d2cf8a34 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ target/ *.iml +.env ############################################# ## Original contents from github template: ## From 6ffa488618c7794522a138891fbb855334063c27 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Thu, 28 Jul 2022 09:09:24 -0500 Subject: [PATCH 14/15] Update qqq-backend-core to 0.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9d3b76e4..cf322050 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ com.kingsrook.qqq qqq-backend-core - 0.2.0-20220726.214150-15 + 0.2.0 From 0d5097564fd56fd5e7f7aeec9277bbd1cab569f0 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Thu, 28 Jul 2022 09:10:40 -0500 Subject: [PATCH 15/15] Update versions for release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cf322050..3844bd49 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ com.kingsrook.qqq qqq-backend-module-filesystem - 0.2.0-SNAPSHOT + 0.2.0 scm:git:git@github.com:Kingsrook/qqq-backend-module-rdbms.git