From a4bd3b56f6593f75f1bbf140863fdf068dddb8e1 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Fri, 2 Jun 2023 09:11:29 -0500 Subject: [PATCH] Fix comments, cleanup from code review --- .../core/actions/tables/DeleteAction.java | 6 +++--- .../core/actions/tables/InsertAction.java | 6 +++--- .../core/actions/tables/UpdateAction.java | 6 +++--- .../bulk/delete/BulkDeleteLoadStep.java | 20 +------------------ .../bulk/delete/BulkDeleteTransformStep.java | 3 --- .../bulk/edit/BulkEditTransformStep.java | 3 --- ...ProcessSummaryWarningsAndErrorsRollup.java | 5 ++++- 7 files changed, 14 insertions(+), 35 deletions(-) diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/DeleteAction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/DeleteAction.java index 83776d9b..5e30832b 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/DeleteAction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/DeleteAction.java @@ -221,9 +221,9 @@ public class DeleteAction oldRecordList.ifPresent(l -> dmlAuditInput.setRecordList(l)); new DMLAuditAction().execute(dmlAuditInput); - ///////////////////////////////////////////////////////////// - // finally, run the pre-delete customizer, if there is one // - ///////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////// + // finally, run the post-delete customizer, if there is one // + ////////////////////////////////////////////////////////////// Optional postDeleteCustomizer = QCodeLoader.getTableCustomizer(AbstractPostDeleteCustomizer.class, table, TableCustomizers.POST_DELETE_RECORD.getRole()); if(postDeleteCustomizer.isPresent() && oldRecordList.isPresent()) { diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/InsertAction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/InsertAction.java index b2f8219b..44d471d6 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/InsertAction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/InsertAction.java @@ -136,9 +136,9 @@ public class InsertAction extends AbstractQActionFunction postInsertCustomizer = QCodeLoader.getTableCustomizer(AbstractPostInsertCustomizer.class, table, TableCustomizers.POST_INSERT_RECORD.getRole()); if(postInsertCustomizer.isPresent()) { diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/UpdateAction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/UpdateAction.java index 0a446963..e5501f28 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/UpdateAction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/UpdateAction.java @@ -144,9 +144,9 @@ public class UpdateAction new DMLAuditAction().execute(dmlAuditInput); } - ///////////////////////////////////////////////////////////// - // finally, run the pre-update customizer, if there is one // - ///////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////// + // finally, run the post-update customizer, if there is one // + ////////////////////////////////////////////////////////////// Optional postUpdateCustomizer = QCodeLoader.getTableCustomizer(AbstractPostUpdateCustomizer.class, table, TableCustomizers.POST_UPDATE_RECORD.getRole()); if(postUpdateCustomizer.isPresent()) { diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/delete/BulkDeleteLoadStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/delete/BulkDeleteLoadStep.java index 0b50d953..920da51f 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/delete/BulkDeleteLoadStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/delete/BulkDeleteLoadStep.java @@ -26,10 +26,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.stream.Collectors; -import com.kingsrook.qqq.backend.core.actions.QBackendTransaction; -import com.kingsrook.qqq.backend.core.actions.tables.InsertAction; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.model.actions.processes.ProcessSummaryLine; import com.kingsrook.qqq.backend.core.model.actions.processes.ProcessSummaryLineInterface; @@ -38,7 +35,6 @@ import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutp import com.kingsrook.qqq.backend.core.model.actions.processes.Status; import com.kingsrook.qqq.backend.core.model.actions.tables.InputSource; import com.kingsrook.qqq.backend.core.model.actions.tables.QInputSource; -import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertInput; import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamedwithfrontend.LoadViaDeleteStep; @@ -48,8 +44,7 @@ import com.kingsrook.qqq.backend.core.utils.CollectionUtils; /******************************************************************************* - ** Generic implementation of a LoadStep - that runs a Delete action for a - ** specified table. + ** Load step for bulk-delete. *******************************************************************************/ public class BulkDeleteLoadStep extends LoadViaDeleteStep implements ProcessSummaryProviderInterface { @@ -153,17 +148,4 @@ public class BulkDeleteLoadStep extends LoadViaDeleteStep implements ProcessSumm } } - - - /******************************************************************************* - ** - *******************************************************************************/ - @Override - public Optional openTransaction(RunBackendStepInput runBackendStepInput) throws QException - { - InsertInput insertInput = new InsertInput(); - insertInput.setTableName(runBackendStepInput.getValueString(FIELD_DESTINATION_TABLE)); - - return (Optional.of(new InsertAction().openTransaction(insertInput))); - } } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/delete/BulkDeleteTransformStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/delete/BulkDeleteTransformStep.java index 95df5260..0c016813 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/delete/BulkDeleteTransformStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/delete/BulkDeleteTransformStep.java @@ -151,9 +151,6 @@ public class BulkDeleteTransformStep extends AbstractTransformStep // no transformation needs done - just pass records through from input to output, and assume errors & warnings will come from the delete action // ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// runBackendStepOutput.setRecords(runBackendStepInput.getRecords()); - - // i think load step will do this. - // okSummary.incrementCount(runBackendStepInput.getRecords().size()); } } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/edit/BulkEditTransformStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/edit/BulkEditTransformStep.java index 077a9f29..ed1bcd49 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/edit/BulkEditTransformStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/edit/BulkEditTransformStep.java @@ -139,9 +139,6 @@ public class BulkEditTransformStep extends AbstractTransformStep outputRecords.add(recordToUpdate); setUpdatedFieldsInRecord(runBackendStepInput, enabledFields, recordToUpdate); } - - // i think load step will do this. - // okSummary.incrementCount(runBackendStepInput.getRecords().size()); } else { diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/general/ProcessSummaryWarningsAndErrorsRollup.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/general/ProcessSummaryWarningsAndErrorsRollup.java index 91f343bd..ce0cb2ed 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/general/ProcessSummaryWarningsAndErrorsRollup.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/general/ProcessSummaryWarningsAndErrorsRollup.java @@ -34,7 +34,10 @@ import com.kingsrook.qqq.backend.core.model.actions.processes.Status; /******************************************************************************* - ** + ** Helper class for process steps that want to roll up error summary and/or + ** warning summary lines. e.g., if the process might have a handful of different + ** error messages. Will record up to 50 unique errors, then throw the rest int + ** an "other" errors summary. *******************************************************************************/ public class ProcessSummaryWarningsAndErrorsRollup {