From 5da44ccbc8e0c7f09e811fab959cb40a060d1af4 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Tue, 19 Jul 2022 10:50:49 -0500 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 955bc9c7e399763f1e9d89fc4594393eb5b68b10 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Tue, 26 Jul 2022 16:44:16 -0500 Subject: [PATCH 5/5] 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