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 1/3] 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 69e8519359b8bcf1c0e89f2ece86e67fcdf64d43 Mon Sep 17 00:00:00 2001 From: Tim Chamberlain Date: Tue, 26 Jul 2022 10:16:38 -0500 Subject: [PATCH 2/3] 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 4193bb124213b71d4fe25a50d6eb7bb3fa5eeff7 Mon Sep 17 00:00:00 2001 From: Tim Chamberlain Date: Wed, 27 Jul 2022 23:43:49 -0500 Subject: [PATCH 3/3] 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: ##